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

commit:     4ceafbdf3a6001ad676c817fcd0b406e6d47d1b7
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 15 07:10:42 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Jul 15 07:10:42 2015 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=4ceafbdf

netbeans: bumped to the latest sources

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

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index d49282b..84b9de1 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201507090001-src.zip 208130931 SHA256 5d73ccaddac610
 DIST netbeans-trunk-nightly-201507100001-src.zip 208139985 SHA256 ede6f00ad37a28f1fa7c825e0f86ada8e314a969db3ea1884d21b6cced8dd527 SHA512 49c255eefd2affd8206082b04cb2127138b841d9ffa5f175aabfdec0703a81da0299bfc7bf55404829b493cd530e2db5570f4a19e66cf5af83b2081ed90a43ee WHIRLPOOL 6f1dd8b72445a31428e310cba1de99f0223c57c6b24f178d9cf5855633d5da23d1a87a130267b9da9697fbf28d7dc7fca2a0a341af9936f443cb9e1dc6bf89c2
 DIST netbeans-trunk-nightly-201507130001-src.zip 208143364 SHA256 f6a745a4112c25988071e5add63f52b567ea416e56eb1c5ac1f0caa40b2fa47d SHA512 2a01dde8445619c79b837bc51d1eb5fb9136dc0ad74d1e73df9d45748baa7b41032c10a76d26505fcf783193978c25907dbb2fc93a0e54f8b470ca2a6d7b9a8c WHIRLPOOL 095f94bb313aa828e0d0e972e2ccd69015e300023d7ce51569963eefba61146421f5a1a015c28fa8885445bbf42987367d18ed57da98e3b7f6521bddd3a4aaa5
 DIST netbeans-trunk-nightly-201507140001-src.zip 208144479 SHA256 9daca7bafaeb7d4e4eed58ecec4ba487f11fd6fd4b6790c719d4f428929588d4 SHA512 96adc2194d3f005216677ccdffc1ac51ecac1c2a13ec3f29b177e553ea9f5a36d9c9010c7f6454612b78a7dcb5f5ef08197e1113701bdaa0c727b9c352422c3f WHIRLPOOL 4fecb0c62019a2fc3522db07513eba2b877c01c856ac2b727329cca7ff86d573ef493a813b943558c06da3d6bc3109b5082e7ccb356318e6aef374eadeddee51
+DIST netbeans-trunk-nightly-201507150001-src.zip 208148635 SHA256 7d87494131b5b5747a107020375a39bb160e0f8ee137dea2464befa602c66c49 SHA512 4fa53101acf4866ce6fb99322dd4b1eca1ac35c3b685fa81f4f69b1f7c5515f4b65cb9d39e11e8cfd03cd1a5aaa3f466cc1a38291c9e7c9463b80e410b72360d WHIRLPOOL 054331ec1b61af88d192d095792d8bb350de86d1a8c4bac8ef8c2f2dc85fcf3fb6ad73b6e45d1794521e6745fac4e4613214fe9fc44662b69b1ca070632ffac3
 EBUILD netbeans-apisupport-7.0.1.ebuild 3134 SHA256 41c32033c9945a39c0aebb6b0271767031d53a47e5c8365d9e3a7c86712e24cd SHA512 dd4bdde9574a87b46b02fd7204b1e90394bd87dc572dfa015b601203b026b35571f20323db834a310f90aefe6e4a822044b0d71d535a7351137219b50ecb2aa8 WHIRLPOOL f3721521a33b337d7dc24d6b49b0b2fe723f5ec446a5a4befb085051140a41bfd2d3081876e9f02f8b9932a3a0997b92211cd964fe372e40b42813df5db5170e
 EBUILD netbeans-apisupport-7.1.2.ebuild 3143 SHA256 cf24048c0ecca98a7d6371624bb0ddfb78663bead073d515a7c84229dbec00a8 SHA512 ec44c263e786210fd64c9ebb253bc9d4fc34d3be9493157dad06007c19734672bfd767765c003393d1e5cc6755fd5d1eda956b00c2092e98592a73ec1af4e729 WHIRLPOOL d619c304a994a2b818d892fb6315d092588f2ebf95e566f7a909f92daf21bb368a28c4e1af876ae585980dc82996e62aba30b12c41461103c23620a215480b76
 EBUILD netbeans-apisupport-7.2.ebuild 3126 SHA256 b0d64795b8403a932e3e20721a116c755c4de66fc36f7191476fcb4a226bad13 SHA512 cea062a72a8e75a9c2fe91c323f83d542a70149336360e1c41479f401fcae5ead6a301c8a7d5704d5beb27f7810b5d1e3cff0196cce7a26890a001c570179f6a WHIRLPOOL c286f4e4d3a02cbeb1a6e13b2005dc5435a6e9ec026a98fcc00bb83222014b800cd83f437c69352b48d16bdf442a6c7ebbed6aff86f10b3c5e6cdfb7edd9e184
@@ -70,5 +71,6 @@ EBUILD netbeans-apisupport-9999_p20150709.ebuild 3390 SHA256 e844ae5f57b4ee91aa7
 EBUILD netbeans-apisupport-9999_p20150710.ebuild 3390 SHA256 e57b8bb7294f6b9ee865a676298f501de9247c9eec18fd0df12c660cb5dc2127 SHA512 bba385ef6e398812cc2a9249e69ceb69023f68d94c20038205628038c19a8b97977d3cd03da697ae3cefa215f04be1f56de4712af9d7fc9889b7ca8c2d4e3be7 WHIRLPOOL 2fe17c98105f6ed84d0da1e3dca2d6b6ba8a8d4f92514a7772dc2b1f6f8945d477fa4c99ff34798edefdcd759857ec0cbcd5b664d31c52a49225df41598544df
 EBUILD netbeans-apisupport-9999_p20150713.ebuild 3390 SHA256 ec9958b49b7dca8d57b0ee972ef28513fdef9e5286f1c2a0a2384a0e4e5e476d SHA512 324e8ef128df793847570665042daa236a9596a74eb32e8d31c29814128144a14e92016b8f29ecda438b182ca4cd26971025f4517890f5b6c046fc51da73d25c WHIRLPOOL 560227ba70dc309e07f6c48eb37a93f5072dacd325a720aa6c9f4bc4b45d9ab76dde2981d6277fd4b9d63582a5cb2c6e185287de5c2341b4cd800bd5b94a3ce7
 EBUILD netbeans-apisupport-9999_p20150714.ebuild 3390 SHA256 c9c104e19509f9aea688de43a4eaf31daf831dd7d31f787dbee29e62acfe4f14 SHA512 b67420d7f0cc7692f9e5a563f3a7bb05f0821a905317f4f751a74cd396ac6e8b1d6bf0d3753ee599811c5bff35a3425ba1190577114d41a2f9732f4759279ae5 WHIRLPOOL 67d17b81c673822a26f82382aaebc8f7d1f2073b17b9c25c9ab54a659c575fafb132be5dc556a54d51aab8451c87e1ff54b575dd7b01992e0e1b160b6bc5729b
-MISC ChangeLog 179157 SHA256 79a9398a5e671536907a0758442fa9c543a6fbd7b6eca32f8be8b3cc07e38e8e SHA512 633796f2732605bcf60d3d0a62d5bd063f778a4c566713e849412c46573387e0b95144a85a762072eef799ed53dc08d04183226607e5b8ad46c8ce814b27c4eb WHIRLPOOL ccbc49ac11ea614973d76ed65f7da42aa28de5f42622aba84bbb42aa46d6cc0af6ab080c7e91164219f15e16e52caf5e91ef5898f0c773bc2140021ed8515689
+EBUILD netbeans-apisupport-9999_p20150715.ebuild 3390 SHA256 4395fdb8aba2bea65190c00b676c8c8b6bd48a578952ae6f278f91a2374d57d6 SHA512 28dcd9b4a789dac02c29982f77da069fbc48499b273e366392160f01d6ed9c9d8b88ca42ea741c2715c06366eaf99086a0470db8d0d865383d8a62fa9346c051 WHIRLPOOL f667b55e72dca0352f5efcd018f3b057a932ce84f66cca3a8745b724051fb8f3f5e7291f53b76697fbce463569a7decb390b5c0c50a0de583db77bf9804e8242
+MISC ChangeLog 179339 SHA256 b998158b4fe675142d690a489d02b737c51c9485659d05921709b49dd70094a1 SHA512 312b0f5472e4224b7af84c8f1ce2b0ba1cf96d9a23eb8401de082fd36c698c82e172b21f46bf350a65df1bfc9ce6b498318a6430eba375bfd9cd3b529b4ff351 WHIRLPOOL dfb8ca61505192d52487d05915fbf94ac277a399013a93b70740c5c60afbedac82eb6fb07ac13bfad186216fd4adc2fe6e3a88df657dee8dbdf7041c60e6c180
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150715.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150715.ebuild
new file mode 100644
index 0000000..7fbde79
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150715.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans API Support Cluster"
+HOMEPAGE="http://netbeans.org/projects/apisupport"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-07-15_00-01-56/zip/netbeans-trunk-nightly-201507150001-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 8f950b9..57c42fc 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_p20150715 (15 Jul 2015)
+
+  15 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-cnd-9999_p20150715.ebuild:
+  updated to the latest sources
+
 *netbeans-cnd-9999_p20150714 (14 Jul 2015)
 
   14 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index 50f4def..a65f816 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -12,6 +12,7 @@ DIST 5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar 2388361 SHA256 9d3e8
 DIST 61CC1E7181A8B26E9B3E1357C06B63F8F0077FA5-open-fortran-parser-0.7.1.2.zip 94483 SHA256 11fa943df02788767f4c3439f142a4d1d9937818e9c0b2812dc824230d890a7c SHA512 c15a6092859c6dffe07a51a78596c09f40b0c4ae7073dc119c19462d955d4b3e4fd0057907a50db50c4936fbc802c8a034659383df0b66842ac9382abb5896e8 WHIRLPOOL 8ae8e818f912709ea38b7702cda934c41c828041244f6f1a6249fa392a98e1b58c6c1dc60921c7625dda0ec7aed30665a58420e35ba94d3c33d1098ccde87d58
 DIST 6E8B38E9CD7AF2EF5750E31455C03D0956F4E520-clank_0.3.6.zip 6969106 SHA256 68449488e1588fc5a85c356030eec52e52c54df8bf6b6eeba9691213373b9be7 SHA512 26b396b3a6cdd9bb690b4a9f0f4744f61036991089b4f01f264718925c6cc71b8dfc1071624723a8541bff4b82be2a5088f9e4efe57192dfd41feb386daa81e0 WHIRLPOOL 6ea28e7914c10305b760164b401a85a7e79f8196627d6af953494cee8fd00c50ef6dd89bdc8d82bfc8257f009baf3361ad5d3dca5af530543d31a0ab0ca5f27c
 DIST 84F10BEAA967E2896F0B43B0BBD08D834841F554-cnd-rfs-1.0.zip 146651 SHA256 4921fdeeb7dcf6b7c8677000a75e36894757cf78ba87cc744fb7239480d3ad17 SHA512 8400fce70d4083f83cf619378838d8880deca491cf4e79a26885df02fd0d80709b2acb7a6fafda3aa081a5a45a9ccfc00db6c26bcbb36c0d86be149dc0271372 WHIRLPOOL a2aae1eb36d6c70db6db8f670ea8183a99600a4fc5f9c93f846733978576c279035da455236dfb36c9d83b153beb4afbc18a5a1135d95d686cc7c6332d379f83
+DIST 93C7FB153337A7638E255CC9EBCADFABC8C29855-clank_0.3.6.zip 7404354 SHA256 30373dee776b066aaaad58efdbc80eddccb6e76a18ade1744d01f10feeed48e3 SHA512 7b4720c99ba5b9a8b6cdb928e4e8e050f7c1f6357e10bb420ad2a39c4d7b2c0517e345c3ac3225d1bc835998b3e248fde99e0cca86a517d9c1343600f691f84c WHIRLPOOL 092a6c438e8ca1cc89f44082d2c778a490a71d6a0d13986b40a4afc2ded2829d85cc9f6f8926cfc7daa54d0d73b50e36378ae489e4932d42fd66b1c876d0670b
 DIST 9ECBC27AB8AB49F7EF0694F1F8C760733CD26A0D-clank_0.3.6.zip 7857222 SHA256 e8ad3a7b68c75eaf5c9a9d636a19031532ca7e9ff6a386ebe8f0b15114572f82 SHA512 c9717c1f9f5ab54a2b3ab08bd628741c4883035307e879ed4efce7d0da10414afc2e9576c61979d343a1e99934fc1200651887efd00c6e44ba0a33595b8c371a WHIRLPOOL 449af7c517d673ae75207641cac5a6522d1741c93424463409641432ef671ccad8a60053f85a671870bebc92440288becf03860d007488471e0424c327f83c73
 DIST A17998A985D048F3195B6ADE1A360440FCE30102-open-fortran-parser-0.7.1.2.zip 94549 SHA256 94927e1464ab91df0ef44646a88160dba6ed209a2e7b17f0fa6284ca296e5097 SHA512 016745718f8cf590eebd122d1af1c83e3ca6a17a23a47590255429942331f5a7fea4ede008fd698079783533ae648ca03ef20fb761ce098ec93be53a082dc07d WHIRLPOOL 042f826d6d47d7035e80365a14b7c49d807ea6ddaaefab319ffcd3dc8c2d6266f60636ae65a419b73c293d92e1bd04b198a5cc395f7b494984bf404ee0f80ac9
 DIST B1B162CEF5F7306229ED9FF850F56F04FCF92312-clank_0.3.6.zip 7446062 SHA256 eecdb28bf2568a98c2866a8ac96da63cc9f1a3696f67336ad4c0ebba4b6ba88a SHA512 fb5229c67e047feaa49f1d31760504a0912a61d58d873705669bbb91571310e111c07b86b347229ccb907f540a55ce081e9a724405500527132b9e9bebef8874 WHIRLPOOL 7561a6461fb8671e9eb39eb39ba2e3045fb28152f158293eaaa033bfac18c88113cc2bd8a5f7d892056a5af30e38b6c6fe40e250f7fc9122506f87c6ee33b146
@@ -64,6 +65,7 @@ DIST netbeans-trunk-nightly-201507090001-src.zip 208130931 SHA256 5d73ccaddac610
 DIST netbeans-trunk-nightly-201507100001-src.zip 208139985 SHA256 ede6f00ad37a28f1fa7c825e0f86ada8e314a969db3ea1884d21b6cced8dd527 SHA512 49c255eefd2affd8206082b04cb2127138b841d9ffa5f175aabfdec0703a81da0299bfc7bf55404829b493cd530e2db5570f4a19e66cf5af83b2081ed90a43ee WHIRLPOOL 6f1dd8b72445a31428e310cba1de99f0223c57c6b24f178d9cf5855633d5da23d1a87a130267b9da9697fbf28d7dc7fca2a0a341af9936f443cb9e1dc6bf89c2
 DIST netbeans-trunk-nightly-201507130001-src.zip 208143364 SHA256 f6a745a4112c25988071e5add63f52b567ea416e56eb1c5ac1f0caa40b2fa47d SHA512 2a01dde8445619c79b837bc51d1eb5fb9136dc0ad74d1e73df9d45748baa7b41032c10a76d26505fcf783193978c25907dbb2fc93a0e54f8b470ca2a6d7b9a8c WHIRLPOOL 095f94bb313aa828e0d0e972e2ccd69015e300023d7ce51569963eefba61146421f5a1a015c28fa8885445bbf42987367d18ed57da98e3b7f6521bddd3a4aaa5
 DIST netbeans-trunk-nightly-201507140001-src.zip 208144479 SHA256 9daca7bafaeb7d4e4eed58ecec4ba487f11fd6fd4b6790c719d4f428929588d4 SHA512 96adc2194d3f005216677ccdffc1ac51ecac1c2a13ec3f29b177e553ea9f5a36d9c9010c7f6454612b78a7dcb5f5ef08197e1113701bdaa0c727b9c352422c3f WHIRLPOOL 4fecb0c62019a2fc3522db07513eba2b877c01c856ac2b727329cca7ff86d573ef493a813b943558c06da3d6bc3109b5082e7ccb356318e6aef374eadeddee51
+DIST netbeans-trunk-nightly-201507150001-src.zip 208148635 SHA256 7d87494131b5b5747a107020375a39bb160e0f8ee137dea2464befa602c66c49 SHA512 4fa53101acf4866ce6fb99322dd4b1eca1ac35c3b685fa81f4f69b1f7c5515f4b65cb9d39e11e8cfd03cd1a5aaa3f466cc1a38291c9e7c9463b80e410b72360d WHIRLPOOL 054331ec1b61af88d192d095792d8bb350de86d1a8c4bac8ef8c2f2dc85fcf3fb6ad73b6e45d1794521e6745fac4e4613214fe9fc44662b69b1ca070632ffac3
 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
@@ -96,5 +98,6 @@ EBUILD netbeans-cnd-9999_p20150709.ebuild 4796 SHA256 77eb8517b79df3e097d120121e
 EBUILD netbeans-cnd-9999_p20150710.ebuild 4796 SHA256 a3df9b198db497a616fac8bf8744189ba80f24177c21b67c3029333ba55f77a7 SHA512 7a8d68b81f0575b188c613761453e4f08db47398a071a94c0652799ee6682db913d027d7ec482a531a081a2e77466344b370f19daeed27d474f1b154405cfa95 WHIRLPOOL b67ad31d066b8be211aeed7cd9459ab52fa43243148e8f3ff7fd9474d0413280dd8aa3823805689d84ed0650433fe7e166928c029e76f60f5af0eddec62504ae
 EBUILD netbeans-cnd-9999_p20150713.ebuild 4796 SHA256 035ef2ba92b66b1d1086bb336e4854e315a1c47b79db7df0a0a1bdae8682e0ab SHA512 a3008d850ef9c7e4a75f19a320b7bd4626bfc9a415d8808f5f410f662c136ee19adf75026665cd961ba2d41c662a479c15541769cbd04471f5a107b7f754286e WHIRLPOOL 956ba7e0bc79ff8c5937d4ae074f3153e6c46819a0d0137e27231e9f2c63164a85583ca9b10ae961781b6bfc61747f19228e9e50d74e8e7dc5c53c825deb4911
 EBUILD netbeans-cnd-9999_p20150714.ebuild 4796 SHA256 8fc0db063174cf8ff29adc574501965831cd95745e3043567f613dd79d52b359 SHA512 f9452c4333eb5efdc6fa9df818c57b67cc6f04873df2ee7dfe0cf42b12b68b09445f28621a6ab582f21c7b51ba8e8cbc12cda7ebbc79350885bd6dbc88940496 WHIRLPOOL f5ab5f9fc5ba51f763a676d6d5140a08942773045c46b02bd751cf16915715ed1c8c03db41b171627a03d3934a832ac36f794fb497b4fde7d2ad63022202c7e1
-MISC ChangeLog 163494 SHA256 13ac5686e5366b741b86fb02472ba9fd8eb9e52112fed4646e550c1efa67d8b1 SHA512 2477706780b26619ca79fcd27e1d6e533bf2e6310c2a7c94711a3b186c88487388c87bc43a979307845fbdbd29232bcb9e2a04db5b5574d7028764671bbed4e7 WHIRLPOOL 58e64a1376f1cf0995370acf81a271ea47e7dad7e2a2260af2586658d35a4300af8528ea1badde645ac539f02d70b344fc6362fc2d2699ced123715e3b60685b
+EBUILD netbeans-cnd-9999_p20150715.ebuild 4796 SHA256 bbbb38e2b58d429396ca21acb1267105e4d3f4f8be30290abf35cfe96196e9ad SHA512 9e2809e6cefa520c68c5101ead2ca4a8d1ce169dbdb2927195bfd9544d69697d0aab19e846e4ab1e3a5abddc522df6f2c472205abfc1f70f89b4b232b46221f3 WHIRLPOOL c5c38beb4921b19c2931536711b696dcad45781c25a1ede396246dc6268c2c21b621e8fa1f90831c9f0b021ce30bed77958f92e72482869a376a0565495a498f
+MISC ChangeLog 163662 SHA256 83a4b4348744bd44e9275a5ae032e6fe7b1dffe2aecf5141f34dfc7951cb5f66 SHA512 35f95e80533e4305e9c9f71b3d060a89cf7cd01cc8eade79424933e21ec6bf4c91790386c3a81864ec458e234ce2723153bb8815ed5a3bf3b3030c38717b0e83 WHIRLPOOL cec624b11a3c845c4ee9fe58b51313186b7350d11a019c7bf4079eebce489125bc620910153fba8df39f96b49c5141ecd3fb477b7c1a26498d16ddafeb07d131
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150715.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150715.ebuild
new file mode 100644
index 0000000..3d6aa01
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150715.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans CND Cluster"
+HOMEPAGE="http://netbeans.org/projects/cnd"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-07-15_00-01-56/zip/netbeans-trunk-nightly-201507150001-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/93C7FB153337A7638E255CC9EBCADFABC8C29855-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}"/93C7FB153337A7638E255CC9EBCADFABC8C29855-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 5f6faad..9dc9962 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_p20150715 (15 Jul 2015)
+
+  15 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-dlight-9999_p20150715.ebuild:
+  updated to the latest sources
+
 *netbeans-dlight-9999_p20150714 (14 Jul 2015)
 
   14 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 6dab8c3..449ee31 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -1,6 +1,7 @@
 DIST 0018CB63E592539ABB6549B00A354DA95B404F61-fs_server-1.0.zip 231348 SHA256 df603a2ef8fe07f2926b4c6222bf9f607d720e54b7aa49a84b58f5c5feee9474 SHA512 691d30b6ab9031a1158f8ad1c5c30005eae9ef192245599de891061ecbf83f063bb7b1c54fe304670abbe7efd76b8d23288be78ab2cd27d94d86b8176cfe11fb WHIRLPOOL c10768468555ee539250149f831aa3885c8328b3789bdde36b4634373762361462b411230d89833ceac79d5a41f20b49d95de894a4d073f586d48e6c93b24c8b
 DIST 457A4C66AE33D1D5887BB1F359EEA41A10EBB2AB-fs_server-1.0.zip 283369 SHA256 2da5ca58d9960bb19f3b573709c0f73a408cbd94a19e89abfcc261b85decf9d2 SHA512 60a742dad5967c2eb5350d62cfc39925a4413fc4dc904ebdf1e6a04849a4f659dc75ff6166189957854d1241badc0bc0925aa868509d96495f41f4d91565a545 WHIRLPOOL 27e8e1219ee65f87b4cf0a24ac9955bbf65e33d4cd2315bfc9c157b170b6b9eba1d703a72a4a1a2ae05462b6c8c99b82b1e908362d65bfc36685e2c1ccb75b5f
 DIST 623DE5A3A60FEA313099D7C42256B146E2BEE9B2-h2-1.0.79.jar 1086505 SHA256 2711de9ace1c4d993524ce362485ca3cf5771a326bcb715229f0e3ebe0772587 SHA512 2e1a7463c03384b5d1b32fb3d100a42120522451b6c8d0a1c0cc74d5f098da74034e62d7b3c1a118720d13918ce4b679fc480dbd09777622f0e34e6c06f86233 WHIRLPOOL 2f27e0f011ea4cbfe7f1ceb2919089574c1a08b0fa58ae2fe4ba8449d84ab2090e13734d6882872f1971d30b600c37a0bdd021d860fa491713e809509df9712c
+DIST 6396ED8427E5068B5331C0A3A03A2235135D6D75-fs_server-1.0.zip 452453 SHA256 b71050a9f755b13d435cbfd6da00c369cb1e17baeec566624c1d4857d59b9dc6 SHA512 aa19678614bb3508403110884a22d5e967c75c1f07f2baaf862864f2078bbf9be32a81ea30c36211a0a4b4bc2b3906e73f25f2f3cf56abae9c0537449a9af654 WHIRLPOOL 7ce77d0a7244a140180960a052869b2aa66a3ab2aece3df6570157b4a2b0f053cdef22499f1f89cf5390f978ec30cbbd361f85b933148cf504b0cc2ae84e3982
 DIST DF1C6C0A0B03BC0147D215D01DA34F2E5DC13245-fs_server-1.0.zip 766626 SHA256 7fdeeb6fd54189748c2ea95cb1fd752229b88bb6ffda5205041c37f888144a9b SHA512 0002980e23014ea6b7446394af3b09188d2dcddeef5f941e532a7a509c2d963cd32b4715658a559159c073f0d33c89d4406ae2d98f89af8331d14d1a9191f0ae WHIRLPOOL cce2bd59ec9f89c37e07378149995eb3bbfa5dc1bf4c5a9ab08b78bd0846e716e56fe8e9f23418edae3122ba76bb6ff5d437fd402983c451b649d7118cbd1a97
 DIST F1AF5929CD612475CCF186F69E268F0CAAA2A90E-dtracectrl-0.1.zip 8834 SHA256 af00adae935a995cce5d668fd220cefcbe5e35ef943412109d25106982f2fd56 SHA512 72e8afec5ede6779c42221dfe5374121f0b5870f9b616c73418555bde50e777d090e9418d32e5953415e433f27300f7ab9f6aae69badbb4b8529b46364af8e93 WHIRLPOOL e529dcdc4f09d07984d671765f2990eb906c098d3feb9e512fd53441b22743d7f0900e3434fd4f1843537931470a45a91cda3f2eabe45bdd498c0a64c6d8c077
 DIST F787C9B484CD7526F866C21D8925C4DACE467F8A-derby-10.2.2.0.jar 2276020 SHA256 fc563bf30d51408ee092a59cc6abe381172040954ab1654061efb8eaf67fd2ba SHA512 ad3cc09057cf339c59189abf8fabba1e43f876c2cc2aacbcc95d8ff0ebaaa5641ac600730fbde83a13dff89705a7ced6d000f409257ac3e5f1ce027287e2c4d3 WHIRLPOOL 5e361676c3b2c3cdb35ac070dbdf2e6fd998476fb643426c106a22edadd1db904d8e0f1b25bf504d932f46247470fedc4efca92e116235669008d934e4821f97
@@ -44,6 +45,7 @@ DIST netbeans-trunk-nightly-201507090001-src.zip 208130931 SHA256 5d73ccaddac610
 DIST netbeans-trunk-nightly-201507100001-src.zip 208139985 SHA256 ede6f00ad37a28f1fa7c825e0f86ada8e314a969db3ea1884d21b6cced8dd527 SHA512 49c255eefd2affd8206082b04cb2127138b841d9ffa5f175aabfdec0703a81da0299bfc7bf55404829b493cd530e2db5570f4a19e66cf5af83b2081ed90a43ee WHIRLPOOL 6f1dd8b72445a31428e310cba1de99f0223c57c6b24f178d9cf5855633d5da23d1a87a130267b9da9697fbf28d7dc7fca2a0a341af9936f443cb9e1dc6bf89c2
 DIST netbeans-trunk-nightly-201507130001-src.zip 208143364 SHA256 f6a745a4112c25988071e5add63f52b567ea416e56eb1c5ac1f0caa40b2fa47d SHA512 2a01dde8445619c79b837bc51d1eb5fb9136dc0ad74d1e73df9d45748baa7b41032c10a76d26505fcf783193978c25907dbb2fc93a0e54f8b470ca2a6d7b9a8c WHIRLPOOL 095f94bb313aa828e0d0e972e2ccd69015e300023d7ce51569963eefba61146421f5a1a015c28fa8885445bbf42987367d18ed57da98e3b7f6521bddd3a4aaa5
 DIST netbeans-trunk-nightly-201507140001-src.zip 208144479 SHA256 9daca7bafaeb7d4e4eed58ecec4ba487f11fd6fd4b6790c719d4f428929588d4 SHA512 96adc2194d3f005216677ccdffc1ac51ecac1c2a13ec3f29b177e553ea9f5a36d9c9010c7f6454612b78a7dcb5f5ef08197e1113701bdaa0c727b9c352422c3f WHIRLPOOL 4fecb0c62019a2fc3522db07513eba2b877c01c856ac2b727329cca7ff86d573ef493a813b943558c06da3d6bc3109b5082e7ccb356318e6aef374eadeddee51
+DIST netbeans-trunk-nightly-201507150001-src.zip 208148635 SHA256 7d87494131b5b5747a107020375a39bb160e0f8ee137dea2464befa602c66c49 SHA512 4fa53101acf4866ce6fb99322dd4b1eca1ac35c3b685fa81f4f69b1f7c5515f4b65cb9d39e11e8cfd03cd1a5aaa3f466cc1a38291c9e7c9463b80e410b72360d WHIRLPOOL 054331ec1b61af88d192d095792d8bb350de86d1a8c4bac8ef8c2f2dc85fcf3fb6ad73b6e45d1794521e6745fac4e4613214fe9fc44662b69b1ca070632ffac3
 EBUILD netbeans-dlight-7.0.1.ebuild 3624 SHA256 499a9303a1972ee89dfa2685e1dc1e4511c7531ff3b29caadd1136ba25dee82e SHA512 ad60adc5d64f93d03e27170311ce7bd0a6952c8b41cdc51385f8efc9140593201064d162b3130bff7a003570de11963d375d3676476115b1129ac74632d4a227 WHIRLPOOL d68dcdba50b2565d40e1adc484b51c1ed0171c2fcf99fbee08a221e6d9767f96d161d45eda612eb4c4d62e0db6826e2cd124b83e11ee2f7c9bfb6a440ec6821d
 EBUILD netbeans-dlight-7.1.2.ebuild 2935 SHA256 dc7d110b80174b1baeaca9c005e2cc9167540f186c7794067cfb45d335251b9a SHA512 7dc2db63ee40a3e64375eb49e669c54f88cc532d7ac8c7320329f8378a3be15ebc4536208ea2975c7fe4a9b3f2ac60d0ec5b8c9a9da392587fb04838f101e0ec WHIRLPOOL 1801653d9e146eba02642dbdb0a39c235a40e5d3d5ac8d4d5b8d2a570aa62330638355ee8df76693db177c58bbf31271342215c70d7e198e4b6bd905984ed9c7
 EBUILD netbeans-dlight-7.2.ebuild 2650 SHA256 9b0c0049b7cf6894cd44327c3697d4ddfb0dba2aebd6aabc1821b550932cd69d SHA512 0584c2a1cc65193673bded284c454b430fa3f5774c33d704922977d25ed26bf88d090670e330299c85ada2e897e5f124ae9f635a6f8be7d7fd10740482df7eae WHIRLPOOL 1c27b0c84a34865cb8a84062127f49aefcd245fa16fb825d7ee57d24c3f5841935242c16b3250319078762ce4e8aa5bc8dbd8dbe497b39af8e027b9e39ee585f
@@ -76,5 +78,6 @@ EBUILD netbeans-dlight-9999_p20150709.ebuild 2995 SHA256 d586ac52ad2470df138084b
 EBUILD netbeans-dlight-9999_p20150710.ebuild 2995 SHA256 0eb4ea181336fda35c4339f4b1ce3122b7f09b5531fa179839da53fa02252f56 SHA512 4e7df7ab53f48e932e723aa7e5032da4eea1b0073addb742e14d812dcbc5b23c412e936dd4a10a467385c47980a86c5770f1f0f975f51f63640ac8ae5fc2a86f WHIRLPOOL dd49e641ee734e6f73b822b23b1d4c8f3e6c74dfc2b3b68bde06e663f90a1694edeae81d666ac64c59d0d6dfcaa4a843c7b678c5dbf7b530411bae9ff94788b5
 EBUILD netbeans-dlight-9999_p20150713.ebuild 2995 SHA256 2ca21f72070814b72461e12df121e8de6f270338b56fd42f8839efbdf6e6353f SHA512 2626e667e648f48fa30fc6b60fd25671416d73ea2898ffa3ed0060da14d106d13cc8cb41815f94d5d675e81c6b64164ddcbcaf8112a962e97bdc043b08b759a3 WHIRLPOOL f31108ca8ff22d1b73d2ffc149f8b8945077d958fa7e55755ad968a49c40cb925f451ee3d8e4309a881093cf08bbb5ce1a0514b26e6bd24bcef80dd1ee227ece
 EBUILD netbeans-dlight-9999_p20150714.ebuild 2995 SHA256 72a3464d5a634a1da3f4e18dc9b16bfef1e3b541cf5a1f2914d94e0c73b7c6e2 SHA512 be9dc1c5eeebb7d0e5e063d05dd702c9f4863e49eaad8efda65581cd06b7d6c878826a7104328902a10dc7a646c818c8160804fda1860348d64cd34c31c818fb WHIRLPOOL 7a0e9bd842d835441596d6ef89f32b47d11204d648b1037cdc2b0de053f57b93f1e4130c7aa46d4813bb6a21dc748671c1bb7ce7243514884ee37573813ac7f1
-MISC ChangeLog 170654 SHA256 dbf4f5d56064cdfd2bfe5d4006803626ef42e8ff0d5852abde3a95f4ca411097 SHA512 e754728f07a2ad02204a5907545f20b782729c9bb42a5116ffab266b860401f394142f7b30ec6a6d4fc46075538f92c4312fade8e7af00986f8e05263670fdb3 WHIRLPOOL 3ba762c3b6a2165be6c708789db29a0ccb54b07e159a48d2ea6f2ca961fcf3ffa00983ede790bb328e4f559edc7bedf921882203608848683e095f3148a9268c
+EBUILD netbeans-dlight-9999_p20150715.ebuild 2995 SHA256 ef36b04a31591cbe06a91179af28aef2ce730aa3538273f1a33dd91b8565a332 SHA512 e6f2c2a6d85df700745e61c92d3b7276736581b85980683f2b4c620dafaf69773618e143159f7aa3e9631745bb7f0b5fb87b8c6cf569a300bf04119f56aa243b WHIRLPOOL 6977b1066d1cb4d125fd1a4766975e454723022e03393fc9e9d7e06f07d7139dce45e24f2f0c370cd59798c3b760f3381728caa171b71fbcf321ef7edd5664ac
+MISC ChangeLog 170828 SHA256 ce304f896052681bfac1daa7e0964aa9b8537dc9b39288df431ccea10d1f9750 SHA512 c2a8275e5efff1097a399b53920a50ceec32fcef9793cfb9ed2ee71adc49dffd6acc71a958fd99c8db0aeac1e808b75b95dbde48a9cf82b0e2000692f066de98 WHIRLPOOL 51bd86cd199383683b55bdaa443d4982c038e38a5ba2e29ad70835dc6d5e202042e9ee2f3af810792c4db5fa63c3f589b5ccd78528f4b759c61423ff30a7ef51
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-enterprise/ChangeLog b/dev-java/netbeans-enterprise/ChangeLog
index 54ba6d7..7805832 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_p20150715 (15 Jul 2015)
+
+  15 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-enterprise-9999_p20150715.ebuild:
+  updated to the latest sources
+
 *netbeans-enterprise-9999_p20150714 (14 Jul 2015)
 
   14 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index f6cd539..48d0bbc 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -127,6 +127,7 @@ DIST netbeans-trunk-nightly-201507090001-src.zip 208130931 SHA256 5d73ccaddac610
 DIST netbeans-trunk-nightly-201507100001-src.zip 208139985 SHA256 ede6f00ad37a28f1fa7c825e0f86ada8e314a969db3ea1884d21b6cced8dd527 SHA512 49c255eefd2affd8206082b04cb2127138b841d9ffa5f175aabfdec0703a81da0299bfc7bf55404829b493cd530e2db5570f4a19e66cf5af83b2081ed90a43ee WHIRLPOOL 6f1dd8b72445a31428e310cba1de99f0223c57c6b24f178d9cf5855633d5da23d1a87a130267b9da9697fbf28d7dc7fca2a0a341af9936f443cb9e1dc6bf89c2
 DIST netbeans-trunk-nightly-201507130001-src.zip 208143364 SHA256 f6a745a4112c25988071e5add63f52b567ea416e56eb1c5ac1f0caa40b2fa47d SHA512 2a01dde8445619c79b837bc51d1eb5fb9136dc0ad74d1e73df9d45748baa7b41032c10a76d26505fcf783193978c25907dbb2fc93a0e54f8b470ca2a6d7b9a8c WHIRLPOOL 095f94bb313aa828e0d0e972e2ccd69015e300023d7ce51569963eefba61146421f5a1a015c28fa8885445bbf42987367d18ed57da98e3b7f6521bddd3a4aaa5
 DIST netbeans-trunk-nightly-201507140001-src.zip 208144479 SHA256 9daca7bafaeb7d4e4eed58ecec4ba487f11fd6fd4b6790c719d4f428929588d4 SHA512 96adc2194d3f005216677ccdffc1ac51ecac1c2a13ec3f29b177e553ea9f5a36d9c9010c7f6454612b78a7dcb5f5ef08197e1113701bdaa0c727b9c352422c3f WHIRLPOOL 4fecb0c62019a2fc3522db07513eba2b877c01c856ac2b727329cca7ff86d573ef493a813b943558c06da3d6bc3109b5082e7ccb356318e6aef374eadeddee51
+DIST netbeans-trunk-nightly-201507150001-src.zip 208148635 SHA256 7d87494131b5b5747a107020375a39bb160e0f8ee137dea2464befa602c66c49 SHA512 4fa53101acf4866ce6fb99322dd4b1eca1ac35c3b685fa81f4f69b1f7c5515f4b65cb9d39e11e8cfd03cd1a5aaa3f466cc1a38291c9e7c9463b80e410b72360d WHIRLPOOL 054331ec1b61af88d192d095792d8bb350de86d1a8c4bac8ef8c2f2dc85fcf3fb6ad73b6e45d1794521e6745fac4e4613214fe9fc44662b69b1ca070632ffac3
 EBUILD netbeans-enterprise-7.0.1.ebuild 16338 SHA256 03ea08daaf5d4c5592937929bac33b4af3bac00a23f2167a7ef7b3c172a72abe SHA512 4d24162c7920b9a1c65e6c6753900ead387a4941c2db98b522631bb09889c281bce048a74e2e584f8b5732cfaad1d7125e0cfd37aa2dc81fe85160b0e123ccd8 WHIRLPOOL 35eb648c37cb6e59aca7969c1074c2c280814529aa7ec3c3191b0d3f2a92fa24e1a8d981f343e4217fff52f6100b4884b970df734c45145759889aa6e6661ff2
 EBUILD netbeans-enterprise-7.1.2.ebuild 18060 SHA256 f63721b8ce5e1afbc58f783348f66f1e3501be519a1c9c1287ef860acc64ceda SHA512 2ca89ec8f89f106a284136d4d0ed52fe3bcf49c650d56ded6e62306c531e5e41f62b8aa923cb544842cf6e34e5f433fecb278bc1515abac987e2d00fb68ffa26 WHIRLPOOL 879067d72285aa6c7273e84ddc3dfef7d09c7cb9f9a6c279fddfbd3eea6439dea053d3c648fcd56d47ef2292db14d101307eb1aa8b3081dfcdbc3dac4d0c3ed9
 EBUILD netbeans-enterprise-7.2.ebuild 17752 SHA256 2f46916df731fe33c5d4626ae580a77686c392932a3388f755324bc3184bd636 SHA512 3543d033b971108fa2b8e6633ed640e812a83b34807e1cb5a69d425823d1fec1c13ecba3cc36fa4504fbfd6297e7eff1ecabe07d01725d9f13c99ffd70d220ba WHIRLPOOL 512753153bbf714ae3fbf9c580f350234d88bd5ce5690e7bc0fadd1c355bd38c2a5c1e9adb7993c3678d759661bbfb1654b0630e3535a2fb9198742fa7fd2c1e
@@ -159,5 +160,6 @@ EBUILD netbeans-enterprise-9999_p20150709.ebuild 15937 SHA256 87eaff639766d1ec92
 EBUILD netbeans-enterprise-9999_p20150710.ebuild 15937 SHA256 940138b52dea154460d664d394f99c868629283fa095fa62252b6fcb3f00ee70 SHA512 f3c5a16541eebb6ae57d2ecbdf4e24481f1c1e1933cea3d285779095ccecaf68366395c2f37e23cd9c65ce7e7ebd1ed0d8cd45662dad72e438f73ca1db71365e WHIRLPOOL 4d6fa155471356fb572c33892d29a46ec502f14bbbdc89cf187498a98a90a6d66c6e73b841d623b881beaafdf5ff649ec5522d66f9013f4e18db29533bb329ca
 EBUILD netbeans-enterprise-9999_p20150713.ebuild 15937 SHA256 6419377f3996100986931eb270a7a70d615e33aee66495be2ff18842d42c62c1 SHA512 eac97c64bf7d0cc218c2d011e3cd459f2fe0a4b8c38110c10c8d7daf20833fbabacd02da9340088d8eab78701212df4e47d1ba9437864ebd3722191175ce214e WHIRLPOOL f32ed24f489d4924dec03db81d55231db3c2683e61c6ef4e640bfdc049ff106d33c938fa2fd88160e654855d5177ae95a74e6e5360732cc728be67d2a4872095
 EBUILD netbeans-enterprise-9999_p20150714.ebuild 15937 SHA256 fe0f28e98967b40a9024b173aa965998f049ab6bc0c4f13b649ad0e22de7d4a8 SHA512 2d399e70148ff113c07813e8b9c1a957d8e4690c35d0694acaba78d58ce77f4aa7d73492fee02f52944d141f3dab0b187a44f8ee85370a7a21a8c4f6894c748d WHIRLPOOL 3c4316b96f61c3ff9ec1ab10e7761f8163d6b584a616b7051f9ffc5566f99851dea703ef65ca628c0748df0d445883c0824f42931f0807e0d947df9ce0a0704a
-MISC ChangeLog 179682 SHA256 3c127f58e1203503e6846b15618ec49b7e3cac30fed08aa482bf32e085cf3f90 SHA512 670374feb6e0547d9f48e45929fe2fb6cf00e47a448247e19e85c656b955679c2ec1f29248a820a051cadc306f92928c3de46c30b1e00616686ecc3f0a4bd2bc WHIRLPOOL acdaf1423369e3cdb1737947242a7d2df36cf63e9aa3332f901568e8556577572b16fcb9157632bcd189189bbf710059a9558e377b1c9f3085255318431cb7d1
+EBUILD netbeans-enterprise-9999_p20150715.ebuild 15937 SHA256 6f84cc704ecf4acbc20462270e0c4735e93dd004ba39e4c3cc7d7f5f80c2546a SHA512 71b66b8514cfdbb769ccf36d83bd9783b89904cb343299f2bc22f10579ae212af9e3cca64121c4e5843dce150945c90c513590f6579957059cf068a3c8d3f738 WHIRLPOOL 72aa8dbe5066fc56e8c5c7811ad78e39f4bf66a15233001a0facb95f04899553f394b5e666f3e47051d53b592923d6bfe6cbaeb9bb431ba25ba3fa0a6c9c0df4
+MISC ChangeLog 179864 SHA256 aceed0e3e7991fd62b1ca557ae7d346c682474a7ef5eca3227d33a14892d87ad SHA512 fd060db8d93d45e879115ae4e83e5df9db32f7290c7064dee2b9b30724048b4b9c492202e9e55934a501aaca185fe8d41c41ea8e1bfcc8c6cff88e3a5a0fd368 WHIRLPOOL 6fe38f6c9a4887b2d9b5f58db300efd8b172219b19651fc8a8d9328326022f181f6ea19d61e26b3ee0ce0597d6316c60a0c24f234f4ccf4ba2a24b6873f857b3
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150715.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150715.ebuild
new file mode 100644
index 0000000..dafed52
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150715.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Enterprise cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-07-15_00-01-56/zip/netbeans-trunk-nightly-201507150001-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 25b6171..072d426 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_p20150715 (15 Jul 2015)
+
+  15 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ergonomics-9999_p20150715.ebuild:
+  updated to the latest sources
+
 *netbeans-ergonomics-9999_p20150714 (14 Jul 2015)
 
   14 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 341a272..69746b8 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201507090001-src.zip 208130931 SHA256 5d73ccaddac610
 DIST netbeans-trunk-nightly-201507100001-src.zip 208139985 SHA256 ede6f00ad37a28f1fa7c825e0f86ada8e314a969db3ea1884d21b6cced8dd527 SHA512 49c255eefd2affd8206082b04cb2127138b841d9ffa5f175aabfdec0703a81da0299bfc7bf55404829b493cd530e2db5570f4a19e66cf5af83b2081ed90a43ee WHIRLPOOL 6f1dd8b72445a31428e310cba1de99f0223c57c6b24f178d9cf5855633d5da23d1a87a130267b9da9697fbf28d7dc7fca2a0a341af9936f443cb9e1dc6bf89c2
 DIST netbeans-trunk-nightly-201507130001-src.zip 208143364 SHA256 f6a745a4112c25988071e5add63f52b567ea416e56eb1c5ac1f0caa40b2fa47d SHA512 2a01dde8445619c79b837bc51d1eb5fb9136dc0ad74d1e73df9d45748baa7b41032c10a76d26505fcf783193978c25907dbb2fc93a0e54f8b470ca2a6d7b9a8c WHIRLPOOL 095f94bb313aa828e0d0e972e2ccd69015e300023d7ce51569963eefba61146421f5a1a015c28fa8885445bbf42987367d18ed57da98e3b7f6521bddd3a4aaa5
 DIST netbeans-trunk-nightly-201507140001-src.zip 208144479 SHA256 9daca7bafaeb7d4e4eed58ecec4ba487f11fd6fd4b6790c719d4f428929588d4 SHA512 96adc2194d3f005216677ccdffc1ac51ecac1c2a13ec3f29b177e553ea9f5a36d9c9010c7f6454612b78a7dcb5f5ef08197e1113701bdaa0c727b9c352422c3f WHIRLPOOL 4fecb0c62019a2fc3522db07513eba2b877c01c856ac2b727329cca7ff86d573ef493a813b943558c06da3d6bc3109b5082e7ccb356318e6aef374eadeddee51
+DIST netbeans-trunk-nightly-201507150001-src.zip 208148635 SHA256 7d87494131b5b5747a107020375a39bb160e0f8ee137dea2464befa602c66c49 SHA512 4fa53101acf4866ce6fb99322dd4b1eca1ac35c3b685fa81f4f69b1f7c5515f4b65cb9d39e11e8cfd03cd1a5aaa3f466cc1a38291c9e7c9463b80e410b72360d WHIRLPOOL 054331ec1b61af88d192d095792d8bb350de86d1a8c4bac8ef8c2f2dc85fcf3fb6ad73b6e45d1794521e6745fac4e4613214fe9fc44662b69b1ca070632ffac3
 EBUILD netbeans-ergonomics-7.0.1.ebuild 2884 SHA256 e8e4a785fc11b6d0d3c722826761581b8c9c779c5460dc7d1487b3154f4402ab SHA512 3ba2810e650726f48fbdb1bc0c58b6ee1e7d9d29d4be3b27c00bc981b773f26d979fd90154184276e044eafd1d4d8940b47d6f0f58589f9cff7fbadef5fbb05f WHIRLPOOL 5fab7fe6492f91bd0e97a8a95c0652266d771e9b60957e16ce6ff683c1e38081372151cd8c7bea44ee1f1dd7bf435f8b00b9a1a23e4c6106c990794c6093ba10
 EBUILD netbeans-ergonomics-7.1.2.ebuild 2893 SHA256 cd56250980429160b8fa9deb17f15050d016394d5fdef19bf772cf29988c86d8 SHA512 32d4556218791a32efb8cf8ec8303f7e8f27bfb03b97af0c66cee717563c7e02fcd9e350b0425ec0cec28ab09865d4815aba1471ee958e05e7c42e421a7f71c2 WHIRLPOOL 318c8528c2338c1e2f6e342c263be52753fa74c9ac934b0ee60fe0fff2146e86d1761fef8eaeca8eab844709bea2196fbe181fad1f689a9d5b9994da3271b4db
 EBUILD netbeans-ergonomics-7.2.ebuild 2876 SHA256 ca7184ac24c255941c4ec3e686c4237ef0af4be7242c44417fa799813083515e SHA512 c6537bedf2fed4ea914c74a208124fe692af837ab2c81c98b8aa0347cb9d5af496378a8c042437facced26d3b42b101225dfa8b81dfc3d6ec4e3e5613e359f72 WHIRLPOOL c7e4c08ace118690f454dbf6a9040bff3e7013c646947fd02b05bca2b4d802393b6eca3234c6228f8e4df4da1ed193ecfd93c848038e4dd9ae3f50959692aa15
@@ -70,5 +71,6 @@ EBUILD netbeans-ergonomics-9999_p20150709.ebuild 2919 SHA256 be57696d7eeb2cd77d0
 EBUILD netbeans-ergonomics-9999_p20150710.ebuild 2919 SHA256 7d115315ccffd2471b3cab0e9c8acaa499b5f3faac565bd5f1b25b6339fe06a1 SHA512 f1b7d351b549a0086bf4e087f07aec3d56b0b63b810f4f90c0f187e0460a0830df8f73a5826cd1bbea61880f16c15a5b45e037eab9717c8163806c689ec5373c WHIRLPOOL db8bdcc1b22d9dbe2ea95f0d7a53a1bdc4462e01215e3ba1750b7072124c3c09bf5394f1c14a4b27e4aea6d859076314d24bacd59e04dadfaa6e42f9e8c28ebb
 EBUILD netbeans-ergonomics-9999_p20150713.ebuild 2919 SHA256 dac80babfd9636a1992b41fa7e9b488fe7255026651d9de0aee99a39673bde15 SHA512 d86dedf389aa58faf5d32392b86e0e12063762199bf578323f917a0a2a97f8b3f964086e85682ca4cff09abb66083749753b3350bdce7381906675f692cfa014 WHIRLPOOL 01c574fe6d98092d5687c69bb2a6f38261a2a4ac58a9662915a402784f41d095b423e20b87c03b8c9def1ed9537a2a193af5cf12d0273f96957d091ded9e85a9
 EBUILD netbeans-ergonomics-9999_p20150714.ebuild 2919 SHA256 98bad55d138c7051aefc238ce2d10f48df49bc87602ab62269f97a7935b22a62 SHA512 342415c67c9fc8adc7611d2051850238a6dc7d350f4cc4ba5ef356c12596704b062d058955754d5216f0de47db8a644c2ed10c7014040216f4d97089ef3eec8f WHIRLPOOL 27a8fce0e19bf9ed9559b39e2ea507194564de25258912f8359d9100c57a7990ea301c21fe78a9efcec35118fd5eededb6c6e85e6e3fa32636fa3ea1bf76a58b
-MISC ChangeLog 179157 SHA256 b37ca5b46997d8e55abede7dd0b285260cac7549995b8b94ee71be3190d152e3 SHA512 7ff96f18127f4e6572b7f6eed577ce471b6a30a951854544a76ffd935cfd938ceffa1ac93c22fc781fac1f23e32b6c1c041c92f951e5351ea3036887d33c9c8e WHIRLPOOL 2d333d5f3e8e896bffe1e38319fd470b7aa21d794fbe6bfff335eec561896bc8347727f0fcef8df2abd694d9ed15ec9f0a0d6e1cf2f9cdf114f26fd9488af21f
+EBUILD netbeans-ergonomics-9999_p20150715.ebuild 2919 SHA256 6d387e3c3e981a3e6c2aaf4f74b6026558c70896cde25cd1863f7be945c4e8b9 SHA512 d3bba3ebe661efb2817fb97e3768a34142caa1887f9d60f3e8565a71627e48dccb925049099a5f8f672e0cdb72dbff83d2c9ecf86118cf7519b8b415bce213bd WHIRLPOOL a3712c50ebb0e666b9fa0679d166da3060fbbfcfe84b2989f87ab4308a63f2126932dcee0ab1e2f7986674161705aa404af52632b78bd0802a4cc8ee8755c9e5
+MISC ChangeLog 179339 SHA256 b1ec3ed96f63764125c49d6d0214115ac9b919e8652fe98f7c99cfa06e994d0b SHA512 71e7d203c023ee040fa35c5e4cc45f733689323709713cadb2f222f3526df392cc5cca31e65c570b8047491b428573c144c156d22431f94bfb342e169da5fb40 WHIRLPOOL 9fda6b25708ca7ddc21b28c2e3c7eb29f81e1973108e1739fa5e26918592aa57133b35faaeaee371470100d77cf1a29289dd30ac0b66f76399902f31102edfea
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150715.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150715.ebuild
new file mode 100644
index 0000000..67c5cda
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150715.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Ergonomics Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-07-15_00-01-56/zip/netbeans-trunk-nightly-201507150001-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 14d94f1..be2562a 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_p20150715 (15 Jul 2015)
+
+  15 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-extide-9999_p20150715.ebuild:
+  updated to the latest sources
+
 *netbeans-extide-9999_p20150714 (14 Jul 2015)
 
   14 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index 4cf56c8..79b7cf5 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201507090001-src.zip 208130931 SHA256 5d73ccaddac610
 DIST netbeans-trunk-nightly-201507100001-src.zip 208139985 SHA256 ede6f00ad37a28f1fa7c825e0f86ada8e314a969db3ea1884d21b6cced8dd527 SHA512 49c255eefd2affd8206082b04cb2127138b841d9ffa5f175aabfdec0703a81da0299bfc7bf55404829b493cd530e2db5570f4a19e66cf5af83b2081ed90a43ee WHIRLPOOL 6f1dd8b72445a31428e310cba1de99f0223c57c6b24f178d9cf5855633d5da23d1a87a130267b9da9697fbf28d7dc7fca2a0a341af9936f443cb9e1dc6bf89c2
 DIST netbeans-trunk-nightly-201507130001-src.zip 208143364 SHA256 f6a745a4112c25988071e5add63f52b567ea416e56eb1c5ac1f0caa40b2fa47d SHA512 2a01dde8445619c79b837bc51d1eb5fb9136dc0ad74d1e73df9d45748baa7b41032c10a76d26505fcf783193978c25907dbb2fc93a0e54f8b470ca2a6d7b9a8c WHIRLPOOL 095f94bb313aa828e0d0e972e2ccd69015e300023d7ce51569963eefba61146421f5a1a015c28fa8885445bbf42987367d18ed57da98e3b7f6521bddd3a4aaa5
 DIST netbeans-trunk-nightly-201507140001-src.zip 208144479 SHA256 9daca7bafaeb7d4e4eed58ecec4ba487f11fd6fd4b6790c719d4f428929588d4 SHA512 96adc2194d3f005216677ccdffc1ac51ecac1c2a13ec3f29b177e553ea9f5a36d9c9010c7f6454612b78a7dcb5f5ef08197e1113701bdaa0c727b9c352422c3f WHIRLPOOL 4fecb0c62019a2fc3522db07513eba2b877c01c856ac2b727329cca7ff86d573ef493a813b943558c06da3d6bc3109b5082e7ccb356318e6aef374eadeddee51
+DIST netbeans-trunk-nightly-201507150001-src.zip 208148635 SHA256 7d87494131b5b5747a107020375a39bb160e0f8ee137dea2464befa602c66c49 SHA512 4fa53101acf4866ce6fb99322dd4b1eca1ac35c3b685fa81f4f69b1f7c5515f4b65cb9d39e11e8cfd03cd1a5aaa3f466cc1a38291c9e7c9463b80e410b72360d WHIRLPOOL 054331ec1b61af88d192d095792d8bb350de86d1a8c4bac8ef8c2f2dc85fcf3fb6ad73b6e45d1794521e6745fac4e4613214fe9fc44662b69b1ca070632ffac3
 EBUILD netbeans-extide-7.4.ebuild 3311 SHA256 8585e0b9eac3b9bb35d5b5e0152936f84708a824d76831930a3dfd3d196556b0 SHA512 19eceec7a634923b4712eb277a1ff9900a2eb4d9ac0a2c699175333c263f0c02baaf24eb30bd7919444f5c9df751186689b2d4359ca1c88dca02884d7c18c3cd WHIRLPOOL e64509f198c4d09851f98d5bd2ddd5b469b0a7c0f3122f391c17833e5d6d77b7a6c2fd9e942e34f2df42047504ad40593f97af9b2898450e769c7b012355c316
 EBUILD netbeans-extide-8.0.2.ebuild 3313 SHA256 d147df43b8e55de81e0429604a2497a82861864ae50fbb85368a3070e1c266c9 SHA512 8f2722ce12c1582ca6e9ed348fcb37b9969585037b5432e592e5dd6ef4b3e49c58783da5fe20f088bee07514e3b42de7aa36607900b285c32c4b91fa218df90c WHIRLPOOL 0fb074484787a5e0e688dc734efe027ff6dfd082dd63bc9bccc612f915fbbe33a4f93db6c43d345abc9c191e22ec196aada1e889d1240968916d54c69497a2d6
 EBUILD netbeans-extide-8.0.ebuild 3305 SHA256 b2d57e2e2d92760ead3d383fe4dd5b4fb9fc2807a9b58c6f40b44fc24072b8bb SHA512 6e7f12758188a564ef6b5cf8b0ffdf79e30d1021172d10f215d04e727bc4001e4385fd0961a26a6bb42638089e0919b1d4628a13ba11a3deac94d4693c7210d5 WHIRLPOOL adac8461de43669b7bb98ea8920c0a2944837211a37503b957221149d4b91c4bd92b6db160191990b838c474495c65f62c8a4bb9fdbcaa371b4648a335b1afa9
@@ -64,5 +65,6 @@ EBUILD netbeans-extide-9999_p20150709.ebuild 3383 SHA256 4e46ebdbf5d44146a8d2a06
 EBUILD netbeans-extide-9999_p20150710.ebuild 3383 SHA256 6a2fb625791eb9a5b76a4efab549d5bb3cba35f51ebe54f8b9851b354f40f492 SHA512 d3f47368f8b34c6757f15b6c2cd5ddd9581eb577c57e702a87b434859ad2d444d46faf71f3c6785f733a1a98c4e0419d5d5f471d882a6515802858a4b297f4f1 WHIRLPOOL 3f041fa8fea108ee71589dd1483f4626606f3fc766cda8a4ceb615a310d704bfbe4e70edb551ee93febc7e3da5fd272c36a6158a7c8ef0e20ea1712de701367c
 EBUILD netbeans-extide-9999_p20150713.ebuild 3383 SHA256 1036262272ddff7c603345733196b96291ee29eb140b1fea1bb10002bdc3a41b SHA512 a52708af15086d5a643191cddfa5970ef6b4e1277f354689b61842288fdd00ba8ae6e883c7fd084ab355b136b542c9a86b0becbb0f4e00bd0833c6f70d75f202 WHIRLPOOL 7c2c2906cb6bf483002566834552f237bfe11b28f8aba77740292c2fe2110d68b091b50bb0ec7829d56ff64718d3f2424763e3b56ad123f6dcc119eb077e65df
 EBUILD netbeans-extide-9999_p20150714.ebuild 3383 SHA256 2d5c9033e8b180757698e13050eaeb9df1a8ab86f9579335021b213b7923ed38 SHA512 c9f632904d97f959fbe73ae7fcaeec6e3fcecbe21cf9ea7ba4f6247165479362b5a8ba32eb99b8b88007442ebfbe783489bf7616bf616dbb0145e120811515d6 WHIRLPOOL d77d32d4945f3aa4946e47d5e088c7860eb1a6c67a26e15f42f2b4169b766b20506bec614f646ea1087ac3718336a203a0ce383bf86ceabb3ce713ee973d1a5b
-MISC ChangeLog 102564 SHA256 72debc678a77150df00a558c5fdea83865e01753c6350fc868ebc699c8528c26 SHA512 9dd467a40726257e3c324684c57f6723c8df79e1e618f4386e0d9200822725c370921a9685e6d6d887eea5af8c2a9b1db9f2b51948ceea1f06ccd1d815d2af37 WHIRLPOOL cae2717bf3d4d583bb78ae24a079c24ce9e5cc922deeb4e3fc1f5fea70d16083ce56235562ce0cec6bffb3ace820b57241550eedd1a16130dc025d3d34369386
+EBUILD netbeans-extide-9999_p20150715.ebuild 3383 SHA256 c962470f0589b90ee64ebd39f4150eab77b27e0f2a4b9992a93d8aa31d4ff430 SHA512 678955c7f4d2435e517fc4849b3a493b4f0caec115bd071a2007f2702f3a1eb54526861b3167b96ea7775165f54d5426ad8b494771f72233db4e8eae904b95b6 WHIRLPOOL 24ece60ddd503488fc670932b6708053f6111537d5ff3a020a093beb05d31baa0b4f3cbf1e875f199c6fc16f06de9b144b2ec062021fe72642bbe27167ffd421
+MISC ChangeLog 102738 SHA256 09e0d506038c6ac92cd95a40ce274dfd0504a1fee662d6c535fcf41de5543900 SHA512 300cc7975e005c3d7c27166e8f1fd110b27d2479b408739543e198ae6360100b3be009ddccadbee63cf40c7503725208dec36432c40077a29cce1b4e284849ac WHIRLPOOL 30aa71f4a6210f3802451ea27d8552ee6ffcab1b7ae1e3bab8c29eb3c93a9e056c86bdbfce66198819722603195c5edce32ae1bdbebc31732396f3d5d02a99dd
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 4d6fefc..a00078f 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -42,6 +42,7 @@ DIST netbeans-trunk-nightly-201507090001-src.zip 208130931 SHA256 5d73ccaddac610
 DIST netbeans-trunk-nightly-201507100001-src.zip 208139985 SHA256 ede6f00ad37a28f1fa7c825e0f86ada8e314a969db3ea1884d21b6cced8dd527 SHA512 49c255eefd2affd8206082b04cb2127138b841d9ffa5f175aabfdec0703a81da0299bfc7bf55404829b493cd530e2db5570f4a19e66cf5af83b2081ed90a43ee WHIRLPOOL 6f1dd8b72445a31428e310cba1de99f0223c57c6b24f178d9cf5855633d5da23d1a87a130267b9da9697fbf28d7dc7fca2a0a341af9936f443cb9e1dc6bf89c2
 DIST netbeans-trunk-nightly-201507130001-src.zip 208143364 SHA256 f6a745a4112c25988071e5add63f52b567ea416e56eb1c5ac1f0caa40b2fa47d SHA512 2a01dde8445619c79b837bc51d1eb5fb9136dc0ad74d1e73df9d45748baa7b41032c10a76d26505fcf783193978c25907dbb2fc93a0e54f8b470ca2a6d7b9a8c WHIRLPOOL 095f94bb313aa828e0d0e972e2ccd69015e300023d7ce51569963eefba61146421f5a1a015c28fa8885445bbf42987367d18ed57da98e3b7f6521bddd3a4aaa5
 DIST netbeans-trunk-nightly-201507140001-src.zip 208144479 SHA256 9daca7bafaeb7d4e4eed58ecec4ba487f11fd6fd4b6790c719d4f428929588d4 SHA512 96adc2194d3f005216677ccdffc1ac51ecac1c2a13ec3f29b177e553ea9f5a36d9c9010c7f6454612b78a7dcb5f5ef08197e1113701bdaa0c727b9c352422c3f WHIRLPOOL 4fecb0c62019a2fc3522db07513eba2b877c01c856ac2b727329cca7ff86d573ef493a813b943558c06da3d6bc3109b5082e7ccb356318e6aef374eadeddee51
+DIST netbeans-trunk-nightly-201507150001-src.zip 208148635 SHA256 7d87494131b5b5747a107020375a39bb160e0f8ee137dea2464befa602c66c49 SHA512 4fa53101acf4866ce6fb99322dd4b1eca1ac35c3b685fa81f4f69b1f7c5515f4b65cb9d39e11e8cfd03cd1a5aaa3f466cc1a38291c9e7c9463b80e410b72360d WHIRLPOOL 054331ec1b61af88d192d095792d8bb350de86d1a8c4bac8ef8c2f2dc85fcf3fb6ad73b6e45d1794521e6745fac4e4613214fe9fc44662b69b1ca070632ffac3
 EBUILD netbeans-groovy-7.0.1.ebuild 3296 SHA256 29c3d304eca5999e78550fd715dbcbef9d15639d4e4f17fa0e45a46803080729 SHA512 43a0ddb43354bb3c0b8e29004ab547da508662d037b0006dfd24250c49470ddc0384bfffb6423f1e3eeaca98410c5de8b314a69970189306869a16380ab098a1 WHIRLPOOL bf626cecf6dec0c51e7e0b95ac4ff26a795e44a5dabd25719eeb2244742d96d33cb20ebbd9a68728dc27d28b8e558a7e2a3ee318c2e4fde234e0b5e8d32e6a58
 EBUILD netbeans-groovy-7.1.2.ebuild 3305 SHA256 1e00f335b8cc1e90deec3c3251629ba699286b25be5b6945d135d271004dc34b SHA512 3a1d67d02054478ed15e11789292fcce3fcfd343b8feebde5e07a9463c380c644310603a3f9f984e8071b0b097075809dce423b888e1f2aed316cb90a562d20e WHIRLPOOL a790c1e186c4d1949de6b4dd975b929c132e3e7b7c455c7867bd1445f59fb6ace72b5c9adf09d0c6079718fdc6c34a0c5f0c9c437517b55b7ae109ce3e20b064
 EBUILD netbeans-groovy-7.2.ebuild 3160 SHA256 6d709b7cc07d7ebb59c3ede0a19c9890ca3230144d7f455cf24d984ac2f633b0 SHA512 e30c8d58165b87a39a356f8b813c593910cd2c247de41420369fee21157c2f2881db34612711f77c9ecd9501aa6d7235ab7bc41d4092be1e68fab778c16d8288 WHIRLPOOL 4a6495ca077f3c374105b25698c8251aaa89daf56c2749bdc73867b0ea1ae404cfc7b2a8b435ef7b19f00aee8128be051c04d6a24fb631379fbe98d6854a507b
@@ -74,5 +75,6 @@ EBUILD netbeans-groovy-9999_p20150709.ebuild 3422 SHA256 9eb2fceafbbb1552a8157ec
 EBUILD netbeans-groovy-9999_p20150710.ebuild 3422 SHA256 25549c6857ae96f2e32e283ad4022af57c940d2e69cce17b48d9a63e0400ba25 SHA512 00d997c349fe3c544977aa34392361fe236b63b60912d778559a07a9ebb0d3cee302edb169b9ba74a664946e5a91ed21d951effbd77933f65eda3bf1363f2b25 WHIRLPOOL 76544694760ac653c14c753abeb9f456ba4903504c615b19f6ebb50c5b399c7bf6343ab653e9476009bae148e362571065017d228bfac8c9d79bbf78d0b39d28
 EBUILD netbeans-groovy-9999_p20150713.ebuild 3422 SHA256 37ae1eddf9463bd2081a67109d061e5055e1b7764df68615ada2e2157a6de8d1 SHA512 9fe2b671f4909060a960b6c1b57cc48f3964580e507edba73e763a547877cc91776486aed575a3c7617b2db39bce3b96d07637f10d56aaa178e27c4f63b35f78 WHIRLPOOL 3258b5230a2fc9a13d343b10a011aba79f04fc215eeb4f50f2aa9918c204530dac0e81252be5384b73cc8c6ce52de2a963a1579eac1aa918c188dbd3ee91b46b
 EBUILD netbeans-groovy-9999_p20150714.ebuild 3422 SHA256 45646c294842bd53576f66ade7d0a1448acdb919fae089dcd5ce9b8d3bbf4af9 SHA512 051b5043174fd271085366aa6bcc25a26e94700284f4ef15a34c53695b5131a52ac31078cea75ba2c688f85a7b03ed8af0c77d8c595f8c0b96ad28a274fb4e6e WHIRLPOOL 4ddca9d186ffe0f8907609b39143e1a375df6bb91c7d440587a4d77891e4ca31f8315e09212860faca3a1978fc3bba7181dd2f25e2a9b1f6b9b7d41ac0641b92
-MISC ChangeLog 170544 SHA256 6ba3a226574ef8e20a97f7c2d0c42fe2b8a5af57bc9d741ac9650c7b00389f9e SHA512 712eef315fcdf525e2068b0e53b0c3a497ed3b83f823df2eac69c7b69eb568d42502c45ec859b9c589b1b13c547b1be430fa5c73792c4ab33548f9067afa6584 WHIRLPOOL c02e6d20af61c68a81ab11555969b8568368a791e959209ba13551ad9b0ffbd20285eab7e0cb364d1fec930b74fc56e4fcdbd2c9e10292d8f0d9d5d376c90026
+EBUILD netbeans-groovy-9999_p20150715.ebuild 3422 SHA256 8437166acb35d96870ca2e9e6183ef5f496e0153b2844aa8bc256ea1aa654e97 SHA512 d6c84676dd76d17375510d546b59322df83852658a82b5121ca0fa2bb05685cda730d2e3416e79ae6a52552810d18d5388cd5beaa11a5b0b7c41789f0cc8b9f8 WHIRLPOOL dc5a0217164d71cdfc3991a3306c0a4dcf5225ba2e6e8afc5fde58c75d5d6a28814b9283b3ec689bb287346b07dba83e368db503aa50c0d98d1d8d5b5ec861b0
+MISC ChangeLog 170718 SHA256 ce0f4bd66d6ce090a7376d00fb520e9bb00269d317ccdf9255dd819bf4252032 SHA512 9db05540d80aca29a86ce2dd053103062e883249788af23e3a52ca968b4b061f79ec7050beba76aaf4a9496c41b8995f0fd3a15765ece65aa94dca1c50357012 WHIRLPOOL 0b3c360bafbf1d6e8ebfe701a2cbb22ba1d96ed5b47422422daf65fba6b8cc82c2d9ad4298e72f197902d906d2043550062f1979109a2a37cbb9f09bad208139
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150715.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150715.ebuild
new file mode 100644
index 0000000..dbe93a9
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150715.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Groovy Cluster"
+HOMEPAGE="http://netbeans.org/projects/groovy"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-07-15_00-01-56/zip/netbeans-trunk-nightly-201507150001-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 307c3cc..80b88c9 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_p20150715 (15 Jul 2015)
+
+  15 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-harness-9999_p20150715.ebuild:
+  updated to the latest sources
+
 *netbeans-harness-9999_p20150714 (14 Jul 2015)
 
   14 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 2d9781e..2627df3 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -44,6 +44,7 @@ DIST netbeans-trunk-nightly-201507090001-src.zip 208130931 SHA256 5d73ccaddac610
 DIST netbeans-trunk-nightly-201507100001-src.zip 208139985 SHA256 ede6f00ad37a28f1fa7c825e0f86ada8e314a969db3ea1884d21b6cced8dd527 SHA512 49c255eefd2affd8206082b04cb2127138b841d9ffa5f175aabfdec0703a81da0299bfc7bf55404829b493cd530e2db5570f4a19e66cf5af83b2081ed90a43ee WHIRLPOOL 6f1dd8b72445a31428e310cba1de99f0223c57c6b24f178d9cf5855633d5da23d1a87a130267b9da9697fbf28d7dc7fca2a0a341af9936f443cb9e1dc6bf89c2
 DIST netbeans-trunk-nightly-201507130001-src.zip 208143364 SHA256 f6a745a4112c25988071e5add63f52b567ea416e56eb1c5ac1f0caa40b2fa47d SHA512 2a01dde8445619c79b837bc51d1eb5fb9136dc0ad74d1e73df9d45748baa7b41032c10a76d26505fcf783193978c25907dbb2fc93a0e54f8b470ca2a6d7b9a8c WHIRLPOOL 095f94bb313aa828e0d0e972e2ccd69015e300023d7ce51569963eefba61146421f5a1a015c28fa8885445bbf42987367d18ed57da98e3b7f6521bddd3a4aaa5
 DIST netbeans-trunk-nightly-201507140001-src.zip 208144479 SHA256 9daca7bafaeb7d4e4eed58ecec4ba487f11fd6fd4b6790c719d4f428929588d4 SHA512 96adc2194d3f005216677ccdffc1ac51ecac1c2a13ec3f29b177e553ea9f5a36d9c9010c7f6454612b78a7dcb5f5ef08197e1113701bdaa0c727b9c352422c3f WHIRLPOOL 4fecb0c62019a2fc3522db07513eba2b877c01c856ac2b727329cca7ff86d573ef493a813b943558c06da3d6bc3109b5082e7ccb356318e6aef374eadeddee51
+DIST netbeans-trunk-nightly-201507150001-src.zip 208148635 SHA256 7d87494131b5b5747a107020375a39bb160e0f8ee137dea2464befa602c66c49 SHA512 4fa53101acf4866ce6fb99322dd4b1eca1ac35c3b685fa81f4f69b1f7c5515f4b65cb9d39e11e8cfd03cd1a5aaa3f466cc1a38291c9e7c9463b80e410b72360d WHIRLPOOL 054331ec1b61af88d192d095792d8bb350de86d1a8c4bac8ef8c2f2dc85fcf3fb6ad73b6e45d1794521e6745fac4e4613214fe9fc44662b69b1ca070632ffac3
 EBUILD netbeans-harness-7.0.1.ebuild 3579 SHA256 f4d09cb7bd5e8485caf75a3020ddb8102d3ea326878ac384ef4aecb011a1f6a5 SHA512 390c26b4a3dbc81ad1ef210b3ea668926398cb38ea13fa37dceb6782b4478b1ceb7a49e9db300f691fb8b31c21c56b25f4c3237c0890f0c637ca45f596c88294 WHIRLPOOL ae1e34af6dd61c30f645f39a825b6235e3eb1f9a42dd23431225513733209a2eb225a741b75342f827a4be0ffbf41b9786a6a6430051f543c321abe3c20da6bd
 EBUILD netbeans-harness-7.1.2.ebuild 3587 SHA256 e0adc470109009641bf48569623bf0fc51a400ac1ba686475c7dae1a5b561c96 SHA512 e4157a6b294c17fd7430802b33253d473120dc16173557e0d7840078f4043a383d5e3672af64f124509e54cc85d590abfa4375f181a32ab8b49e976cb6613cea WHIRLPOOL 423a5844a2c55ea99db4ac78e1c605a55a04f634601c0ac054e739c0ab4a3e9c765778dbd81ccf4a1e50e9d9e4cc29ecfad2ec64b483197927f434b67cd4d773
 EBUILD netbeans-harness-7.2.ebuild 3421 SHA256 47a5281d140b47e0235592c58657a9065d1827175ccca7d0c73fd81e90710090 SHA512 403fd1f49e11b27ef8002c4066fc911dbeadcccc7adddcdded86c6cd95e8bddaf0603c0ccafd0e91ef31a0909508deab1eb326e98e621bcbae7304413acca291 WHIRLPOOL fe3c5f95a606db39861a80201c185cb5a25e2d80698ac78ff724587b54e859f861b834b89aa79aac22f2c5da700532eaafae67fbcc33259ee07d578ba5c7f9ee
@@ -76,5 +77,6 @@ EBUILD netbeans-harness-9999_p20150709.ebuild 4131 SHA256 af48ec9e2e964ed81b3862
 EBUILD netbeans-harness-9999_p20150710.ebuild 4131 SHA256 a7f3be19f579f33027eea530d500835482b8993616f5f89d09ff596009daf089 SHA512 b466d4a1d9f40faabfdb0354b487eea8fde21a11556c72936bd39030f86597c8895e4eafed47e8d868ad8df2c520c49c8ab3b05000f68a80aa4112eff3d85bc4 WHIRLPOOL 1f9d09cdadb568cd9994abbe500e99ec7423705c4bf04634db2c0bfb700bfb0515a6dbbe80893a5a266528d0a80d86cccc788452174c9c9664ad37d06d3fd461
 EBUILD netbeans-harness-9999_p20150713.ebuild 4131 SHA256 91051678ad76b7484c51135e65281081c4e0a9c61886be5b0e28e22b7d7f1507 SHA512 9bf95469cc493a30270839a8a3b7c44060ddbc4c260f0a6e2e1f10c96d7e43099f407aa8cce591c7d937e1688d010abaaf5e35d5657b26bfc2e70bc379de6cd7 WHIRLPOOL 0a8876f748476579a421f56ef6616dd9a780ebf7801b46b7c812d041f2df9ac02c14b29d486b133f433b5aed88f603f8363599f6e639c8dabdfc7b2bbd8aef4a
 EBUILD netbeans-harness-9999_p20150714.ebuild 4131 SHA256 964c34cb15f1645baaff655b205c76b6969914bb877d6c7dc5299ab3280ecedc SHA512 a36460dda89f8c628ad3ad01a8bf55849c0001fcff42d18b42f2254c428c2d438da2e3bc756150ed310f5bb8a633bf321c24cd5abc2885738a5d920c940ff4e4 WHIRLPOOL 8e5d7fb5925984e77b5a6615cebfd05ebc6d7228e384f657e9c234cb57a9d3c70a4f728f5b06a5ef7fcd1544dfe0bfaf339499a8934217c11c09a3cb92e60ce7
-MISC ChangeLog 172726 SHA256 609b4063018f07cb97f26a181b229b7ea1494d4493fe8c488717ed10ba9b4796 SHA512 c17dd49db19fe3a63a693242c0433a9f4740f7e1ac8d7b570b04680d8cba02798fa5fbb3a1411831ba2e9e3d97e90587ed1afbfef082c98eb862054e2a42d57b WHIRLPOOL 39d2748f77713b543044c994613661c20419726a3dce61ab729ce34bdb3422ef4d5a2c8063a650d2e7f042911cd89b3e7de34a6011876590b5330911fd650521
+EBUILD netbeans-harness-9999_p20150715.ebuild 4131 SHA256 c91b84244e97790e5304598986bae2bc43010ef5f3f81dd219b4896c3604a3c0 SHA512 ebe4377eed03a7859a781d2c638065f9881bdb1654e9f9fc0a83cd97f32182a7418b079bec9dbcb2e68e64d0d5030b202bc4fd21d24a4756410b4e59d90e4cc2 WHIRLPOOL 16ebc069e9fe43df3a497dd07f885f22be40e52e1caf9ebb3de9cd5b78d25f56b9a00672974bf928126a5e4f3fe41df84bd4a7a92beecd807944568f96d830a5
+MISC ChangeLog 172902 SHA256 6fb7ebfd8d637cdb612cf9005dfc7eb4423648afe46672f9ec21ff42bf17d136 SHA512 4c9282adb28e8ff015ad0e5e159e40a70c55c2d1cb84eb536680ae948b47dbb1f6fabd5e83554799ce2f7052df206cf34827220401115176277d5152842a1521 WHIRLPOOL 798b115dff0678a21e2f3cbabea63f24bc2a345e85607a61878d93a380eb6fcc3742edd8fa276393f673310688052f817298e00c182b5193e0f581503e458362
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20150715.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20150715.ebuild
new file mode 100644
index 0000000..ca746cc
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20150715.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Harness"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-07-15_00-01-56/zip/netbeans-trunk-nightly-201507150001-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 7245ef4..3031b66 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_p20150715 (15 Jul 2015)
+
+  15 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ide-9999_p20150715.ebuild:
+  updated to the latest sources
+
 *netbeans-ide-9999_p20150714 (14 Jul 2015)
 
   14 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index ae500e2..bef30fd 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -247,6 +247,7 @@ DIST netbeans-trunk-nightly-201507090001-src.zip 208130931 SHA256 5d73ccaddac610
 DIST netbeans-trunk-nightly-201507100001-src.zip 208139985 SHA256 ede6f00ad37a28f1fa7c825e0f86ada8e314a969db3ea1884d21b6cced8dd527 SHA512 49c255eefd2affd8206082b04cb2127138b841d9ffa5f175aabfdec0703a81da0299bfc7bf55404829b493cd530e2db5570f4a19e66cf5af83b2081ed90a43ee WHIRLPOOL 6f1dd8b72445a31428e310cba1de99f0223c57c6b24f178d9cf5855633d5da23d1a87a130267b9da9697fbf28d7dc7fca2a0a341af9936f443cb9e1dc6bf89c2
 DIST netbeans-trunk-nightly-201507130001-src.zip 208143364 SHA256 f6a745a4112c25988071e5add63f52b567ea416e56eb1c5ac1f0caa40b2fa47d SHA512 2a01dde8445619c79b837bc51d1eb5fb9136dc0ad74d1e73df9d45748baa7b41032c10a76d26505fcf783193978c25907dbb2fc93a0e54f8b470ca2a6d7b9a8c WHIRLPOOL 095f94bb313aa828e0d0e972e2ccd69015e300023d7ce51569963eefba61146421f5a1a015c28fa8885445bbf42987367d18ed57da98e3b7f6521bddd3a4aaa5
 DIST netbeans-trunk-nightly-201507140001-src.zip 208144479 SHA256 9daca7bafaeb7d4e4eed58ecec4ba487f11fd6fd4b6790c719d4f428929588d4 SHA512 96adc2194d3f005216677ccdffc1ac51ecac1c2a13ec3f29b177e553ea9f5a36d9c9010c7f6454612b78a7dcb5f5ef08197e1113701bdaa0c727b9c352422c3f WHIRLPOOL 4fecb0c62019a2fc3522db07513eba2b877c01c856ac2b727329cca7ff86d573ef493a813b943558c06da3d6bc3109b5082e7ccb356318e6aef374eadeddee51
+DIST netbeans-trunk-nightly-201507150001-src.zip 208148635 SHA256 7d87494131b5b5747a107020375a39bb160e0f8ee137dea2464befa602c66c49 SHA512 4fa53101acf4866ce6fb99322dd4b1eca1ac35c3b685fa81f4f69b1f7c5515f4b65cb9d39e11e8cfd03cd1a5aaa3f466cc1a38291c9e7c9463b80e410b72360d WHIRLPOOL 054331ec1b61af88d192d095792d8bb350de86d1a8c4bac8ef8c2f2dc85fcf3fb6ad73b6e45d1794521e6745fac4e4613214fe9fc44662b69b1ca070632ffac3
 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
@@ -281,5 +282,6 @@ EBUILD netbeans-ide-9999_p20150709.ebuild 30352 SHA256 b2effb44600cc7c959692d3b0
 EBUILD netbeans-ide-9999_p20150710.ebuild 30352 SHA256 3fbbc679e3c3847bc3499c78ed41224ea2deae2cc3e633e0d2477515330a875c SHA512 c64fde46ed91aa9cad2e13c08e9072266e5986703e46e9f4d1aded37c45f99c2d7f8eda1b6854bd2307cd3ec4b02f96e582d80004218229e620dda4985f58c56 WHIRLPOOL df5f5f5ed32157f4917f5a8bdb6faaa49b1651def6bad4538ee9635cf8e47fd50056468b17d82d9dabc30452e7949d6bd61b09ef8e2b3270e9042198f9467fd0
 EBUILD netbeans-ide-9999_p20150713.ebuild 30352 SHA256 f02ceb79baa242817f1359bd2f8102685121825f0525a47f3e30c91c63a57f0f SHA512 5317ba24e3da7310870d019caf9112049644cd60ce47b2e18a1e46e69aa3b26455c6474fc780f3262d41f56500754d3a7c5c570c33966ce64b6d1b2c1ac08281 WHIRLPOOL 529d3909df23fbfc63d6367ec67a9334add060a7701717d651e944fe6b55b659a10dd38c27c708c35e6f0df60af718c7f26a3525473634431a1f198172135c6a
 EBUILD netbeans-ide-9999_p20150714.ebuild 30352 SHA256 aed02267974ff1f1c83b422576994ab5c8260e5b416a176ad73043edd41186bb SHA512 70fed3332f085a7c62610685732d65d419d933f81207581988434f0db905abdf76fb5625a1a2e1b230367dca8998daea7a87153c242e08ec5ab4f49b2a1db26d WHIRLPOOL f085b37af0f1df7085576827202c57b91b3df2f08d6f563a44e301663748cab976a290dcaeb9f28a44c0a308e8cec735e693214055b205363cd03c0d10bc8ece
-MISC ChangeLog 164416 SHA256 a99d5fe270b11ce6b1523570b49ad88252921b85c59c7ed2c135fa4fbfed89d5 SHA512 a84a17882762bde57a07f87637a1b1c09cff04060ab389e565b2a061845adf28a81609805b67772fb52684b6af1ef08b50127174df08a3b5a9b9e2204eb9958d WHIRLPOOL f84a5ee107067a79a59300a6b24d4217cb8ebe568d1a4ebef714bd74da66e5521b7eeb066fb439d75059f5086acd60ff3c5573284af4ab87970df2edaeae2c70
+EBUILD netbeans-ide-9999_p20150715.ebuild 30352 SHA256 8ff5420c4736cfd507c8a6de384e5d76ee8f2c0a1f05d82d124b9b2730264f66 SHA512 cdea158048c3d0ee67c742621128461002bbb5e75e01dcd6643b6b3f6b65b10e972848c4c2b61a13e3dac31b6cff2829c8de7af548fbf78c9a4f7b6e0f5c967a WHIRLPOOL b3a8d19cafb53d1deeeffef03ecdaf52c099c17a26c804e4907d2b526abed94284256c8a74bc085ad52ae685e9823e4087e751e576e6a072260558500a337ce1
+MISC ChangeLog 164584 SHA256 8da19c885ca033771e7cabc1c09add215e07c003c73acf28585a19b6eabf24b9 SHA512 2ef3623d1db0d5795429432c350c670d2b58be3bd0824582a38858d16d5cadf7799432b8a61641e1bd3f4b8827cf2ed2f5d6b61708ae9cd60ca3da42a7836ab4 WHIRLPOOL b98a5de7315e0fcbb1a12d0d5402be47aa884a5796121725428489f28569a4c771081d28e9deac2eb2cc868b02cf1e3db444d45e0ccbd1ab9a61724ece657c9e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20150715.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20150715.ebuild
new file mode 100644
index 0000000..e68cb8a
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20150715.ebuild
@@ -0,0 +1,377 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-07-15_00-01-56/zip/netbeans-trunk-nightly-201507150001-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 fd186c7..ec0502e 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_p20150715 (15 Jul 2015)
+
+  15 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-java-9999_p20150715.ebuild:
+  updated to the latest sources
+
 *netbeans-java-9999_p20150714 (14 Jul 2015)
 
   14 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 2422e5a..977b9be 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -119,6 +119,7 @@ DIST netbeans-trunk-nightly-201507090001-src.zip 208130931 SHA256 5d73ccaddac610
 DIST netbeans-trunk-nightly-201507100001-src.zip 208139985 SHA256 ede6f00ad37a28f1fa7c825e0f86ada8e314a969db3ea1884d21b6cced8dd527 SHA512 49c255eefd2affd8206082b04cb2127138b841d9ffa5f175aabfdec0703a81da0299bfc7bf55404829b493cd530e2db5570f4a19e66cf5af83b2081ed90a43ee WHIRLPOOL 6f1dd8b72445a31428e310cba1de99f0223c57c6b24f178d9cf5855633d5da23d1a87a130267b9da9697fbf28d7dc7fca2a0a341af9936f443cb9e1dc6bf89c2
 DIST netbeans-trunk-nightly-201507130001-src.zip 208143364 SHA256 f6a745a4112c25988071e5add63f52b567ea416e56eb1c5ac1f0caa40b2fa47d SHA512 2a01dde8445619c79b837bc51d1eb5fb9136dc0ad74d1e73df9d45748baa7b41032c10a76d26505fcf783193978c25907dbb2fc93a0e54f8b470ca2a6d7b9a8c WHIRLPOOL 095f94bb313aa828e0d0e972e2ccd69015e300023d7ce51569963eefba61146421f5a1a015c28fa8885445bbf42987367d18ed57da98e3b7f6521bddd3a4aaa5
 DIST netbeans-trunk-nightly-201507140001-src.zip 208144479 SHA256 9daca7bafaeb7d4e4eed58ecec4ba487f11fd6fd4b6790c719d4f428929588d4 SHA512 96adc2194d3f005216677ccdffc1ac51ecac1c2a13ec3f29b177e553ea9f5a36d9c9010c7f6454612b78a7dcb5f5ef08197e1113701bdaa0c727b9c352422c3f WHIRLPOOL 4fecb0c62019a2fc3522db07513eba2b877c01c856ac2b727329cca7ff86d573ef493a813b943558c06da3d6bc3109b5082e7ccb356318e6aef374eadeddee51
+DIST netbeans-trunk-nightly-201507150001-src.zip 208148635 SHA256 7d87494131b5b5747a107020375a39bb160e0f8ee137dea2464befa602c66c49 SHA512 4fa53101acf4866ce6fb99322dd4b1eca1ac35c3b685fa81f4f69b1f7c5515f4b65cb9d39e11e8cfd03cd1a5aaa3f466cc1a38291c9e7c9463b80e410b72360d WHIRLPOOL 054331ec1b61af88d192d095792d8bb350de86d1a8c4bac8ef8c2f2dc85fcf3fb6ad73b6e45d1794521e6745fac4e4613214fe9fc44662b69b1ca070632ffac3
 EBUILD netbeans-java-7.0.1-r2.ebuild 14932 SHA256 3d8eeb5c3aea368c5064e83e9519b2982a3d0f999db11344ba33605f46f865b0 SHA512 0c99037f44aa968f357724650189fe0f6fc89496fbf73f6c5a9bcd589afa5af4974f058a8eea2b6a97e1884f4cabba8b5ecf0214b7e840870358f0e55abbc595 WHIRLPOOL 4c1ccada62d0c8883033500ead9586e5bfcd360e6030b3d8368b0b16b9ed01cc03d3c3d5888de437a16d5382b5fe9ec7c02f3e200c3c19bc9a43f011f32d3a68
 EBUILD netbeans-java-7.1.2-r1.ebuild 14936 SHA256 6082d8d5022e011e7aa9d4ff92bf9a144a4f733b879127552c0ca55566b0f18c SHA512 c03a674b6d93a4261bff40ad9aaad6fa9bc0451d6017aeb51f14c42113cc2ff12f84ff5a6cc01c01b43c7ce1b4d885da5c9cb4c0e13601c8ff780eb140060ac6 WHIRLPOOL d32f06a7bd7d4924f14fcb2ed67fd2f5a1766087e4f46ed77d12d472c4c133eef5431d75a709da1abcf8b8cff5afef303dd57e82e4022651a7278076502300d6
 EBUILD netbeans-java-7.2.ebuild 12206 SHA256 da05f74f2c02e4aac745dcf1be75069cc7070f241d063c19c40465e139ac135f SHA512 62be228321e175ad03c2a7d9270065445ba9e1ca08a1a51927027ddbc78aa43a0c57c6b4193add993764235068c7128655f2f12e00fcd17fbac807334f2483c6 WHIRLPOOL 5f518535df8a5f1e1e4f0bc5c845ca063317221c619c3e8928c89a4f2bb30be5a03838f5a610bcda58959d535e4fb152f92f4edd780bcd423918b448d7ddf2e1
@@ -154,5 +155,6 @@ EBUILD netbeans-java-9999_p20150709.ebuild 14580 SHA256 1aa26a48cb7c86aeb5114308
 EBUILD netbeans-java-9999_p20150710.ebuild 14580 SHA256 3b5aa4d265d569bf22ea9988af4dd40cd1d8dea44e36b3b56856a7dbf2e47dcb SHA512 aed5c69a36ecfa0e2347405405b89a93e80728015a16731f1692d615c5f7991d69b3885e9ba7e53bd6a0d7122dec2a331642ba603e9f122c77ca1e8997fec3e4 WHIRLPOOL 784763cde3a10fc277753011c29b13256310f1d5661af518ddce2b783ef288cd94c8a40bceb418ed9c893c728a1db4cb2778306c326b63ba182d10bc0623e6ba
 EBUILD netbeans-java-9999_p20150713.ebuild 14580 SHA256 912d0ec2fb4772cb46599232e91732d71294609af3c389b531cff6dd82517864 SHA512 cb87acf1b4c479c59edf38b06ea843ab0c8fbccae41f563a6338468a6ffa512a2bebd37991011efdebb4e7f4ab970cfdc2ba66336ebb2b3cf2851dd040c80a0f WHIRLPOOL 3ae0d03711b3f2b1e7192136edf43726d92b0bc2ca7b6efaf95f07e68c6697e71d4d18b5f25107972df2776041aedf59be241c573f5ded64a2005bd8bbc88cf3
 EBUILD netbeans-java-9999_p20150714.ebuild 14580 SHA256 01a89bd34825d5743d818f36e9949eb6500b760e19e1ad9119c1c044654f705e SHA512 813c2ce7c73d93042f2db954879283dd35d24ea2afc2f9b5a3dd38642bef9198b3add4a6c1f95c7cfdd9f4e6195d6148a6152896deab606f49a5d2f5810bea29 WHIRLPOOL 3df8adcead15eb18ba580b0d628964883542e9413f5277d7a180a186a77d252a01f866eddf61b7fd109d8cf0e79c0fdbc4cc8a3db52be5e31954ba505fe87a75
-MISC ChangeLog 167863 SHA256 40a2ddb83b9ba3973455c73607ff0f4b6601e7431235a46fc558fb8d016699d8 SHA512 e6bf51d36f51a5bbbc97d2b4d92eef4964f112e3d68449732456a329a3f53aca949b6a07c3592634059e19631856c6170ca437376a5690571635eb148152f5d6 WHIRLPOOL 3a732b47391f5612ffece2af4983bec904bed00a61b22fcdb11780d925e3dff0d023c2ec04bcd0d844a1f23b46a15ea17422cb126fac134e0a6f2c92f447e8c9
+EBUILD netbeans-java-9999_p20150715.ebuild 14580 SHA256 c44d79536ba32ff42d18726b9a9842df0f001fb6b9ac42edad1fa5795f5cfa64 SHA512 ecda4162ba1d59b20c1c3fc1d666973298be5d6023bd0a1cbb1e714af50cd953b4643d395aeb27461b2f15f2576a674d94fb41080bad17f531196fde8f1891d7 WHIRLPOOL a5dd1b52a6849b4ec604568d809dfcb7024ad45bef69581b8773cedf1468f62515b91b6ea1f02abc8cc63a0a9fdbc9eca6f20b0250f19092b0bbd215d7bae829
+MISC ChangeLog 168033 SHA256 dab5d370f45bce93db971d6a0880f9935d28b29fce0d607b1f84757fef12bbdf SHA512 a9400883e50a3ed50c0ffcf829f9acc0a7308a8a97fe03a57d397d5541db49fcb09ec6b029ecd2d6b2ad90bdf2e9157be5e67bab59c10d9349b6d238a74c4602 WHIRLPOOL a18d01bbda1f95f5d2510449b3b557c80dca79704eb2e601c0edde4a9439be2df119b5fac4c4605a2f300779e07280ce6fb5b7e079dde3b3ab1d5853ca97452e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20150715.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20150715.ebuild
new file mode 100644
index 0000000..45f5c27
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20150715.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+# Maven cannot be unbundled because it depends on exact maven version and exact content of maven directory
+
+DESCRIPTION="Netbeans Java Cluster"
+HOMEPAGE="http://netbeans.org/projects/java"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-07-15_00-01-56/zip/netbeans-trunk-nightly-201507150001-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 e3278e6..6b29eb6 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_p20150715 (15 Jul 2015)
+
+  15 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javacard-9999_p20150715.ebuild:
+  updated to the latest sources
+
 *netbeans-javacard-9999_p20150714 (14 Jul 2015)
 
   14 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index b01be0d..9124c1d 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -41,6 +41,7 @@ DIST netbeans-trunk-nightly-201507090001-src.zip 208130931 SHA256 5d73ccaddac610
 DIST netbeans-trunk-nightly-201507100001-src.zip 208139985 SHA256 ede6f00ad37a28f1fa7c825e0f86ada8e314a969db3ea1884d21b6cced8dd527 SHA512 49c255eefd2affd8206082b04cb2127138b841d9ffa5f175aabfdec0703a81da0299bfc7bf55404829b493cd530e2db5570f4a19e66cf5af83b2081ed90a43ee WHIRLPOOL 6f1dd8b72445a31428e310cba1de99f0223c57c6b24f178d9cf5855633d5da23d1a87a130267b9da9697fbf28d7dc7fca2a0a341af9936f443cb9e1dc6bf89c2
 DIST netbeans-trunk-nightly-201507130001-src.zip 208143364 SHA256 f6a745a4112c25988071e5add63f52b567ea416e56eb1c5ac1f0caa40b2fa47d SHA512 2a01dde8445619c79b837bc51d1eb5fb9136dc0ad74d1e73df9d45748baa7b41032c10a76d26505fcf783193978c25907dbb2fc93a0e54f8b470ca2a6d7b9a8c WHIRLPOOL 095f94bb313aa828e0d0e972e2ccd69015e300023d7ce51569963eefba61146421f5a1a015c28fa8885445bbf42987367d18ed57da98e3b7f6521bddd3a4aaa5
 DIST netbeans-trunk-nightly-201507140001-src.zip 208144479 SHA256 9daca7bafaeb7d4e4eed58ecec4ba487f11fd6fd4b6790c719d4f428929588d4 SHA512 96adc2194d3f005216677ccdffc1ac51ecac1c2a13ec3f29b177e553ea9f5a36d9c9010c7f6454612b78a7dcb5f5ef08197e1113701bdaa0c727b9c352422c3f WHIRLPOOL 4fecb0c62019a2fc3522db07513eba2b877c01c856ac2b727329cca7ff86d573ef493a813b943558c06da3d6bc3109b5082e7ccb356318e6aef374eadeddee51
+DIST netbeans-trunk-nightly-201507150001-src.zip 208148635 SHA256 7d87494131b5b5747a107020375a39bb160e0f8ee137dea2464befa602c66c49 SHA512 4fa53101acf4866ce6fb99322dd4b1eca1ac35c3b685fa81f4f69b1f7c5515f4b65cb9d39e11e8cfd03cd1a5aaa3f466cc1a38291c9e7c9463b80e410b72360d WHIRLPOOL 054331ec1b61af88d192d095792d8bb350de86d1a8c4bac8ef8c2f2dc85fcf3fb6ad73b6e45d1794521e6745fac4e4613214fe9fc44662b69b1ca070632ffac3
 EBUILD netbeans-javacard-7.0.1.ebuild 4961 SHA256 566bc7e3275c97d0fe3d68c843b53aee641548ec39a8143aebd56d248da3c32c SHA512 5973c8d4254943473209b0881c0fbe40ac6b61563d508e58adc248dd40c8c2d6b742bd6c1667ee11fb404f9d2e62f08a8e4d822a2a3db9fccab254f73828c3b0 WHIRLPOOL fd1e08943ce754a2abfe8c8b83954399287500ce574a46fe0d76f94b300fd2a5978957f94a3ac1d85781330248a46fefacfbae25db95669c3de910145ef96424
 EBUILD netbeans-javacard-7.1.2.ebuild 4970 SHA256 15ff13152b140edaa549ea6515949d99cdb2a4656918566179836ab2277f01b8 SHA512 b7e52b477f6ba645084034eb27e848fb48361351937fc45455bf4b7d74acbdd257427ec589286f0edc71cc98c8cdb114e55988b6d3dc92143e13f407e3b45a52 WHIRLPOOL 85ab6dc2c230ea89fd19d7602ac24e3d2b0f226590998e6a6e277c24ef60a7e86874f7e95e90921d255e84f05e04ad1998ee7361b4d26c6f14828076792a933c
 EBUILD netbeans-javacard-7.2.ebuild 4718 SHA256 d173c848e825b342a52073ba16b7784016f92124d4bc3b5ad8beebb7a7dda772 SHA512 019183c236c59ec2b961445c49643c6da0b376048f1be1d58677a753890bcb03db126f6441221c7572a74fe45c4c27aeee4acb38db620f9203ad04ae8ff2c426 WHIRLPOOL f2a10183045edd22ef4419b630cedafc093b326eb593178a0f50e8d82ebb25ab732fb8c561d49969073d9fce551c5b9150fb1900b49458ed53f0234baa29a78e
@@ -73,5 +74,6 @@ EBUILD netbeans-javacard-9999_p20150709.ebuild 4982 SHA256 96aaf28d604086d1f77bd
 EBUILD netbeans-javacard-9999_p20150710.ebuild 4982 SHA256 13619333e6fe3a01609ab4ca9dfaef98b3708e20b09d8e327fc9ee9bc8293e58 SHA512 990124c81061b2f2512b6652a34d275def2953a3890f2a350bfd221f090021227c74d1ac39ed31a4a00224cf4128119ae6f6bdbd5706426e3eff15ed633ce099 WHIRLPOOL 818ba93f81bceb9d15b6362923aa7e6049530875093de182c236f3e642c59f703fb62f6e75a9ae7b7dcf76433717e73ef96d25f1f05fa37d45d80c5b029147fa
 EBUILD netbeans-javacard-9999_p20150713.ebuild 4982 SHA256 88dc45e51432c1f945fed2026f81f9b068f671d2ba882a479a4d4f5743e217dc SHA512 873e0483c727ef24e2ffd5023a2686d834c246fc35f9caf5daaf7fdfb783b9962cf56e9e656c3d98611bf67977c9ef30e9e7d28ea086660898573ddf4f0e6a5c WHIRLPOOL d1cbf5a9ce0ccfd944523a749b2c6bca39fa237575b060c8ae25338dfdc863908397bd06fa74919f54fc19bdfeb81b4f80e0a2b6e634f946930886036c6b4b28
 EBUILD netbeans-javacard-9999_p20150714.ebuild 4982 SHA256 491e775bdb913bdefe19db2f52d707b520bb7adc90075186c149eefa53d06172 SHA512 1c5e042804dc50398318580aba8d7b91769daa1b47ef3fdc2cfcf8f008ef11802fea85d8090f2a2156c2c1a6496919220d800ef2b3bd75e400390b44278c7d53 WHIRLPOOL 83f2c129751b8905714b0c556ccfdef14f8f7e9a526fe94d551d2fd0603e32863eb6a3bc7ba5dad4a235a453c43cb09413947f7587a37116991e9a8a52642642
-MISC ChangeLog 174908 SHA256 fabf2ee415f78928fbdbfaeac14e6538ae9e1d2cc3d69925009e4c0603b4ddaa SHA512 a2ced61ff527a7363072db8a06e5e83835b892da84e1b46cd03518225d6407f969737074c216a0272c72f515ef2bcf0e41cb34b2034649ba09b81147e57a4a0c WHIRLPOOL 3adfe1930246206888cf4ba3dc1cb0f67a1eb0b9b6735e678dfa4aedd5cfc7fa02eee9b61a934ca05a6d97c72fc52873e315271733fe8210ae594f2c03dd4b36
+EBUILD netbeans-javacard-9999_p20150715.ebuild 4982 SHA256 1b092441f4f4d31ce72cfe45ab8da2600c6c515902fe43ceb84a8756cf91967c SHA512 715790a86308866972de548906c3824eb2f49c6357f2b37ba4c6219db521ece4150a1c0bc2d198f2fcc94b6b589612c65a685a88208ce89f71445ff42eccf9ae WHIRLPOOL c13dd30abffd8b38b7fe57cab2e0798d769ace15a2622a0304ace01f47e5e0b8a34761987fe2451aa02acbaf001bf808743ae469764bc1b8f53a4c5aff554fca
+MISC ChangeLog 175086 SHA256 c10bc977fed092befd47342cc08bd4b23370be1c9b7440aaa8467873442f5f57 SHA512 88df7085a4346e6f14bf2f5f81ef21598e2d4dbc82d144962912f754f3074ac19b44546f4aafebed0aac2160cd9f9d58e753c96fc373534ae56e96949892bcf9 WHIRLPOOL 0f0b587f8b3cd476f3fad6d0c326de7f6359fdf74bcddeb9cc62a4dfe23794abe5dd7a127850bcb1c4f4888aaf04ece8cefd55c933c7219960aadf9e4f1a4d34
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150715.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150715.ebuild
new file mode 100644
index 0000000..38f67f1
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150715.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaCard Cluster"
+HOMEPAGE="http://netbeans.org/projects/javacard"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-07-15_00-01-56/zip/netbeans-trunk-nightly-201507150001-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 a8e3d33..8194218 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_p20150715 (15 Jul 2015)
+
+  15 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javadoc-9999_p20150715.ebuild:
+  updated to the latest sources
+
 *netbeans-javadoc-9999_p20150714 (14 Jul 2015)
 
   14 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index 9a7a2f1..cf2271c 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -44,6 +44,7 @@ DIST netbeans-trunk-nightly-201507090001-src.zip 208130931 SHA256 5d73ccaddac610
 DIST netbeans-trunk-nightly-201507100001-src.zip 208139985 SHA256 ede6f00ad37a28f1fa7c825e0f86ada8e314a969db3ea1884d21b6cced8dd527 SHA512 49c255eefd2affd8206082b04cb2127138b841d9ffa5f175aabfdec0703a81da0299bfc7bf55404829b493cd530e2db5570f4a19e66cf5af83b2081ed90a43ee WHIRLPOOL 6f1dd8b72445a31428e310cba1de99f0223c57c6b24f178d9cf5855633d5da23d1a87a130267b9da9697fbf28d7dc7fca2a0a341af9936f443cb9e1dc6bf89c2
 DIST netbeans-trunk-nightly-201507130001-src.zip 208143364 SHA256 f6a745a4112c25988071e5add63f52b567ea416e56eb1c5ac1f0caa40b2fa47d SHA512 2a01dde8445619c79b837bc51d1eb5fb9136dc0ad74d1e73df9d45748baa7b41032c10a76d26505fcf783193978c25907dbb2fc93a0e54f8b470ca2a6d7b9a8c WHIRLPOOL 095f94bb313aa828e0d0e972e2ccd69015e300023d7ce51569963eefba61146421f5a1a015c28fa8885445bbf42987367d18ed57da98e3b7f6521bddd3a4aaa5
 DIST netbeans-trunk-nightly-201507140001-src.zip 208144479 SHA256 9daca7bafaeb7d4e4eed58ecec4ba487f11fd6fd4b6790c719d4f428929588d4 SHA512 96adc2194d3f005216677ccdffc1ac51ecac1c2a13ec3f29b177e553ea9f5a36d9c9010c7f6454612b78a7dcb5f5ef08197e1113701bdaa0c727b9c352422c3f WHIRLPOOL 4fecb0c62019a2fc3522db07513eba2b877c01c856ac2b727329cca7ff86d573ef493a813b943558c06da3d6bc3109b5082e7ccb356318e6aef374eadeddee51
+DIST netbeans-trunk-nightly-201507150001-src.zip 208148635 SHA256 7d87494131b5b5747a107020375a39bb160e0f8ee137dea2464befa602c66c49 SHA512 4fa53101acf4866ce6fb99322dd4b1eca1ac35c3b685fa81f4f69b1f7c5515f4b65cb9d39e11e8cfd03cd1a5aaa3f466cc1a38291c9e7c9463b80e410b72360d WHIRLPOOL 054331ec1b61af88d192d095792d8bb350de86d1a8c4bac8ef8c2f2dc85fcf3fb6ad73b6e45d1794521e6745fac4e4613214fe9fc44662b69b1ca070632ffac3
 EBUILD netbeans-javadoc-7.0.1.ebuild 5814 SHA256 68531c51838c95012830f5ae09e2386ea3179c2b31bfd5191f67993e3b3dbe2f SHA512 3bfe0ecc46f371d2553b031a5699229fb874dad1e94415635558b7d46b6764c31337d03444753e687b19a7c0976c68cb72007ccc82df7d1e5848a81f241f80c3 WHIRLPOOL 6571f7a73c262b3b67407840523b79eecc14bad9678cff05fb32a2811049158400870de51bbcef97ecb3f18f8ff59f965bdca8e788918d53822b92e2f20f75f5
 EBUILD netbeans-javadoc-7.1.2.ebuild 5855 SHA256 af28efb956ac3b7147e254ca3083dfaab11b84ea42e20677ebdd18aa29ff87e0 SHA512 ee06c552782170b51cfe70d603792b4240aef6064ba0a5074f394701a43285ed1e4030f539622c616be3175dab013e791c1a3a1193ad379193f5fa3e92eefa40 WHIRLPOOL dfcc63d6c9fcf094e2998ce1c08e29b4d4acbefbe9bea6498c2e28f84576f628da50164a1e0ab3ff5528720fe54cae71f2f5e6f84aedca5b639f13053464e6c1
 EBUILD netbeans-javadoc-7.2.ebuild 5805 SHA256 20d01deae745a7e8d84ffe55ca63ad74342bd8528c0dd15a20aac6570a1a83e3 SHA512 3947f1ab3efc236b8faa14736406ee3e537bbdbe377ea1bbd4f1eafa06a36d2863f8700dc7c84e6c8501abdf130a78e87ad6a0f52c5172bf0ab52f288617bc86 WHIRLPOOL 8301cce0679ed5f68a09e2e968ab2ba0955547f438758b042a04744539324fd79d83d853dfb8b48421f6dac616362cf1a9dd2a0e0ff8763dc2e12a470d16b95f
@@ -76,5 +77,6 @@ EBUILD netbeans-javadoc-9999_p20150709.ebuild 6234 SHA256 c0134551280a238215bf57
 EBUILD netbeans-javadoc-9999_p20150710.ebuild 6234 SHA256 75813ed0dabc345582ba7add7685a037ec1c010a3b1fcb30e77873b568ea93af SHA512 56363fe0b1cd36ed9ad9bfba754e73a59142afbd5a7d913713330322530df3341ae2852be54f42fe758481bebe57ec0e4c07a941e1140540d9937f791245da69 WHIRLPOOL 8a55e4b2f147783293ebe347d347dc500b26af6af919f3657938212c430261c883b513172c20a31b150ea341cbe7c0425faad9328651d77f318bf30930c74e14
 EBUILD netbeans-javadoc-9999_p20150713.ebuild 6234 SHA256 d7f32d5901579f4684f82c3efe9841611bbc8b9ad5aaf077fcfef35164b62eb8 SHA512 b95bcca57f370dc15c9607548db631093ce0e6360b5044246ebbce05710a145af5aca54a9e878f515b23c616fe148915416651e9d2e5ab4a2573d799d2acf72f WHIRLPOOL 8bc5d92895554d62d00d52fe4c84b372f29075de33ec88b2e624a691a36b545e6443893a684085a9568c32f16f638452fb698e155e37669d52ecb0543c210cbf
 EBUILD netbeans-javadoc-9999_p20150714.ebuild 6234 SHA256 7ed8fd273b741c757cde62ac41aff768456b852e570eff40e78952265b0f8b01 SHA512 2ddc0f89391fa4a32f02d62d87a861e38572af2b9bd6eb1f55c9c9a47845cdfd0d38efef5b56977b9baa7ef446741ce16958652b88bb6b396ba9ce7382ffea1b WHIRLPOOL 61034c700e3b22f5e73fe6fd0cb7af4f2824e78706e68999587908d4e96b2653f617a0c63887e0e7379d3693f5704296153c178ac7cee4d2505777456968e676
-MISC ChangeLog 172552 SHA256 104496df3e00454c07cfcc34285493a529c5ea863e7d36ede5721533eaef1057 SHA512 15b1d2e5743e88d6b9e47ed80ed62639b0f58e9115a56daecc48741113738196390bdf3182c7eebfebcb84ae5556e9e93ca931ccf87fe05c403bd06dc91a2279 WHIRLPOOL ccb7bdde60ab92976da8dd62eadc54c56a3ca4381141a0e37c9a81a673a843d86c22ac2637eb46311bcd55c5303731838f274683a32c3d7f25d9d3e0bd226e27
+EBUILD netbeans-javadoc-9999_p20150715.ebuild 6234 SHA256 b9fc35d05538c42e74b6c609fdce93529379f087fd117827a5b114c86d9ea246 SHA512 3760b0420798dc50b80346aaa0b061a9252bdde3c247ae98e9db281f8dd57f21428be447c8e3b8fe79bea06a922a45a3948706d0ba0661b0b64f3e4de03f5a09 WHIRLPOOL 73dbbaf35125e3e3b4c24f33ce2e226abed5d0db5eda2b6dbed3ec9bc9f38421823c09be5cfc1ce634737728caf6b5b67b684293d68ff0b2d760072d18d72ce0
+MISC ChangeLog 172728 SHA256 cfe773c36ed43162c4124b5df453a1cbd600ce3170bdb3f9b4605f212fa97239 SHA512 15da823e2e7b30660a1e59a223f344133421ae73aac8c5253b766f1fd7d8a0ccfbcfd14401ee6ab57970527309fcfcfa6be9b6656c0b7a46cb08be45b3b064a6 WHIRLPOOL 32ae92dca3dd4eb0d656f89c446d927ec2c3245c1cff7010e50d163c92c225682e5356ad586846eb77d3881eda854abd3388507469a1d728d881880c7574d3ce
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150715.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150715.ebuild
new file mode 100644
index 0000000..05526d1
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150715.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaDocs"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-07-15_00-01-56/zip/netbeans-trunk-nightly-201507150001-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 138841d..d421431 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_p20150715 (15 Jul 2015)
+
+  15 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javafx-9999_p20150715.ebuild:
+  updated to the latest sources
+
 *netbeans-javafx-9999_p20150714 (14 Jul 2015)
 
   14 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 639be8d..c9dbf05 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -44,6 +44,7 @@ DIST netbeans-trunk-nightly-201507090001-src.zip 208130931 SHA256 5d73ccaddac610
 DIST netbeans-trunk-nightly-201507100001-src.zip 208139985 SHA256 ede6f00ad37a28f1fa7c825e0f86ada8e314a969db3ea1884d21b6cced8dd527 SHA512 49c255eefd2affd8206082b04cb2127138b841d9ffa5f175aabfdec0703a81da0299bfc7bf55404829b493cd530e2db5570f4a19e66cf5af83b2081ed90a43ee WHIRLPOOL 6f1dd8b72445a31428e310cba1de99f0223c57c6b24f178d9cf5855633d5da23d1a87a130267b9da9697fbf28d7dc7fca2a0a341af9936f443cb9e1dc6bf89c2
 DIST netbeans-trunk-nightly-201507130001-src.zip 208143364 SHA256 f6a745a4112c25988071e5add63f52b567ea416e56eb1c5ac1f0caa40b2fa47d SHA512 2a01dde8445619c79b837bc51d1eb5fb9136dc0ad74d1e73df9d45748baa7b41032c10a76d26505fcf783193978c25907dbb2fc93a0e54f8b470ca2a6d7b9a8c WHIRLPOOL 095f94bb313aa828e0d0e972e2ccd69015e300023d7ce51569963eefba61146421f5a1a015c28fa8885445bbf42987367d18ed57da98e3b7f6521bddd3a4aaa5
 DIST netbeans-trunk-nightly-201507140001-src.zip 208144479 SHA256 9daca7bafaeb7d4e4eed58ecec4ba487f11fd6fd4b6790c719d4f428929588d4 SHA512 96adc2194d3f005216677ccdffc1ac51ecac1c2a13ec3f29b177e553ea9f5a36d9c9010c7f6454612b78a7dcb5f5ef08197e1113701bdaa0c727b9c352422c3f WHIRLPOOL 4fecb0c62019a2fc3522db07513eba2b877c01c856ac2b727329cca7ff86d573ef493a813b943558c06da3d6bc3109b5082e7ccb356318e6aef374eadeddee51
+DIST netbeans-trunk-nightly-201507150001-src.zip 208148635 SHA256 7d87494131b5b5747a107020375a39bb160e0f8ee137dea2464befa602c66c49 SHA512 4fa53101acf4866ce6fb99322dd4b1eca1ac35c3b685fa81f4f69b1f7c5515f4b65cb9d39e11e8cfd03cd1a5aaa3f466cc1a38291c9e7c9463b80e410b72360d WHIRLPOOL 054331ec1b61af88d192d095792d8bb350de86d1a8c4bac8ef8c2f2dc85fcf3fb6ad73b6e45d1794521e6745fac4e4613214fe9fc44662b69b1ca070632ffac3
 EBUILD netbeans-javafx-7.1.2.ebuild 3593 SHA256 76a29b37765000745794e6ae20c6b8528d8637507a257ffef3bef2ce648f05cc SHA512 a04618bda036e6652c7208f90a4dd91e07e75b85243580263f6ec846425ab907a87c318117990d4e8d9044bcd7a0ca8b63bc32bdd0d84e5373a10e67a77b79c0 WHIRLPOOL 11acad585f7315ae6b4edd53c764167567a948cb0e2037d95f2f4de34765909b71d095540c054f4cef3ba70224d294b42720536566e445cbdd06ebf2ad903841
 EBUILD netbeans-javafx-7.2.ebuild 3576 SHA256 3441b901a5074013351bc6c7ba6c424455e2affe52e448f2cfac0058c82345e2 SHA512 ee384d6e4ac767ade82b5d337d7a1c5d2b463c15a7596d91e1a850b37349f88d7867a0ffa11a118c48e2ed463f38dcfa791ec42b3fe85ea1e6bf7c4b27f9b073 WHIRLPOOL 15c7d20f2caa39c6cfcba2f846736754b049483f135ac90ced399672932a6a73467f0b4016550c3b2d8583be20d1467486f5652111893ec16111095a3e9c941c
 EBUILD netbeans-javafx-7.3.ebuild 4476 SHA256 9f268a852d45f37f9d22c3bb58d36be17f438e4b4cb5105d88ac4404731facb3 SHA512 3fa0e48e949d0df0a4404c04379623529f73ff15259f4164fddd10afb9faa046ceed16aac1a7b14728af89bf3a4ed7037638fb7e7e932a64cc71e84f7ecaa44a WHIRLPOOL 0395ca679fa41610c61dceb6ac018d7a76b62c08ca740de2fa2d98523f8e5f840a2d0a8c357b674d171841f93d980b536a671a1f12b5261d402c03b691ac6504
@@ -75,5 +76,6 @@ EBUILD netbeans-javafx-9999_p20150709.ebuild 4723 SHA256 4e3a4c9bde5fa4b70c02516
 EBUILD netbeans-javafx-9999_p20150710.ebuild 4723 SHA256 dfa7a3bcfb3d7152a652f36e1512b424f753d1d6c8c3f14841c389d9e872fb0d SHA512 1bb06607efcf0e2939a1720137fdda4a2035b383e228deebb417f58b20bea2adfe838b07e24f2c2d2045a40d6224e416bfa3aaca9bc4a5efbfee8a0bd7b3b25b WHIRLPOOL 4ba9b6f97a67a93cf53dae911c4877b9c1f73e12b242f44dab26352ba6ed221cc05addac82435ee07411b6a4315133a3c90f9b0fa0f9c1c2d8bdbb328511d66a
 EBUILD netbeans-javafx-9999_p20150713.ebuild 4723 SHA256 f788ece5211545ceddc483da60950d46ae68a0d12924521b9a21397e0c0e2a77 SHA512 5c2727a377d2cbd22c54cda29927be22bb1887170ec5cbf2794e91bf0f086e6e965ab38fbf611935530a5e776bdcacd6310cf6e6bf360d3554fb0b276753cdd6 WHIRLPOOL e49e6735a7f99dad66a8e47a29cce514c9294643ff6dd7df1d6d068ecd3b359f76593f2956fbb7d72f9d47ebc408652c7ae2f4dd9fb145757fae2dcc032b9bc0
 EBUILD netbeans-javafx-9999_p20150714.ebuild 4723 SHA256 b85437783827d4fe028019280d380d0002db6005819fcd88a36a936f6f05f5b1 SHA512 54493d2b51fabd89256cad63c58eaefb4a911ed0bc21ab7f4122be5a6970ffb3a52e0657a2a0e7b1cddf2e264b50acbd5e881407872319756026ae3b6083f79b WHIRLPOOL d4b06765c9f499001921f0f0c0d44bb4e4f015f20f502e6686508bf80fb3b0e1e9f1a6870bbb30a0bf3de93c8f26fee0c7a61cdfe8020d9fa0edd496db5ef174
-MISC ChangeLog 157063 SHA256 9e4f6d079367c26a92cdc42cf9a0f1eacfa90b143149548ae4c01613d90350bf SHA512 f59b42262f907ab432d3912bfc15e2e65bef05cfc3391e0dca0938b66eb5640f792a8398df105de19b37ac94b46bed45bbb5d708be7b28bacc7c3fdd456bafcc WHIRLPOOL a2e5fd70a75822285b1b19c24871fd03f071afa9292bb66f9bfcfc9a165433e2332a6bfe6fdfa5afbbb7130bbaa8e1366e0071fb053b5988a9919b40f3acde72
+EBUILD netbeans-javafx-9999_p20150715.ebuild 4723 SHA256 5d1a087b6589ff3bd2661690bdee82a01dd85e689086b649762433ab34f8556f SHA512 2bbc4d381de1e0803d30c3b6feaca2c1b54fcdf867545ff4a5ef92bd95844c51382fcc70857c4ab8046125612db1268f79bcf8c53080cdfe2edb4b3e23f51efd WHIRLPOOL 90f3223e80566dd26ec80b18bc06079c62793cfc6c288e37e78800bd33dea65c89365bf3d0121821896df66ba66e7115a2ea3870dd41f0d4cd500dd9f3e87cf8
+MISC ChangeLog 157237 SHA256 28fa50d2918a840aa096cc0224c5892c003f6b3eb1bc75b42f45f0ddce342a97 SHA512 339af473498303772015ff5fcdf75340486b78e73ad9f347cb63ec19e11edc58edde2c56f0c519b802604cc640efd8e092746b2437987a1867ea52c6282c0318 WHIRLPOOL a5945c003d688777cf3b8f7d41bb3b3328c0669a2a7da29515b0048c02a0c0a60fcb934116b1e8bc34c2b06b18e1189aaaa525ace4ea3718949627d3eebc49e2
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150715.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150715.ebuild
new file mode 100644
index 0000000..3c6b41c
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150715.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaFX Cluster"
+HOMEPAGE="http://netbeans.org/projects/javafx"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-07-15_00-01-56/zip/netbeans-trunk-nightly-201507150001-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 d900575..5d3e226 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_p20150715 (15 Jul 2015)
+
+  15 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-mobility-9999_p20150715.ebuild:
+  updated to the latest sources
+
 *netbeans-mobility-9999_p20150714 (14 Jul 2015)
 
   14 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 9f59638..7aa56b1 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -47,6 +47,7 @@ DIST netbeans-trunk-nightly-201507090001-src.zip 208130931 SHA256 5d73ccaddac610
 DIST netbeans-trunk-nightly-201507100001-src.zip 208139985 SHA256 ede6f00ad37a28f1fa7c825e0f86ada8e314a969db3ea1884d21b6cced8dd527 SHA512 49c255eefd2affd8206082b04cb2127138b841d9ffa5f175aabfdec0703a81da0299bfc7bf55404829b493cd530e2db5570f4a19e66cf5af83b2081ed90a43ee WHIRLPOOL 6f1dd8b72445a31428e310cba1de99f0223c57c6b24f178d9cf5855633d5da23d1a87a130267b9da9697fbf28d7dc7fca2a0a341af9936f443cb9e1dc6bf89c2
 DIST netbeans-trunk-nightly-201507130001-src.zip 208143364 SHA256 f6a745a4112c25988071e5add63f52b567ea416e56eb1c5ac1f0caa40b2fa47d SHA512 2a01dde8445619c79b837bc51d1eb5fb9136dc0ad74d1e73df9d45748baa7b41032c10a76d26505fcf783193978c25907dbb2fc93a0e54f8b470ca2a6d7b9a8c WHIRLPOOL 095f94bb313aa828e0d0e972e2ccd69015e300023d7ce51569963eefba61146421f5a1a015c28fa8885445bbf42987367d18ed57da98e3b7f6521bddd3a4aaa5
 DIST netbeans-trunk-nightly-201507140001-src.zip 208144479 SHA256 9daca7bafaeb7d4e4eed58ecec4ba487f11fd6fd4b6790c719d4f428929588d4 SHA512 96adc2194d3f005216677ccdffc1ac51ecac1c2a13ec3f29b177e553ea9f5a36d9c9010c7f6454612b78a7dcb5f5ef08197e1113701bdaa0c727b9c352422c3f WHIRLPOOL 4fecb0c62019a2fc3522db07513eba2b877c01c856ac2b727329cca7ff86d573ef493a813b943558c06da3d6bc3109b5082e7ccb356318e6aef374eadeddee51
+DIST netbeans-trunk-nightly-201507150001-src.zip 208148635 SHA256 7d87494131b5b5747a107020375a39bb160e0f8ee137dea2464befa602c66c49 SHA512 4fa53101acf4866ce6fb99322dd4b1eca1ac35c3b685fa81f4f69b1f7c5515f4b65cb9d39e11e8cfd03cd1a5aaa3f466cc1a38291c9e7c9463b80e410b72360d WHIRLPOOL 054331ec1b61af88d192d095792d8bb350de86d1a8c4bac8ef8c2f2dc85fcf3fb6ad73b6e45d1794521e6745fac4e4613214fe9fc44662b69b1ca070632ffac3
 EBUILD netbeans-mobility-7.0.1.ebuild 8655 SHA256 992e214ff2926e2f0db623d96b717bf8f8e4ceb47e96e69b3c6b8f67d6a8d130 SHA512 d51bc003f4b637cfe71c9f49a96427e535596542ac195a9621bc4f92c04a6f720a87fac6eb267732f869ba105f263d9d36f848b54a89c734b6a68a78ed323808 WHIRLPOOL 515da7153b12c3b5779cfad16e3800b4d26ba4b174027d9a7b06a26754fad065751c7eda137ba6199315d024a322d59e7ea39a1b2f4244ea75b30770ac505791
 EBUILD netbeans-mobility-7.1.2.ebuild 7543 SHA256 bb3f1245ad68133798fa507f06dd1ffbc1d55f6ba38f4cccc29ff0240e5b5f22 SHA512 41f663977a0716c5449db597d5f90054717ff3579a9137a910d1943d3e0b39379c34c0d9aa9c98d231037a042074c8ecf5fc62c018cd7cd5e8680734ff854c51 WHIRLPOOL c3c6feb41ce3df356f617ca80530673ac653cdf50da0aead00518854d0850d6420333529aa6591e15ddd4053249191fcb47100c5f39a804352722e54f802bae4
 EBUILD netbeans-mobility-7.2.ebuild 6571 SHA256 58af97ca9a6adc56fa6abe91777a1ac35a3a9b7d68af1e73c23a45dc5631abb2 SHA512 ac42c3a3daa7d55c9c13d1c99dd6880d5d99741f80cfceb683da27e30c70d6228d9434571f2405d0dbbf27d2203e3f877da6347794b07b98331edd1631d3a69d WHIRLPOOL 5a6af3cbcd08180dcdf708a038f3119faacb9c78532b4bb1945c7260fb0a8232af57745e41a73311fafffe185c969e0c88ac34970caab7708313f53417695374
@@ -79,5 +80,6 @@ EBUILD netbeans-mobility-9999_p20150709.ebuild 4418 SHA256 6d7c572355535683ebe1a
 EBUILD netbeans-mobility-9999_p20150710.ebuild 4418 SHA256 d97a5673eae484d19b71b857a4bd9a0ddc0e56aa9cc3b326d12e5d21733d0ca6 SHA512 e8f1685cb67817e36ea2f909cb410ed23316572f6d94507875d197bbb4cd382678209bc5ec3c2a1bc86437a6fb9910f8c8844656c6e91b7454dd86b7ec21d957 WHIRLPOOL 2b09ec49ebf40549c0b7f64def7ebdf01afd0dfb88214d82adb038406d048ec55afdd40dff9100f3a739f54d1af693d96630d0fc6c15a054f1195fcf91dbfd27
 EBUILD netbeans-mobility-9999_p20150713.ebuild 4418 SHA256 85c501f8affa91f212a6e89a95c33eb649f9296ee001cf93ac5cfcdf8d66011a SHA512 be544ceaa221fcb0acce7ccc336d3f798861ec1cf103cc4d9f49953f0333240969c2de94d9f0fb5b73156c7a3ade279065c51881ca761e6dcfedbd36acc2ead6 WHIRLPOOL ab6f093abff54fd0d432911a2ff6e1115740ac22f9394017d4a8b3a0d337f9c4d3146008faed705cde0ff10bccdc14e59eb25fd07102d4263fee40ae1679dd42
 EBUILD netbeans-mobility-9999_p20150714.ebuild 4418 SHA256 020d806add4ae47a9411296f1021d483e75e914d0be2681380b2c0b6a95703aa SHA512 71100f3e5bd74bfffa5d5a5ccf5cde493f95b54a74c3e7a3afa87499ae881038c620e95b15a5c44230d064e327fb7b98541f96d47c2d8eec982f054caf662c7d WHIRLPOOL 3294af44cfd1154ceefbda9b5920368f272710071e69c2d7598ac754f3892e3be775add3c00f53cf6a1dfbc5310d9ffd9a86ee0db1f26efb22a7aa0c0b7bbc0b
-MISC ChangeLog 175049 SHA256 e920757b8b60456340250c892a1d70a6b65059306d54db010c6325e05765950d SHA512 e5232456dba73b28f5316abdc4fb8877d07b44bb640c9bc438af0cdc2d54f2017bc3c97cf11610f1916f7624899464711ad1748838b8014ab00e9c6d05b6ca94 WHIRLPOOL 0acc718685c32cfba2ce64986a259110c4bf40e48b663670d4b4437e2bc1189ce3c6211688422301dad51c2b0b7522fea8c87eeae2c5c8423bb34f085e0f69ef
+EBUILD netbeans-mobility-9999_p20150715.ebuild 4418 SHA256 d43b2cbeb194623b9c6f88030a33fdb752498b247066aedb3eaa2ca13bd6bc6b SHA512 d02cbbaacdcbd92e048bce4041d640dbd1e20d2cdc4918d6a59e31877ce5a8207357993693d82e942d9d71e865f9cfc7a9da2cd126213e9a55592e7e6cd47168 WHIRLPOOL aa2c7b5706d5bab37c26138611fc81594cb0cbfd34def585ae33013ce6b49ceb767bbce5ddf30e977261cfca545d3b481120e533e48ca8aa6f386475dccb4be8
+MISC ChangeLog 175227 SHA256 86bf019f6f5bd9b585b60a2e257118db4f2edd754fbfd26488de0eabfa22cc80 SHA512 672b0c79ea51907d6653735954a3520f65af8390a53713b8418d0b247a3a08b76758324b55a363b27d7c60f2a2e948d6cb996752fbea83466e2789b5ad730a3b WHIRLPOOL 9dbf46d93da08950fbb71d779bd674278b86c0b62674646d19e7fcff5af0744fa816600bcc1e96944e046faad28ce5dde364f406f951760f0c4faaa327682727
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150715.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150715.ebuild
new file mode 100644
index 0000000..f167414
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150715.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Mobility Cluster"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-07-15_00-01-56/zip/netbeans-trunk-nightly-201507150001-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 dca5e32..464c89b 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_p20150715 (15 Jul 2015)
+
+  15 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-nb-9999_p20150715.ebuild:
+  updated to the latest sources
+
 *netbeans-nb-9999_p20150714 (14 Jul 2015)
 
   14 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 2943b36..b689c1a 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -46,6 +46,7 @@ DIST netbeans-trunk-nightly-201507090001-src.zip 208130931 SHA256 5d73ccaddac610
 DIST netbeans-trunk-nightly-201507100001-src.zip 208139985 SHA256 ede6f00ad37a28f1fa7c825e0f86ada8e314a969db3ea1884d21b6cced8dd527 SHA512 49c255eefd2affd8206082b04cb2127138b841d9ffa5f175aabfdec0703a81da0299bfc7bf55404829b493cd530e2db5570f4a19e66cf5af83b2081ed90a43ee WHIRLPOOL 6f1dd8b72445a31428e310cba1de99f0223c57c6b24f178d9cf5855633d5da23d1a87a130267b9da9697fbf28d7dc7fca2a0a341af9936f443cb9e1dc6bf89c2
 DIST netbeans-trunk-nightly-201507130001-src.zip 208143364 SHA256 f6a745a4112c25988071e5add63f52b567ea416e56eb1c5ac1f0caa40b2fa47d SHA512 2a01dde8445619c79b837bc51d1eb5fb9136dc0ad74d1e73df9d45748baa7b41032c10a76d26505fcf783193978c25907dbb2fc93a0e54f8b470ca2a6d7b9a8c WHIRLPOOL 095f94bb313aa828e0d0e972e2ccd69015e300023d7ce51569963eefba61146421f5a1a015c28fa8885445bbf42987367d18ed57da98e3b7f6521bddd3a4aaa5
 DIST netbeans-trunk-nightly-201507140001-src.zip 208144479 SHA256 9daca7bafaeb7d4e4eed58ecec4ba487f11fd6fd4b6790c719d4f428929588d4 SHA512 96adc2194d3f005216677ccdffc1ac51ecac1c2a13ec3f29b177e553ea9f5a36d9c9010c7f6454612b78a7dcb5f5ef08197e1113701bdaa0c727b9c352422c3f WHIRLPOOL 4fecb0c62019a2fc3522db07513eba2b877c01c856ac2b727329cca7ff86d573ef493a813b943558c06da3d6bc3109b5082e7ccb356318e6aef374eadeddee51
+DIST netbeans-trunk-nightly-201507150001-src.zip 208148635 SHA256 7d87494131b5b5747a107020375a39bb160e0f8ee137dea2464befa602c66c49 SHA512 4fa53101acf4866ce6fb99322dd4b1eca1ac35c3b685fa81f4f69b1f7c5515f4b65cb9d39e11e8cfd03cd1a5aaa3f466cc1a38291c9e7c9463b80e410b72360d WHIRLPOOL 054331ec1b61af88d192d095792d8bb350de86d1a8c4bac8ef8c2f2dc85fcf3fb6ad73b6e45d1794521e6745fac4e4613214fe9fc44662b69b1ca070632ffac3
 EBUILD netbeans-nb-7.0.1.ebuild 5106 SHA256 3c68751bf5face5f80e2d7dcedb7466e69343f2d06c0a4dd30a722a987fbb207 SHA512 d79343e0ca8655b074a8f96b9898e4bc0123d60e346602ba8d7a239597993cadb33a036b43862ef1a39630e4f0ba7e79892d8b2eed8b30535f12a5d0b9f4b581 WHIRLPOOL 9f2cd645e34fbcfa8f0059fbda4f355f411aaff7966121360dfe5b3c769966c5a4586bbc04142b279e3a3fa323bc4b51a6349cf3eafe89063db44fcae58ef119
 EBUILD netbeans-nb-7.1.2.ebuild 4977 SHA256 265f9e4a9490937a65632ddaef48e3a731154b07b9ee5f9536a991181fc2fcbd SHA512 65d1065993dba3b1fece428beb1b75f17d89eddb08aacd2cbf5ecd3ee5ca844e75e9100c324ecdeeed5b138b1da4ab8cd5a4598e584a17545ffc2c52ea763779 WHIRLPOOL 9b63f2b5671bd38d24ff6b280de37fc19c74170bf80c22818da5e8af415a85211c6cfcf690e68d7697c41a1b749a3c7b48ec9b362782df140856f892d381e360
 EBUILD netbeans-nb-7.2.ebuild 4960 SHA256 bef2020a6e0d722ca77c0931b9a06014cedc822f14a21d8d916200e358dcdfb8 SHA512 988d902bbef52e123b5800e56049210d69c4dd6dbeca80396aeac58c70d90b76da65b338e664368ea3f9a3973b7b94ffd0a47a77b01be53452c2cc04c4067442 WHIRLPOOL a27fa8a1a066499a3fc2cb82e955b6b18b1725889b088ea1e94528cde3ec58f3b46c1e757fa597af6ad4ba96218dacfacff9561799f46add316e233d46127d28
@@ -78,5 +79,6 @@ EBUILD netbeans-nb-9999_p20150709.ebuild 5003 SHA256 f61c71b64613e64cfc044b55833
 EBUILD netbeans-nb-9999_p20150710.ebuild 5003 SHA256 c4b42e26ca3c5fd191f771a0850d513ed2e54ce01be652211099567562b312ac SHA512 67f6c2ec60669fbcc2c7fece6d66d7a2ca9ce2f047b46ea996a20d7a4f6adf916b56d8b1736c2ce85c3cd0927f6ed95c22eed648843767ff845ff63bcfe69145 WHIRLPOOL fa2ade397b80bcb9ef22a6b82db74364d4a2fdc74ef11abe5cb7a71b1a8b0030893ce5f33bac951394af8c2f8eb336ac6c0829ba8bc8c11ac355d4811a650bb5
 EBUILD netbeans-nb-9999_p20150713.ebuild 5003 SHA256 8867f681a33bec35cc65f6a0cb67693d2dbb657dc22be20470d4bf9e01e3db01 SHA512 9477c40162f9ed38b66e22925000bbe8e993ddd42c052a3f11208c6b9613ab4545e9fe8a6183dbff4ae8bd24d49af34c24bfd9b432b5b3e393a0a0f053714e8e WHIRLPOOL efaea908a825979bf37f4c95092cf95a8c43b87dd02189aa8f42f6a1069d1bf5b32ff8a3e2829a81c6e138a75d094f184b92e70c6f48f18b9dc9158bc57dfa15
 EBUILD netbeans-nb-9999_p20150714.ebuild 5003 SHA256 325c749cd45ae91ecb0ab0e8b83d92f353de9c69116775f7ff417b60871db4bb SHA512 92b7263bcf6761669e9d4f20824446d84a4948c4c8cb22b80308de8bf6c0fe390d6dbcf38ac66f2cf98c2dc8bf00d9bd47c87ead651541f0615278d2554c6610 WHIRLPOOL e292de0c5970303fb2354e42a3dbfc3e01adcee1e8b072727ee7bcf420275485812b917f23d6b66c1abd670dd1fd56c6b1b8fa800146f4bd49c02fb0dd8ca4cd
-MISC ChangeLog 163431 SHA256 4f7762d162c9c95181d99ef3c2e3f5b8f09092b7bcd1a82876dd0655ae98afed SHA512 5dd9556cebd8335a568081ca8d5e894be9b2833a656749f642dbf99cc85eaa5ff63923659bf66702f630e4b0bb0ac20b7dc9a1215c6aa09d69a53ce38d6a943a WHIRLPOOL 283131f8e6e91401154ce61782b2100b784928c10f42043c91e717033366ea2ac8219abb2aa502370d2f093d6537e8c284f9d9365a91d28e0b32cc54073d0516
+EBUILD netbeans-nb-9999_p20150715.ebuild 5003 SHA256 abd3c47f3ff9939cd74425fc873417c27079a43db2e2ab83f2680ef517b2dc1c SHA512 e394a11c97a469497da999e5293f1fe141f0b458cd1f34fca8a67010ee2e59fdff6bfcbc910a72163a1c540fd9b07448236c51e867d7441e5ace811bd70ddd45 WHIRLPOOL f0d80fec373a04416ed6c608988dc3c6c0e7f6e4b3efdc7b90bc3fba863592295496fc51a134983d4c49c8c951f3cd4aeb25e687e86d418a76171ef61b6bae5f
+MISC ChangeLog 163597 SHA256 97270515003eeb19b78f6e473e4ef90b60ccb2a94ae981fc8ffe33a4c543ef6f SHA512 db12e59f17849424999cf94bcd291ed86cb8944b4e97c923cf30fa6aebbebc2044ae471cd3621ccf5d3577191b6337fcc74dfe355688ce3d8b201cbbc3361143 WHIRLPOOL c87018ca6eccd6529d9f0e6bbc95833405fab8149b07f3b1a11c2be238fd1f345bf393c15ef18ec4c177cb4b95008e0ed9515fb6ac0aae7bd441edba8f858bc9
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20150715.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20150715.ebuild
new file mode 100644
index 0000000..67f5580
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20150715.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Branding"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-07-15_00-01-56/zip/netbeans-trunk-nightly-201507150001-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 66dea21..54a0991 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_p20150715 (15 Jul 2015)
+
+  15 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-php-9999_p20150715.ebuild:
+  updated to the latest sources
+
 *netbeans-php-9999_p20150714 (14 Jul 2015)
 
   14 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index d635f86..f0aebe4 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -50,6 +50,7 @@ DIST netbeans-trunk-nightly-201507090001-src.zip 208130931 SHA256 5d73ccaddac610
 DIST netbeans-trunk-nightly-201507100001-src.zip 208139985 SHA256 ede6f00ad37a28f1fa7c825e0f86ada8e314a969db3ea1884d21b6cced8dd527 SHA512 49c255eefd2affd8206082b04cb2127138b841d9ffa5f175aabfdec0703a81da0299bfc7bf55404829b493cd530e2db5570f4a19e66cf5af83b2081ed90a43ee WHIRLPOOL 6f1dd8b72445a31428e310cba1de99f0223c57c6b24f178d9cf5855633d5da23d1a87a130267b9da9697fbf28d7dc7fca2a0a341af9936f443cb9e1dc6bf89c2
 DIST netbeans-trunk-nightly-201507130001-src.zip 208143364 SHA256 f6a745a4112c25988071e5add63f52b567ea416e56eb1c5ac1f0caa40b2fa47d SHA512 2a01dde8445619c79b837bc51d1eb5fb9136dc0ad74d1e73df9d45748baa7b41032c10a76d26505fcf783193978c25907dbb2fc93a0e54f8b470ca2a6d7b9a8c WHIRLPOOL 095f94bb313aa828e0d0e972e2ccd69015e300023d7ce51569963eefba61146421f5a1a015c28fa8885445bbf42987367d18ed57da98e3b7f6521bddd3a4aaa5
 DIST netbeans-trunk-nightly-201507140001-src.zip 208144479 SHA256 9daca7bafaeb7d4e4eed58ecec4ba487f11fd6fd4b6790c719d4f428929588d4 SHA512 96adc2194d3f005216677ccdffc1ac51ecac1c2a13ec3f29b177e553ea9f5a36d9c9010c7f6454612b78a7dcb5f5ef08197e1113701bdaa0c727b9c352422c3f WHIRLPOOL 4fecb0c62019a2fc3522db07513eba2b877c01c856ac2b727329cca7ff86d573ef493a813b943558c06da3d6bc3109b5082e7ccb356318e6aef374eadeddee51
+DIST netbeans-trunk-nightly-201507150001-src.zip 208148635 SHA256 7d87494131b5b5747a107020375a39bb160e0f8ee137dea2464befa602c66c49 SHA512 4fa53101acf4866ce6fb99322dd4b1eca1ac35c3b685fa81f4f69b1f7c5515f4b65cb9d39e11e8cfd03cd1a5aaa3f466cc1a38291c9e7c9463b80e410b72360d WHIRLPOOL 054331ec1b61af88d192d095792d8bb350de86d1a8c4bac8ef8c2f2dc85fcf3fb6ad73b6e45d1794521e6745fac4e4613214fe9fc44662b69b1ca070632ffac3
 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
@@ -82,5 +83,6 @@ EBUILD netbeans-php-9999_p20150709.ebuild 4423 SHA256 7b7b28eb39566140a3e2d2eb1e
 EBUILD netbeans-php-9999_p20150710.ebuild 4423 SHA256 096464e002d7269ee1e91937b17b9528c31a7dd6eaffd21e652a1544cacebe0c SHA512 4337870f6ae5a15da316146c864939596b99984c238890179eb9e7e63d968108611be0243d83b7e8d9ea466b668f27cf4ece426ed59eef924d2f7c9af4ae3951 WHIRLPOOL 675e823f1129691fd8f10fa2279bbe21c6fe3dcecc9eeb895a12a27e6acc245dccc5956acce3e2045acae978575f9695f54d677f15185ca97ee2c1718495ee1c
 EBUILD netbeans-php-9999_p20150713.ebuild 4423 SHA256 ee7b48a5ba7a114cb4e1dca98b3c556aff76b3488c017bdbe4dab8d786ce851c SHA512 42a2cc4386ddbe920b9d384024eccca037dbf156fbd18d4e95ed38be7c9a63c8cbad17dea8d895d732f34ebb7a5ad56f4ed78882357488f58298559c023ce9b7 WHIRLPOOL deb2763b60ebaabdafac26d1baa763b1a3e8830b4b4611256724cf0d034c81a4c697b2ea19b335061c14c8fa358c4cfd56c0a7f27b9d07d10545cfda000433c4
 EBUILD netbeans-php-9999_p20150714.ebuild 4423 SHA256 2089d90cac7f4a343fe840b203f10bf504cb21d92400f5fea31cc882262b4353 SHA512 e072047322e782d86d9309734f9c1a992d3e00c7d0daf73d1fb1338dcef7cbfd6bd3d3888c39b0f041ddca5d14d1a6a8f757fdaaf890a29038e7127865740535 WHIRLPOOL aae9719590b84c0293ae73baf6df4941f0f421e319d4c88172e8058000e254befaa63b46ae4033873b90e2a672af50ce0fd22045eaa4ab5c0093932d2461615b
-MISC ChangeLog 163245 SHA256 6d8fe08a5038534fb9386e636e1d8890dd0f1358e2d5e1ad868b8908c8d83652 SHA512 5127e63c8573b93ea101e304a7296d9600bb1def0bab867033c7b443a3174eb6fca03706b6c382323c6e0c3bf2391d04aa1af0c3202ed350c4ff77762d6156a8 WHIRLPOOL e8468598c501ca5fd247c7932798fb440e38b286e1f76c18fd188eba74068d996f2166ab52ebadf77e4d5687fa887ea3ba421a17b76d3c48f29e843ed8043c52
+EBUILD netbeans-php-9999_p20150715.ebuild 4423 SHA256 78c15cb7638d20fc3a2138769a7df9337d8241eb0972cc1ab3aaa83890b11502 SHA512 8083b676f18e73f1c50acdf526d7fe750709c3cdf7afc72de6bb3b7893b20469fdb7f287724e79dd77c67ba5ed00c9885436b131aaca9de8666e55822280d47f WHIRLPOOL 4158c85cc7525626e9845d80d33fb7d3ec49dcbb25666cc50e375ecb2f4770531e8b8ab496b9e4713b53259466abb5d45eb7359baf7a90e9f08e837de2fdce38
+MISC ChangeLog 163413 SHA256 7f4e0fcee535a038daba4666bb1cac05f4b6f321056410b860f36ced4525a26d SHA512 2d3a097a6465065ae0cdc116f4ce815e4cd185566ba24efc15193248b85492be1c8b7fb93d8d79e253c3f4634b4a93f0dc5b06de3a0dbcefde3c198847246ad1 WHIRLPOOL 27e29fdf771d4858afcccaf599f9de21aae51c9b2895e294c511332deed7f3771991413a7bd8de0f6234b2db691247ecb065a4856d5c21a1550345291db06075
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20150715.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20150715.ebuild
new file mode 100644
index 0000000..e417d85
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20150715.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans PHP Cluster"
+HOMEPAGE="http://netbeans.org/projects/php"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-07-15_00-01-56/zip/netbeans-trunk-nightly-201507150001-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 1a0230a..63d3db2 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_p20150715 (15 Jul 2015)
+
+  15 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-platform-9999_p20150715.ebuild:
+  updated to the latest sources
+
 *netbeans-platform-9999_p20150714 (14 Jul 2015)
 
   14 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index a6be256..e497e63 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -64,6 +64,7 @@ DIST netbeans-trunk-nightly-201507090001-src.zip 208130931 SHA256 5d73ccaddac610
 DIST netbeans-trunk-nightly-201507100001-src.zip 208139985 SHA256 ede6f00ad37a28f1fa7c825e0f86ada8e314a969db3ea1884d21b6cced8dd527 SHA512 49c255eefd2affd8206082b04cb2127138b841d9ffa5f175aabfdec0703a81da0299bfc7bf55404829b493cd530e2db5570f4a19e66cf5af83b2081ed90a43ee WHIRLPOOL 6f1dd8b72445a31428e310cba1de99f0223c57c6b24f178d9cf5855633d5da23d1a87a130267b9da9697fbf28d7dc7fca2a0a341af9936f443cb9e1dc6bf89c2
 DIST netbeans-trunk-nightly-201507130001-src.zip 208143364 SHA256 f6a745a4112c25988071e5add63f52b567ea416e56eb1c5ac1f0caa40b2fa47d SHA512 2a01dde8445619c79b837bc51d1eb5fb9136dc0ad74d1e73df9d45748baa7b41032c10a76d26505fcf783193978c25907dbb2fc93a0e54f8b470ca2a6d7b9a8c WHIRLPOOL 095f94bb313aa828e0d0e972e2ccd69015e300023d7ce51569963eefba61146421f5a1a015c28fa8885445bbf42987367d18ed57da98e3b7f6521bddd3a4aaa5
 DIST netbeans-trunk-nightly-201507140001-src.zip 208144479 SHA256 9daca7bafaeb7d4e4eed58ecec4ba487f11fd6fd4b6790c719d4f428929588d4 SHA512 96adc2194d3f005216677ccdffc1ac51ecac1c2a13ec3f29b177e553ea9f5a36d9c9010c7f6454612b78a7dcb5f5ef08197e1113701bdaa0c727b9c352422c3f WHIRLPOOL 4fecb0c62019a2fc3522db07513eba2b877c01c856ac2b727329cca7ff86d573ef493a813b943558c06da3d6bc3109b5082e7ccb356318e6aef374eadeddee51
+DIST netbeans-trunk-nightly-201507150001-src.zip 208148635 SHA256 7d87494131b5b5747a107020375a39bb160e0f8ee137dea2464befa602c66c49 SHA512 4fa53101acf4866ce6fb99322dd4b1eca1ac35c3b685fa81f4f69b1f7c5515f4b65cb9d39e11e8cfd03cd1a5aaa3f466cc1a38291c9e7c9463b80e410b72360d WHIRLPOOL 054331ec1b61af88d192d095792d8bb350de86d1a8c4bac8ef8c2f2dc85fcf3fb6ad73b6e45d1794521e6745fac4e4613214fe9fc44662b69b1ca070632ffac3
 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
@@ -96,5 +97,6 @@ EBUILD netbeans-platform-9999_p20150709.ebuild 9244 SHA256 f94aa0c55c865916abbe6
 EBUILD netbeans-platform-9999_p20150710.ebuild 9244 SHA256 2c2f12786809911c4c12311b999647fe77519450c60236420c0633e851ced2bd SHA512 f28469839edb1bd8df14b512cb59385ab406243900e8cbbec97b7f857bd0c1399d1d773d72ee26b0255115ecfdc926d31c778c93ac491bad7353ee9d68e7d102 WHIRLPOOL 32ebed23ba1806b565e3797ee9d2ac6fa51cc3301e588bd96679bfb4e19a7c42da1a947240c89b252366a1aea35471f172e308133657d6301e29e96f6975d4cb
 EBUILD netbeans-platform-9999_p20150713.ebuild 9244 SHA256 866bab76fe85ae683f4c7f204574ecea1efaeee7ef300762e2c6bd3aa38d793e SHA512 35984c6bcfbb17711b39bace4b1cc844da9f2147e0803e2ceb44def2e84a10609f55e4c692bd069bfea6f4700689b5806479bd3d3ce713608f0944c4c19c2992 WHIRLPOOL 879539e8ace8d5f6077dd6e7e818b9bf1c0458d03019bdd64f7325935fbb4e466d5afdb76eef06c6551dba46a6921bb5f6f3e6100dcbdb15c8c0a384985c3b67
 EBUILD netbeans-platform-9999_p20150714.ebuild 9244 SHA256 a24b98615e35ef05b1169011ddc3df192ad60859c6ee3e9ff76efab5ab762e47 SHA512 f32fd118f14a137663cb458a7ec799f274081db4c99dd7ce5c9f6afe57a34a34d36f9adb63d25b4e74eeea7ba107444aa902df7deffb86acf69cd06bb5f6a2e5 WHIRLPOOL 1aeb317ce1f28c2986f0f5de7ab07eb104e8f123a3148aa9ed16b950111c5e5496f809d4a0b352df5bd61f3b4d8a362ec25127377e8f1456504c649009d57136
-MISC ChangeLog 175645 SHA256 68f7329d1f245ce3a98b0267b9b480a3a66b75be4cb9eaaf0a3e86551198fc04 SHA512 c3d3a20b0d332d36d8f473cde74bbb8b2cd76336394c5b9e5cd24b481149619d2f43f211ca5096a918efca5fe6126f4845fd537af344fe38cb7b0fbdaa670e0f WHIRLPOOL 574bf4b89f671e7ddcba481912639884f9222a8530d91e410ae57f664f70b5b930defe63bfedb2462eb3bc089a47308448928b9fa48a55060bda7143740da910
+EBUILD netbeans-platform-9999_p20150715.ebuild 9244 SHA256 4d632a29bcabf873e2067f5d1a4d5241bac7e760966e26b0d3cbd7d090d677f2 SHA512 5cd7ced23bf5c3112f2f19601a778e9ffb33c80d6a7b61d9ae33ba95a2e2d06bbf8cc32f9b31ac390688876f3853ad8bed04bc78cf1c3b6a88de45fc64ed4cd9 WHIRLPOOL 5e7f6c01bc26021fced7f79fc167476faa792ac0e5036463ae71269430f9569e56756f28dd90f79738c1677553e643fed4a79be41fdd766c637c3a37c8fd9dc7
+MISC ChangeLog 175823 SHA256 197b0ff8abdac1439c30c320666b4ceb3d91f4c8d7c623bc72063523fba528fc SHA512 f09ef2cd41404a8db7fe9ef6f067428821bdef2fc554c2490d14b741c808fcfe19a8f7b99acff24fe52f264c26f37d2f1ffd7cc52253696acdf190c0d529c300 WHIRLPOOL 7bc951c89cb5fb633289f0f4184d23ea33dd6d291c9288601c600e8004e179dda89405adad3fa29e56eef9014ded74b85820869d5b57b3693c31c1fae613a183
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20150715.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20150715.ebuild
new file mode 100644
index 0000000..8c5adec
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20150715.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Platform"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-07-15_00-01-56/zip/netbeans-trunk-nightly-201507150001-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 e1f9f21..85a8fd4 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_p20150715 (15 Jul 2015)
+
+  15 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-profiler-9999_p20150715.ebuild:
+  updated to the latest sources
+
 *netbeans-profiler-9999_p20150714 (14 Jul 2015)
 
   14 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 2e3e88f..14acdbc 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201507090001-src.zip 208130931 SHA256 5d73ccaddac610
 DIST netbeans-trunk-nightly-201507100001-src.zip 208139985 SHA256 ede6f00ad37a28f1fa7c825e0f86ada8e314a969db3ea1884d21b6cced8dd527 SHA512 49c255eefd2affd8206082b04cb2127138b841d9ffa5f175aabfdec0703a81da0299bfc7bf55404829b493cd530e2db5570f4a19e66cf5af83b2081ed90a43ee WHIRLPOOL 6f1dd8b72445a31428e310cba1de99f0223c57c6b24f178d9cf5855633d5da23d1a87a130267b9da9697fbf28d7dc7fca2a0a341af9936f443cb9e1dc6bf89c2
 DIST netbeans-trunk-nightly-201507130001-src.zip 208143364 SHA256 f6a745a4112c25988071e5add63f52b567ea416e56eb1c5ac1f0caa40b2fa47d SHA512 2a01dde8445619c79b837bc51d1eb5fb9136dc0ad74d1e73df9d45748baa7b41032c10a76d26505fcf783193978c25907dbb2fc93a0e54f8b470ca2a6d7b9a8c WHIRLPOOL 095f94bb313aa828e0d0e972e2ccd69015e300023d7ce51569963eefba61146421f5a1a015c28fa8885445bbf42987367d18ed57da98e3b7f6521bddd3a4aaa5
 DIST netbeans-trunk-nightly-201507140001-src.zip 208144479 SHA256 9daca7bafaeb7d4e4eed58ecec4ba487f11fd6fd4b6790c719d4f428929588d4 SHA512 96adc2194d3f005216677ccdffc1ac51ecac1c2a13ec3f29b177e553ea9f5a36d9c9010c7f6454612b78a7dcb5f5ef08197e1113701bdaa0c727b9c352422c3f WHIRLPOOL 4fecb0c62019a2fc3522db07513eba2b877c01c856ac2b727329cca7ff86d573ef493a813b943558c06da3d6bc3109b5082e7ccb356318e6aef374eadeddee51
+DIST netbeans-trunk-nightly-201507150001-src.zip 208148635 SHA256 7d87494131b5b5747a107020375a39bb160e0f8ee137dea2464befa602c66c49 SHA512 4fa53101acf4866ce6fb99322dd4b1eca1ac35c3b685fa81f4f69b1f7c5515f4b65cb9d39e11e8cfd03cd1a5aaa3f466cc1a38291c9e7c9463b80e410b72360d WHIRLPOOL 054331ec1b61af88d192d095792d8bb350de86d1a8c4bac8ef8c2f2dc85fcf3fb6ad73b6e45d1794521e6745fac4e4613214fe9fc44662b69b1ca070632ffac3
 EBUILD netbeans-profiler-7.0.1.ebuild 3222 SHA256 b1bab800a27c30aaea26b8ff5ab21abdd1bec16b9890133429eca9ea77c018fe SHA512 d6198f44a06561b7e2598fdd6a37f8a3dc13c38f63dfbf6a86a083adbf71e9c62af87cb4e1b5b8dd2dc99feeeb99a7afcbb8f7747c378ad92c71263cc91a6c54 WHIRLPOOL c62613f511636b1f0393ac32c6b50641cdf7df9f9fdc95fd5acbe1a602ffe42fdabb556f989552b05b0607a5ad9d324a2019440c3ae66c50995ef3fc8775f385
 EBUILD netbeans-profiler-7.1.2.ebuild 3231 SHA256 94d87bf6f86add3bdc27f9f20084f35fe584fc2bd697acafa8c23cce16a0d1ee SHA512 dcc8da918a6b6e07ccae513fb4296d16891e205b49098fb8269d16beb9b1367b1920797cc78053b83f4321c1b69faa393365265c72213bb2abfb9d3f84f66319 WHIRLPOOL 18325a1df836e7242838920483c41d43f37b9dae8322d36a2a562b414baa0dc76971f581204ce76a6d64196dd60643089e8704da69617590cda61ce54ce82e8d
 EBUILD netbeans-profiler-7.2.ebuild 3214 SHA256 ddcba9ba672ad566ef256538fc8631ae691aa7c6574269199f26df5382c37f4b SHA512 1bb7eb95381861b8265ab366fe3c7a9b99971d1c4600eb6c7bffb521f4cebb32bcf3d662f82c811d47fe95e77cd39e48f3665f0fcabf9145eb171c2746d89684 WHIRLPOOL 7f74c2be9ec4e7ff419086f1da3b1a12b1c187102def004316ef89ed28f30da62542ed3409a51473a8d9d68d18a30de36b1d0307cd8eeb7e580668fe896c5aa5
@@ -70,5 +71,6 @@ EBUILD netbeans-profiler-9999_p20150709.ebuild 3478 SHA256 ee0b7000e1730b10961fc
 EBUILD netbeans-profiler-9999_p20150710.ebuild 3478 SHA256 3b5a8418be05b89c4baa61dee826387e5604340c9bdd404a4f676ce9f7942eee SHA512 31f01a417cfc6ddf2a03510d923ba20643f4a4a1d2f0bc13a6bda40abe00efb75286e2952dd9f83613ab030db4ba6190e8d03e73fe7d1a2e0f8f5df290eb4420 WHIRLPOOL aa09ca1ec7428c9ff80b01ff3391d0a1fe347e5d6f59f56c7832b7df14fd0475cee8443c01bc1ff924e15cb1da5a1b44004232df667bc17d7348c5600fb7f1f2
 EBUILD netbeans-profiler-9999_p20150713.ebuild 3478 SHA256 c9deb5043e222551a77450d02eca261a916a773eeba316e9555500e8111754f7 SHA512 a568c60e895ee778bca2458876a9ac5fc07333cffc02abdcaa2f12ba2e1d79e17dc0292c0b6bfa009c49f9878077c4a2756dbae405de3fd51be1c23139943fc8 WHIRLPOOL 08442e86f306d06a9831c2d5a314be3f4f24e6f14b8b80159ed7e006f9525a4718706623f17331e109d297e4809af9130118f9d4aad13a94d919e448c19ab456
 EBUILD netbeans-profiler-9999_p20150714.ebuild 3478 SHA256 c0663e2c9b2730569a5a5081aa4f953bec108be28bc5c7c4eb7cc87ada89dc9e SHA512 36f752167cb59701c6d73b769f3c4c1fb21b74d0e8dba59db4bbb9bbd5527c55516bcb0f12172c0de3ee2f6a1d2574b574540685dc70513e11ff4e099f518559 WHIRLPOOL a21176f491f4571052b58a5ab52650e4405c8c0ab2240c3388553aa05765744fd0f75e076860495b640f323fc2defa381bc9036e7a7bb2191b66b06f6a4b58ac
-MISC ChangeLog 175106 SHA256 be27aefb79ce8d9fb33087d56a4d5542da8c4a26a6179fdbcb9f4ab16fa40b00 SHA512 910482410095891433aa6782edd2c798536a0c4035c76399c181e947708e7ee78ccf65d3247c3c448f38bbd52f5a98ab20a004fdcfac6e336a5792432a56e6bb WHIRLPOOL 579b736c5c29b3cfd41cfb1e52f65177992e8eb1162ffd403275a18a05795eef4e67fc82cc3fcfc33ced0038684fc78764509f85096c7b8997ab5b0225b83b9d
+EBUILD netbeans-profiler-9999_p20150715.ebuild 3478 SHA256 8a7c2e94f69eaaf7c00232efdbda3bd755d618bbf836aea7e2f57763a18e2e97 SHA512 3056a7cb081e58e0372b0a3e6bb0f90d1277a84f8068a07712230c6870fb4b11d84226881db09dcdd5055b15729b57ec2df81d9e20cdf92f439cd7248b43e371 WHIRLPOOL 57d36afb4c0927d84b485c79566cbb0cea5367b470ecbb7b56dbb4c01319466ef3aeb5ce43de7662d2c10b00c5155fb9ac262153647c5cc291e261eaf81f10e6
+MISC ChangeLog 175284 SHA256 95038bbe3189c0f2759f076f9500ea4a5ad59f40b01ff74e83b919048bf867d6 SHA512 2a6bce28b2ca1787c7c8966328ffcbac32d2c90a829007e9d5bf35c28400915a917c7f77232aac4fba314530dc024ed2dad269928c0d87562b25a0dab7865509 WHIRLPOOL fc2bd52379f0498a14749f8849fbc4f62b74a8210ad57b24ecd17ff2e299ab54a55546f235c66282bc2f61b030dee3d987bf4b44a5a1dd8406f79c81e0d5414b
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150715.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150715.ebuild
new file mode 100644
index 0000000..1239e70
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150715.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Profiler Cluster"
+HOMEPAGE="http://netbeans.org/projects/profiler"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-07-15_00-01-56/zip/netbeans-trunk-nightly-201507150001-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 82ef7ca..f0dc6c0 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_p20150715 (15 Jul 2015)
+
+  15 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-webcommon-9999_p20150715.ebuild:
+  updated to the latest sources
+
 *netbeans-webcommon-9999_p20150714 (14 Jul 2015)
 
   14 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index 6a933b5..842a57e 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -44,6 +44,7 @@ DIST netbeans-trunk-nightly-201507090001-src.zip 208130931 SHA256 5d73ccaddac610
 DIST netbeans-trunk-nightly-201507100001-src.zip 208139985 SHA256 ede6f00ad37a28f1fa7c825e0f86ada8e314a969db3ea1884d21b6cced8dd527 SHA512 49c255eefd2affd8206082b04cb2127138b841d9ffa5f175aabfdec0703a81da0299bfc7bf55404829b493cd530e2db5570f4a19e66cf5af83b2081ed90a43ee WHIRLPOOL 6f1dd8b72445a31428e310cba1de99f0223c57c6b24f178d9cf5855633d5da23d1a87a130267b9da9697fbf28d7dc7fca2a0a341af9936f443cb9e1dc6bf89c2
 DIST netbeans-trunk-nightly-201507130001-src.zip 208143364 SHA256 f6a745a4112c25988071e5add63f52b567ea416e56eb1c5ac1f0caa40b2fa47d SHA512 2a01dde8445619c79b837bc51d1eb5fb9136dc0ad74d1e73df9d45748baa7b41032c10a76d26505fcf783193978c25907dbb2fc93a0e54f8b470ca2a6d7b9a8c WHIRLPOOL 095f94bb313aa828e0d0e972e2ccd69015e300023d7ce51569963eefba61146421f5a1a015c28fa8885445bbf42987367d18ed57da98e3b7f6521bddd3a4aaa5
 DIST netbeans-trunk-nightly-201507140001-src.zip 208144479 SHA256 9daca7bafaeb7d4e4eed58ecec4ba487f11fd6fd4b6790c719d4f428929588d4 SHA512 96adc2194d3f005216677ccdffc1ac51ecac1c2a13ec3f29b177e553ea9f5a36d9c9010c7f6454612b78a7dcb5f5ef08197e1113701bdaa0c727b9c352422c3f WHIRLPOOL 4fecb0c62019a2fc3522db07513eba2b877c01c856ac2b727329cca7ff86d573ef493a813b943558c06da3d6bc3109b5082e7ccb356318e6aef374eadeddee51
+DIST netbeans-trunk-nightly-201507150001-src.zip 208148635 SHA256 7d87494131b5b5747a107020375a39bb160e0f8ee137dea2464befa602c66c49 SHA512 4fa53101acf4866ce6fb99322dd4b1eca1ac35c3b685fa81f4f69b1f7c5515f4b65cb9d39e11e8cfd03cd1a5aaa3f466cc1a38291c9e7c9463b80e410b72360d WHIRLPOOL 054331ec1b61af88d192d095792d8bb350de86d1a8c4bac8ef8c2f2dc85fcf3fb6ad73b6e45d1794521e6745fac4e4613214fe9fc44662b69b1ca070632ffac3
 EBUILD netbeans-webcommon-7.2.ebuild 2665 SHA256 9328ea550dfeca5be5c2b03aa5f512d451f1673e49a40994155fca0b2fb2f79d SHA512 d8b80b79e78769a70d01605a79a8a91f7e839d4138b4cbf28cafca6f56ae3d7003c2f5f40aff77bbe3f2882f43a7d7dca3f0428f0f2723a42ae5b49e4c71ffff WHIRLPOOL 31254cbd2fc6cfb2d1bed4d22958595dbbf73032439f19e684463efbe466ee80c144f77ab00ced7a07815b1cdc1d45a87ceda83e7a2fd20ac2ce65e45d30a093
 EBUILD netbeans-webcommon-7.3.ebuild 2986 SHA256 327c0a73fb20778d9fbe4a12024fa065e4102a7aff3fcbda7448874656a46420 SHA512 3d270e940424b3bcdc8c7f8ff2016d33eb55420ac4037f4e406b688c2acea1b07a04625772265ac293d80c0d1afe3bbe6f865051ed9234b700619bd0781d8b39 WHIRLPOOL 5bc288949ed3aa9c3c4cd4cd33b817fe317754229ad30e80da8cfea817bfb77e988a1d6d3280aaef90619968e0309fad212deff0f7970f04438494a893a30a5b
 EBUILD netbeans-webcommon-7.4.ebuild 4727 SHA256 54a0b63527001da34a21ae3ed69c2cfbf9a446ee69bda4bb6ac5ebb939ebb68d SHA512 96895c972cf7092426ec8bc06dccc6ab4f33334da4e67fd4da01e586801110bda8d955f2f29ecd93b8bb58ae64c4af4139e9954a784c10dec925e2beaeab2394 WHIRLPOOL aa7b3b59d315bd37553052470b1f56f435979569e5ef033493cf6f93c29827f2ecd30f6b874f07a0cd8824469c6546982ac3ed360bf3b6cbf211d95943a3398a
@@ -74,5 +75,6 @@ EBUILD netbeans-webcommon-9999_p20150709.ebuild 4997 SHA256 6be8ae78858bb3446116
 EBUILD netbeans-webcommon-9999_p20150710.ebuild 4997 SHA256 d19cba438920ce918796867950f1927190eeb77f059a29464d0efdcf8b2c7fc1 SHA512 76dfa73e78caa00e6de09b99ac1629dcce228896b21bf30a53f6b75b0716997c82583f0a665e8aeb595ed1ff9aa3cb835fb555bf586cca4c6039415841fc3ffa WHIRLPOOL ed9e09be8e749520de31f4e931fba005c919a947f2f0083ad7d2cd6463ea7547231cc21cc794d6f27c0fbb65b78fbbdb31bee77ee39475a2a107d72472b9e2fa
 EBUILD netbeans-webcommon-9999_p20150713.ebuild 4997 SHA256 6266c8c9a418811fc6d3a5b3173bb06e89a9f08d75d40c15a2c8554a60044d6e SHA512 0ae9dfdec0362e65a50e5d976b240e555bdcd56c62bff16188228d057a8455bac068c4bf0fa7b502286ed54a107b78fc61dfa97751a9927c83cc9705987f49fd WHIRLPOOL bee3074f4e52494b5f4ca7d4f99acf11bd54136ce07e4d03470d083a703f4c3f8abe90520b4924da292d3aa173b159d11cf0b87b917395f16e22fbf8baec7d8e
 EBUILD netbeans-webcommon-9999_p20150714.ebuild 4997 SHA256 7ac39d3df9aabe4642b16a206138470031eaa768a11a5d2d9cbdcd867db1d131 SHA512 38eb4db4430a5da425f7c965cc1024dd70928b97848b4633bf605d71b17900da05a43f40fb82ad24c14a082458370ab4ce237c89fe41da44e17473aecec2cab5 WHIRLPOOL 7f55ceeabef1db1ec6a6bf706c32f5098896f12042a6187e47be1f93213024437e192071ecff524916bee3540f925b8945d2df1474daa582a81f708b563193af
-MISC ChangeLog 148275 SHA256 5caf3493d3d8ea831f370490a4e4f7a49145431ddf08a8b3f97f9229432dcab1 SHA512 9bf45cdd73013a6b53cccc5b988e8a83d6530c577929158b13892164a7c8ee2518a5d2b36501d80bcd07a61c56b19291bafeb47a035c3600890cd496ed65357f WHIRLPOOL f1e6d7b0e5e5fe35a47085c6e7068728db258fed376a4e7ee472332769c8754a35f38556dd97b063d09f346420f23a177288bce816621a0a3e842c310aafcad0
+EBUILD netbeans-webcommon-9999_p20150715.ebuild 4997 SHA256 d59f9ffa61356fe799c0efd527caa9fc80d58369c3d98064cb1426b4c9ab86db SHA512 54a0170e81ff45391d319779203d334557fbae90c0e5453cfba4e73c0f51b2bd85a9c926ffae3b98f2181e7cdfe413361928ecc40acd82950e1b30d276be7eb9 WHIRLPOOL 3432ec01f014fd250b9c2d1a20c6aff6bd2731fac146631286ae597bbd3727a8921e6483bdc286613fff54bdf52ee8fa68d2fe3214f444b1d829910f6256db93
+MISC ChangeLog 148455 SHA256 05998a824621c5cf092bfa1d72217f54d3351131a2b21f9162ab2b6ce96b17a1 SHA512 25bba546e04aa1bf590b89e61f51cf082d52df25f6e0e1d0ff20386d4dd83688c97e2a01731e48d4c2b4ef9842f9e9c669e070257a38ffd810c488f5d963f73b WHIRLPOOL 67d06937c653f6ee5fd4a9e6344c8fe591a0d147d78080faf1dfaf48818a6cf252f4478dc516783ceab1761b7620c033abde13a288d3917f57703fd98be7be5c
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150715.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150715.ebuild
new file mode 100644
index 0000000..5214032
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150715.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-07-15_00-01-56/zip/netbeans-trunk-nightly-201507150001-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 511618c..be1c943 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_p20150715 (15 Jul 2015)
+
+  15 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-websvccommon-9999_p20150715.ebuild:
+  updated to the latest sources
+
 *netbeans-websvccommon-9999_p20150714 (14 Jul 2015)
 
   14 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 93d82dd..7457c72 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201507090001-src.zip 208130931 SHA256 5d73ccaddac610
 DIST netbeans-trunk-nightly-201507100001-src.zip 208139985 SHA256 ede6f00ad37a28f1fa7c825e0f86ada8e314a969db3ea1884d21b6cced8dd527 SHA512 49c255eefd2affd8206082b04cb2127138b841d9ffa5f175aabfdec0703a81da0299bfc7bf55404829b493cd530e2db5570f4a19e66cf5af83b2081ed90a43ee WHIRLPOOL 6f1dd8b72445a31428e310cba1de99f0223c57c6b24f178d9cf5855633d5da23d1a87a130267b9da9697fbf28d7dc7fca2a0a341af9936f443cb9e1dc6bf89c2
 DIST netbeans-trunk-nightly-201507130001-src.zip 208143364 SHA256 f6a745a4112c25988071e5add63f52b567ea416e56eb1c5ac1f0caa40b2fa47d SHA512 2a01dde8445619c79b837bc51d1eb5fb9136dc0ad74d1e73df9d45748baa7b41032c10a76d26505fcf783193978c25907dbb2fc93a0e54f8b470ca2a6d7b9a8c WHIRLPOOL 095f94bb313aa828e0d0e972e2ccd69015e300023d7ce51569963eefba61146421f5a1a015c28fa8885445bbf42987367d18ed57da98e3b7f6521bddd3a4aaa5
 DIST netbeans-trunk-nightly-201507140001-src.zip 208144479 SHA256 9daca7bafaeb7d4e4eed58ecec4ba487f11fd6fd4b6790c719d4f428929588d4 SHA512 96adc2194d3f005216677ccdffc1ac51ecac1c2a13ec3f29b177e553ea9f5a36d9c9010c7f6454612b78a7dcb5f5ef08197e1113701bdaa0c727b9c352422c3f WHIRLPOOL 4fecb0c62019a2fc3522db07513eba2b877c01c856ac2b727329cca7ff86d573ef493a813b943558c06da3d6bc3109b5082e7ccb356318e6aef374eadeddee51
+DIST netbeans-trunk-nightly-201507150001-src.zip 208148635 SHA256 7d87494131b5b5747a107020375a39bb160e0f8ee137dea2464befa602c66c49 SHA512 4fa53101acf4866ce6fb99322dd4b1eca1ac35c3b685fa81f4f69b1f7c5515f4b65cb9d39e11e8cfd03cd1a5aaa3f466cc1a38291c9e7c9463b80e410b72360d WHIRLPOOL 054331ec1b61af88d192d095792d8bb350de86d1a8c4bac8ef8c2f2dc85fcf3fb6ad73b6e45d1794521e6745fac4e4613214fe9fc44662b69b1ca070632ffac3
 EBUILD netbeans-websvccommon-7.0.1.ebuild 2692 SHA256 a18cf7fe0a1e38749826cb12651be06c210b038be50117647496ee6cbd184cda SHA512 32b32894713d7235ebd03446c5c411d22eb8701b96e3d3ac54eca78b2abc833babf279085cea3b74bb7bddc6d89a283a21c58a0b0462042ddd10e22dfcadeb84 WHIRLPOOL 59c18168245767acd1f8e53046f8942698237aa6fd903a669c626b7f17cf3d39247b7ae57f2984562230267885a4b6a62be43dc8a330f1dfeb2cc7acbbd7d3c6
 EBUILD netbeans-websvccommon-7.1.2.ebuild 2701 SHA256 3b2a1cf0d32db3c55b66d1c6b8c4ae2ad5487d3fdb27752468ce5c860f9b9515 SHA512 b9be64755f00157c2d6984887b8c0fdc1e34470f21df1fd72b3e399d3ec894af01c9b79fd604778213ac2086a6c96bf66366e8c2c8bf97f7fee23d16ceb36974 WHIRLPOOL 91559de8c8f6391c3c69888854778a91a1a7e0052ae69eb9762bcbd64d8bc5587fb84ebb55d7d0375da5a7855aa8672abfd035b6a38b3eeb5c23a4cd59b3cdce
 EBUILD netbeans-websvccommon-7.2.ebuild 2684 SHA256 8bf8cad1e0469713c63280620fed089600191230f501a78b834b010f8fa9b3e9 SHA512 fe885f92a7c6cfac532c8e40e4df6283253c43294e9d82ee4d0d070425496eee3792479c268b46bf1fd484f753ca1f21e7ca38a5d71816b6d4fd219082e8e276 WHIRLPOOL 9d2d622d4a800470c874d8751e9c2055e0a4ef72ad01a01aefda4e95a7f295d55fc95fdb55fdd1f631212e1f610bdc7a6b4ee631b92492bb85f73b0d9fb4ba26
@@ -71,5 +72,6 @@ EBUILD netbeans-websvccommon-9999_p20150709.ebuild 2727 SHA256 64f3c9d0e68e2cdf9
 EBUILD netbeans-websvccommon-9999_p20150710.ebuild 2727 SHA256 04349a5344b4b0783b84d3dd6e3bce7387d6b741ce496dd270bb27dab0af2022 SHA512 daa0e76c339bf052d857acc9880ae5b3312b8bac716da00977c2be7b3bee89a11d245dd7f0a9cc940cb0505fbe0b3208c02adbed1d4824c9e44cccabc02da0cb WHIRLPOOL 50b84a8f5acb980cc296291134f6c532bdef4d7cd923a1ac975a898ac672820863b35c7a737b8255ff0507d766a878476c79a319facffd4ace94c1fd0da7b68c
 EBUILD netbeans-websvccommon-9999_p20150713.ebuild 2727 SHA256 c226e2e2e457f30c71b57f0cfa66a42ff4c201e829c80258976ef25751d1162f SHA512 3fd48b40c9535449aa69ee82a83652eca072db212eeb6991a32af812939c6748095345291cc8f3b07f2120dcdc26d0255296c4fa28a577fcf432ba3fb87fed7a WHIRLPOOL 8636e04ed2a9fc13823f138e5f9823e7a3004f6f7eda9e509ce23a301e9c7297a5a4ec58300ad7ec5aafe9b0c431e8196d7f06397c95dd65df787385f3beee96
 EBUILD netbeans-websvccommon-9999_p20150714.ebuild 2727 SHA256 9a8d5ef6a459d446230c5cf08c349469b294ea0f0a8d70a94397980664d5a689 SHA512 bd0aad3718d939a4fd28390f89e816bfe459ce9c138849d5e8aa7b9fb3470270afaa044c16c39be9995549d4631a8bb7a611733980f9e6b6fedf35b6ccfa2199 WHIRLPOOL 19020433a5cb3010fa491e38cf041f9851f81fe6fccbc4da57ff25bfd69bb72177607d8f81b44a834e306eec1b1ae670a8df4cec7f0de894f3e5a6e3d1ea138e
-MISC ChangeLog 183536 SHA256 1b9b8c72f77d54f5801b334f2e2118cecb1f5e3ae2e47b2bc0dda3e051f3838a SHA512 78077efeed6d0740538b0a95bbc594e2218a86e27cf9f5dc57c76f7943f9b9ef36edeefb894d900e86f7d906851a51080f27a4fa1d7450271791c6cb6ee8a987 WHIRLPOOL a3ad58ec3775e884c6e4bdab000c485bd7f7020d8604b165659d6caf293293239aae03a9af747c55aafa5365eb0b16fbc1c630ad647a04da0c3f80c9449f24d9
+EBUILD netbeans-websvccommon-9999_p20150715.ebuild 2727 SHA256 029f1bd46cf9cf2bfc4a46a2512bd816ec80be279a80ab0ee18ed4c1520284d4 SHA512 828b7d2ac39dbc2beb161959dc0f742e7070832181c0897c03f16d7cb7caaa5734d71a390bbd4adc76398a7206e26aad4f5319c9fc873e2ba3aefa06b88c517b WHIRLPOOL 9dcf969bf5f56d5d2d4ab16f0c97471322f22273ce0591bca8210bf9c46489777c82534f1d006196d396f075b9e179faf4c2fbbed3e3ba7795fdceeec716ba4c
+MISC ChangeLog 183722 SHA256 3baa056f42316dc0d2e6d569ee1245639e0f278fdd16aee8500bfcbcf065a164 SHA512 24a1a8ba25ff00c545bf1c672d606a9de2cf989b7dbf86e1e3f92a937e56ebf988b435fcc55a1ab9dc7045024f1224126410987d2d0e1a91697f3a8f3df62eba WHIRLPOOL ea00f412f717652c703277ce89218c5bf9f43d79df12ea93e1cc0c37a9c124c23465f7076abe042f1483a1146ae58d26d7729d6470a3b583f8e562d93e4f9b31
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150715.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150715.ebuild
new file mode 100644
index 0000000..fb512e9
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150715.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Common Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-07-15_00-01-56/zip/netbeans-trunk-nightly-201507150001-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 6cfe6d9..f48452d 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_p20150715 (15 Jul 2015)
+
+  15 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-9999_p20150715.ebuild:
+  updated to the latest sources
+
 *netbeans-9999_p20150714 (14 Jul 2015)
 
   14 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index d0726fb..813cc7f 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -46,6 +46,7 @@ DIST netbeans-trunk-nightly-201507090001-src.zip 208130931 SHA256 5d73ccaddac610
 DIST netbeans-trunk-nightly-201507100001-src.zip 208139985 SHA256 ede6f00ad37a28f1fa7c825e0f86ada8e314a969db3ea1884d21b6cced8dd527 SHA512 49c255eefd2affd8206082b04cb2127138b841d9ffa5f175aabfdec0703a81da0299bfc7bf55404829b493cd530e2db5570f4a19e66cf5af83b2081ed90a43ee WHIRLPOOL 6f1dd8b72445a31428e310cba1de99f0223c57c6b24f178d9cf5855633d5da23d1a87a130267b9da9697fbf28d7dc7fca2a0a341af9936f443cb9e1dc6bf89c2
 DIST netbeans-trunk-nightly-201507130001-src.zip 208143364 SHA256 f6a745a4112c25988071e5add63f52b567ea416e56eb1c5ac1f0caa40b2fa47d SHA512 2a01dde8445619c79b837bc51d1eb5fb9136dc0ad74d1e73df9d45748baa7b41032c10a76d26505fcf783193978c25907dbb2fc93a0e54f8b470ca2a6d7b9a8c WHIRLPOOL 095f94bb313aa828e0d0e972e2ccd69015e300023d7ce51569963eefba61146421f5a1a015c28fa8885445bbf42987367d18ed57da98e3b7f6521bddd3a4aaa5
 DIST netbeans-trunk-nightly-201507140001-src.zip 208144479 SHA256 9daca7bafaeb7d4e4eed58ecec4ba487f11fd6fd4b6790c719d4f428929588d4 SHA512 96adc2194d3f005216677ccdffc1ac51ecac1c2a13ec3f29b177e553ea9f5a36d9c9010c7f6454612b78a7dcb5f5ef08197e1113701bdaa0c727b9c352422c3f WHIRLPOOL 4fecb0c62019a2fc3522db07513eba2b877c01c856ac2b727329cca7ff86d573ef493a813b943558c06da3d6bc3109b5082e7ccb356318e6aef374eadeddee51
+DIST netbeans-trunk-nightly-201507150001-src.zip 208148635 SHA256 7d87494131b5b5747a107020375a39bb160e0f8ee137dea2464befa602c66c49 SHA512 4fa53101acf4866ce6fb99322dd4b1eca1ac35c3b685fa81f4f69b1f7c5515f4b65cb9d39e11e8cfd03cd1a5aaa3f466cc1a38291c9e7c9463b80e410b72360d WHIRLPOOL 054331ec1b61af88d192d095792d8bb350de86d1a8c4bac8ef8c2f2dc85fcf3fb6ad73b6e45d1794521e6745fac4e4613214fe9fc44662b69b1ca070632ffac3
 EBUILD netbeans-7.0.1-r2.ebuild 6736 SHA256 e808fba2ddb516270d93b5cf67cff60d98b37ca58a158878f2e3b3ad696cfc82 SHA512 653fb585d9eaa20fcf88d778a7f34d63c9f29f2af2153a432fcab6d977ef9619c699b19587a48b148ccf717f4b31a43859b81cff80d5d84ad273c5fa16e8f565 WHIRLPOOL 257f2466c3ad198a05db9d5e377cad2707f8a4daf1f421e516d7435670a85fd4bb5f6b3ab657ebda8cc23937e1b4e1f4acce8cccd85bccddc5a7b1f9abbde0ce
 EBUILD netbeans-7.1.2.ebuild 6976 SHA256 4222e248dfb664ccfea85d4938ad691d3685f32d8e9b33289d1dda088057261b SHA512 cc0a20bd542b61621fe08d5413611f7bcbbebf0c37d5f67c590c31324e74eb5594e72efacc86d843ff3abffc98c4859c2733c63ce6f993baf51e24d69197b64d WHIRLPOOL 30fb7b0cbf22fc39a8dabefd27a0073ce73e62ef082d55839fb7f815bb73bc5c3c24c3418ce175f355d7c64138ef7e9616da41c68b3b57a70353d16c6113daf7
 EBUILD netbeans-7.2.ebuild 7057 SHA256 29140b2779f1a24722499605101c286d05415b4f97d2363afedef711cc586067 SHA512 0776f530f9530c533b13019f7b34fc664990a16926bcff768d0a9f3b9035de82dcd2ed66425ad8da27c65aa69fe3e6be966e0a1ee1bc222949e5d42e14f7f7f1 WHIRLPOOL 9fcb95348171fb0bd8d794b80b51b2e3ce36fd84ccc81653bdd0172cbfa99791e527b33c895ebf7b4d81c228f17d4afab367eb55ceffe28df835b2d09dc8f778
@@ -78,5 +79,6 @@ EBUILD netbeans-9999_p20150709.ebuild 7216 SHA256 be1f77984016bf0ae981d31f3474e8
 EBUILD netbeans-9999_p20150710.ebuild 7216 SHA256 149d2d23b0c15050b63ea55e775cb5737bcb50880a13329298ee6e1911fc68bd SHA512 50690e18425634fe87b3f26f29d678ef6fbc488d9ae37b0b27c39ff50ebc34049d53197adffdd9a1b058a47eae979529150869ea13169052b2f8b05a8da53ec7 WHIRLPOOL da33cf14950a1c330e8d1931a5ea11f8d40153341d341ddb634ff923cd790e3aad50720b8b10cd9d5e74f1cbd73a611d8dfdc06c77f231297d2cd1da0f3c3062
 EBUILD netbeans-9999_p20150713.ebuild 7216 SHA256 6c112ec6c95fcb5b0521a230a4f603594217d17450ba67503374c3c1a727e04c SHA512 ac7ab94f454d03f3ffa944d113cdc8f5419dd1021247ac267cb5e99d120dc0a8ad67aaef33f664c1dee1761a53a28db4867b21d72c8a628e0f95ceba02629d2e WHIRLPOOL 4f050168b862a5543adc6d62cf40c90605b9e156937497d4a9f1027795bb25af256995aa0e64b7ef27fd765482a6ecd757b169271ed554d963125a0489cfda93
 EBUILD netbeans-9999_p20150714.ebuild 7216 SHA256 9551cde3d63dc073cf76ca02687e119393c4f119e49be3a3ca1f264bd53e9b22 SHA512 99ba41300091b49e5a3ff398957b5bdfe6d1f60e0a8bfca56099b785ee4e54db6447b21bcf956f52fb5c8c94a570acfb13cf5cd12bf154336400c0ce68879dee WHIRLPOOL ea9ded01627b442057471ddde25f541cc8fc67a178a39925ed87609adabeebf706721b47f2b9e3d5518298479077761afa231ec8b894165d9a540562da3d4b5a
-MISC ChangeLog 155902 SHA256 633d241cee4ed8b3570fd44cf352df6d8a983783ac304bf5065fb8b554991318 SHA512 ed325471220d4b8121861ac13fa49976106cfa298d4486a049f572ea6ac110e6be85b316b85bbb45058fdd4c71e36facc95fe8a2db16b282ff07efa72e3153da WHIRLPOOL 58bf2abf0e4d404ece8002b434fb48f3974849b50d5ef6d7a42f6daf3c47f8334383d024a82bcddebaeadf20666cbbc5060ab7c2af61ebb1e540258aeabf6a4f
+EBUILD netbeans-9999_p20150715.ebuild 7216 SHA256 431c399667c6e695c96044bd477978638886eaa53949e2a330553dc2bf7006a8 SHA512 4286a55259c62d1c347eb7eea0800dbbf8140a83f12f8405d9b0860f8569f8dd1296032c71430d603fb5e0240f9fa82e5c5fed0e4d27e803efd001e78482144b WHIRLPOOL e1cea152f05836a8a370d61c14eb1dc587a643cc49dbbc6855908ce106095a94414c6ca9aa0250f49c205c24c0e9ceb56f7bd74b53bf8486a2ebbd8fc2cc1aa0
+MISC ChangeLog 156062 SHA256 37e4d21cf01abea8b2ac38c912fc919ab2214d8306a5a08d77ff9e5ab205aef0 SHA512 ab47717b40c8381067104cf1c8e12c06ac61bf2c18b1adb047ba6504891758369deb6929f2f6b9aa1b5ef17fca26636da828b0899894834745c622290184b4f0 WHIRLPOOL 1cac2e8b96ce66375f8327786248bb993ded683c7ecaa6ad72f76c76dcec8f41cdba3644a69f0e5eb04e3c9acbf2d76a001957fac2fa1a66f2dbc7efce333f50
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

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

commit:     57c47022073ddb203b6ceb3768d13c3c3942d9c4
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 25 06:09:33 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 06:09:33 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=57c47022

netbeans: removed obsolete ebuilds

Package-Manager: portage-2.3.0

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index c3a7886..e82641d 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-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
 DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
@@ -28,7 +27,6 @@ DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae9
 DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 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_p20160526.ebuild 3384 SHA256 78b42989812c06a312a216ba4d7478ba3ac8ff3553724cf8301d5bf50e00160a SHA512 d9b856dac4c202eb279fefcf3354496f48847c2e62d054bc2cd6f983d3b6ef108dfad5f5a962fe5d938619bb1168864227b529c0dfe9465f3bc93199c379e859 WHIRLPOOL ce2799381ebcbb851d972b5c93a96d40cb65eb773ec7ba787ef1c36b15fd20a89ffa561ccc344c2dcb9bf273c1d4e8c5e6e7baa72a174711f47a8cc8db87c645
 EBUILD netbeans-apisupport-9999_p20160527.ebuild 3384 SHA256 6b1cdd342ea791cd5a43da5207aacd826f027402357c638fb0c2949a67a064db SHA512 b89d4adde2359b36d31b520d7795a9c52c0a13a1b26da354148e4622143f50dc28aa8e2f61755d3e7f10a91bc21b9f8df78089cf286ebcb641f4f95f4c990cd5 WHIRLPOOL e3fbdb080132993746349a051a15102ff3268986d963a1933e3f9c7d2dfad5e4585006a52f083cd7b070da870f99410846c37b6e4612bef01f8b129b022b2703
 EBUILD netbeans-apisupport-9999_p20160528.ebuild 3384 SHA256 dea76ca12a89bdc4de57bf75ef99a2d11aa1813abac00884438810fff9669d75 SHA512 aee2a8891a7f2ce8bef07ad356ec38e32e34a99b8ba0ca8b8e5ec79f1c1d5718df4968afdfb2c3ffb8e5e0ab3b49cb3f16a2e19c1e50d1d2279eaf68c869d564 WHIRLPOOL ec6188dd99f247ac87b35abd162b23a1fb9cba47f7f039850ec600664322b7db1e375cf70d5d69df588bdd64f632ed4ca8e37e7aff10225a602447fe4d4d317c
 EBUILD netbeans-apisupport-9999_p20160530.ebuild 3384 SHA256 914cb3fd6fb081b4854169a8b4ffaa481c4fc48c6fb7f0d0914a4fab479c7b1a SHA512 845fcd99745a16a760747cce6fb3278d4a13be79135521b2a40ec136f71bb72d7c63f6327196d204f0e96baf1081f179563647c562fe9f99d96845d8d5272a5a WHIRLPOOL 93c0d56cfbbab65286e24417665a1c7efadaf03fa40293902d3e963c00ca41635041cef1ceb1f6ad270dc19c839bced955923c584ec372b5b2c702bf3998d5ed

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160526.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160526.ebuild
deleted file mode 100644
index 2a592f4..0000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160526.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-26_00-02-33/zip/netbeans-trunk-nightly-201605260002-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 d017142..cc9b611 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-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
 DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
@@ -41,7 +40,6 @@ DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae9
 DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 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_p20160526.ebuild 4790 SHA256 15c1efdf697e4eec5d827e580c4d2ee6e3ac3308a0184fedf3b882ff16abc55b SHA512 055977fc46ed6ea306c43a939cb9a24deec2764a881ada5a32d15f5f8e06024a628785d71827dcd331d0ae8d0aea8e89a780ae3a09e6a24a5a1aaf1acaed3ba6 WHIRLPOOL 1d04809ee29093158af062fc7e8e3f9843bc11d51c439c7b47c45f646f4a21b9f5231e5bdccb6e168fcf30b0dfb613c7ba4265c014b298cec68edf6276d33c02
 EBUILD netbeans-cnd-9999_p20160527.ebuild 4790 SHA256 3cf4a0d65a879cc2a8f9e5ebb83abc6bc3fd8c804adaae9d33792639b762ba26 SHA512 9cd977b0c24d4b5422f55b47dd593fb45980ecaba25dc71d5eefa77e365d446bb12b32d3211a449b804515924785117bb4dd31915fb65c28f31aa2c0994cc202 WHIRLPOOL 6b41d54b12d7fde225f5673c6acefa2d9a1d4616be5be9f1b949023d2c35af70577ef5d680c86c03035ddf8b3ba22294a7d052c224904a12e77c014fef21e10c
 EBUILD netbeans-cnd-9999_p20160528.ebuild 4790 SHA256 51886877261cfbad884f0726664a048b620d40e5a0e2782d812990762027dcd5 SHA512 73284fbc92397b2abd8d67e3d343f010e82d2b35df86ae3a2787d5f88434c2211098452a8b203e16a5afa083d62a35d404ef4e0ff0927b77c6ddf62a6a19c015 WHIRLPOOL ae5620916361e0970e17476ade2d3bb50848b5840775d903daf7bafecc2dc70311ede53b268d211cbefca8820b346fcb4bf3dddb5fe2f72dca0c497fe61c7900
 EBUILD netbeans-cnd-9999_p20160530.ebuild 4790 SHA256 7769cf54a5ed50ad522d6be9dd38b301e410e973bcc43ed14b743d531281b80c SHA512 7e0ad8ae0ec2d5f40c401ae196c4c39c0768e8dd27bf716ddd211935753fb11a77031b5a5337ca7ebd7268931eb6462040a567283e339bae34b313bfc6830def WHIRLPOOL 34f1eccec6eaff036e66eb94ca671448a94fef0c8507d447593e04c3371082f7b1fdc3a675c18905a91c9a85aa48185d8aeb7cb78aa9d092e62464d5e0541f83

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160526.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160526.ebuild
deleted file mode 100644
index 20b6755..0000000
--- a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160526.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-26_00-02-33/zip/netbeans-trunk-nightly-201605260002-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/2B406087CE1AF289539768BDF36F52E63F69F1CB-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}"/2B406087CE1AF289539768BDF36F52E63F69F1CB-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 800c642..b59af94 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-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
 DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
@@ -31,7 +30,6 @@ DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae9
 DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 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_p20160526.ebuild 2968 SHA256 627ff0954db98e43e9961942b65ed75c2faf99904e31275ed290f72438142738 SHA512 a39dfcf667517f62ec637af1ea16aa7481e598016e83201aec40a0414bbcb60e8e00a4aa7f407358a1c07e93dc915444c1913966140a45d7b23ee0bc59fdadc7 WHIRLPOOL 6667817edc1d8e81d2ddc9d9304c4cd12f2af1ddba13c534427f11183fb8e241bac9bc4d4755f19d53163beeb0bfb0d33535292b6c56fb77fab79064269cccc1
 EBUILD netbeans-dlight-9999_p20160527.ebuild 2968 SHA256 e31aa9c2e0d9768c6734acb590461f8a45007517b52f24eb1020a5bae75bb505 SHA512 950b04493deae35018a60bfdc2d245e1ca114deee3acb888bc89d0a86d10010d096be1d48b0740173ae9cb54bc07af0269e8f060578ee0dcdbcc85ae41f37622 WHIRLPOOL a1122ae0ac832f1a22574411b92e83513f10372d6952d64159724e31826d11acf209d5e0af8dd1ed51eb3964c8fcbcfc988b8c9b8548aef9871ad453c8e87dbc
 EBUILD netbeans-dlight-9999_p20160528.ebuild 2968 SHA256 44a7bac7ffc8b7b17500ee8d784debe345e573f796ae4615453198d5712a6762 SHA512 f1ce3a2e8790b1a70efbec5914ae90d0e2282cb9aa16f3758f124413a81c51cf6b797f50fa8fe87b3e06a1cccbdc014e51875d412e28a6aaafefb12fe4617966 WHIRLPOOL e61c1c70dbde5e769e5a62247247673c367239a8278cba3b278dd7a96b0ed11e6e662acd3c97c96235e65ad552058de4b32c3081c6a65ba0c9d1ea776d6688a4
 EBUILD netbeans-dlight-9999_p20160530.ebuild 2968 SHA256 10bd2623faba3cf6d42fb9e5af40344891403ec71d7f191c5e7f12750377c50f SHA512 9be1cd298afa533147aac29313ce8ba75f780a1c40b1cfa7af85a688d5f8afedcc8f9450b7ffd35ffede2755646190f41afaa2e715fa174e2c45b6037cd9ec55 WHIRLPOOL 090d3826a38a8ed6781ad14024fa0ac3d5eaa061368a06403899b02652d8240ff045639a150fdb8c97521df2adafe996844699e71072b5f7696ae85b5082701b

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160526.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160526.ebuild
deleted file mode 100644
index 4892baf..0000000
--- a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160526.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-26_00-02-33/zip/netbeans-trunk-nightly-201605260002-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 ff91703..140de43 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-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
 DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
@@ -60,7 +59,6 @@ DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae9
 DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 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_p20160526.ebuild 15825 SHA256 95734908288d5bc9cc17af2c0906bda2fa17e50f24dc295334a339083d95e756 SHA512 d85ff9ba3e3420832b65f6863ffa352b3cb9b28dbd33e2ba110c0b7d15a0a68f5546341d83e6e18419c3c33feb8f95dda6bb0839f3f852733f0e0d0ce5657cc1 WHIRLPOOL 77c0a24f3a1e2da993a1c01cc67a216f011bb877f4afb9cea648251b73ce34b80ae5fc692a2b3236a965bfba95b0d7700764eb7429c45cc1abca7b4e5305dc3c
 EBUILD netbeans-enterprise-9999_p20160527.ebuild 15825 SHA256 5ae5cf98ef42b44e124270fb3709dd675c651830f1ecc6c2ab8f6c7e4e8602d1 SHA512 b34cb992fbd884382264e975f0d51866af7c25564b24f90a76253b25356340f108a84863394da00ff2f15bd0c65059265c6dc758d142b99f5095cc2a3df195a9 WHIRLPOOL 613d2de27c9936d86f878666257a9fdf8868478b39c06ff7504779aea2f5dda257cfc86db013967090278a0cfbbcf116d3a75407ae10c97c37ef89b8a0c59613
 EBUILD netbeans-enterprise-9999_p20160528.ebuild 15825 SHA256 05765270dd6968aac62912496073a5b8a45c4f0721ae3f2e55fa9b956c04a73b SHA512 dce21c1246bc6a6c7d2953a92bc7662f8ab3867dbab34289556c09a9a6d4af339717a830288308680077b9a68fd333197fbaba5ee0c78610e26b1e018f308721 WHIRLPOOL e7bc32b284e69d83733e2d134828c56b09600a2e523fe8200c339056d707f6800b8bd117df43b7fbdc4028839ee3d3ad0cbc683d5cc8662329b71317ae0837f0
 EBUILD netbeans-enterprise-9999_p20160530.ebuild 15825 SHA256 c2a2164241155e021bcead95e796793f06dfd14bb17d30b31dc521a6f6010440 SHA512 da6e60db8ad6523551250509e2b95a236c5f519ceee3e0c748b6f7d78a07cd83c52cf3499d6b943f73f9693389311aba256de58e6d606afb31b38e3e17a560ce WHIRLPOOL c8736abcd05f81742a152f9430ceb58dc621a28ff872db9fc7c09206e21e06bfc8f91cb199573cdfd1882545e91641c7c5d0da8251828a7573f0efe6c1c2ff57

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160526.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160526.ebuild
deleted file mode 100644
index be7bb38..0000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160526.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-26_00-02-33/zip/netbeans-trunk-nightly-201605260002-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 0219a5c..edbe872 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-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
 DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
@@ -28,7 +27,6 @@ DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae9
 DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 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_p20160526.ebuild 2913 SHA256 cb90adcc4199e00b2781e94bd34c5ef0c05361dad1bb389b9a583c2ea4d83a36 SHA512 bb235a9b2421fe6369e5700c924c66a19c8a4798f133b886fa87f2d0213ee41eb9902b602d78d766a568b355f8178ea445958d00af7dfe7bdb19b2d37e96723b WHIRLPOOL 50ef76e33091a3c40e8b1791a273a9525210f02a0ba0bd0fdbdf69182d2a709c01ca019c01f12c84721c1427dbefcc9ccef4af2c22670d35df703d5c72d4fe38
 EBUILD netbeans-ergonomics-9999_p20160527.ebuild 2913 SHA256 d0a9c443f59b0f26f50c7faf75ecc091e6c82c7ed7b07bfca2ecab8f622ae24a SHA512 c8b64476f191ed7cca4980c8f80046ddc68780bc9176249606247fbfd16f234fc1941a8a6035628967906278f2f07b087da67962cc076fdfe4ebdfda1e4b16c9 WHIRLPOOL 16067a2a0dfe092143a35ebff76ca6ef2170fcbd0db6890f5abbce25ae094385d7c54f88be771279f9dd7341732e406535d2d79ab31220569bb08f4dd891f7db
 EBUILD netbeans-ergonomics-9999_p20160528.ebuild 2913 SHA256 a9167b158e314e46f83edbd5d520e3defc3af442bc32455a1916fcb028244380 SHA512 bcf7d2833f57f7376ed4638b3ce0d807ad2d86f6114d5c34ea95dec01b05929c73bb6cf4a4dbf90d581ab2c9706ae16047a9e52346f396b6f0dd79d83db31ebe WHIRLPOOL d1faa8f2a115beeab22807028e43a0a972e057a9ea1d0ccbf0a1ab96bca64ec952e588c93d4c49a1540002a8f5463f19bd25ae3c5134859010b11c646cd2065f
 EBUILD netbeans-ergonomics-9999_p20160530.ebuild 2913 SHA256 fece8416b9de9c9799e0baf8911e4964081a5bd0268cd2b9cb8dd086b45a7cfd SHA512 de4e1004a910a763f4086ab4b57241dc03704a4acb9126dd47c7b5883046898b51af9f838904ebd74e5b11af6a8d650ad85a3f6d0c27939feeb22e557ad04c8d WHIRLPOOL dc65801139c09d51a68f3481478d1aa1b42683ce52e73afc5fa86994535bebd224e752649dde268c6cd8cc61ef2cac949faa9f9577aefdcba8fd902159e6d22b

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160526.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160526.ebuild
deleted file mode 100644
index 2d2cc32..0000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160526.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-26_00-02-33/zip/netbeans-trunk-nightly-201605260002-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 9548e9b..3944897 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-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
 DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae9
 DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 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_p20160526.ebuild 3377 SHA256 32ae570338aab8acd5f5dac7154bba217fb1baf507d24e6d2df7c13c0eda06a6 SHA512 0c295a66ace5709c4ad71569f32c645de4bf39f09ea308388becec3b55753d363763b2e22733d234992e0471b0ffeeb1ed94d69e2121140519434781c4ffdaf2 WHIRLPOOL f478663b9c91a5f4400286b714cd49d9efa8a2d193b4c0209926b062ac9f35443d7ac620712112dab3448139bcfde744c5fb37767e2530a9ebecd0ac19c86796
 EBUILD netbeans-extide-9999_p20160527.ebuild 3377 SHA256 c34a7b73508938fae77cd74201f666d9fe7e12a64846e2950cf8e236ffa8658d SHA512 c3449cb97376606ac0e728e6a93deccc4fc0d9d46b96d33bbedfa8479bcdd0c89220f3302565ed9d1e4f7e78102e51d78d757c6f7a8f5886c62b36470c7175df WHIRLPOOL 7e1320997af8ff09f5da347671287a869856296e96863595bccf195f02f11bbf7ada4f377565cd94e0e456cfab91b04d7658c8d456796a71fc5758b1045e3a3f
 EBUILD netbeans-extide-9999_p20160528.ebuild 3377 SHA256 2d0a71ea5ca88ab01cb5e6c35ef961750821f30632158856d757b1a8ccb2fba4 SHA512 3fa3bead601fd0d04f59be7ffd7b8c009d3b31986f2dff444e1398767c31b96cdf6df4926b6486b0f91dbb970a1eda3e884b981e596b0d4f233e89dcaa31a78b WHIRLPOOL 6b4cf850a935d3357bf5af97ed2a9945b6c0946ff79c68940f28626c293a099e6d3bbe0e18335f4c1024f95ace91b0a20d2640f4b613c1c875a63436c7fa26da
 EBUILD netbeans-extide-9999_p20160530.ebuild 3377 SHA256 ca892dd9aad03a6b440aebbaedd80910eaedfeae1ff671c3c5f85b258cd1561d SHA512 01435f91fe82dda69ce7135e867068add4b284fee0bacfa6247f898313dc6bc7215258f80d1fd5c50ee07b5015b625327eea355864d4c94196fa39862605e6c3 WHIRLPOOL 833940e29916f0e24e2ef1039193caf6efd519013476529c55c6527f8940f8eb852e28cf39e3931cb9b243829273522a774f30bdb68db018d04ef38de35658f6

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160526.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160526.ebuild
deleted file mode 100644
index adc2c63..0000000
--- a/dev-java/netbeans-extide/netbeans-extide-9999_p20160526.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-26_00-02-33/zip/netbeans-trunk-nightly-201605260002-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 3e62518..7b880c9 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-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
 DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
@@ -30,7 +29,6 @@ DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae9
 DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 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_p20160526.ebuild 3416 SHA256 be1ee8f717846b15a238066b76cc786a50cfff7753ee71e63b121dd10d44013a SHA512 ff10317dfb02d9ed8dbcfdc42ee97c5860a6122feaa5393078f4c5605fb386a85df7b18c4e163d9d2d87a53d8f6b55b5171ef05dc81307d804884c4879dd6f04 WHIRLPOOL d09c5c26b83863ec3608941b9fad7dd34f8d7f4b1dff1b34035d151033bf0a201aaab8b934aca4d5f679df78f6e95a879a26b1e164a9f05b6682c007de4aa11d
 EBUILD netbeans-groovy-9999_p20160527.ebuild 3416 SHA256 0f2f2e202c85daf713c98770e52be0d0c073ab7ee584c55c8d3222b46fc9f760 SHA512 3b2b0b87f80de8e749415853ef46ad84a5c5d9d72844f90eefa460868bb83565ed7f056dc8dea9e22ecb07852122995abe4f5c2cd38e9c2fae995d8f7c1f0598 WHIRLPOOL 6ccaaeb8e90376b932016b9cc84aa4e6fb5db26ff6430e3960ab0d452df4ca7f16c7a0ccb02d286771320045118ea5c85883843f4da93ed27a7f92ee6ab9e6f4
 EBUILD netbeans-groovy-9999_p20160528.ebuild 3416 SHA256 e665a7c01fc1a2d1b677d309eb7f8948f8e6f1f0e28ac44366a6611bd295348f SHA512 4fd0989c9b68477f8c47ce83d85f22ff56d0f407551b91aef0f43e1f6e2a435e3cde6fa7ae911d835874fd7457a1ee6a922d05f78529ebd29fff0d7b829c3dde WHIRLPOOL a52adde743894e8da2fa3a8cc810e69382f4807d61dd758a83e4d04771b0400b2720737437e5ca54fe9748dcb0fd5c043394db69f22bc21daff90fe99d203b20
 EBUILD netbeans-groovy-9999_p20160530.ebuild 3416 SHA256 604d361d4be2383ad30473ba61e48f657bc2719a9b8f4d36165bff85a9470002 SHA512 a3a7da055fb9ca2d099767aadb356219f7d05613352dc3ab093d660ffac45d9d1a52d3f3a2fa3e69e59c911eca1ad9f40cb454977611cabeb16b0c005fd88487 WHIRLPOOL a4f6a6b224d4bd4ece3ca0714cd336e1d07e2d9ecebf3841ac2aae05b583251a09acd5424e9e76f2dfe0c8de6a78153a01b90b2c60983d212ae16be0c77b5acd

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160526.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160526.ebuild
deleted file mode 100644
index 4392a58..0000000
--- a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160526.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-26_00-02-33/zip/netbeans-trunk-nightly-201605260002-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 01d74b1..a03cd1d 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-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
 DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
@@ -33,7 +32,6 @@ DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae9
 DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 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_p20160526.ebuild 4126 SHA256 426d851e07f7b4aecb4dbf0dd7d6bb5fcede49dd6adc57323f5f9dce73dfc458 SHA512 c5196c5c0ce120cbf0f99f5d7086970f2985dd020e989c0818dfb39311a268970a56631bd6989a7ddce6655194417f60888532775cd3597f2de54ced3fb98c5c WHIRLPOOL f0d745155325d6fc65f9953e097b9bbb9e65c4972621c5761b29c603acc98362a55faebb33d05b6daa0791cafca99460e16a57a9cacbe71acdeb64858d29bbd0
 EBUILD netbeans-harness-9999_p20160527.ebuild 4126 SHA256 6ea77d6402426bfd58f582615164c3fd8a36fb4a79e10843fb8fe345ab6c8b36 SHA512 85d2523f2ab58847cc39933ebd7e17c66a1c2c6e9f4b7a150b9fa9ba354e64b31497e9218aaa7b121b267ba0d44cdca8dff3550ceceff269913389bb85dce533 WHIRLPOOL b864cea4fb36f50f228120b337c704128b244ae335caa8657c4437a3e677eb16f883ea4f0e28a9dcc67e3e64c687506de8ffd8b3a08cdfae4ddff0799e62a79a
 EBUILD netbeans-harness-9999_p20160528.ebuild 4126 SHA256 99f5fa177880e85be0724d2aae9fe5e940fed4532d5c59018fa01be4b98c5ab1 SHA512 09c011633e1a96636f11aa64033fcf082952684626560ff48817075f4613af2c42674d7eac3ffea8e4f9f525a2696e60b10c523541f303e7389dd3c566efd4e3 WHIRLPOOL 83beb42e42ef2b659e9f6945eb0519d042bb6d8345f762c667984ddf0ee7d65ebe10b364b134f4d852f5882331e2af8fd7744a359e672d34dcb53916cf6b6293
 EBUILD netbeans-harness-9999_p20160530.ebuild 4126 SHA256 c4ca867ae9a0127cb0e3313c92b296d89208d60049a715f6e1f3e52784be1555 SHA512 72bee50ccc7c0fd2e89fba17865f59c23dadce10c354a8c4aaa5f122d54498f536dddb560721a6b853d4bcef9e2319d28e4819d885cb9c209208d9b16a6272cf WHIRLPOOL 562e44586ad6e1116626724bb9607498ca50d1a28fe9af2cd1f71f307c33eb7efeb7a22eb4057fe4e876520f7546e216aabd909b56c5faeff7a945b1e22f0ce8

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160526.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160526.ebuild
deleted file mode 100644
index 8f5ff24..0000000
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20160526.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-26_00-02-33/zip/netbeans-trunk-nightly-201605260002-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 39c17f5..69dc3c6 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -143,7 +143,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-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
 DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
@@ -168,7 +167,6 @@ DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae9
 DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 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_p20160526.ebuild 30761 SHA256 aa8fd88f3ff99839f86621747c14468edb5b7a17fd2674d7f818e51c22e66ab0 SHA512 a6005dd66cc846cb911435e51b630ce9a2373c61bd5ea086fad16ee0240929707ec2385626c6a970fd2dbac0dd02eb6cff7297ac0b616a93544f21d527324183 WHIRLPOOL b54d768432f1d48822383bd03fa00143ac588c1e660bf3ac2dfa79068bf9c910e53f161302048c2dd966d1dfe2a34e7f59d8aede8930b1345c947b57aac242d8
 EBUILD netbeans-ide-9999_p20160527.ebuild 30761 SHA256 30a7c01e43ea6727c41f308b99f970f1746c1c88d42e3d67357f725305855222 SHA512 304c7aa29e132ed0a7d6dcc5e96ad57c7b6cf22807f4580bb4505a86cf2583dc4a8b6930ab0678462707df81bd97076408aa0ee7d0edbd923aed7116aa631af7 WHIRLPOOL 46e57e5010ce719a538fbfdef4e090fc9d961923bce888e2c7d186bb4f281a607fd66991d0536f3760259806bc5691590fb76742402fa54db48121af7efb2f58
 EBUILD netbeans-ide-9999_p20160528.ebuild 30761 SHA256 f96ccfd9ca8d15d671c2262f1e1b88b18f650567c313750cea011fcd6886a7da SHA512 1f19648d50f20876ae1ca79da4e79d87fe876d87cd113ac4a876ef77e0c4503e3bcfe1e233e08a9edbad5a4f97f980c789b087666137c23874d22666fa17eeff WHIRLPOOL a46f961a1d7d19b42834bf67acb49247a7efa7877d21a832224dde769aff62c7f4505f531ac24fcd516b06a1f9e7c9c527b111d7d644fc85dc9fc94595034b5f
 EBUILD netbeans-ide-9999_p20160530.ebuild 30761 SHA256 729d47fa65bda0ffd9e451882d14fb7a046bca4b429a6801243db70fda2993a0 SHA512 1dbd30fc7b3229e3d5e46068a53008d4e364913d03883cfbb38e043eeb2f04873045b3a6ee89945576b4df872e636c4938cc4252618c15a05c8c7a58f2988d20 WHIRLPOOL 70311879716c5927aba8321f9e919ccaaa508bd78f55fa11727d9c24599ce949655bbce7d58463f345ed52909204a0f026763daa1101a29cb9983e3b45ececca

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160526.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160526.ebuild
deleted file mode 100644
index e4335ec..0000000
--- a/dev-java/netbeans-ide/netbeans-ide-9999_p20160526.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-26_00-02-33/zip/netbeans-trunk-nightly-201605260002-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 deb19e1..6c54652 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -45,7 +45,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-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
 DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
@@ -70,7 +69,6 @@ DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae9
 DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 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_p20160526.ebuild 15656 SHA256 7ab21a594c4dbfb50403217ae8ae32613bdaad67d92035bf725601a23836b53f SHA512 3a2ea79df5dc4e481324fe22cb93bdd59189f22fcf92b333aaf45e975bee73192a732c2901eab2822d2e5bb4f7f0f02f5101b554734317b1b2bf96021f57f0a4 WHIRLPOOL e4f0aef8a47f2065c9256058588603975c2612bb3a3e20e990dab86b467ce7d4b7102091904478a05bed8e5d9bc5c4f75f332807930f4a6bcfbc9d969ed27daa
 EBUILD netbeans-java-9999_p20160527.ebuild 15656 SHA256 82f8a59c3f4d2173ae303f5f9088cfe156c31a9856e0ae1db15531ea9c45b975 SHA512 d6bff5d1324e912f7ad385cf8f2ffb1922ce9e498924da16b25f438f1d3ece1d83558e42839bdec39bc744e1d3ad8e8c6b1698a6061c331ffeda3adc3a1cc798 WHIRLPOOL ef578a7a426cedbe3cf42bc31aca392f280bf193df244e6a86f71f28135cec15e0827d3cc59b9accdf08806d83b78e5db9b058f806e05259e70b458198af08f4
 EBUILD netbeans-java-9999_p20160528.ebuild 15656 SHA256 6dd45030be2a0858ed1651144cf484f6cc5e4d1dacc06fa6005d55079b8290bd SHA512 58ebbe7985852cd6613875ece3322fcc0bf3dfc6993cdf9009d9fdcd51e35b21b53071b448883d78bf8650f9549e11144f6dffb5c24bc5ca9c2055b4cef208a9 WHIRLPOOL a7e93b5b94f6551521040bd10bc90dbca666eb83594db9716d2d6d0c80d8d02446bde557844691c8d052a75ea8445410eeddac218c698336bf11473ada7b369f
 EBUILD netbeans-java-9999_p20160530.ebuild 15656 SHA256 1b8eae5cc69ee5c52d22ee4877eaa52e1f472ee530f21815ab48e34ccbbee3b5 SHA512 6a907af9f568ee927df9f10f7564182592fb6cd448fa163294041aa5f5070a197426d954f6676e05f5e0c6c40fa49fda5cb4426c922805ed502d0183db314fbb WHIRLPOOL 8be5a9d7a20549a2d72c3f14fc15ab5db8836459042409a112e2f9de2dc9e21c503cc22d41230597f023b5c3fb97870b3194bab32873fb4ff51ba6f2766dc287

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160526.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160526.ebuild
deleted file mode 100644
index eae4db8..0000000
--- a/dev-java/netbeans-java/netbeans-java-9999_p20160526.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-26_00-02-33/zip/netbeans-trunk-nightly-201605260002-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/B0AB099BEDA0D2A210519332B0254D65917DDA66-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}"/B0AB099BEDA0D2A210519332B0254D65917DDA66-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 2adb597..07a1d0e 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-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
 DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
@@ -31,7 +30,6 @@ DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae9
 DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 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_p20160526.ebuild 4971 SHA256 78ce43ca036f26420537eb05b34c6c0079a8d16899c6f4a2c95461ab9ec86153 SHA512 e1190b0a1fe0e1f91a71fd9bcd9ebaf1e66a87d5866b0c08c883fb37eb98bb267610289068bf14b0625385fda1c568851901e143406b1b47050718a09c45d56f WHIRLPOOL 48a011eb8157d25349659c952d51ae4178851345e0999c2c3cc9ffbd0879008355874c80eecd4923f0c7108a3fd3acf13a19b81486c6e5c3f00d6227d0d82ed8
 EBUILD netbeans-javacard-9999_p20160527.ebuild 4971 SHA256 53b3a9fa460a828eb7500f8be6ffe71a692ed829090b81e866ec5c2184dc3fd2 SHA512 bad4d747cd0fdbecd7ad142690e4b5ca7274fa7eddf95189ab4553bb80c2c16202d98b9a35e4878a96d4bd462b76ffaf5c4cee9fe3522191c624d1fb4b223c8f WHIRLPOOL 9a7ab13755a4a3f3df80c530a04980c0f1c504a0bbdd51fcb80600e888a2b35fa4b0b26cf4a19d77357681d226379ca92016d9cb3f121220f7f4619b614be7a6
 EBUILD netbeans-javacard-9999_p20160528.ebuild 4971 SHA256 540550bc4c687bd48bb77fe687b97f392fc0204e30ea9939a9d2d4537ab35999 SHA512 bd132115990a1687bab73ce04621d52c4625ffc9e00075ace4efab6e565f80b76bf1d8781a2b0f4e861bef04b7bfb24d5eed6c0c782c4d9e1567cbc39be7fd14 WHIRLPOOL 2340d8fcb95fc5d562b9717cdded960de68b770f44370a00d7af2cc7af98f16220b3a72711d76c66516613c5dfbed9fead249d560852383dc29d6c8b85a20bfe
 EBUILD netbeans-javacard-9999_p20160530.ebuild 4971 SHA256 8aed47e3d3a4d151cad6366d8a8ab02c52464cc372ad2aab9023f9f646eeea45 SHA512 e813fa58fbd5ca2dcf0b62bf5b7f26b5ace2c954cc673f99f23b4ca2a5bb96420c9bf0f985c40943096cc539d5064165facf25528c130476d8026f7807653613 WHIRLPOOL 21af88b8f80b9d13fb1b5603a5b8a8d5d22a443887e6fe5394cfd5956bc8b0e4e4f848cd147afc0fd1d0ac964874f91f9474dd74eaf626fbec682c6f0b3ddf3f

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160526.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160526.ebuild
deleted file mode 100644
index bb5e221..0000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160526.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-26_00-02-33/zip/netbeans-trunk-nightly-201605260002-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 7298fcd..a06d8c5 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-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
 DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
@@ -30,7 +29,6 @@ DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae9
 DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 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_p20160526.ebuild 6293 SHA256 8fa5191a0ac5191df7f812f391bdade4829283bb7f6044e64c37324c24d8adc4 SHA512 8dd2d609f1badefb9d55af6a51b7e89ceb774d589b1a4f8ff845826fe2f8c0d43261b959da89404eddf68fef1dbff9d7af097a44cb4f87036bc8cfc6ac252902 WHIRLPOOL 969646b20d660d40ad6a8caaa72836900b5ae85f83b3a10493f73686e761abbccd4e144a7bf1d3c3cc7b7e98bb672d85a3d091ae7d697d6910cc52e19a863653
 EBUILD netbeans-javadoc-9999_p20160527.ebuild 6293 SHA256 ff75ead29a2cc11526903a4a47206492af3ad3b97411c690f4a0b5fe0aa0b3d2 SHA512 b5c233c49cfa52a8c06ba5851f2ccef84528ffa0cb368b42ddf186092a38455a684458872ec9bd0abf65ee048495e1a25b4e52b9c94ab00fdbe44ac5d1ab217e WHIRLPOOL 7f4284e14b082a75b148f318ac4759ec692fb39a1a801fda68138982505c25db8150f7ee4e6267a626adc62967a54b539e3f775315103ec1be3d530cd9b56ab5
 EBUILD netbeans-javadoc-9999_p20160528.ebuild 6293 SHA256 1819bdd300775c2e68859957bd2e494f5712b87e3c71a3b4a17da1515310a0ac SHA512 c560c0eb3f21c2cfa8f7eb940998332268b8566eba553dc5dd9bc83b4f3566c1a2c909c5a2a7503a4da4ebd01c8f70eb016570d85584bfcda33344614946303f WHIRLPOOL 3fd6cb40583c2b6a3ed056013e5b3ee95ded71f0586c0d4d48211ff89fd64e3c635ddd1453aad3b77249d4edd338aaa5e553d328af99651020da2e8a9c2ab46a
 EBUILD netbeans-javadoc-9999_p20160530.ebuild 6293 SHA256 4a30ffd321e2cf9d48884e5558cf10f59b851dcd8dd0ad611752b4945fad6507 SHA512 c639dd17eaecd5a6fed55eb537306ce388e020be4aed9ffec572d1a928d80a880ee7834b13012f3a65b1d88a058a64c3958f2f24795f9e4a0f5ed21e8f518b1a WHIRLPOOL 079267b3edb4803f49151012b8e48b4a8e50a69357143ee5c721a8d39f9dd04cdfdca81120ee9df871ebca1017353d8264eba13fb5f6499f606fd5e3a49844ce

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160526.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160526.ebuild
deleted file mode 100644
index 79ffcfd..0000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160526.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-26_00-02-33/zip/netbeans-trunk-nightly-201605260002-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 598deb8..a27ceec 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-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
 DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
@@ -36,7 +35,6 @@ DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae9
 DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 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_p20160526.ebuild 4717 SHA256 4225476bd2157f41fce02dea5997d9241c5734a6f523782276cd0e1cc8446797 SHA512 88beac29101918cfb7e51ae9f2facacc94959f6368f15783837e29c43640f166e51fe1b021635c15f3e4a426b3ccc253bdad90fac4b1c93fb23eb30edda8396d WHIRLPOOL d6c35b42954f656e44e65524d049f940a6e357aa40f684cc120a3cc0cff79fded39a42a2dacdef95cdd04879897bc430eac77b5d8e63e67c56ef6323eb9e8b0a
 EBUILD netbeans-javafx-9999_p20160527.ebuild 4717 SHA256 a3378dcc1dcc5f3e9404fa2d4abcea51f5db5cd146aafe6d86dfc109d61c03b6 SHA512 d56a70aebf8613e15327844fbea54ec3d31db5a5037d2af8663bdef320c048a7c1e34a0747b901e0483c6a083627e2f88f01151d65bc3dc3cfbd5c987820d97d WHIRLPOOL b08b97e419e59d58c0f1f0a539a03d3ab135adfdebd32253953997e3abd472935b336256e1504d19b1b8aa91c79600576d98504479fb86bb531567fdd47db62f
 EBUILD netbeans-javafx-9999_p20160528.ebuild 4717 SHA256 a6768b7e080c378775cad95ceea1cb37f280c3995a56008eea5d16d2c9b0ab68 SHA512 2864481bafccf49f714b96554713f7142de1265d23526fba1b82c104e7463c8be4dda95eb1f9b19ca824959f579c63d0e9367bf994b5f29609c178bc234577c5 WHIRLPOOL 7055fb8dd6da8d93c1b6e729b7851be87335b279f61442982ca5a044b6f241bafed60f8c901de980a6ec829601c329e2f0767959994ab372acbfe261d32ee4cd
 EBUILD netbeans-javafx-9999_p20160530.ebuild 4717 SHA256 8d47c484169039f422ab26243e9759920de989254eb8d36d229f03a9e846072c SHA512 7706da460389b59cbe9932b4927901168af67be0d4eeb690c261c66bcae9c765cfcf319310849ffa8aee62a20867cfa6dd676733a5536303364cc627959ca8bd WHIRLPOOL 990455ca21ef0e5b9ddd2ca76d1960b7a2eb3088193ca12d732ed4dfa8dcbdf1d5c9ebe33de58ddfe814f9ec922aace5a18f1281097aa95061ef210ec80e5251

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160526.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160526.ebuild
deleted file mode 100644
index cf39910..0000000
--- a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160526.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-26_00-02-33/zip/netbeans-trunk-nightly-201605260002-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 80667e6..da705fa 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-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
 DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
@@ -28,7 +27,6 @@ DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae9
 DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 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_p20160526.ebuild 4412 SHA256 08e99f6a150a8646821e68f3cfae74afc8da8c2165056c31965ad97671d3fce7 SHA512 078206786fb0ebce9f7f439e9038b3ece094113d6a842842263210e2ecb9527c32dc0164eca238aaafe9d41c6fb4d2105c55f02ad61a37b9ac73d92df303359b WHIRLPOOL 80cd1e1db614f23fed21b3225e9b0546ecc7574e569ed411e39f6bf47007f50fe3b0586d6bf4e580c3be7ffdf80bc78c56ef0a99c4a91706ffa7047008f5b640
 EBUILD netbeans-mobility-9999_p20160527.ebuild 4412 SHA256 ed5ed3bcc24bc10c7cf4a1a13149e8913b13d0714c0b6b124e3329b61cba840b SHA512 f0e71dbe8fbf0810ec38e16317551be93d75baf0717e7345418a8e72970b6301642acdfaa7d335fb5b693f3505679421c52a9b221dae152ae9d26dc1698e7b0a WHIRLPOOL 227788711dca74888fff365b850c7a0d71f59ff834be6ad0f47af676f454c58ad9c02f5d54da969d30dc8a8dd178fbc9952f136a203e3106257a41d20f5eede4
 EBUILD netbeans-mobility-9999_p20160528.ebuild 4412 SHA256 8d5a5a9c719ae131256033cd64457e7bdac10b58acc7bb0afd6bf3e7d910d492 SHA512 02fbbe548076277b229043b61fb411aefcc04fc10caf84754ae8c7a3b252736aa495a10d06be6fc0feee466b0d16b390e2cc4b22e432b03d084735229072b6b1 WHIRLPOOL 85561167229adf05bba05c7c92549ee111f3724feea68c5b0da824bd539a912d800742fd5d8388e1cad7b0dfbd41ce8165e8c3979116e7f328ab9ab6d8a8afa9
 EBUILD netbeans-mobility-9999_p20160530.ebuild 4412 SHA256 d28b10e50afe7913493d1418b41f70c956226228a2c4914ffc4b9b8ca312d1b6 SHA512 d5d44e26ce875490dd1da9f6dda261e42383b33ab411b56cf91f464ca5356136e27b13be182b78a19d67b4b387b003b78cf496e16f05d2bdba0de80b44dcd353 WHIRLPOOL 9e488789123eaefa971aba6e285ee128119306babd06e3c763c989c4e4f61f7d54fdf4ce89a6b247666bcac2f3ac64048824b1f67c01d79b73a7da21e5c10073

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160526.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160526.ebuild
deleted file mode 100644
index 3f79d86..0000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160526.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-26_00-02-33/zip/netbeans-trunk-nightly-201605260002-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 973a6f8..3c7fae5 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-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
 DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
@@ -31,7 +30,6 @@ DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae9
 DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 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_p20160526.ebuild 4111 SHA256 e931fffc71d94a04205eadbfb0de0860b452ae5736f2306bb2bc152f2f38b349 SHA512 f62400f7255598b7d484095298b8332ffda0591019603e1c4d46c33eb053c1cf24f3102ff1450cf778f7d00fa1c39b4074d36196bb967308ab51c516192bc84e WHIRLPOOL 5a0abeb8b9df6132e2671179710b2323e3e13b116f38d767c279e03be1a08bbbc27ab4e71037bb1bfcf7c670a95aeaaef7e0fa2317dd4ac84c6a4cf247f1e1c9
 EBUILD netbeans-nb-9999_p20160527.ebuild 4111 SHA256 a6dfefd5ee97a3a17f592ab00b3c97c9ed3d2bb6971c0758b215f65a70907dd2 SHA512 bcee6f396b2020052c7723d30d8447efa54e1e2a7e086e1b4ca5a45edccf452c11ba1c6a08487a7b354a76ac110004f7a99520ab7322c1d5dee7d18e2189f70b WHIRLPOOL f30344ef2098f118261d5bdfc1f0a7dd573cdc491956d36207fa5b609fbb51c0972001d9bb64976ca8fa22f896da46023645a3900404301d40eba3494d6fcbc0
 EBUILD netbeans-nb-9999_p20160528.ebuild 4111 SHA256 59330ba4b6068e00b552441f03f908a7df398b21d909410a26e8d24013ec05bc SHA512 dad57262798f5567cfe4469fc144eef0e9a061326bc426670bc533ceb0f636e5fb8915facf09a7e7c5b686deb9cf3436a28f7a57fbb520ab56201729520fd649 WHIRLPOOL 13d6816b75dc66ef5c794f1ca5ed82d0e77854e432e4b6226aefe78b501f3010d0104a9795004e505d907daf44d6a4963ad08f3c70490ed5f3dbbf6be59cd4a3
 EBUILD netbeans-nb-9999_p20160530.ebuild 4111 SHA256 894ad7d26fed0945f1a472f8812f3509ac426844ad7bad373d1ffcd35eb41218 SHA512 c71b4268dbf84a3e9313ae4d5a1df700e5266675cdcf00c533985dc0abf6d5160087a43c176c48eeac3d69e689835ce686ef9f35f495f9793096560b6b8aad79 WHIRLPOOL cf7b1672061157a1c600b75f638131c4bf7e69305759e25033590dfb14736e28c8c60dd163997fa2794aab0c7061b911a73c84538ae588393ee2ae7c13905900

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160526.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160526.ebuild
deleted file mode 100644
index 1ff763a..0000000
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20160526.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-26_00-02-33/zip/netbeans-trunk-nightly-201605260002-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 eecee13..b6509b6 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-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
 DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
@@ -33,7 +32,6 @@ DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae9
 DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 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_p20160526.ebuild 4418 SHA256 539f53cd6a9e911a052485e7bf5f523293dfa9991b34d23ef8b12a2e0867ade2 SHA512 563bd8382822108144477619c6ee105e6a2961569f3bc699d5914ee46d4815130ada2c214a770ce4cbf94363f63b09531cb540e83b20c91b6ef481e20bfad081 WHIRLPOOL 98cec862c50ed659e6f8295db4b6ec40712f257c75d351eb418873147fdabf16adee232233b5f1fa12d8f79925b5508b5e7db24c014d64c1ee9285761b7aaf58
 EBUILD netbeans-php-9999_p20160527.ebuild 4418 SHA256 a14c7a641f7f0b4e73f3bcf74bf783c0b93d4fbe871a1b5e522da7e98c58a166 SHA512 66dec4856192ab502fb4b702b2b73021181c16c232905eca73d68e049433603e4d2b7c3779a49d8e5b58a24d5b4fc1b90a8dfbe28659e33a1aebfd6566a770ed WHIRLPOOL aeb8c177b49be01b55f83155aa64ec9a132eeb2858e04e552b03189a62ac8a0aad115b3012d2203c3bfbb33ed11a7d41bf8b50eb6e116c2f55851b9eca5639c3
 EBUILD netbeans-php-9999_p20160528.ebuild 4418 SHA256 89f59ed6c89ba5e6cbfb4ed92e7a0473f8698a888cdbcb3d3664c5095be265b0 SHA512 d861bb733db82aad7e69d79e78ee997a0b3da2982cd36c463f5b14bb44e97732acc9eb928aa98081cee1cfd1f0c685e3c3039a65cd699a7186e730427ee6e588 WHIRLPOOL a86c2b18877287e331e0f9318d775388ef2401295b5c9f5df933016c11684bb92a3d959bcbad8b6280e4c4d8d2b828bd30995a4f56237aa9334d8a305d7f0c99
 EBUILD netbeans-php-9999_p20160530.ebuild 4418 SHA256 81d6ff1ace4684c8e091e318c5ad27739b204e8138be984cb62fe11e547ff2bf SHA512 60aadfda9de85fc255803fdbfafb9c3bc19bd1be035adb0cd4d135005bb6e5b3c70ad658d2d1c462e7dbc759459fce57dae0a05cd2b2bf85062e7c9fb4b7914c WHIRLPOOL 3036c97558de84352415e08b90b4a233995ee449e8cc2c4ec18bbb849ef1c9b10d2958c01b4d41abe9fe4685e7621ef91e45a30181176793bd5a039cd5cd349d

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160526.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160526.ebuild
deleted file mode 100644
index 553b785..0000000
--- a/dev-java/netbeans-php/netbeans-php-9999_p20160526.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-26_00-02-33/zip/netbeans-trunk-nightly-201605260002-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 9bb94e3..0443f36 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-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
 DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
@@ -54,7 +53,6 @@ DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae9
 DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 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_p20160526.ebuild 9520 SHA256 258a40482a2e3a2f2c95c9d01ea629812a818387eeb2ef8086ca5324935a91a6 SHA512 f78c19a870b32734cb60154a0ab0a7645d9171cfaf280aea736bfc008cded701043703745d8cd273dc7fcd0622f9bf40bb63ee4bda8f8d45c106c8ffa041a86b WHIRLPOOL 0a31f9dc97fd2fe961dfb9619005e95e1f7c26e66b32f9ad50285ebb2b1048a1db6db43598bc2f9f8c26ce4dbbdb2e6aaa3b610c33f4ac221eff187c1ea891c0
 EBUILD netbeans-platform-9999_p20160527.ebuild 9520 SHA256 6182f4e93aeb1875102826bba91362b9313a0e3f23257d7d02b88f4d1b641132 SHA512 b5030e9f64ad6406ec887fd6fd41aca394e5676cabeec574aec0ec4ad1db38c97e44be85fa46d88573c9f9f611a5931d287db55610683c86ffe41b732f0d55d3 WHIRLPOOL 0c4a9bc995979e3e7f5ecc1e4634cc798b83f137e7ba89e3a91168654cff6a45dcb80e0cde934c34a959867553d7445f26d8422a0fcd3e51f1f02e19628392f8
 EBUILD netbeans-platform-9999_p20160528.ebuild 9520 SHA256 e8ae71da574ddadb2103716aa0c511df722a8c57bed50b849dbfecf0939ccf82 SHA512 2bbc29ff5ef604b029590b4021f3caca21a46bc2876370776f665982032df896e32d49171c1046255e7b015fc51a3298264503eb7456a26c4d8fd5171bc28513 WHIRLPOOL 11a7e0b2dff87a673b720f9aa92e11fc47a22d1e22908cfb62c1ba8efdcd2702b7312be08c9e80d8db628dcb8a81951ad5296f84304917a75573136f2387104e
 EBUILD netbeans-platform-9999_p20160530.ebuild 9520 SHA256 76304dc6ed4405b46126d2b081d0a3dcc187825b92651b26ac6ccb0379e81876 SHA512 a9e4db74a54d19837dcdc52c1d04a2ed51d561ba8380da9a2c31e09ad489548f4d114e9958d552cbf9b8c276fa6bdda735f7bda237fde63e5229b7cb9a6e89ce WHIRLPOOL 9adc5f9dcb52ac33d08019b694d245bac8a397d8b16a9752b241435bda041b6b110d160817fcf846e056cb7037307450c0016e9d5b6b2a80aeb1d3d79f6b3e5c

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160526.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160526.ebuild
deleted file mode 100644
index 07baa95..0000000
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20160526.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-26_00-02-33/zip/netbeans-trunk-nightly-201605260002-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 0cc0de2..5cb6e4e 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-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
 DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
@@ -28,7 +27,6 @@ DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae9
 DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 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_p20160526.ebuild 3472 SHA256 9c5c819930b714dd0dfa69331167ffe84f3e1f64091a2bf98bdbb193ea5d02eb SHA512 6920123dd625b37f41b0fd7fe6a56264737003ae056db050e954a41a7c9e0344247214c7be51ed4bd91e923edd1ba453540690bcd9491a07c5f0aa6bbfc04a8b WHIRLPOOL 9e12ef4ee182fd6d4b9808adaf2f5f0264a93d7a1dbb1e1a0fcda61ca0bcdf4b967820485c462eaa569663c9c4a04184dd6e3f79cdb61296634cb24505a08098
 EBUILD netbeans-profiler-9999_p20160527.ebuild 3472 SHA256 a606cd9bf4b3cd59ab6f6837c30a87030073c1c3f99067074b4a9a54aeb7ace7 SHA512 3d6530b60d7fbab5c389813df9a9100f630289a82301572f50158492c2f624fa6c36e63c79c6fb74b7cde690aa6a529a20b9fcbf7bb4b0d973fe10126fba91eb WHIRLPOOL 33770ccd6c966b016d6627bafc8cbc8019972f01222fe09957d1cd23ce4cfa90c62fb11b2782f975189ca510a6b27054629f3a4cd3ac8e435734a1e582f958d3
 EBUILD netbeans-profiler-9999_p20160528.ebuild 3472 SHA256 8a49898402a8dc8a616ab2ac090bc203a5d1ab18d51d0ae84beca00a10957654 SHA512 51aeab139a508fe6b722ce6c7d88b11d6f6554d1b5786d5163a2a0f09d4b0d4398673087e5cf055aa1f46e3e2f210b02347d0c372fb1205e52419620cabc78df WHIRLPOOL c6e3b7cbbac535dd84894cd3ec76552a57986d6f7406a36644da7f98571e519691f4803f4841b451564fccbe2a58b797b7500c0edcbed9fc8512ab6c57c250a0
 EBUILD netbeans-profiler-9999_p20160530.ebuild 3472 SHA256 f4891cae7bc0778360ade4015dd259f7f3f1fbf034c907bcd238a59c4f5da8e2 SHA512 bfad3027bb756de537d9d50a4195ae021914323e75ae5ca8c41a5af3b42f2e04d7835ed15786030a3fa0e2169d9d4215485bd73917d7121aa8397c10218012c0 WHIRLPOOL d785e33a7b45710ecb9a0b5d50151ac37f60a2878461995b5e53e5557efce758deff13711d3f41e0fa73ffbbca266d311adfc184db10d016e900897c69fa2520

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160526.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160526.ebuild
deleted file mode 100644
index a8f6da6..0000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160526.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-26_00-02-33/zip/netbeans-trunk-nightly-201605260002-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 0d6de3f..6bd09ad 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -23,7 +23,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-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
 DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
@@ -48,7 +47,6 @@ DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae9
 DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 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_p20160526.ebuild 5343 SHA256 641c9053ad1d10625552c0b8564dc0f0f2e47c92bfc3ec076a2d255a5fcebbf5 SHA512 5d473720ff5e7d35e6cf03d29575e5d517fe92a67f652a82babc25c9a255c09eccdc89d68c1e48c7b2e19c0e265827cca3572ed45df445c27de07bc41601ea00 WHIRLPOOL b1ba9950f0cdc9aa10e98e2821c5ae0c9ade328fcac7e86554092a9dcfd276ef3497ffa84f66f85b2b630e6a9ab708ee7730c9a01ab94cbb1f6a4a06cacb6fc5
 EBUILD netbeans-webcommon-9999_p20160527.ebuild 5343 SHA256 0a8def86900796e0200f07ec7dc461f19765fcf6051d7a394d55d5b343510153 SHA512 fbe546b3c51d7c84779b1ec88f9894e3bf74bd76d0a4badf61ad39b154e51ae78e7a172a5bf7cd71a8872d4984661203f087010fd225ba9002b87c3a1a00d344 WHIRLPOOL ffab5b9147ac7c4fc49004d4dd0e8116e6011baad4aef4a8b46214dc950b7d6774622b13cacc38a8f50f4f43b7e86c4e96fde45d6a64f3f7471b2a1fba3dc675
 EBUILD netbeans-webcommon-9999_p20160528.ebuild 5343 SHA256 b1c3e0af12fac98bcb169b4cccd822919f965a7f842e56b2c8bec1afdcb55912 SHA512 6f77a01c8336f45fc41ea179dff017e791b3fec16ad3820ecd99abeaf597b408b6732087d4625e9325ff04379a27a580f01159c85d2abe6136b510bfafd55f76 WHIRLPOOL 170981192a08e7213376631275ec1503e5c8aac0623c5ad490f3ebe4d1b698338d57e33c79a8000b34c6c391fd76def1efe48d117e8daa4634ee7347c6067462
 EBUILD netbeans-webcommon-9999_p20160530.ebuild 5343 SHA256 0cfced87a671a4fe5762de3a4b4dcd0f24e45cfe0181c167207db1ea1b6c52c6 SHA512 76399150baf348ae63358e9e265009bdd8286179168ff874fbe1ee04c5d8ba2f1163ae4604a9ed648fda3cffa02a764d71e7e8b863a308b3caea410da8dddee5 WHIRLPOOL 05539e87b9eeafcfa3e33986d5a104e3c4c644da540aad987766ba4b5556e1a0594e3fa81e057b36a595581fb41383fcb775c33326c3dc5b4442d0086966b443

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160526.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160526.ebuild
deleted file mode 100644
index 9ef10b4..0000000
--- a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160526.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-26_00-02-33/zip/netbeans-trunk-nightly-201605260002-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 eeb680e..7587246 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-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
 DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
@@ -28,7 +27,6 @@ DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae9
 DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 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_p20160526.ebuild 2721 SHA256 970655934ee3b7eec8935449ccd63a35112d33a858d4e9cc6404c46045f24ff3 SHA512 57de5ff271959da3a04a733df902e37d14e51fa0ee60c94ec6567eee65b182da68cfe98c90ac5a218ede59ea17f624b252bcce2f2f1072194301aa1639e0af5e WHIRLPOOL 3d3c5df73a4ee8cb03ad232792780e989bd4626a16b061c84b6e675c75448f398de0a0fab6a778ab39e511cf3e222248a954247ee833ce9bb113f281f406eb7f
 EBUILD netbeans-websvccommon-9999_p20160527.ebuild 2721 SHA256 f5f9b560951f634e83d1744f9bca681eaaf2f8a44b1d4047b4bd11f60bd27c99 SHA512 7fd7a7a696891db0c760c1c40aae8fcf1f9cd76c3f934d4c2ac14315fb629804c875edc197d438e1844d8778cf38a2a81e6de7bce4296dcdc60ec493b8938fdf WHIRLPOOL a86ed25643632aefc85f9da470473839a79944fc40e79025881c8ba9ae763b304a5f36c270087cef5f68f7d2f117637c5a85c7ac37269188f24a06afaf541769
 EBUILD netbeans-websvccommon-9999_p20160528.ebuild 2721 SHA256 df33ea22af6c470e5949bfe5fef8870f67e598cb1e33c07ff122f78c15ad06c3 SHA512 c96153fde1e4cfecbb80c9903cd9039d5cf2bacaaa97e90750c2df727bdf404f0795159895a85865f78ac4cc64617f2e565a40c27e8b7e57cfd41dc854d8142a WHIRLPOOL fde53ceeefbd901667b8df002551c17a95c19baacee332841c008755a16e25e69da3abaffa53c6be281e0e0ca15e2b34bc84804ac8fd08a0f400ebbb768d3fca
 EBUILD netbeans-websvccommon-9999_p20160530.ebuild 2721 SHA256 1247a0423aecd4a5fa8e9d360367e09cd747bcc03375430a9cd9e13c1f0d33d9 SHA512 387048f5f2c6e095852b2470e793659a7bd17b2ce8441b17fa247fe4e770ffaa279313df8e8233444f9f02f6791e389a973fc22ede481a33edd4d4eca212a285 WHIRLPOOL 58056552b07e285af6d95e667b85cfff55ae61119358f565dfe96c3858d03109aca3ab2f55dbd7b622d661298cda8608c763bf5030948c70bafbb0e8fc6711b3

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160526.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160526.ebuild
deleted file mode 100644
index d12621f..0000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160526.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-26_00-02-33/zip/netbeans-trunk-nightly-201605260002-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 bc645d9..9ece2f8 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-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
 DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
@@ -31,7 +30,6 @@ DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae9
 DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 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_p20160526.ebuild 6939 SHA256 2565f9c875e0303e0c161ba372716b4c6b0972abd4013b3da988e0cd5c223dfd SHA512 13583780bacb761445bc2c9331b374d889c9629c69cf70bf800951b8e57e80b86bf59bb5872bb0d3bd18c48cf21bd0420eca9ce59cc89e46ac845a9bdc6e9c1a WHIRLPOOL 910a1c3a7518eff6be5fc69a0f33fc3f09ff0b88452b1cf43eebc1df1bd4d86fa63710a4da739755a9d4d0bcf3ca8bb1023728d035f9021479fc6d4845a0ea9b
 EBUILD netbeans-9999_p20160527.ebuild 6939 SHA256 4609ef39a87fc0528b592a021a612c0e7c855a0b70778385a5f18a90ea8b73af SHA512 8912aea322ba92c9d8a03bf10717cae056a9ecfb89928e76aa468923c92d6c251980ccc7e3bfc99792863c9cd8983c5a916c41693df3f0d7160c582a5e354f6b WHIRLPOOL 66ba582715f13692fcffb6daf43e0b43bdd49393e2f1528e2aee62d86f4d31a7f1ab5557dcb7779909e0d0e8fe968f59664cd18002ec962b1095f00239ba590a
 EBUILD netbeans-9999_p20160528.ebuild 6939 SHA256 01fdb05047da53305851d0354c5abc106a327936c614853b62e56568d613bbaa SHA512 2fcffe52bca886750d9189914eddf6531e6c4c391731860e277ee8ccb394ea7f781e8ca9cc395d47c0c446cf9b16b27bf31f6bf90583f0c7a7db5b597d302c45 WHIRLPOOL 65f5b1614121b0defa87598d869af5904d14ab6ee8fc82cf9f51674972e3faa9273eba8bd6d8ab4b947940bf1517e759ea2d25888f01b3b551c9a92d84cc0ce8
 EBUILD netbeans-9999_p20160530.ebuild 6939 SHA256 5dd3440de60fcd4bee802a332f06a0110e66e8530cf89a59c7342171e47df863 SHA512 fca992d656ec13a8278fd760660a278ae76e499c5355ecf9d2bfd0914d5ba02a585766d524c4e069dbb2280cdc587ea158caf927bb1ee206bd2039c7064d1d2c WHIRLPOOL 808326ef2e03695c52064a263afb50f79a3aa34b197405d10d4e0a567602903eefd6961a7221740f84fe78d923f1858360be49751c42c18d8e87a4b8e7e868d9

diff --git a/dev-util/netbeans/netbeans-9999_p20160526.ebuild b/dev-util/netbeans/netbeans-9999_p20160526.ebuild
deleted file mode 100644
index 4c4a1c3..0000000
--- a/dev-util/netbeans/netbeans-9999_p20160526.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-26_00-02-33/zip/netbeans-trunk-nightly-201605260002-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-25  7:52 UTC | newest]

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

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