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

commit:     b3756c0670dd696d5d26a69f025f473d8ff2765b
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon May  4 10:33:41 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon May  4 10:33:41 2015 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=b3756c06

netbeans: bumped to the latest sources

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

diff --git a/dev-java/netbeans-apisupport/ChangeLog b/dev-java/netbeans-apisupport/ChangeLog
index 36be9c1..38d0400 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_p20150504 (04 May 2015)
+
+  04 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-apisupport-9999_p20150504.ebuild:
+  bumped to the latest sources
+
   04 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
   -netbeans-apisupport-9999_p20150314.ebuild,
   -netbeans-apisupport-9999_p20150315.ebuild,

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 6665dba..0158299 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9e
 DIST netbeans-trunk-nightly-201504270341-src.zip 207311520 SHA256 acf9098ac80b152d852b40943cbf6ec50878ee0d089ce4bf7666aab656303127 SHA512 344f9e396f20c463801b44a264ca55ba4d05c7c51f83c650f2a6ee9d4858947962db8a7d9f0ab1e77eb921c9d974dafd7cfd8cd641005c468d7511cbfe0be57c WHIRLPOOL 8b5915c7c222f965ac8848b198be9afe4b227d5e3bd87f2c391ee06032914af414aa1ca438a92262b0921f6918fb2135513a648adac56e0dee3ba236225f9dd1
 DIST netbeans-trunk-nightly-201504280001-src.zip 207313287 SHA256 4d9e7bce832a438a5a030d15d0c65c5dd930a81e910efe56a6e98302db7c6aba SHA512 6355cc5666f6cb654bae79e37a06e4ccd4637ea1f093cd6dbdc8d99a109e61de6e644a4e9489bf67d72f27ce6797c175f948244a2d80b59e0f43fc64961b41ba WHIRLPOOL 70666a34cb2cabab59abe6fad18f85cf3cac3c6bc417ac2b0098c881625ec8292b1f2edc6a606370ead0f491be39815022978156d09c4ebd927778f1f8f9291d
 DIST netbeans-trunk-nightly-201504290001-src.zip 207321088 SHA256 65f4b2406259c40afa0207688a0e3250ae12c9d160dbeb70ac0fedb68fddac88 SHA512 9ab6957708e2cf7848020f4a298a73b65422815d95729ebe294f77237fc0ae42f049ce26a149d1ff249324acbdda4842607d02dcf095e8e186de49edd8c45e9d WHIRLPOOL 7c7d8c960a1791dd0c743fe8c19a54cdde50043efbdd06e2a68140f370a82ef70321524f64e5ac649e738e64a6a01a1bdcf5fcdc573969decfce203d4dd8da24
+DIST netbeans-trunk-nightly-201505040001-src.zip 207344087 SHA256 a60787b743a7a09946775f22bf41441b8be68f9c9a8429c5d5511f6c1ded4275 SHA512 009013edfc9a6221591d3efdb0a2cb25ae68a919554d621c3bb4d058fced5e303586218c0c662b86f8c03f15819bf52ed4e9d66b89bd1001fc3f656d5fefdbad WHIRLPOOL 140b8f2e27d33a32d6f8fc9f2b797dbf5018dd716e62c752e1ebaf27edbd71972e57ea9faf67d243caf23500750cac87a5e0c970ae1264347c6b7f9a3680a46f
 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
@@ -58,5 +59,6 @@ EBUILD netbeans-apisupport-9999_p20150423.ebuild 3390 SHA256 07a92b64899e853f447
 EBUILD netbeans-apisupport-9999_p20150427.ebuild 3390 SHA256 198afd8736b37d36a133c1fc01deff0d5d0471cade75919e8107a67338d2dd70 SHA512 8a821ffd9c2a3725f63092206a8b741c8ee5097eea7cbe4ca73a1fe5230c4e5c91e56955c9fc61079ce9a2378cc02994e24cac9803871ce982b363a84f1f748f WHIRLPOOL c134a327c96527c4927e265d250e542b1f552da3ff79b589da2ed94b6eb739af751849bc8d80a80463412bc40233e1c085a9cd357b0a9d2c1826a1ea4cf20d14
 EBUILD netbeans-apisupport-9999_p20150428.ebuild 3390 SHA256 cb54d026e3812c5ae2200afc7cbc5ba05d718c4987b7205dfa097cebf5a8ee12 SHA512 00451b562c9ffe298776bfaacd4b0a63ed5d7faf7691b1d85cf1b9c40f72e458543f4e7901d213b066794fa9bd4a2eb67eb14c36cabd8d6701de83a3dfb0455a WHIRLPOOL 49826a6e23ec3821b23da72eeb245ff91352cc54fc0ac787df7a7369db9190525f2d5a2fa819d405dce107a030281fef1cd036e0bc54007cde74594b127e5f90
 EBUILD netbeans-apisupport-9999_p20150429.ebuild 3390 SHA256 8759c722368de5eb473922ae9eb908371485b8dced0603b4e1fbe29f26217bf8 SHA512 a975770b887c1e5e9ad9ce242755b5ed8e822e5557c2c9c94f0060146523d9d847dd6aa972a021b91133f98c0e921b3fa1a2654b3aa17af243b8cdde2606c35e WHIRLPOOL 8673a3aee5aa01f2d3cfd796deaa5d22a0eddc2ff010db4e6df7ac5203b343a55863fe3d44839921a6ac666d28fac92378f3de22e71333ebdfb26f2dfcd00562
-MISC ChangeLog 169268 SHA256 0c3d04ede41092eac10162e4046b655459625e2ac4cebb1124d4b8b04d1f8f0b SHA512 cd9ec00c9db7fea75cebc11235aa06f73c51f39c5b944360c4020541c414f0b38ded94e35d2b6223e0a96d05c5cf379ab430af5d04dc4c7e6e9433b23d8f6b42 WHIRLPOOL c4fd940410c5825ea044b6bed57aab536f6efdc56f0b94eadc440ddd44d47f5732768e2b86a45f66eae434020456d350585de9fb2149f30dee0127b48ae97254
+EBUILD netbeans-apisupport-9999_p20150504.ebuild 3390 SHA256 9fad485c600335e4133b484b245364d112c14092d0371cea89cb64306e67da87 SHA512 66bc784e3d620656400ef252e0e8b6e0be0deafcf86aa45020423eaa3140c51461d4782f60c31ce1ac92b09a4018a2265ca7960dac9e47831128ffac5e53af7b WHIRLPOOL 3c17d5279afc431cc34ac458941a9a5774a4a7d6cba0d3ad57c0f158eb5dd58b4de5e86e73b52b59914d52133e567fb62bcbab8355d2520ee08f297669096895
+MISC ChangeLog 169449 SHA256 b8cfcee280b5fcb6117edda7fa4f74516da4ce20f24073601f88883bcd8c4be3 SHA512 5210e467fa27a0b2c831f5edbc0771c5f91bf073f1e1cf449e67aed730250e72b14a09fbea78bf48ab789959d799af9f02302a7ffe29a4717f4b819d42bdaf33 WHIRLPOOL 0b6c0562f07ca68b0b84ffa533dbf9cb24c77367cbf61fdcb01e66288bafafea0c5d9be09295ffb50f976a6124438aaacb7e4dfeab8dc412161fdc7acadec3df
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index e772bf7..c4dae3a 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -47,6 +47,7 @@ DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9e
 DIST netbeans-trunk-nightly-201504270341-src.zip 207311520 SHA256 acf9098ac80b152d852b40943cbf6ec50878ee0d089ce4bf7666aab656303127 SHA512 344f9e396f20c463801b44a264ca55ba4d05c7c51f83c650f2a6ee9d4858947962db8a7d9f0ab1e77eb921c9d974dafd7cfd8cd641005c468d7511cbfe0be57c WHIRLPOOL 8b5915c7c222f965ac8848b198be9afe4b227d5e3bd87f2c391ee06032914af414aa1ca438a92262b0921f6918fb2135513a648adac56e0dee3ba236225f9dd1
 DIST netbeans-trunk-nightly-201504280001-src.zip 207313287 SHA256 4d9e7bce832a438a5a030d15d0c65c5dd930a81e910efe56a6e98302db7c6aba SHA512 6355cc5666f6cb654bae79e37a06e4ccd4637ea1f093cd6dbdc8d99a109e61de6e644a4e9489bf67d72f27ce6797c175f948244a2d80b59e0f43fc64961b41ba WHIRLPOOL 70666a34cb2cabab59abe6fad18f85cf3cac3c6bc417ac2b0098c881625ec8292b1f2edc6a606370ead0f491be39815022978156d09c4ebd927778f1f8f9291d
 DIST netbeans-trunk-nightly-201504290001-src.zip 207321088 SHA256 65f4b2406259c40afa0207688a0e3250ae12c9d160dbeb70ac0fedb68fddac88 SHA512 9ab6957708e2cf7848020f4a298a73b65422815d95729ebe294f77237fc0ae42f049ce26a149d1ff249324acbdda4842607d02dcf095e8e186de49edd8c45e9d WHIRLPOOL 7c7d8c960a1791dd0c743fe8c19a54cdde50043efbdd06e2a68140f370a82ef70321524f64e5ac649e738e64a6a01a1bdcf5fcdc573969decfce203d4dd8da24
+DIST netbeans-trunk-nightly-201505040001-src.zip 207344087 SHA256 a60787b743a7a09946775f22bf41441b8be68f9c9a8429c5d5511f6c1ded4275 SHA512 009013edfc9a6221591d3efdb0a2cb25ae68a919554d621c3bb4d058fced5e303586218c0c662b86f8c03f15819bf52ed4e9d66b89bd1001fc3f656d5fefdbad WHIRLPOOL 140b8f2e27d33a32d6f8fc9f2b797dbf5018dd716e62c752e1ebaf27edbd71972e57ea9faf67d243caf23500750cac87a5e0c970ae1264347c6b7f9a3680a46f
 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
@@ -73,5 +74,6 @@ EBUILD netbeans-cnd-9999_p20150423.ebuild 4586 SHA256 057bfa9973b0107d35f55f04c0
 EBUILD netbeans-cnd-9999_p20150427.ebuild 4586 SHA256 6cbb94d3254267706de1d842a9e8469fa39b541dd5c15fa641f177747ee5bb0e SHA512 f6c4492992ec4805ca76f90d3d13c115fb06f54648a19b3a73e87155e5ca64ae09200557779e3ed806ec794f87e69778571c5b228ed1db882b663eb0980ea482 WHIRLPOOL 05271a9115e207081c8bfdd32ae9dcdbddedff6d834bf04accb28982fb4acb734d74884110ce16b29b8acb379b96d78eabd2ec4b5fdcc06c3542b0b3ebc7c4d2
 EBUILD netbeans-cnd-9999_p20150428.ebuild 4586 SHA256 9c90ec42fa6c75c31c5edde4087dd9a58ae529ce530c791174364dc4bf88f0b1 SHA512 1b019f06fe35c05999418b0034d57b2d0e7b36a1e6def27efa53f4396bfdccf07782c507ac5a3c3982288e7abc4b2e3c5e9ec0bfee5c448417631b58ef56cb87 WHIRLPOOL 420dcb77711e86867496d8d0e5498b0c25c31a3a8fd5eca72b13590bd53598a32da59cf92d6cf584dd5300424dd86bb1ea453a00d4a7b0e94f49adb092557da9
 EBUILD netbeans-cnd-9999_p20150429.ebuild 4586 SHA256 2ad44c2dbc1da47eaed3e4ff368ee101b07172768f988d935abf5ae2b139bd9d SHA512 4ccb8a319f04da763cf7ffd9c1b84926ba9e86c88efb3c4a1922696ee2362fbba0c93b376b6f899531c9243ca93d66bbbea47ab63e4a089c97cff2661ff10d65 WHIRLPOOL d2648c9a81ada3f44b861ce600e291f7d02b701c91f6aca16920b8b1a57f895c4367924612d21229bcd8e3cb3d29bcb5c75e6f73335d5464148ed4aa755f4cc7
-MISC ChangeLog 154508 SHA256 68c13a0a3f9c3048112e43d0e8df93ddc9a624a616fff7b49936a62c11a15e5f SHA512 4fb09f58ea1a188616e4aba7c8bbce96a1deacaedbeaf7a842fcf5b46408e1125c9f9b372eca19815ee44fa730871d13a2aca713b7e7a1e43677b09352971dda WHIRLPOOL cc1f42481895ffe89c4229f6821f10b4da588de23562f85b14b1e5403b375a0e596d193fec28e90e281a076536631153379d6cc227876997f3d66a4707c1fe24
+EBUILD netbeans-cnd-9999_p20150504.ebuild 4586 SHA256 d932a7d180f86c506c0465ec98cb2f8d77c26ff11de3a8f4a794b5bcfc45d4f1 SHA512 b863762c57199fca915143bff2377a2b329133d18a95a8fc0282234fb2b9f6cebf59f7d65bb03c1e46be723ae7b36d0ff4651c4435bdd44c3975507b6c20864f WHIRLPOOL 874ade9b152076aacefacd405b7e8870912903e85c8fafdd46e67b18306619c115f7d014f8fa478475bf2f35d3f4dce8d754e4eb8bee391513c28cb625045085
+MISC ChangeLog 154675 SHA256 939c51514cdadba7fa308f646208a07347fe72983acd1238a4406ee7ca1fbf48 SHA512 ece3b5e8309f02d89c0316ee7cc5e40a31bd68a7446732784d8e80dc2d6db542db12af576d1760167b7d03e9c14aa04fdb084e3378c1ce1bcb15097eeaa85703 WHIRLPOOL d18581a6de1bb07791070144cb17031bb06b40c812c473e9748b450b567612ab5c740207a8fbf34b36d595fb362fdef60bca2f79eb8f5b550af6ae2ea414453f
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-dlight/ChangeLog b/dev-java/netbeans-dlight/ChangeLog
index 96cd4c7..bfdb180 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_p20150504 (04 May 2015)
+
+  04 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-dlight-9999_p20150504.ebuild:
+  bumped to the latest sources
+
   04 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
   -netbeans-dlight-9999_p20150314.ebuild,
   -netbeans-dlight-9999_p20150315.ebuild,

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index a6b9ba4..f18e2fb 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9e
 DIST netbeans-trunk-nightly-201504270341-src.zip 207311520 SHA256 acf9098ac80b152d852b40943cbf6ec50878ee0d089ce4bf7666aab656303127 SHA512 344f9e396f20c463801b44a264ca55ba4d05c7c51f83c650f2a6ee9d4858947962db8a7d9f0ab1e77eb921c9d974dafd7cfd8cd641005c468d7511cbfe0be57c WHIRLPOOL 8b5915c7c222f965ac8848b198be9afe4b227d5e3bd87f2c391ee06032914af414aa1ca438a92262b0921f6918fb2135513a648adac56e0dee3ba236225f9dd1
 DIST netbeans-trunk-nightly-201504280001-src.zip 207313287 SHA256 4d9e7bce832a438a5a030d15d0c65c5dd930a81e910efe56a6e98302db7c6aba SHA512 6355cc5666f6cb654bae79e37a06e4ccd4637ea1f093cd6dbdc8d99a109e61de6e644a4e9489bf67d72f27ce6797c175f948244a2d80b59e0f43fc64961b41ba WHIRLPOOL 70666a34cb2cabab59abe6fad18f85cf3cac3c6bc417ac2b0098c881625ec8292b1f2edc6a606370ead0f491be39815022978156d09c4ebd927778f1f8f9291d
 DIST netbeans-trunk-nightly-201504290001-src.zip 207321088 SHA256 65f4b2406259c40afa0207688a0e3250ae12c9d160dbeb70ac0fedb68fddac88 SHA512 9ab6957708e2cf7848020f4a298a73b65422815d95729ebe294f77237fc0ae42f049ce26a149d1ff249324acbdda4842607d02dcf095e8e186de49edd8c45e9d WHIRLPOOL 7c7d8c960a1791dd0c743fe8c19a54cdde50043efbdd06e2a68140f370a82ef70321524f64e5ac649e738e64a6a01a1bdcf5fcdc573969decfce203d4dd8da24
+DIST netbeans-trunk-nightly-201505040001-src.zip 207344087 SHA256 a60787b743a7a09946775f22bf41441b8be68f9c9a8429c5d5511f6c1ded4275 SHA512 009013edfc9a6221591d3efdb0a2cb25ae68a919554d621c3bb4d058fced5e303586218c0c662b86f8c03f15819bf52ed4e9d66b89bd1001fc3f656d5fefdbad WHIRLPOOL 140b8f2e27d33a32d6f8fc9f2b797dbf5018dd716e62c752e1ebaf27edbd71972e57ea9faf67d243caf23500750cac87a5e0c970ae1264347c6b7f9a3680a46f
 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
@@ -65,5 +66,6 @@ EBUILD netbeans-dlight-9999_p20150423.ebuild 2995 SHA256 b810e07b435dd806dc61cf0
 EBUILD netbeans-dlight-9999_p20150427.ebuild 2995 SHA256 412547df83fb0c839216f770effd629cd96f20b36b0d76ef9415340d6f296053 SHA512 71babb389601fb0645c7eb4f5ad1643b9b90e9814d880ef1c4a12c17b8c14076459da780334ad145f37a64edfc5b82f4e04488a8b5b6f24e4ad1d3a0e5a4281b WHIRLPOOL 751e5f39da310a3aa5a691c945f776e388040004af703556e8d13e24f1cf07cc95a4989cd80580ea13d86c840e6a47d5d0c732416f84c7681f2799ea789f5801
 EBUILD netbeans-dlight-9999_p20150428.ebuild 2995 SHA256 ec28d97d0b04c66f25481049d1ad950e914bb63ab37eb3df2225c695c66865b7 SHA512 93af3520f84f3d8afef9bbae39d2df74a4d00b8d91267fe98f05215ca4138b0cd840af6f3072f571f0b9165af18411190734b3bbe912aeb23d366fe64d01b2a1 WHIRLPOOL 05d10d9ba7744583c15acd75c07c1f6034df12e6d0852487cb02131af7a6549a074fb90e78c004d0368d2f1ba64c2d3a7b2351da8a8aa780ac0e6886b4ec0815
 EBUILD netbeans-dlight-9999_p20150429.ebuild 2995 SHA256 6c834c967e8e924c9ca46efc5ac4210cd16737fbd4aec28bc9e3c7ae728f359f SHA512 74432786453051718f709583054df293c4ca8c45405d94efa4173d6333cbfcbb3aedfe981e3602bf7a11c4fdd90a66e8f998cf2156b099d9d8687d69e121f628 WHIRLPOOL a99f0c03f2f18d66471f20bb40557abafccd660b1bbdaaa0ca6520e41d1a118fd5d60dfda40855551150865729b767bcb0a371a7a11a27969c50b7e222f2991e
-MISC ChangeLog 161257 SHA256 ad13fb297b7a07530b2286db11d789954b2fe84c07afcec8945ff0c3508d097a SHA512 6415465ec18728b056f6d0e8cd8f7850efa85840474d2341112aed3687002f37a220a4a519ae93ef55d4fb948d7434972b50d304a2396f21d852d918dcbc5dd5 WHIRLPOOL 10ef33bfe29bef6b4b840eed1be703166e2106f574c9f21006ed62351adb2f81a77243b496558eae7177249b54a2eb786682d49bba0e7c7dffdf135357201128
+EBUILD netbeans-dlight-9999_p20150504.ebuild 2995 SHA256 431375fc148eeecf88fbcf85b6a105bf02da628aac19813b69014371e2b52d42 SHA512 45e25fdad0802ff137e25e00cbbb891ff572620a03ae60c75565eebea0c680258f5fc993cf2751eac39bfa7195845641260b78ade243e61ac6c4dcdd121a9a9f WHIRLPOOL 01e33aa33142f7ca4b9b00ced881425875a28d4bfb0c82fa00532b95ca41c573e25a47d6128ec8038ce8a6c301c78246e3052ed8a04ef0c75f0309f64b5db120
+MISC ChangeLog 161430 SHA256 ec021e5fd9a3375c747d0a64938301bf6523b5648933ec9fb691f96baf10abcf SHA512 e6cf397621f7042e16fe20c658dad2b65469735872a46297527398d41772a2fa3cd9a0999975ca0d7f64dc8c862539bd4b23a9e8d998d81f90baf5e4f0f73785 WHIRLPOOL 69199206b27ea0e8146000099212301e1a900d3b940724937e716527e9b4a880c0eb3f38bbd1b6b73406cf7fe9b03e3a1c14bd8218f2ae2f3828e462e23cef7f
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-enterprise/ChangeLog b/dev-java/netbeans-enterprise/ChangeLog
index ab45f10..4701a79 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_p20150504 (04 May 2015)
+
+  04 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-enterprise-9999_p20150504.ebuild:
+  bumped to the latest sources
+
   04 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
   -netbeans-enterprise-9999_p20150314.ebuild,
   -netbeans-enterprise-9999_p20150315.ebuild,

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 7c201de..558f2ae 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -121,6 +121,7 @@ DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9e
 DIST netbeans-trunk-nightly-201504270341-src.zip 207311520 SHA256 acf9098ac80b152d852b40943cbf6ec50878ee0d089ce4bf7666aab656303127 SHA512 344f9e396f20c463801b44a264ca55ba4d05c7c51f83c650f2a6ee9d4858947962db8a7d9f0ab1e77eb921c9d974dafd7cfd8cd641005c468d7511cbfe0be57c WHIRLPOOL 8b5915c7c222f965ac8848b198be9afe4b227d5e3bd87f2c391ee06032914af414aa1ca438a92262b0921f6918fb2135513a648adac56e0dee3ba236225f9dd1
 DIST netbeans-trunk-nightly-201504280001-src.zip 207313287 SHA256 4d9e7bce832a438a5a030d15d0c65c5dd930a81e910efe56a6e98302db7c6aba SHA512 6355cc5666f6cb654bae79e37a06e4ccd4637ea1f093cd6dbdc8d99a109e61de6e644a4e9489bf67d72f27ce6797c175f948244a2d80b59e0f43fc64961b41ba WHIRLPOOL 70666a34cb2cabab59abe6fad18f85cf3cac3c6bc417ac2b0098c881625ec8292b1f2edc6a606370ead0f491be39815022978156d09c4ebd927778f1f8f9291d
 DIST netbeans-trunk-nightly-201504290001-src.zip 207321088 SHA256 65f4b2406259c40afa0207688a0e3250ae12c9d160dbeb70ac0fedb68fddac88 SHA512 9ab6957708e2cf7848020f4a298a73b65422815d95729ebe294f77237fc0ae42f049ce26a149d1ff249324acbdda4842607d02dcf095e8e186de49edd8c45e9d WHIRLPOOL 7c7d8c960a1791dd0c743fe8c19a54cdde50043efbdd06e2a68140f370a82ef70321524f64e5ac649e738e64a6a01a1bdcf5fcdc573969decfce203d4dd8da24
+DIST netbeans-trunk-nightly-201505040001-src.zip 207344087 SHA256 a60787b743a7a09946775f22bf41441b8be68f9c9a8429c5d5511f6c1ded4275 SHA512 009013edfc9a6221591d3efdb0a2cb25ae68a919554d621c3bb4d058fced5e303586218c0c662b86f8c03f15819bf52ed4e9d66b89bd1001fc3f656d5fefdbad WHIRLPOOL 140b8f2e27d33a32d6f8fc9f2b797dbf5018dd716e62c752e1ebaf27edbd71972e57ea9faf67d243caf23500750cac87a5e0c970ae1264347c6b7f9a3680a46f
 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
@@ -147,5 +148,6 @@ EBUILD netbeans-enterprise-9999_p20150423.ebuild 15937 SHA256 0e9ed7f410cb4331dc
 EBUILD netbeans-enterprise-9999_p20150427.ebuild 15937 SHA256 55e50746f80f3ed1814ae3fd18ae78df7f7667a28b1f229189b6542007153f7c SHA512 befd2b711056afcabb8a6e1a13bc39ab8602869b9a6b2b15bfb6965f677a04d4773e7b9a7b19c9b2693cc2906ab60dbc34b12a0185ec84f3e5f50edbe9a4f35c WHIRLPOOL 96f2d017e295d8cda3d7502c1468b50b855fe8b2a0293736e8e0909df5dc3b075c17ea8ee86cf737fdf3d5f1c412ed2343de1565cb9ed38901cb0779c1b568a6
 EBUILD netbeans-enterprise-9999_p20150428.ebuild 15937 SHA256 9151153c90b54c9de15c8bcccffb9a1ce4c7c948b0b12f4b3d2cb0898a1c353a SHA512 be52f8c25556f4203ef348021bf83d377609a8d613e4f5408d04f735f7ed37b1b19ed79822b0390f16ee770930e308b14aa2a5145d25e5394db6c9a5aa56ca20 WHIRLPOOL c8eba13148d9a06b88e1fc7ec00d0f31ee6c2c747dbbebbaab0316fdd85acb2aa0cda2d724d3b7a75d0e45c70d04f33f35ad67dc3287571879f61f12f036f13a
 EBUILD netbeans-enterprise-9999_p20150429.ebuild 15937 SHA256 fe34a9898241a719a145a729a24045a23e0fa6b1f1e53c9714d5fa0ca94bfc5e SHA512 a363f4e76aaffc99d534aa2062d1da2d1b01d9acda6d7652829136502b291c569cdfc776eb516cf51b6075ba5b73c4b50d42ea8b2ac2ad570ddc3f8a41325bca WHIRLPOOL aa8ca7efe2c68f8c638bbf865ce550403d0b6bd17d6e8a50caf3b927478116f1d51a274f3c38a3c956e44d2017f858f688ef5587ea8688f875493f10e5eee972
-MISC ChangeLog 169793 SHA256 7ed31acf916aa452e2964c7c11ff3601a7c43eb6497cb97573a0f020c0870d4e SHA512 170b18c02052ac881ac3e67680042c08c7604c1fe2451b574152d76d5c4ba6b1ca545bad8efd9540ee79183efe8b695117dc0bc1726f1490c1b68c2778cd971f WHIRLPOOL d6ead59dcce820d3ba37da28343a8bea566ab5882bb59c280f560701d4d248c0762e50fe768eaf196f7c710b35828b86f975947952e8deb4e140f0ffb0fbe7b2
+EBUILD netbeans-enterprise-9999_p20150504.ebuild 15937 SHA256 8d49d64b06bdccc6df73011462af43d7d022ad9690e6f3635c684d6923d2f15d SHA512 d80e6be5b48d8a7f8677c30477db515898190effafa857968ee42df51abc565faae861cc4072e881b35951668ad6a800954ac924a7cd0d3ff6d3b44870ab3ade WHIRLPOOL 572d4e74452f32fbad4c32e579ef87ed82239a5ccad7236b4708174e78f7ec8f876ca16ed487d58e2714a78739b030a84f4180cd7fea0efb58e83eb642a99780
+MISC ChangeLog 169974 SHA256 b0a34585e9697bb02377c7cd169f4a97152a9ba1dd9401d568049108cf2e2730 SHA512 683bbb48a32f8119685c628807a62e4afdd2b49cd332535f4f9acbaf37757763dc620c51461da854923cdb469f9d1887693213a2a73c8c3b46f173b74551d2f5 WHIRLPOOL f61d09dcae7046fb7f8c02d9e62477b8dfb4e50c06a766374d9638ba3feaa8a566c27d5f436c4b3be5fb36cab9df09f2b23caa697ef5b2da85da2845a4059a9d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 396572b..f2f6085 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9e
 DIST netbeans-trunk-nightly-201504270341-src.zip 207311520 SHA256 acf9098ac80b152d852b40943cbf6ec50878ee0d089ce4bf7666aab656303127 SHA512 344f9e396f20c463801b44a264ca55ba4d05c7c51f83c650f2a6ee9d4858947962db8a7d9f0ab1e77eb921c9d974dafd7cfd8cd641005c468d7511cbfe0be57c WHIRLPOOL 8b5915c7c222f965ac8848b198be9afe4b227d5e3bd87f2c391ee06032914af414aa1ca438a92262b0921f6918fb2135513a648adac56e0dee3ba236225f9dd1
 DIST netbeans-trunk-nightly-201504280001-src.zip 207313287 SHA256 4d9e7bce832a438a5a030d15d0c65c5dd930a81e910efe56a6e98302db7c6aba SHA512 6355cc5666f6cb654bae79e37a06e4ccd4637ea1f093cd6dbdc8d99a109e61de6e644a4e9489bf67d72f27ce6797c175f948244a2d80b59e0f43fc64961b41ba WHIRLPOOL 70666a34cb2cabab59abe6fad18f85cf3cac3c6bc417ac2b0098c881625ec8292b1f2edc6a606370ead0f491be39815022978156d09c4ebd927778f1f8f9291d
 DIST netbeans-trunk-nightly-201504290001-src.zip 207321088 SHA256 65f4b2406259c40afa0207688a0e3250ae12c9d160dbeb70ac0fedb68fddac88 SHA512 9ab6957708e2cf7848020f4a298a73b65422815d95729ebe294f77237fc0ae42f049ce26a149d1ff249324acbdda4842607d02dcf095e8e186de49edd8c45e9d WHIRLPOOL 7c7d8c960a1791dd0c743fe8c19a54cdde50043efbdd06e2a68140f370a82ef70321524f64e5ac649e738e64a6a01a1bdcf5fcdc573969decfce203d4dd8da24
+DIST netbeans-trunk-nightly-201505040001-src.zip 207344087 SHA256 a60787b743a7a09946775f22bf41441b8be68f9c9a8429c5d5511f6c1ded4275 SHA512 009013edfc9a6221591d3efdb0a2cb25ae68a919554d621c3bb4d058fced5e303586218c0c662b86f8c03f15819bf52ed4e9d66b89bd1001fc3f656d5fefdbad WHIRLPOOL 140b8f2e27d33a32d6f8fc9f2b797dbf5018dd716e62c752e1ebaf27edbd71972e57ea9faf67d243caf23500750cac87a5e0c970ae1264347c6b7f9a3680a46f
 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
@@ -58,5 +59,6 @@ EBUILD netbeans-ergonomics-9999_p20150423.ebuild 2919 SHA256 b407b9c8c0273b431ff
 EBUILD netbeans-ergonomics-9999_p20150427.ebuild 2919 SHA256 982f6a43e34cce3860e93811258f82dc737cc3676f138a8f24dc2356cbc9c382 SHA512 2b4fc54fac15b05599ca4eb9b8fb8ce61a48fd11a64e2db829b01c394fa1369171cd120da49cc1ca27cc0dcb99c2194bc3ef66812088b03fdd2155c89a2dbbda WHIRLPOOL 6e3c5d0f8a221281132997025a7d0a24ac725dd4aeee86086340d269672296f45e718ad5656136ac8d45bff69b5a62a0e575602efa803e80c089e703067adf57
 EBUILD netbeans-ergonomics-9999_p20150428.ebuild 2919 SHA256 a4c45be51883f4c369ddbb4e2782353a59dfeccfae1ce03c04597fec9502873d SHA512 be3e15685921f73a6d7f9b614860eff924b1734ee9ceaafd3a891a2b65b02f68973993d5177aa392f7d75e67ce84b93e394eb6e6b334b3b41976a392e0f626c2 WHIRLPOOL 69c7af8e97cab5bb2f148c7ec8e1323b1344746c92a765d180fbceeaff10091928ffd2f4d9609cf049ea660a55a052e2692a60ea7c68b89bce0d8332b8394efb
 EBUILD netbeans-ergonomics-9999_p20150429.ebuild 2919 SHA256 e01899bd2a4d7eba45825b7f6c7d7f4056cb400dc1272e5760bbfdf8611c1103 SHA512 cd5f029ef9d27ee012d6e954431debc80f0223a4781c0d94e10cae6c7f9b98d6aacf31ca8c709fdbbcc4789c9dbb013bb2f4311ce51fae7fc61a327618a62958 WHIRLPOOL 678f31893d33e2502747d689fe99a44346b23b18a0e3881f271a21dd376048da92dd271cf4123a45db53a2dc048ff866b407e928b6473ee136292ddc03adad6c
-MISC ChangeLog 169268 SHA256 709b79baae164c46275999bf0adfce9e778f3351701a21828cb6cb79f043f086 SHA512 be17236ebbadc4de03cb0464d0566176d07724619af848ccea1bdbe98359476aec9e561321b3663d81678000f32f04b6d49a66ca7f740d9d430a17e295636b98 WHIRLPOOL 8653a8f668275923521debf699a07e9d485286362c4f7831436a258065679cef8f5972faeb6d2ad27c50a950fefbfc80592d6c7e64e6bc49eb79eba315a11abd
+EBUILD netbeans-ergonomics-9999_p20150504.ebuild 2919 SHA256 c64eb196314d209e3049d536d2a87b86ea8e93009f83c78a3406995e9610fa3c SHA512 9330be52e4e1dc5da4a1841738c9ee80ebce58c4b6bb264547775a76acfd55813220118eb4454ef2dd1214bad068bf8f31b4a35522db61aeabeff4181019a114 WHIRLPOOL 6f3fc0b0a338760616062fee55fbf782179986e987c5917d3738013880499ee9cecd32991804edc974185763f8964e92e628893907f64d77dc8e2bb5618d96e3
+MISC ChangeLog 169449 SHA256 8fd80544e9def82f710493f6999c832c0b3d14ed850621f8020c2b168278f140 SHA512 718998c4bace076a6d5352715dde14f57aa53bfb849690bef0acf6d3263586e01c5724b10a905cf9df34cdd7cb3ce9d7d0e4eb6e501c2685b12ac41d967212ad WHIRLPOOL cf1c33e2701cd536e130f545931e17aa54cd416afcf2b67f01115486d1d0e7610f00f37fd4a5facc6155f0b3a24e6d09cb3342427a41f804f00bf2a3af881d18
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150504.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150504.ebuild
new file mode 100644
index 0000000..0c36b89
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150504.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Ergonomics Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-05-04_00-01-56/zip/netbeans-trunk-nightly-201505040001-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 ede0c75..376e4a2 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_p20150504 (04 May 2015)
+
+  04 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-extide-9999_p20150504.ebuild:
+  bumped to the latest sources
+
   04 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
   -netbeans-extide-9999_p20150314.ebuild,
   -netbeans-extide-9999_p20150315.ebuild,

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index df561f1..31ddf91 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9e
 DIST netbeans-trunk-nightly-201504270341-src.zip 207311520 SHA256 acf9098ac80b152d852b40943cbf6ec50878ee0d089ce4bf7666aab656303127 SHA512 344f9e396f20c463801b44a264ca55ba4d05c7c51f83c650f2a6ee9d4858947962db8a7d9f0ab1e77eb921c9d974dafd7cfd8cd641005c468d7511cbfe0be57c WHIRLPOOL 8b5915c7c222f965ac8848b198be9afe4b227d5e3bd87f2c391ee06032914af414aa1ca438a92262b0921f6918fb2135513a648adac56e0dee3ba236225f9dd1
 DIST netbeans-trunk-nightly-201504280001-src.zip 207313287 SHA256 4d9e7bce832a438a5a030d15d0c65c5dd930a81e910efe56a6e98302db7c6aba SHA512 6355cc5666f6cb654bae79e37a06e4ccd4637ea1f093cd6dbdc8d99a109e61de6e644a4e9489bf67d72f27ce6797c175f948244a2d80b59e0f43fc64961b41ba WHIRLPOOL 70666a34cb2cabab59abe6fad18f85cf3cac3c6bc417ac2b0098c881625ec8292b1f2edc6a606370ead0f491be39815022978156d09c4ebd927778f1f8f9291d
 DIST netbeans-trunk-nightly-201504290001-src.zip 207321088 SHA256 65f4b2406259c40afa0207688a0e3250ae12c9d160dbeb70ac0fedb68fddac88 SHA512 9ab6957708e2cf7848020f4a298a73b65422815d95729ebe294f77237fc0ae42f049ce26a149d1ff249324acbdda4842607d02dcf095e8e186de49edd8c45e9d WHIRLPOOL 7c7d8c960a1791dd0c743fe8c19a54cdde50043efbdd06e2a68140f370a82ef70321524f64e5ac649e738e64a6a01a1bdcf5fcdc573969decfce203d4dd8da24
+DIST netbeans-trunk-nightly-201505040001-src.zip 207344087 SHA256 a60787b743a7a09946775f22bf41441b8be68f9c9a8429c5d5511f6c1ded4275 SHA512 009013edfc9a6221591d3efdb0a2cb25ae68a919554d621c3bb4d058fced5e303586218c0c662b86f8c03f15819bf52ed4e9d66b89bd1001fc3f656d5fefdbad WHIRLPOOL 140b8f2e27d33a32d6f8fc9f2b797dbf5018dd716e62c752e1ebaf27edbd71972e57ea9faf67d243caf23500750cac87a5e0c970ae1264347c6b7f9a3680a46f
 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
@@ -52,5 +53,6 @@ EBUILD netbeans-extide-9999_p20150423.ebuild 3383 SHA256 0274d22f28d2378c853a723
 EBUILD netbeans-extide-9999_p20150427.ebuild 3383 SHA256 67f5b845dc3c25b2c03cd412d92694f39c995f789e6d2569060b1cc7ea897fc5 SHA512 711aee1658a6e4b93d7ffd393fefe6ea92965ce7dd3838c6d6b59a3b534fab5c36f607eeb2a26d847d0e4926701aa0a5ffd132316936f1c5dbe9c33cd17b2316 WHIRLPOOL 249e1b8b4988abc39875b1941aca723b18431beec6b2456a9ae259167ed309d3295fc97f29663b63ca5186113d1be24dcc4bae7ec6d5cfdae339992cfbf0c76b
 EBUILD netbeans-extide-9999_p20150428.ebuild 3383 SHA256 80bdc693d7598c5ba2513b6f07352b3d98adb7fee5703f483f106dd8d7ba2d2c SHA512 d8271c167b4bddbef48567097d289ee30367fe745b290bfd4766eb06756f3a1581560a1081c5fadef0adaab52905bd1677869f24f0229d3b06d6940f2e9c6b54 WHIRLPOOL f5f502248a445ad6f94952237a5f9fd061303762ea6db043eec16c4b496c907a0262c9a40247006500a7a56feb3f18ce048d6225922d6fab9b3b54b52c82fa51
 EBUILD netbeans-extide-9999_p20150429.ebuild 3383 SHA256 4d65ec83a4aef365e4824f7f9410ed2a29871c360b60066b8a60c4b204b27918 SHA512 87cf1e212d34d2e87ed232840e5e1e55ea241db00a85ad87378ce022306a0ae0a0a046153c654b54d10278247a5d57b4f92c72a48ce94f579768c4ac38704478 WHIRLPOOL 5fb9631cdb14af470f4316ac3b665872f76c6b31e08dcf3b0f9515ee50b5274a1697e9a323f4ea7d7d101cbf1113c479acdef83ac58a98b8e5fda9513f99508b
-MISC ChangeLog 93167 SHA256 b8cba6c1581af772324cad7030e4cc4836c18d41889dcc03d22d8d4198faa66f SHA512 aa681372bcfcd1f7d655d128194e4b4be5448ed50b539878c04cd7583355aa84abd75d5b797d22d0e794a11539e2f09f856acb8bb5444174eb4f8f590bd5b28c WHIRLPOOL bb28a6019c8de5314596cfd7110700344835df8f07167b51f676807786f58ee44c13f77316ec1e0eda9b6bcb088346ddcfddf743126b142b7b36bde850992eec
+EBUILD netbeans-extide-9999_p20150504.ebuild 3383 SHA256 abd931bb0f4f48d3bd77b0347e77e6d0dc7fa01f70f2c9d4ac23652ade5591b8 SHA512 fbee061a0de54f863bc677a4729a2203276a3eaa6c242610470d509bede8417f57bb5c4f3abaca547b757e2957acd753029fba2e65d82afa92680cac6ea86896 WHIRLPOOL 57941a60c40055f04c04ca2f4cbd27c4cec1949ff757f5bbd565125c9a7502d19c6dcb127dddc3a7577a81c06178d75a802f9fda88b929648660261c9e4892ce
+MISC ChangeLog 93340 SHA256 bc9af9818c4fd7891b8b5e7386c76e2c271ada319c94f93b85cd8b498ebc0bd2 SHA512 250152f2eebea141c4166784116a34d3081b9649c41bab29cda05ca0191bb6eac9c0d32c10aae8b2e8fe509addb741610df735a79905af9b0caf3cad499b7dde WHIRLPOOL 2e94994f6b9b430f10c164da5e7b51c506ac663d298a35aeaec13fba6d5fd3a9a5b8d697da0dbb2bc61fe79acb0737512d614ac20680188eefad97d026adc93d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index f65390e..f41afa8 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9e
 DIST netbeans-trunk-nightly-201504270341-src.zip 207311520 SHA256 acf9098ac80b152d852b40943cbf6ec50878ee0d089ce4bf7666aab656303127 SHA512 344f9e396f20c463801b44a264ca55ba4d05c7c51f83c650f2a6ee9d4858947962db8a7d9f0ab1e77eb921c9d974dafd7cfd8cd641005c468d7511cbfe0be57c WHIRLPOOL 8b5915c7c222f965ac8848b198be9afe4b227d5e3bd87f2c391ee06032914af414aa1ca438a92262b0921f6918fb2135513a648adac56e0dee3ba236225f9dd1
 DIST netbeans-trunk-nightly-201504280001-src.zip 207313287 SHA256 4d9e7bce832a438a5a030d15d0c65c5dd930a81e910efe56a6e98302db7c6aba SHA512 6355cc5666f6cb654bae79e37a06e4ccd4637ea1f093cd6dbdc8d99a109e61de6e644a4e9489bf67d72f27ce6797c175f948244a2d80b59e0f43fc64961b41ba WHIRLPOOL 70666a34cb2cabab59abe6fad18f85cf3cac3c6bc417ac2b0098c881625ec8292b1f2edc6a606370ead0f491be39815022978156d09c4ebd927778f1f8f9291d
 DIST netbeans-trunk-nightly-201504290001-src.zip 207321088 SHA256 65f4b2406259c40afa0207688a0e3250ae12c9d160dbeb70ac0fedb68fddac88 SHA512 9ab6957708e2cf7848020f4a298a73b65422815d95729ebe294f77237fc0ae42f049ce26a149d1ff249324acbdda4842607d02dcf095e8e186de49edd8c45e9d WHIRLPOOL 7c7d8c960a1791dd0c743fe8c19a54cdde50043efbdd06e2a68140f370a82ef70321524f64e5ac649e738e64a6a01a1bdcf5fcdc573969decfce203d4dd8da24
+DIST netbeans-trunk-nightly-201505040001-src.zip 207344087 SHA256 a60787b743a7a09946775f22bf41441b8be68f9c9a8429c5d5511f6c1ded4275 SHA512 009013edfc9a6221591d3efdb0a2cb25ae68a919554d621c3bb4d058fced5e303586218c0c662b86f8c03f15819bf52ed4e9d66b89bd1001fc3f656d5fefdbad WHIRLPOOL 140b8f2e27d33a32d6f8fc9f2b797dbf5018dd716e62c752e1ebaf27edbd71972e57ea9faf67d243caf23500750cac87a5e0c970ae1264347c6b7f9a3680a46f
 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
@@ -62,5 +63,6 @@ EBUILD netbeans-groovy-9999_p20150423.ebuild 3422 SHA256 50f7029938d8bebfe4261e7
 EBUILD netbeans-groovy-9999_p20150427.ebuild 3422 SHA256 d5cf5aa1db1903b0c9489c7c01a44e960700f4ec1020e255e4a5528d5d457b8e SHA512 53147d30cd4e100f5e462fb7a6ef3e3b475d926e2e836b54991a53b42a999431983021621e10122b9eb15fa12b2c03af3f280da5e2f63bf5686259ab1325b364 WHIRLPOOL e68ba23059f8457a045c8bbdb4780f788f845483134a587e7c1e50e73820e3ef8bc527293a684b8829d0324153c1f370104ae7138617fd11883c95d7e56e7909
 EBUILD netbeans-groovy-9999_p20150428.ebuild 3422 SHA256 96ef663061a25b1b77b8ad9bedec1ebcd0fd78d50806cc2bdfa955ce19e82444 SHA512 521214c6e377f1c9ebadfe460db3ed33c6350b0f603701bd862d88c6d596b74972e134976581630df34c7e04fafd3a0b518ff77d6044586fa7cb97d028aba901 WHIRLPOOL 937b7af1ce428965f70a711c169c8f23e138457897b6017ead8816ad8dacd86474a8c8baab8fd1617f4c582a52a299a0f1031b28e1b36fee9f0cedf8889de8f9
 EBUILD netbeans-groovy-9999_p20150429.ebuild 3422 SHA256 896643c6fba3e2906058e57cc02efae121aed20831736a0ff70c239d19946d67 SHA512 149df48404e1b6899526fd33ed4a98c10b230321a383703e70bb9a208ef8ee9470cf920946a4518c0cc69c9d9ab33b8baeeb46f86d1b6a48cd4f1566229f8d70 WHIRLPOOL abd3772ba10ab28642d0386522f4af29ecf357d1aaa417dd0570ba756b9a12f52f18309f899d6af138a7e1ca450302faa4ec9afcb575cd9c91e34a2fdb5f222d
-MISC ChangeLog 161147 SHA256 89d131e81f73886fb8849030ed708c58daf532894c769c8bff87c51543c9ce6d SHA512 d6a1a766fd8888be2804a24182b55972a1e386a7fae62ae8f2cf82aea709cb01b348a1d2836ce9aad459a8a2f195b7118bd1fd8c697f820a55916f4f180f045f WHIRLPOOL 6399e35e2d2c8cd6b521f6b1a183b2e94debab9c2d4d8534d3baab98d974d72713b1450f7a183af02fd6524c8fbedbd343dc438f84ddf3f993842b9d99c07c54
+EBUILD netbeans-groovy-9999_p20150504.ebuild 3422 SHA256 4f02b25e74b457a36d123d62c5f2e533089f4ef181f7a34e183719326fa0e5dc SHA512 501feb95f522ec03f1e81124f35e14e8f4e3350d7d7ab9b4d1682ed2389e75f3c0bd92128f227e56c9c2d16c95eb5a7fdab5aa3dd36a45fd642bc84ad0ce4097 WHIRLPOOL 241f9d17a4a9657a75047c542094be418320e06e40973f334da364a7b18e7dc3584f4e1164a2ab70b028cfc403c428c7434af2586d8ccf0a105106d24771918c
+MISC ChangeLog 161320 SHA256 f6809dc7567a1ad9d5618bda4a9e09fc5fc0b66c207471178fa35d3c6abc88ce SHA512 65ec21974394ebd6e0505da993b2017659fa7697981340daf9dc7cb9b295b48aa4fd9837d849a655da00ee72a46df38c42fd2894ca48dc4996688d14a5b06224 WHIRLPOOL 3163f6bc21c2cdf14730a31e480e0c6d2114c904fdd41b6525bafd8558bd7dd53ee285c29f2f372f3ed41d8986a79fe41e57bd678d94ba118febc42e712e45a4
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150504.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150504.ebuild
new file mode 100644
index 0000000..4fab0b0
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150504.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Groovy Cluster"
+HOMEPAGE="http://netbeans.org/projects/groovy"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-05-04_00-01-56/zip/netbeans-trunk-nightly-201505040001-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 c4b42bd..ed5a9cb 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_p20150504 (04 May 2015)
+
+  04 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-harness-9999_p20150504.ebuild:
+  bumped to the latest sources
+
   04 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
   -netbeans-harness-9999_p20150314.ebuild,
   -netbeans-harness-9999_p20150315.ebuild,

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 333fcc0..ae6f686 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9e
 DIST netbeans-trunk-nightly-201504270341-src.zip 207311520 SHA256 acf9098ac80b152d852b40943cbf6ec50878ee0d089ce4bf7666aab656303127 SHA512 344f9e396f20c463801b44a264ca55ba4d05c7c51f83c650f2a6ee9d4858947962db8a7d9f0ab1e77eb921c9d974dafd7cfd8cd641005c468d7511cbfe0be57c WHIRLPOOL 8b5915c7c222f965ac8848b198be9afe4b227d5e3bd87f2c391ee06032914af414aa1ca438a92262b0921f6918fb2135513a648adac56e0dee3ba236225f9dd1
 DIST netbeans-trunk-nightly-201504280001-src.zip 207313287 SHA256 4d9e7bce832a438a5a030d15d0c65c5dd930a81e910efe56a6e98302db7c6aba SHA512 6355cc5666f6cb654bae79e37a06e4ccd4637ea1f093cd6dbdc8d99a109e61de6e644a4e9489bf67d72f27ce6797c175f948244a2d80b59e0f43fc64961b41ba WHIRLPOOL 70666a34cb2cabab59abe6fad18f85cf3cac3c6bc417ac2b0098c881625ec8292b1f2edc6a606370ead0f491be39815022978156d09c4ebd927778f1f8f9291d
 DIST netbeans-trunk-nightly-201504290001-src.zip 207321088 SHA256 65f4b2406259c40afa0207688a0e3250ae12c9d160dbeb70ac0fedb68fddac88 SHA512 9ab6957708e2cf7848020f4a298a73b65422815d95729ebe294f77237fc0ae42f049ce26a149d1ff249324acbdda4842607d02dcf095e8e186de49edd8c45e9d WHIRLPOOL 7c7d8c960a1791dd0c743fe8c19a54cdde50043efbdd06e2a68140f370a82ef70321524f64e5ac649e738e64a6a01a1bdcf5fcdc573969decfce203d4dd8da24
+DIST netbeans-trunk-nightly-201505040001-src.zip 207344087 SHA256 a60787b743a7a09946775f22bf41441b8be68f9c9a8429c5d5511f6c1ded4275 SHA512 009013edfc9a6221591d3efdb0a2cb25ae68a919554d621c3bb4d058fced5e303586218c0c662b86f8c03f15819bf52ed4e9d66b89bd1001fc3f656d5fefdbad WHIRLPOOL 140b8f2e27d33a32d6f8fc9f2b797dbf5018dd716e62c752e1ebaf27edbd71972e57ea9faf67d243caf23500750cac87a5e0c970ae1264347c6b7f9a3680a46f
 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
@@ -64,5 +65,6 @@ EBUILD netbeans-harness-9999_p20150423.ebuild 4131 SHA256 46418b1805335786c9436e
 EBUILD netbeans-harness-9999_p20150427.ebuild 4131 SHA256 7f7253017c21ef70df2357ca22626108a54f219f964618af6cf239fc5476cca3 SHA512 f18122585da32ac348ce3a6b629750b85be53e1e9a638f00a35f21e5fd187f40be542cccfb737301ba68fca7be5befee177cafbe39f6c714a61083d2de2fd64a WHIRLPOOL 45c836babc4ee23bcd27d4be6bd9df3d6047a736089279b89bbd191f42b22179402eb30b202891b960e2ff58df8ad505df766c11c34dfccd872b361c921ad7a7
 EBUILD netbeans-harness-9999_p20150428.ebuild 4131 SHA256 1fb43ea642f28eb06b67a9caf923f5f7fe16ef6c952c581ee2f3fffdbbd920bc SHA512 8ccfeddb5e51a2dc6e715d43558ce39bff56782359e27514e94a158ff0032fb1bfd7f7aea56593f4a6e9ee64dd00e4b1b2726ea0bc9cfd77e0e3f5fec7340c36 WHIRLPOOL 61851c7b366dc8fb17193ce9026ea680f5032de6f26918a54b4307cea2fccf6cd14e20d6c93fbcd0fb70744524ed20b7aa9a6625a2d3368a3c8da4b469012f08
 EBUILD netbeans-harness-9999_p20150429.ebuild 4131 SHA256 086a65dc9d0f6f232139fe25aa59612d257478822aedb5f1f573538e8d72aaba SHA512 1d3a02e5c80ef7397ff2f1d0f9d38b10f04de5721d100c6e80e949fb4503ffb06251359a466c342bf1b77ad4cc05977fd13450c12d0dff5c754d90ce959e98d0 WHIRLPOOL 1603db1099c09974fde82376987be8296f8e658543ee38bf5b2aaad1b9d95f057551828a23813438d5d3f01300daf4f73f296ec4985886eb899b2becbe56050c
-MISC ChangeLog 163206 SHA256 cdcc68620c601461f498620bd8c503db69b350f43fc65bd198e9f12b43d27ce3 SHA512 89d4e2faa737e2f02449b24bc8cfdee7c4bc8c67756cf9a5b86c5058af0aa7d9208304960a25559e8d0755ff0f9c75c47bceced7e89a8ff3fb344d79fd10bc66 WHIRLPOOL 969e6dea4a1703cd6271962e508e7bfa14c41878293c20f7e37b8da9dc071d1ce923bf88140cd7c99af1ea07b1bfac8a36f31ebe8770b46e2427f56215ebb41d
+EBUILD netbeans-harness-9999_p20150504.ebuild 4131 SHA256 af2e4cf6fffd21889402dc81f0761717a2b6070939e036a248acac33e5e86469 SHA512 ed659de2928cd7319923421b9552391c908409b4d49257f66840eef2f9354dfc2893539fbb2ccc1b26705767ae4e0d657440e6fd3fe5860c2c87af840c8b8e6c WHIRLPOOL c28036c398a95a02cd34f9f2a323aa96f9dd0fdc46a12c8cf846cd443df2538950f0119d00095fcd966cbc97914a308faf238fc00f829d44fe2a5851849b5232
+MISC ChangeLog 163381 SHA256 73fc21b39b00a42cb75ebb495af4bd7f1c951579e6fb32954c8636bc767e08d8 SHA512 8b1b92f07be29db6577999a24b30b64ced28a979851ba45da008adc9210a88479a357275a725801cb3cdfa09b528c878cb10001ab45d09521db8f974835278b7 WHIRLPOOL f962ab8b1056dea582f3378a308a06f99697a4e06259bc5559cbe85258bac84786f55ada81b482430bbb3ebe8f8286fa9c7cc0f4c6681101d3671e7c6d9bfed5
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20150504.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20150504.ebuild
new file mode 100644
index 0000000..7047dac
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20150504.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Harness"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-05-04_00-01-56/zip/netbeans-trunk-nightly-201505040001-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 b4dd3c6..17a0596 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_p20150504 (04 May 2015)
+
+  04 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ide-9999_p20150504.ebuild:
+  bumped to the latest sources
+
   04 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
   -netbeans-ide-9999_p20150314.ebuild, -netbeans-ide-9999_p20150315.ebuild,
   -netbeans-ide-9999_p20150316.ebuild:

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 5fe527d..e52debc 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -93,6 +93,7 @@ DIST 7052E115041D04410A4519A61307502FB7C138E6-org.eclipse.core.contenttype_3.4.1
 DIST 7062F60B3094BE67EEF14899ABA2DD0B886785AB-org.eclipse.mylyn.tasks.core_3.9.0.v20130612-0100.jar 414468 SHA256 ed9df9a54be41ea9b53a07331fd1807214984bbc78d5f033915bcd83950b6e0f SHA512 72984bd91ad36f553191ae65c1a294995ab8a6e5147373755937d3f62e29bedf065f9b39c3dda0e3791f6d8d9754d1b5314f1e1b154c8f807afbfca104367f6a WHIRLPOOL b6ab7b2040c35b573aecf2277ebd251e0d8eea818ec572d606dceee88e38b4d521e185baa3bb94a9150b0666c1165352a434ee87e4798f29e4a6bffbefe48cc3
 DIST 71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar 99570 SHA256 55f9cf74e16ddadcb212afbb73bfd4b9b3dcb47eba79a48421cede9b303bce3f SHA512 5056a55f5ad60e14d7f585288e70da9db87676520a4d81996f7b3deb34b5214cdf519b448a2202193b3b8672a7b2e86345ac28a451723d50678560439c4a8127 WHIRLPOOL 23a97603fd1dd817bdf1786196611c8af35ada3911c14a057b0cc4bd91f432f230ba96783af930547fbe0444236a84d30789846c5679a107005a8c027328213f
 DIST 71F7D2D5A3CF17CECBD15049A856BC0245C95C56-js.jar 756883 SHA256 30bb058a39a819a85e5957672afbdb717d8cc9fc9372c282f2128838311cc9f8 SHA512 1460df312f5acc509536c1d31adbeb6b2ba9a615240981b6ddbcb0c20a5bc2e4281c0a79060573cfceb4ee9cd1613dd30c27afd20ba8c7aabd2bb51a26806e75 WHIRLPOOL 420752a1b0f231687859ca5b4b76c2bba35b4d72d1df4af7ef64d3af1e091e43b9370f5df7fe2e75c4567d281d8587c92a033f5955c166c859a75f8edeec99c3
+DIST 73F57D396790C8D36678CB25654EA936B91AB5E4-exechlp-1.0.zip 273023 SHA256 81ff59208932aebb1cd3acb5cb75f187683cb2890ebe46338cd15313a702e1c1 SHA512 9f5d49f6a849d36c4c3034af866d793c03b9ef4c8b543e0b8587172d7f661592cb81b56a195ae6bf51717efacee260751f839be7b30d3f1dfe62add3a2293a0f WHIRLPOOL 9b352da323626f3ac7c8a749bc2c2b0f959c9189b98856f0840ab4eccdd99049ed82f3c1b7c6fa10e7c4af78d50832d32201115895738e8d464e1f81298d3526
 DIST 74069BFD03B2C66A9EBB4370C0B8064E3F5B6594-org.eclipse.equinox.app-1.3.100_nosignature.jar 79244 SHA256 e9390a423de0d65746c0fc22661614e25f047eafff94b20081a96ccab4bef7d0 SHA512 a810eeb91b0319c15075f25b86a3be30db6dc24040b1461acbf178a922f02ef1039a47f145b2db287744e4efb6b6840550e1384e80eac6db641edac9d544c8c5 WHIRLPOOL 8eb5fc2a1e6964442b124a0379291c00582910dbe83320500d1a03d26f69ae9761ddb63c34317aa7b22d29d32885fc595b81dc52069065428a6745a3aacf0680
 DIST 75928E4368CA748131A6767BA1A97D9DA643C306-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar 77276 SHA256 c3758fbaea25595d616d97115d99647792f67f0caeca075831ee0d0c8f3f9f7a SHA512 bf457f0fc5f69b0b0cb1d923cfe80bdeb8950d4a5a7cc6ab45ba44918c3152b2e27da6eb8d7a85df3aa99945a028e75686ab71a7f8d829dff6d388c4df390965 WHIRLPOOL a57d2d5b63a9b5b06c4c856250a58f46d3f80e5b2c7778ff649abe1e43391df2fd67c6d82a5eae6909bf664f66d502fe65a3c0efae6d762becaa3ba6c096097f
 DIST 75C30C488AD2A18A82C7FE3829F4A33FC7841643-glassfish-tooling-sdk-0.3-b054-246345.jar 457272 SHA256 733785a50767a535feb3d6f85f2b4eda704ce933fe14c7e2701682e42feeffe9 SHA512 fd9804bd80efb1330e66771f3dcb71f99585d610a02a3482b3a429de28e91a4a9b16cf5dcccf325641dbf51a443a28ff12cb60480f71c2498ac537e8db913dde WHIRLPOOL a9de025ada074c876ef35d814911a72d56be3996579ed81666b06b3a3a7e3b1dbdcff4467d3c69508708372c7e51b26f8bfaaf8755b7a69b64aac1abe0b92c75
@@ -241,6 +242,7 @@ DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9e
 DIST netbeans-trunk-nightly-201504270341-src.zip 207311520 SHA256 acf9098ac80b152d852b40943cbf6ec50878ee0d089ce4bf7666aab656303127 SHA512 344f9e396f20c463801b44a264ca55ba4d05c7c51f83c650f2a6ee9d4858947962db8a7d9f0ab1e77eb921c9d974dafd7cfd8cd641005c468d7511cbfe0be57c WHIRLPOOL 8b5915c7c222f965ac8848b198be9afe4b227d5e3bd87f2c391ee06032914af414aa1ca438a92262b0921f6918fb2135513a648adac56e0dee3ba236225f9dd1
 DIST netbeans-trunk-nightly-201504280001-src.zip 207313287 SHA256 4d9e7bce832a438a5a030d15d0c65c5dd930a81e910efe56a6e98302db7c6aba SHA512 6355cc5666f6cb654bae79e37a06e4ccd4637ea1f093cd6dbdc8d99a109e61de6e644a4e9489bf67d72f27ce6797c175f948244a2d80b59e0f43fc64961b41ba WHIRLPOOL 70666a34cb2cabab59abe6fad18f85cf3cac3c6bc417ac2b0098c881625ec8292b1f2edc6a606370ead0f491be39815022978156d09c4ebd927778f1f8f9291d
 DIST netbeans-trunk-nightly-201504290001-src.zip 207321088 SHA256 65f4b2406259c40afa0207688a0e3250ae12c9d160dbeb70ac0fedb68fddac88 SHA512 9ab6957708e2cf7848020f4a298a73b65422815d95729ebe294f77237fc0ae42f049ce26a149d1ff249324acbdda4842607d02dcf095e8e186de49edd8c45e9d WHIRLPOOL 7c7d8c960a1791dd0c743fe8c19a54cdde50043efbdd06e2a68140f370a82ef70321524f64e5ac649e738e64a6a01a1bdcf5fcdc573969decfce203d4dd8da24
+DIST netbeans-trunk-nightly-201505040001-src.zip 207344087 SHA256 a60787b743a7a09946775f22bf41441b8be68f9c9a8429c5d5511f6c1ded4275 SHA512 009013edfc9a6221591d3efdb0a2cb25ae68a919554d621c3bb4d058fced5e303586218c0c662b86f8c03f15819bf52ed4e9d66b89bd1001fc3f656d5fefdbad WHIRLPOOL 140b8f2e27d33a32d6f8fc9f2b797dbf5018dd716e62c752e1ebaf27edbd71972e57ea9faf67d243caf23500750cac87a5e0c970ae1264347c6b7f9a3680a46f
 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
@@ -269,5 +271,6 @@ EBUILD netbeans-ide-9999_p20150423.ebuild 30352 SHA256 0d010b14d34de4dd841a003b0
 EBUILD netbeans-ide-9999_p20150427.ebuild 30352 SHA256 0a412fbd03e44955ebe4317b1ca11af5b8194393bd13b160433406cd73df616b SHA512 7a3f5f3a0fd38f8322f1fce5ae3d192df449bf0c7d9a1f21d6a40a8b57e5c8299a3dfed9eb28b93ee9ef85d4bae2d7670f5ce5fbf92e0882a6efb9ec1328306d WHIRLPOOL 4224a71ad4367cb48cba500290b4b011ad751a992924922e9dc9b64b107288b6781ac5f46e730d7e42428b449a75d0411452f7b5ff2cc568e809d1fa4e6f444f
 EBUILD netbeans-ide-9999_p20150428.ebuild 30352 SHA256 c07244f3118630e56cc5a966f83f0af49d66226586f16bab14e688f6b5e68d87 SHA512 dc309d637ae6ba3ecf44a5394ef9c1a69725d4d7ae0dfe675849832a8d84cd1150b4dcab5034ebcdda9bff78570930b509cc40f2c42b18ffc07effbafcb807f8 WHIRLPOOL 4d0b6f5d7a1668c49b64e80c507cd1780927c4d0749d0e0018ecd61610f391aa65040675b77169b91853dcac139df55bfd784295c99d3eedec268f0a5db3e2f7
 EBUILD netbeans-ide-9999_p20150429.ebuild 30352 SHA256 44ee81970ff3579c3a16d458ff5c991743382febfefd31c137ebf3bbcdf8153c SHA512 9cf0975f2002d3b56de9bd7cce3682cafc186e0e613baa1707879a80c1bb06662bf99a9d33895cb02c35e98ff3ad60a3077890db1518cced14e9c578212c8e47 WHIRLPOOL ca5485678a555a979c0593e95573b8056cdc2d9c64e9b9e90c5c3aefd5144b8e65991651230f86ef30c4ca4c1f70b4dd22721abe4bd4b2854868d57f44778b0b
-MISC ChangeLog 155422 SHA256 a6b6f89398fc381bb6c74d4404641198e7bb16ec5fd15a5b5fb9e7dabdd00fd5 SHA512 68520f3932e6e908eed33498b789207a3d251834be40f91df2929557e0c224a18625c5bd4d83a96c2fe40f9d95421d6f6a4a2630747444728862a3b9077a774b WHIRLPOOL 6c5556e580f82c1a3b236d78b59fe500da67435f207d4a8fa312619a0ade68a941ea99380ca3088111410586940bbdd3c4b407f2727b3e4e576be06b6f7f7338
+EBUILD netbeans-ide-9999_p20150504.ebuild 30352 SHA256 e3eb9e74c7d2acb20f50be2e6636f4bfacbd583a1b0eb5c6e34318ca29e20eec SHA512 f6f71382293882b84b1955457066e723b5b0af98ea7dd72f22937585636cdd8ffb51214432d0cefdf111bc213d7c8afd80e5b4e125821521abde07f9b6b27b26 WHIRLPOOL 45925c133a7602f2a3df39a7d85ab64387c43801f03517a7914f2df121c4b41d80311dd8556be5bfd793d55ae022ea849d58d9de991fea4db7c65f263887750c
+MISC ChangeLog 155589 SHA256 9616f4d9fa0dca0d3f24f5c64f4edff4ef5aa826d6c91306ce948367757c4adf SHA512 5d02a33c7f1bef00cf04f7823bcc937941ae33ee473a44cdd5c4151ac311606be5f997008cc08543bb89ff44a9d84d69b7e9b4f0d8d3958127cd0da72ebb4a7a WHIRLPOOL 5a6957d1e9e9ff8d1a441faac67cc88ea7d1ef44ae96f2cf3beecb53645b3f6e8b308297ecebc9e8995f60dab9788d840d0c77a314bf76443c1166331b167d6f
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-java/ChangeLog b/dev-java/netbeans-java/ChangeLog
index b01c1cc..72663f6 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_p20150504 (04 May 2015)
+
+  04 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-java-9999_p20150504.ebuild:
+  bumped to the latest sources
+
   04 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
   -netbeans-java-9999_p20150314.ebuild, -netbeans-java-9999_p20150315.ebuild,
   -netbeans-java-9999_p20150316.ebuild:

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index f4e8607..712053d 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -115,6 +115,7 @@ DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9e
 DIST netbeans-trunk-nightly-201504270341-src.zip 207311520 SHA256 acf9098ac80b152d852b40943cbf6ec50878ee0d089ce4bf7666aab656303127 SHA512 344f9e396f20c463801b44a264ca55ba4d05c7c51f83c650f2a6ee9d4858947962db8a7d9f0ab1e77eb921c9d974dafd7cfd8cd641005c468d7511cbfe0be57c WHIRLPOOL 8b5915c7c222f965ac8848b198be9afe4b227d5e3bd87f2c391ee06032914af414aa1ca438a92262b0921f6918fb2135513a648adac56e0dee3ba236225f9dd1
 DIST netbeans-trunk-nightly-201504280001-src.zip 207313287 SHA256 4d9e7bce832a438a5a030d15d0c65c5dd930a81e910efe56a6e98302db7c6aba SHA512 6355cc5666f6cb654bae79e37a06e4ccd4637ea1f093cd6dbdc8d99a109e61de6e644a4e9489bf67d72f27ce6797c175f948244a2d80b59e0f43fc64961b41ba WHIRLPOOL 70666a34cb2cabab59abe6fad18f85cf3cac3c6bc417ac2b0098c881625ec8292b1f2edc6a606370ead0f491be39815022978156d09c4ebd927778f1f8f9291d
 DIST netbeans-trunk-nightly-201504290001-src.zip 207321088 SHA256 65f4b2406259c40afa0207688a0e3250ae12c9d160dbeb70ac0fedb68fddac88 SHA512 9ab6957708e2cf7848020f4a298a73b65422815d95729ebe294f77237fc0ae42f049ce26a149d1ff249324acbdda4842607d02dcf095e8e186de49edd8c45e9d WHIRLPOOL 7c7d8c960a1791dd0c743fe8c19a54cdde50043efbdd06e2a68140f370a82ef70321524f64e5ac649e738e64a6a01a1bdcf5fcdc573969decfce203d4dd8da24
+DIST netbeans-trunk-nightly-201505040001-src.zip 207344087 SHA256 a60787b743a7a09946775f22bf41441b8be68f9c9a8429c5d5511f6c1ded4275 SHA512 009013edfc9a6221591d3efdb0a2cb25ae68a919554d621c3bb4d058fced5e303586218c0c662b86f8c03f15819bf52ed4e9d66b89bd1001fc3f656d5fefdbad WHIRLPOOL 140b8f2e27d33a32d6f8fc9f2b797dbf5018dd716e62c752e1ebaf27edbd71972e57ea9faf67d243caf23500750cac87a5e0c970ae1264347c6b7f9a3680a46f
 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
@@ -143,5 +144,6 @@ EBUILD netbeans-java-9999_p20150423.ebuild 14341 SHA256 1b63cb478076e34742f75f8e
 EBUILD netbeans-java-9999_p20150427.ebuild 14341 SHA256 606f890330064641e1e067b04e5731883fbda12f73c10264a762720d9fb1116e SHA512 8365a95c4d89b20b0e72454e6023f723638b43f1fd94ae20c01546695845e53974447f3f9eaf4a5c763d020b3309fecceedbd68b7f61e13bf50aca543d7ad5c7 WHIRLPOOL 967abdc625251e6ea1e82dc0493288a68daf53b0775062e90cb1db585fe0bb9c368144cab0d151424cd2d44211785d748b1433d97de9a28872fc96891869a9c9
 EBUILD netbeans-java-9999_p20150428.ebuild 14341 SHA256 1fbcae56a88b16e49efa8dd088682b08ef2619a6272a41331463921cf93b530c SHA512 2689734a95e66435ae7cb2aaa407ce3ad2dc01097eed51edf737683328d56360e827948805cef692a15a66432410acc3c1a626c74870f841bfaa885ede7ab150 WHIRLPOOL 55ef7036f8e519fc7de7caa85183bdb878ec33f86eae44731bf0ec089c85eb5243ae935d46fc152226b4a897768b04e6d2afdbd9647086bedab10bbbd1138d7d
 EBUILD netbeans-java-9999_p20150429.ebuild 14341 SHA256 6e94bf4bd83e05d8c2723625f635fb0be4d897419cd87a475f8d3c3fabebea0c SHA512 78fccfb6dfc2de50818f01b4667f6a394ce96f682b26e86e48ab399c91a202563e3223a8b20403d5947a434bf110d30dbaed1be0f5911c5e974c2371072083b7 WHIRLPOOL 0490db6f2e4145a937fdd02aae84ed7ea8948e673dddd43dd72e0792627c7f64d57dffef64f5f7f01d99f624b03711ea82d75a66f29cc5283956a43ad25e6634
-MISC ChangeLog 158583 SHA256 d3657cf966f4231e4a70f952f113c4277d5d94fea803de6a400ecb84e890b4b1 SHA512 85d9b8cce44f9d1168979b08e7e8a83f9a0d91bb7f3379700ac40e506a3e555d19c8b11f06779eb2447e15e73f54d2ecc17ec85ec828be598f5d2c71fec7291e WHIRLPOOL 288acd286bf67694e5cf8d8f707014d44945b1b9b0c21c1952ec29a0393c08ca676156b6f823dc72fbbbbc526cda64c1a1211feaac0a08829aaa1f172ca477a4
+EBUILD netbeans-java-9999_p20150504.ebuild 14341 SHA256 f687c15d6e790b610284f72a7344331b03111272d7398f17b3b0e0cf1f63788f SHA512 54ba66423736dc22fae70faa51a261ab30b35cab7a67ea01cc5d9b6382f69208d2057758c4b0f71c7b502975e0b1232841cee20ae5aab48da6c05c0eb115be6c WHIRLPOOL 29e3a7a8aec7f89e355d56ea3933a747b41e488ae12f7efc8fface6a4bddf080bc937f3b9528feaf794d045fb69d4adb3c73b9144bb62070e534f9621fcfc8fd
+MISC ChangeLog 158752 SHA256 3f331cfe1599295e99a869fcf8c44a8bf695e65d025f66f37f6a33397fa6970c SHA512 1c7d91bf4f507fb60e3c043c85a570ab3fe8ccb915f34f0829b932bebdd820ba2e3a552c66514819b20e97711fb90815136b384fca90bcb181f4766fefc5a80e WHIRLPOOL 95887b5dfa6460e7259607718ac4ba069717889478a09336ef29e66c74a5acd5a4f5398fd438b82984914c8f9e4be37f720a2a1b614ad4687c16902edc377fe5
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-javacard/ChangeLog b/dev-java/netbeans-javacard/ChangeLog
index b7794a2..3f98b6b 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_p20150504 (04 May 2015)
+
+  04 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javacard-9999_p20150504.ebuild:
+  bumped to the latest sources
+
   04 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
   -netbeans-javacard-9999_p20150314.ebuild,
   -netbeans-javacard-9999_p20150315.ebuild,

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 915f544..3d851b6 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9e
 DIST netbeans-trunk-nightly-201504270341-src.zip 207311520 SHA256 acf9098ac80b152d852b40943cbf6ec50878ee0d089ce4bf7666aab656303127 SHA512 344f9e396f20c463801b44a264ca55ba4d05c7c51f83c650f2a6ee9d4858947962db8a7d9f0ab1e77eb921c9d974dafd7cfd8cd641005c468d7511cbfe0be57c WHIRLPOOL 8b5915c7c222f965ac8848b198be9afe4b227d5e3bd87f2c391ee06032914af414aa1ca438a92262b0921f6918fb2135513a648adac56e0dee3ba236225f9dd1
 DIST netbeans-trunk-nightly-201504280001-src.zip 207313287 SHA256 4d9e7bce832a438a5a030d15d0c65c5dd930a81e910efe56a6e98302db7c6aba SHA512 6355cc5666f6cb654bae79e37a06e4ccd4637ea1f093cd6dbdc8d99a109e61de6e644a4e9489bf67d72f27ce6797c175f948244a2d80b59e0f43fc64961b41ba WHIRLPOOL 70666a34cb2cabab59abe6fad18f85cf3cac3c6bc417ac2b0098c881625ec8292b1f2edc6a606370ead0f491be39815022978156d09c4ebd927778f1f8f9291d
 DIST netbeans-trunk-nightly-201504290001-src.zip 207321088 SHA256 65f4b2406259c40afa0207688a0e3250ae12c9d160dbeb70ac0fedb68fddac88 SHA512 9ab6957708e2cf7848020f4a298a73b65422815d95729ebe294f77237fc0ae42f049ce26a149d1ff249324acbdda4842607d02dcf095e8e186de49edd8c45e9d WHIRLPOOL 7c7d8c960a1791dd0c743fe8c19a54cdde50043efbdd06e2a68140f370a82ef70321524f64e5ac649e738e64a6a01a1bdcf5fcdc573969decfce203d4dd8da24
+DIST netbeans-trunk-nightly-201505040001-src.zip 207344087 SHA256 a60787b743a7a09946775f22bf41441b8be68f9c9a8429c5d5511f6c1ded4275 SHA512 009013edfc9a6221591d3efdb0a2cb25ae68a919554d621c3bb4d058fced5e303586218c0c662b86f8c03f15819bf52ed4e9d66b89bd1001fc3f656d5fefdbad WHIRLPOOL 140b8f2e27d33a32d6f8fc9f2b797dbf5018dd716e62c752e1ebaf27edbd71972e57ea9faf67d243caf23500750cac87a5e0c970ae1264347c6b7f9a3680a46f
 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
@@ -61,5 +62,6 @@ EBUILD netbeans-javacard-9999_p20150423.ebuild 4982 SHA256 1175aa72d1b45318417a9
 EBUILD netbeans-javacard-9999_p20150427.ebuild 4982 SHA256 6b3db19adf9dfa5229cae46971e9018237eb863d0df32550b59068fa373e1a32 SHA512 43d2698b764f77ced918b97ce39d872e014337a4bd4e1d37dd78de8311eea3ed6e133c143b5e7e31e91b65e74a8414520b4cf47be581255bdd47340c5a524607 WHIRLPOOL c899689db29299feab69cf9a201de631c212e8ba80776917e91113c0ebed271807a475d6197bbcd714b24b7334b1f453e7a8b4b39a65a961b858260b3f6ceca8
 EBUILD netbeans-javacard-9999_p20150428.ebuild 4982 SHA256 d30842111139f8a831dadc65f2c2888445aa768561cdefaa116639eb293fbe8d SHA512 47bd246775219aec0be750bd85adb2998b3496f7c720cf4ffdba7f170b297aa295ec0ad601b95644abf20155e54d53b11bb2bd7efc75c6f39a23a1bbd7c5f063 WHIRLPOOL 163ade38ea94b4efe0ebed2d2d85bda86acc09233e0fb60db4d025bdb7a64aaa0afeab1fe2a89f7f1341d0137bc7a192ba3dafc223e2717c5463a764f1e0ac97
 EBUILD netbeans-javacard-9999_p20150429.ebuild 4982 SHA256 b5180845b199b05bfacd6ff49ff7ce6c75a0d84248f6188d381f870dd9ec1c24 SHA512 600e1a9051f21dd1ec55c367bfaf8a6515e1c0b9eeae6922293dc7bfd3c4df07ba9ba93915cdd953b2da2f6baef56f5e6487eadf9b1f971c24996f71e53e70ed WHIRLPOOL 2c240e733a045f1d01c8aaf07ac0e02ef27a39015a6fb99d3b74fdcabca254b58f890f6bebdab37bb6d0e497f6116299c5a89a0ceed66fbdba63c4b78315549c
-MISC ChangeLog 165265 SHA256 ee6e91c88bedf56bff2024b950bc42839f6e70fb9e5dbd6c97fa69ff0ba7ee2f SHA512 d01b4553d49b49483ec4cdef9d9822585c6c60b968c283422d4860765f529184837c7e5ce129fbce1a943998450fe9ec7a1ef52c95267c95dcff4f10585591e6 WHIRLPOOL 685b765ee7383aafd7ffc98c001a7a3f015793b242eaec903c859dcb14a165abb9432f82281a2175c3b7938f0d5fd50d90bbaa2fa0d4ba8179874858818e6f67
+EBUILD netbeans-javacard-9999_p20150504.ebuild 4982 SHA256 c249f7d1e9bdcac714631403e3cd2a3d2f5a2dd6bb95bcb8dd2d3952b1c60bd0 SHA512 4d66046f0f64eb4f268f3d0d2971b8758ada5c2a7925ac78bc84a1627d870685bd5444e26b7d05f945aefc6a0302249359da722a5488c64994980d83f0e3a5ed WHIRLPOOL 4f518ad59c77deea8c9155e72190b0aa3f75ea84b74b0844a0a7b26f57bc202d92fc008d061e0674af47838412ee4ba2ce17614984493458d62ffc4a5b112178
+MISC ChangeLog 165442 SHA256 c5cd27b728bfa22f8d0eb57f777603a4bb1bb3ff304aa3dc870b450a76df95bf SHA512 ab8469831498fd3c898a54d94f676055b35500f7056628d40b97a4f63f0cb610201052976a723b91e6f115ef28ec61a96acd937758760bef75cb8e89d3959d05 WHIRLPOOL 61edd516eb40015bab119a0d7b86025cda49b11475c23da31458980f8f7c2ac83946b143e719cf825e52e0b7c916de1cc773bd9391831a3a8a0d40955c05b18a
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150504.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150504.ebuild
new file mode 100644
index 0000000..e7caaa1
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150504.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaCard Cluster"
+HOMEPAGE="http://netbeans.org/projects/javacard"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-05-04_00-01-56/zip/netbeans-trunk-nightly-201505040001-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 f9c9537..8c45c0a 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_p20150504 (04 May 2015)
+
+  04 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javadoc-9999_p20150504.ebuild:
+  bumped to the latest sources
+
   04 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
   -netbeans-javadoc-9999_p20150314.ebuild,
   -netbeans-javadoc-9999_p20150315.ebuild,

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index 4243502..19a7dab 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9e
 DIST netbeans-trunk-nightly-201504270341-src.zip 207311520 SHA256 acf9098ac80b152d852b40943cbf6ec50878ee0d089ce4bf7666aab656303127 SHA512 344f9e396f20c463801b44a264ca55ba4d05c7c51f83c650f2a6ee9d4858947962db8a7d9f0ab1e77eb921c9d974dafd7cfd8cd641005c468d7511cbfe0be57c WHIRLPOOL 8b5915c7c222f965ac8848b198be9afe4b227d5e3bd87f2c391ee06032914af414aa1ca438a92262b0921f6918fb2135513a648adac56e0dee3ba236225f9dd1
 DIST netbeans-trunk-nightly-201504280001-src.zip 207313287 SHA256 4d9e7bce832a438a5a030d15d0c65c5dd930a81e910efe56a6e98302db7c6aba SHA512 6355cc5666f6cb654bae79e37a06e4ccd4637ea1f093cd6dbdc8d99a109e61de6e644a4e9489bf67d72f27ce6797c175f948244a2d80b59e0f43fc64961b41ba WHIRLPOOL 70666a34cb2cabab59abe6fad18f85cf3cac3c6bc417ac2b0098c881625ec8292b1f2edc6a606370ead0f491be39815022978156d09c4ebd927778f1f8f9291d
 DIST netbeans-trunk-nightly-201504290001-src.zip 207321088 SHA256 65f4b2406259c40afa0207688a0e3250ae12c9d160dbeb70ac0fedb68fddac88 SHA512 9ab6957708e2cf7848020f4a298a73b65422815d95729ebe294f77237fc0ae42f049ce26a149d1ff249324acbdda4842607d02dcf095e8e186de49edd8c45e9d WHIRLPOOL 7c7d8c960a1791dd0c743fe8c19a54cdde50043efbdd06e2a68140f370a82ef70321524f64e5ac649e738e64a6a01a1bdcf5fcdc573969decfce203d4dd8da24
+DIST netbeans-trunk-nightly-201505040001-src.zip 207344087 SHA256 a60787b743a7a09946775f22bf41441b8be68f9c9a8429c5d5511f6c1ded4275 SHA512 009013edfc9a6221591d3efdb0a2cb25ae68a919554d621c3bb4d058fced5e303586218c0c662b86f8c03f15819bf52ed4e9d66b89bd1001fc3f656d5fefdbad WHIRLPOOL 140b8f2e27d33a32d6f8fc9f2b797dbf5018dd716e62c752e1ebaf27edbd71972e57ea9faf67d243caf23500750cac87a5e0c970ae1264347c6b7f9a3680a46f
 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
@@ -64,5 +65,6 @@ EBUILD netbeans-javadoc-9999_p20150423.ebuild 6234 SHA256 f166b7057cfcd2262ab0bf
 EBUILD netbeans-javadoc-9999_p20150427.ebuild 6234 SHA256 1798ae618bd9ff5589eccd9f5c0978602ede05ab724a562768285114f825ba64 SHA512 0ef02973fc988331ab1d2aa3db4664f87cb1fc01127922e601176a08587ce8918f1f985feff03ce8267c603d8cf4c6e5e6ce3acd1e14be321a2f9be38b561e03 WHIRLPOOL a098e2ea134981307677632f4175cdf15dfbe951682e7ca53bba86316cdc5950cd542eafd446be79c4b6544319ec2150b06422750cff5b57f9e9cdac36cd4c8f
 EBUILD netbeans-javadoc-9999_p20150428.ebuild 6234 SHA256 b16d0df9c6e745becb0ca9f6b4f2ec68fc76799ba06b7e771afcb1765f83bb46 SHA512 df497e9ee28965aefc2b4ce2c255f7a81430e2f5c875054fec37525983325c8e137d987a9dc5f37cff6e12ec7eba88767151f83e9cb5ef1046d520bc9c50c1e5 WHIRLPOOL 53787459d4bb7a04990068d71735004c289ae993fb6008cc5a5dc174544dddc099e004b379c2df9051e38d291c953cbb8df5f0cc28d7b4a3c469d1968c164ee9
 EBUILD netbeans-javadoc-9999_p20150429.ebuild 6234 SHA256 4277cf5eb09c568991bfd4317a1a2c74dd982a5505683b2433b2954cfe4df981 SHA512 5b810a78bff74069286ac28bb9cabd8fbcc9b3204c4d72af37b6260ab9b8aa2cffd3f2a0b78f38b23fa621c754263deab9bb7f117e1098e588591308abdf1669 WHIRLPOOL e16b45ed74b2f0a683d113e44aef0babf1c56d5f91ffb0d32026695016f4b4edb64a9ccc6f94a6a897b87235687a90d975b9dfa4cd4b24fcd7a7ea7fba8c4f3d
-MISC ChangeLog 163032 SHA256 845f55499a27f1d86f2c6a910ff3a6b6bf67be8829ee63aa32369ad59e2c0d6a SHA512 43f71b079dd07e5b47a89c07f7a19989e92b4b9c25f5ce07a11b266d1aba3e767d50ab184adb054bd24d3d0c0a44686fbc4a471f0af3ac40413b98967042fc1a WHIRLPOOL 3d5b8489b3f2984f469a23f365557adca55450623e3b3f495063a9529479959cbeb99be828355e763b004c66b5ce8ad614ee5ff3201bc356bf256acd6f007a0b
+EBUILD netbeans-javadoc-9999_p20150504.ebuild 6234 SHA256 57a5415702e08767086402a630910e99c033b89b3af4980df47339d65c20bf04 SHA512 522d914a89865dce86fe798f84844c0f8e8d045dfd16e4587b39991ca2f80280d43092be45d5904722a14e7713615ed4e3356ceaabc0b3011c66d91ab39bdcca WHIRLPOOL 8421c853e0b55fb65ab56d18944b41292af56ae641c04540834526bb27223624a027e19509a5ae83d90727308c7c7ddc15eabff05b4788eb8b303c80f311093b
+MISC ChangeLog 163207 SHA256 50d4a94f2fbe31f72583b194e50168141828b9a94f91443b6e7067348c4f4aab SHA512 e2ca87515c7960955216af8ba980708e91c031e6ddb61a178052f14f2a8d5016d5c41658a0ed312a53d9c0f67fb9343439f4d7ceeb84eb37a63b1ffda2d6979b WHIRLPOOL 6788184f204245ca9214044ea07d3732d547151a0c5f22798a98bd48df62d4e725e0a8d4e6ed44f3fb2d910a06b49d74772e12f74d43347071950eecf8111864
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150504.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150504.ebuild
new file mode 100644
index 0000000..13f7514
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150504.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaDocs"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-05-04_00-01-56/zip/netbeans-trunk-nightly-201505040001-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 5383d10..37ae8f5 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_p20150504 (04 May 2015)
+
+  04 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javafx-9999_p20150504.ebuild:
+  bumped to the latest sources
+
   04 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
   -netbeans-javafx-9999_p20150314.ebuild,
   -netbeans-javafx-9999_p20150315.ebuild,

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index b0f9f28..d788bdd 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9e
 DIST netbeans-trunk-nightly-201504270341-src.zip 207311520 SHA256 acf9098ac80b152d852b40943cbf6ec50878ee0d089ce4bf7666aab656303127 SHA512 344f9e396f20c463801b44a264ca55ba4d05c7c51f83c650f2a6ee9d4858947962db8a7d9f0ab1e77eb921c9d974dafd7cfd8cd641005c468d7511cbfe0be57c WHIRLPOOL 8b5915c7c222f965ac8848b198be9afe4b227d5e3bd87f2c391ee06032914af414aa1ca438a92262b0921f6918fb2135513a648adac56e0dee3ba236225f9dd1
 DIST netbeans-trunk-nightly-201504280001-src.zip 207313287 SHA256 4d9e7bce832a438a5a030d15d0c65c5dd930a81e910efe56a6e98302db7c6aba SHA512 6355cc5666f6cb654bae79e37a06e4ccd4637ea1f093cd6dbdc8d99a109e61de6e644a4e9489bf67d72f27ce6797c175f948244a2d80b59e0f43fc64961b41ba WHIRLPOOL 70666a34cb2cabab59abe6fad18f85cf3cac3c6bc417ac2b0098c881625ec8292b1f2edc6a606370ead0f491be39815022978156d09c4ebd927778f1f8f9291d
 DIST netbeans-trunk-nightly-201504290001-src.zip 207321088 SHA256 65f4b2406259c40afa0207688a0e3250ae12c9d160dbeb70ac0fedb68fddac88 SHA512 9ab6957708e2cf7848020f4a298a73b65422815d95729ebe294f77237fc0ae42f049ce26a149d1ff249324acbdda4842607d02dcf095e8e186de49edd8c45e9d WHIRLPOOL 7c7d8c960a1791dd0c743fe8c19a54cdde50043efbdd06e2a68140f370a82ef70321524f64e5ac649e738e64a6a01a1bdcf5fcdc573969decfce203d4dd8da24
+DIST netbeans-trunk-nightly-201505040001-src.zip 207344087 SHA256 a60787b743a7a09946775f22bf41441b8be68f9c9a8429c5d5511f6c1ded4275 SHA512 009013edfc9a6221591d3efdb0a2cb25ae68a919554d621c3bb4d058fced5e303586218c0c662b86f8c03f15819bf52ed4e9d66b89bd1001fc3f656d5fefdbad WHIRLPOOL 140b8f2e27d33a32d6f8fc9f2b797dbf5018dd716e62c752e1ebaf27edbd71972e57ea9faf67d243caf23500750cac87a5e0c970ae1264347c6b7f9a3680a46f
 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
@@ -63,5 +64,6 @@ EBUILD netbeans-javafx-9999_p20150423.ebuild 4723 SHA256 0454454b4ed0bd6b0d990cb
 EBUILD netbeans-javafx-9999_p20150427.ebuild 4723 SHA256 247ef1f1954182d036b90ccf659598f991deebeee281942a2edfba4f029134d5 SHA512 c979e5febafae784ed51a89f9ddc880cf6a5717514df6e4b4666a063278b5a925a381a4781172fd5b8e900c52a7b85c77b5961609ae9ea025d1311b011a26608 WHIRLPOOL 4e4eaa130d4ca62e252c8fe5aa92b933afef468e75c46956cc6f1a48475246f83edefca9a8db76e4d5970c0a262637859b2cd44b26c209efad97db6a59af6ac8
 EBUILD netbeans-javafx-9999_p20150428.ebuild 4723 SHA256 d9e4637df5ffd9a178549eeabba579a9e74fd047ff123cb0511a5203c54aaab1 SHA512 83e1232fb99b3fc1f6ea0ae2feb587db74ad52b0e946dcf6942d83f0cc2db4166121b14346985c48930369a14ab8896f3ddc53eec953c07edccb10460881eb81 WHIRLPOOL db2eb7e7d046481b0fb5b7971feb3f1eab3f4dfefdb424a50a07ce213f79ace93c786668fb20476c607a62488e0c0e965635d6910e3de86c7c9d3b3bd82c85f7
 EBUILD netbeans-javafx-9999_p20150429.ebuild 4723 SHA256 278928f47f5905a3bb2715d9735cd0610331386903834a9054a97c635acbb9ba SHA512 67b8bf372b86136eb879b408692ae9ed8e3c48c44035bda5ec28f515e94b58e9f76cb1636cbe7578bc66f8bdfe2a7e6b14ed8be1edccffc305a55cbc05205351 WHIRLPOOL ebf61018415576cb2a3788aff95e58e0080a1691f5dd1ca73e8c00da7d3cfb73d7f2047a48568156a6a8b58f9e95b5911dace75248e565055f57e5a14df035c8
-MISC ChangeLog 147666 SHA256 d22bc80179112e19481965089d29939c836515db4dfc446344b26a7cd0e71ff3 SHA512 980bda3d7580159127a8413379fc0033b7e9c618d6253a047995859e9da0474b178a347249babb7829b0b13aca162be049a598cbdf2eb3cdeace4c917a940b85 WHIRLPOOL 20fcf2d2e0c50f854c11060b3179b4431a9608eda74b4c198b3d64cc301568fbf2704567a113294edcfae842f62178aa399ba76df83cc05735b57408915052c3
+EBUILD netbeans-javafx-9999_p20150504.ebuild 4723 SHA256 99c79744d0094ef382abd586e73cd17ebdadf2853a20446521e4ef0d4ebd6619 SHA512 5cc1551eb4eb52f510a42647a2a1b0bcc5ccc017ba7d1a7f854c456097fe24b3d7de507359f66a9b2b2378c9eb4f61682d31f5e83e8d24cc6e74dfb185228ccb WHIRLPOOL 48429438d444390c922af9f09d98a240f15f403414aa987692db8f8d81b725b404722c8d263d15509d9f0101ceae196ac1d44371c93d3a1ca4e70853391e4879
+MISC ChangeLog 147839 SHA256 22b66432434a072a914c7eef20f4be9de8e68571614bca3968de3f2c69986bf9 SHA512 0fb564f568b0051b721b463b1bd405b004a56107dc7746d749e0d4de47347e08448c6568a66784e9cf586e62ebc9d1951c9213d195965ff0ba2dbe25a9c02b5a WHIRLPOOL 1f23eb74e8d0c5a01c383cc0843f73def3bd77db48a7e78c8a71c72a474a75810183df2206f26dc73ce9dce8190ba746a7178f6ca2bbc1a92a2949e0ab4be09b
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150504.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150504.ebuild
new file mode 100644
index 0000000..a370787
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150504.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaFX Cluster"
+HOMEPAGE="http://netbeans.org/projects/javafx"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-05-04_00-01-56/zip/netbeans-trunk-nightly-201505040001-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 f944d75..28a67f7 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_p20150504 (04 May 2015)
+
+  04 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-mobility-9999_p20150504.ebuild:
+  bumped to the latest sources
+
   04 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
   -netbeans-mobility-9999_p20150314.ebuild,
   -netbeans-mobility-9999_p20150315.ebuild,

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index db5773c..fb8166b 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -41,6 +41,7 @@ DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9e
 DIST netbeans-trunk-nightly-201504270341-src.zip 207311520 SHA256 acf9098ac80b152d852b40943cbf6ec50878ee0d089ce4bf7666aab656303127 SHA512 344f9e396f20c463801b44a264ca55ba4d05c7c51f83c650f2a6ee9d4858947962db8a7d9f0ab1e77eb921c9d974dafd7cfd8cd641005c468d7511cbfe0be57c WHIRLPOOL 8b5915c7c222f965ac8848b198be9afe4b227d5e3bd87f2c391ee06032914af414aa1ca438a92262b0921f6918fb2135513a648adac56e0dee3ba236225f9dd1
 DIST netbeans-trunk-nightly-201504280001-src.zip 207313287 SHA256 4d9e7bce832a438a5a030d15d0c65c5dd930a81e910efe56a6e98302db7c6aba SHA512 6355cc5666f6cb654bae79e37a06e4ccd4637ea1f093cd6dbdc8d99a109e61de6e644a4e9489bf67d72f27ce6797c175f948244a2d80b59e0f43fc64961b41ba WHIRLPOOL 70666a34cb2cabab59abe6fad18f85cf3cac3c6bc417ac2b0098c881625ec8292b1f2edc6a606370ead0f491be39815022978156d09c4ebd927778f1f8f9291d
 DIST netbeans-trunk-nightly-201504290001-src.zip 207321088 SHA256 65f4b2406259c40afa0207688a0e3250ae12c9d160dbeb70ac0fedb68fddac88 SHA512 9ab6957708e2cf7848020f4a298a73b65422815d95729ebe294f77237fc0ae42f049ce26a149d1ff249324acbdda4842607d02dcf095e8e186de49edd8c45e9d WHIRLPOOL 7c7d8c960a1791dd0c743fe8c19a54cdde50043efbdd06e2a68140f370a82ef70321524f64e5ac649e738e64a6a01a1bdcf5fcdc573969decfce203d4dd8da24
+DIST netbeans-trunk-nightly-201505040001-src.zip 207344087 SHA256 a60787b743a7a09946775f22bf41441b8be68f9c9a8429c5d5511f6c1ded4275 SHA512 009013edfc9a6221591d3efdb0a2cb25ae68a919554d621c3bb4d058fced5e303586218c0c662b86f8c03f15819bf52ed4e9d66b89bd1001fc3f656d5fefdbad WHIRLPOOL 140b8f2e27d33a32d6f8fc9f2b797dbf5018dd716e62c752e1ebaf27edbd71972e57ea9faf67d243caf23500750cac87a5e0c970ae1264347c6b7f9a3680a46f
 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
@@ -67,5 +68,6 @@ EBUILD netbeans-mobility-9999_p20150423.ebuild 4418 SHA256 4e12acf22c14b142cb3dd
 EBUILD netbeans-mobility-9999_p20150427.ebuild 4418 SHA256 056c28e3a1d12e7fa79b47c5e396a62a077f9030d49195821554290620432aaf SHA512 180dfe0ebdfee1ba4d20f96e330b69f5431ca4c384514bb77697dd90140464fc7d214ee3fa3cbd7c19f583813071cabf708eaa459d490c148aa2951418dfc2b2 WHIRLPOOL dd49d8f7a49679b662212834ce724f8c78956a0956c2ad5c1adffaa6eaff30bd59f4d392873d6920e8f8ed5b7863a97d2c7311605278a64b7e30f7e7c237569e
 EBUILD netbeans-mobility-9999_p20150428.ebuild 4418 SHA256 8fe440192867e6d9d40d94c27d118c62b624d53f7d1e125b0f6e0ec6b64354b4 SHA512 d8961460885407ff7e3afa3c7c57cf60769a7cbb941fc3c704534cbc77534a48e7c2904adc93fda689b653163f4140dd7706384800d8af8b90cd87032986c0f2 WHIRLPOOL e4c9c40748930018e9522a4c5993ae857d6eae9c621f938815b20b58d3e77e95555c75fe3e2167aa69bd829a32caac6fb6df245c54dfefc80ef733dc593d1f23
 EBUILD netbeans-mobility-9999_p20150429.ebuild 4418 SHA256 03a9812b45a4cd2aba03364ab85e4b09635b86b0e273fa1b810b15296baedbaf SHA512 4bd28763eb7488853377621de6feb1db3fbb0598d3b24d2c23ebc4cfab232484298d9d57c31375089344e2aa25ed26a272e5882a5c0e72c7fc560efa99bc43b3 WHIRLPOOL d7cd41e3e6cd5eeff82d32c7ed16ff0785925345f3d6e05fa8f0fbe01bd9f788eaf898203ccf1fdf9ec1599ecfe6ec8538d352af4d873bb12ea26cfebeca80b5
-MISC ChangeLog 165406 SHA256 0f35e9e43c453e377acf5f095b860b04a02a4a55e611b5b0ec18883f8c173dc6 SHA512 27efba5b118a07859f4744cd607a672dafd1b298bd5eaca9a8b21c70417f1624985de048acf5def37417ee3df0f95c60fb4db5bc291d7b9f69295f70cb7d3b0b WHIRLPOOL aaa8a889786f1a83af58adba8d98e717113891875ee0d2ab7c607e7ed361213fc9ffb1f41c172ae50ff38a64cdb587f8c1f4ab6944dde1e6f3552620b606e239
+EBUILD netbeans-mobility-9999_p20150504.ebuild 4418 SHA256 6c730f414c1f102c333b50da2e5bf43dd7dc378527828961448b50ed70da289f SHA512 278f7f08f0afa03e64b606c6bf2f9caf9c9588bbc88ad40b472f0f7fe2c4306f8f831d02883f58f0a6684542b0ef9867a558a9ab322ea7090d73e0cdc70c181a WHIRLPOOL a87e77acd135a553511f3662827362e3ff01c18c62583210f314843ce245558bf0aef0d7b3c546ddfbaf51070eb835c1c759d78e11e9d9541d0cf70e4984bf5f
+MISC ChangeLog 165583 SHA256 e23e1f9334dee57e9f150bcad93c85045994d648610cbda53f5558e7088f4ae6 SHA512 c6a0141decc1ef0967d6a58fb06757ccc49dd6e11e296846efcf2e9e40467c74f7ffba5aec725230bdd01bc1af332716f0226f46fb585f0bea7d0c1a80fb6f08 WHIRLPOOL c094bae47b138857163e4dbe51fdb41d023dea6c2b612ddea6c0e5265096871e549ad307d58b73154e8a632c6ab109c6b857ff0c44a4ba80fb384428b2c5deda
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150504.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150504.ebuild
new file mode 100644
index 0000000..1672c3a
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150504.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Mobility Cluster"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-05-04_00-01-56/zip/netbeans-trunk-nightly-201505040001-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 74ea70c..e14579e 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_p20150504 (04 May 2015)
+
+  04 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-nb-9999_p20150504.ebuild:
+  bumped to the latest sources
+
   04 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
   -netbeans-nb-9999_p20150314.ebuild, -netbeans-nb-9999_p20150315.ebuild,
   -netbeans-nb-9999_p20150316.ebuild:

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 7dbb5d0..688c2d9 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -40,6 +40,7 @@ DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9e
 DIST netbeans-trunk-nightly-201504270341-src.zip 207311520 SHA256 acf9098ac80b152d852b40943cbf6ec50878ee0d089ce4bf7666aab656303127 SHA512 344f9e396f20c463801b44a264ca55ba4d05c7c51f83c650f2a6ee9d4858947962db8a7d9f0ab1e77eb921c9d974dafd7cfd8cd641005c468d7511cbfe0be57c WHIRLPOOL 8b5915c7c222f965ac8848b198be9afe4b227d5e3bd87f2c391ee06032914af414aa1ca438a92262b0921f6918fb2135513a648adac56e0dee3ba236225f9dd1
 DIST netbeans-trunk-nightly-201504280001-src.zip 207313287 SHA256 4d9e7bce832a438a5a030d15d0c65c5dd930a81e910efe56a6e98302db7c6aba SHA512 6355cc5666f6cb654bae79e37a06e4ccd4637ea1f093cd6dbdc8d99a109e61de6e644a4e9489bf67d72f27ce6797c175f948244a2d80b59e0f43fc64961b41ba WHIRLPOOL 70666a34cb2cabab59abe6fad18f85cf3cac3c6bc417ac2b0098c881625ec8292b1f2edc6a606370ead0f491be39815022978156d09c4ebd927778f1f8f9291d
 DIST netbeans-trunk-nightly-201504290001-src.zip 207321088 SHA256 65f4b2406259c40afa0207688a0e3250ae12c9d160dbeb70ac0fedb68fddac88 SHA512 9ab6957708e2cf7848020f4a298a73b65422815d95729ebe294f77237fc0ae42f049ce26a149d1ff249324acbdda4842607d02dcf095e8e186de49edd8c45e9d WHIRLPOOL 7c7d8c960a1791dd0c743fe8c19a54cdde50043efbdd06e2a68140f370a82ef70321524f64e5ac649e738e64a6a01a1bdcf5fcdc573969decfce203d4dd8da24
+DIST netbeans-trunk-nightly-201505040001-src.zip 207344087 SHA256 a60787b743a7a09946775f22bf41441b8be68f9c9a8429c5d5511f6c1ded4275 SHA512 009013edfc9a6221591d3efdb0a2cb25ae68a919554d621c3bb4d058fced5e303586218c0c662b86f8c03f15819bf52ed4e9d66b89bd1001fc3f656d5fefdbad WHIRLPOOL 140b8f2e27d33a32d6f8fc9f2b797dbf5018dd716e62c752e1ebaf27edbd71972e57ea9faf67d243caf23500750cac87a5e0c970ae1264347c6b7f9a3680a46f
 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
@@ -66,5 +67,6 @@ EBUILD netbeans-nb-9999_p20150423.ebuild 5003 SHA256 f19f2c6d6e80b7967f9fe1c0090
 EBUILD netbeans-nb-9999_p20150427.ebuild 5003 SHA256 dec42363921719f2115fcf18f0c59967972efa9abea4a1a2c40f9eb727e7ef6a SHA512 21fde58278ef9be8656605d77e807bcb23b7efe7af1188d34c0e6760afc0a770e14c0999e12e4bec9efa673c7f6d6a0ee9cbc3bedd4bf4a6cb88b2193955362f WHIRLPOOL 30cd1532af638506afa4cf67d9a91eaa19385939a8330fcffdbd5567d8223e4f13a551124f68521da11f3a8f06b93f1a42b54f63ca1731c2da20727676764ff5
 EBUILD netbeans-nb-9999_p20150428.ebuild 5003 SHA256 2d20c00dc017fdae44e9b1d9fb2b6d70ba99c109436a5b18e1987e5ad26d0fed SHA512 6ca17e46cd1a362c974cff9c44f889dc95657ee407b9f61b4711b4ed8a0f22117cbcc023bd54bfeaf50041f7b6e9511462dedc9640c0887ec16a011b3239b2b1 WHIRLPOOL ad958f705accdd6288d7c67db119c048eebf54ba39af9e85dd672a52d68e18e424e78e11d8bfc7a47011d4bbe7222b8acb2c5a9df8c48017e6754dfda182dbe3
 EBUILD netbeans-nb-9999_p20150429.ebuild 5003 SHA256 01b2e2627d4567fe0b0886c8180990b38f382e2a8da9f331732ae892788965ad SHA512 675ab6862e5a60680abe5bc1904415d98f7f7bced2e4a46568a14edbf6f15cfc4dd00f1cd9b57e9964c066e990657dedd3f74e8c6ac119c16353ec8d5c78ad0d WHIRLPOOL ad57d62e0142182365d6fcfbfcc992048f5a337ee7473ca98b8ede2910bc2ad8baecb1d7d2759ccf533b81281bb8441781239890b8e2ea65945faf75c64053c7
-MISC ChangeLog 154560 SHA256 e6d8356db000409fdef93db7054e17dcca108d15a1a96ccf1611c1c33b3f2ad2 SHA512 64f6eb3c8bd0b1c47ce63f98548edb382acee87fe8d599e5b3ca6a0f74c93f3150b87f8c1aa237e22955363e8a0734bcc6322081490dae491174ba702f782a9a WHIRLPOOL 2b47c4f923317ef54b9e6f896d8d193a5191f3e1877c1c8d0ca237f1c751cd8c042a1a670e2c5a079a2c911abf19fbf7966b95669c2a7151f9cb61096c71759a
+EBUILD netbeans-nb-9999_p20150504.ebuild 5003 SHA256 86fd829bc53ded6a7732b4480e7b3265af81441622c12198d62190e0ef1cfbd3 SHA512 06f07b1aaf6592394c13f34507b1d513392a4d11be990c5dd449cdf458f3327d1bbb509b2d63905b84975d2bea412475e811cb0abc168894494717c8aed0387e WHIRLPOOL 5a025b9e567bd8e7cd52d53b40b9707bd972b6b3f6d906f0b25c6813261646f07fbb4cf3770a110a4ce3b300c1541c2eebf7b73a9366d9c101ff21ef40e5383c
+MISC ChangeLog 154725 SHA256 6b9b93cc8b9c7eae6ee102a453524e93dfaa0bfaace02f22c99be7a93feb2e3a SHA512 0ef3ea505743066e7b7ecaf34988fbc255f93b350a7c55993020e0b23ae60d0cfd38bd582770c5c727ee2aaa3fd3095f8bcb719abb446ac1d13d23ccd0b17abb WHIRLPOOL 9d3551b6fdc822e8999757b985bb2f58e96a45198e47529a8035baa289a1a8260a2f7fb6074efa01ca702c25d742b137247aa02f633b3986f6fdce36920e66fb
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20150504.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20150504.ebuild
new file mode 100644
index 0000000..018df2b
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20150504.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Branding"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-05-04_00-01-56/zip/netbeans-trunk-nightly-201505040001-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 afbb4c1..1fa6466 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_p20150504 (04 May 2015)
+
+  04 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-php-9999_p20150504.ebuild:
+  bumped to the latest sources
+
   04 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
   -netbeans-php-9999_p20150314.ebuild, -netbeans-php-9999_p20150315.ebuild,
   -netbeans-php-9999_p20150316.ebuild:

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index 0887432..66521fb 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -43,6 +43,7 @@ DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9e
 DIST netbeans-trunk-nightly-201504270341-src.zip 207311520 SHA256 acf9098ac80b152d852b40943cbf6ec50878ee0d089ce4bf7666aab656303127 SHA512 344f9e396f20c463801b44a264ca55ba4d05c7c51f83c650f2a6ee9d4858947962db8a7d9f0ab1e77eb921c9d974dafd7cfd8cd641005c468d7511cbfe0be57c WHIRLPOOL 8b5915c7c222f965ac8848b198be9afe4b227d5e3bd87f2c391ee06032914af414aa1ca438a92262b0921f6918fb2135513a648adac56e0dee3ba236225f9dd1
 DIST netbeans-trunk-nightly-201504280001-src.zip 207313287 SHA256 4d9e7bce832a438a5a030d15d0c65c5dd930a81e910efe56a6e98302db7c6aba SHA512 6355cc5666f6cb654bae79e37a06e4ccd4637ea1f093cd6dbdc8d99a109e61de6e644a4e9489bf67d72f27ce6797c175f948244a2d80b59e0f43fc64961b41ba WHIRLPOOL 70666a34cb2cabab59abe6fad18f85cf3cac3c6bc417ac2b0098c881625ec8292b1f2edc6a606370ead0f491be39815022978156d09c4ebd927778f1f8f9291d
 DIST netbeans-trunk-nightly-201504290001-src.zip 207321088 SHA256 65f4b2406259c40afa0207688a0e3250ae12c9d160dbeb70ac0fedb68fddac88 SHA512 9ab6957708e2cf7848020f4a298a73b65422815d95729ebe294f77237fc0ae42f049ce26a149d1ff249324acbdda4842607d02dcf095e8e186de49edd8c45e9d WHIRLPOOL 7c7d8c960a1791dd0c743fe8c19a54cdde50043efbdd06e2a68140f370a82ef70321524f64e5ac649e738e64a6a01a1bdcf5fcdc573969decfce203d4dd8da24
+DIST netbeans-trunk-nightly-201505040001-src.zip 207344087 SHA256 a60787b743a7a09946775f22bf41441b8be68f9c9a8429c5d5511f6c1ded4275 SHA512 009013edfc9a6221591d3efdb0a2cb25ae68a919554d621c3bb4d058fced5e303586218c0c662b86f8c03f15819bf52ed4e9d66b89bd1001fc3f656d5fefdbad WHIRLPOOL 140b8f2e27d33a32d6f8fc9f2b797dbf5018dd716e62c752e1ebaf27edbd71972e57ea9faf67d243caf23500750cac87a5e0c970ae1264347c6b7f9a3680a46f
 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
@@ -69,5 +70,6 @@ EBUILD netbeans-php-9999_p20150423.ebuild 4423 SHA256 854bcc4abeb870e9f7541903cc
 EBUILD netbeans-php-9999_p20150427.ebuild 4423 SHA256 f0f83722f41e72c491f29f6cd3504b356e97f3155415ddca6c2111bdbcb63ad2 SHA512 b096bc10e4e7c385a4dbb54c09c4f8a3cedf020e37e526cd00ebfb1c902cb3f746d86bc4f8d91dd29912eea88eb98712413da7da8915effba4808da31750f98d WHIRLPOOL 873537e236101f23b6c712f174b6c8ee549c9e7a21174d6770e7339f1df23ab46de54d7316f6a6613c21cf9a671f5f9016eb26e1b4506912ebe5d88a54e0510d
 EBUILD netbeans-php-9999_p20150428.ebuild 4423 SHA256 b1c6474cf4b7d80ee8e28847a06127051bf270ca43ae7399a1a004638b93c571 SHA512 f546c502f71cacf5f996a6dc3cdd7a3f4ce68f9102ee548fcd8505237b7fe7d5dcc9cbcfa425b036b4140b1c83a89f0e338d0791a978b053661c9bdb4b3afaf4 WHIRLPOOL 72465b71cda3e33c16112cf610aaeed08a18c20002ff1d589676b570fb3f684b7635b0a1a547e5ed55f81ac2956f11357adc1a2a23d59f5d0d6fd0f0f9400ca1
 EBUILD netbeans-php-9999_p20150429.ebuild 4423 SHA256 1ba7210c1a4821b43421de63bc0280f45204a534eae37ff99b9c4041c1bd51d4 SHA512 1b964bedf1860a1345fa990700111b5fb91ed88094ff769d240851e89bb6cc82046e70c6afbbb21bf7e0de707153de854abfede42ec1259146604c6886ae626b WHIRLPOOL 89e9a4c63c40ad01272636304681c2a6cf8447d69add656dee99914199218f7205eb408e20f2b01a4a078c4c21ba3ec0305448ac8e07709a4ac2922e6d894d87
-MISC ChangeLog 154251 SHA256 f8bf85d1538f42f5c7e751f4f4adb1e50603ec5252a9e4ce6c2fcb17df05c686 SHA512 474501c43a2564ca06860a5512fae1c8422f986788f6fc56b3f4e13336c4936eed6ce4837476e1d23a99bedb72ab12a36f433839c45309cd7a066e11616fc253 WHIRLPOOL bb5670da591f64f25d5dcdb5a019c8d6eb24614c7b5e8c8958368ba5785f6edb3314a66bad56e2d429e4e73e6f626ddcd093e35efa751ea86def9dc3e8792fd1
+EBUILD netbeans-php-9999_p20150504.ebuild 4423 SHA256 2114d45f5b4e9376549183f4174ad4a22d9feca699c3ee46317d4d1cace9c07a SHA512 a94be41ad0b28193f51e7c4c913c27210c42bde83900d7bfd63688569b294d98b139ec13f474ce8578cd5b47ffccdebe600004631971e3446d36f920b1ee6030 WHIRLPOOL 0c2bc73fef6e4a2079a98b4e4214413ee7a14e2d59434a3d1982b9f8a555220c84defd557c0ae581680e50f874647d7b5fc3cbde5bd04e1cf956b0bcec14f237
+MISC ChangeLog 154418 SHA256 220b3a98c201afd3534f3795f6c3d88e4cd979f588b2d5884199eac223787e3a SHA512 8d6cc4b4320a784f3044873f884bbeb214ecccb839e443ce00debba8a5126b57eda505244679041263147dd0bba53207da4df22a5531f90c2f408e4b518f538c WHIRLPOOL e0dec64f868d2432f29169aabfd313f12f209b12510afce61c628932709566a7b511252acf2efe27a2bbd34cb5de7d44d2398307f1f841636a2c95b91e0d3884
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-platform/ChangeLog b/dev-java/netbeans-platform/ChangeLog
index e64cb21..56cf1c8 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_p20150504 (04 May 2015)
+
+  04 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-platform-9999_p20150504.ebuild:
+  bumped to the latest sources
+
   04 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
   -netbeans-platform-9999_p20150314.ebuild,
   -netbeans-platform-9999_p20150315.ebuild,

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 9db7ab4..e820844 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -59,6 +59,7 @@ DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9e
 DIST netbeans-trunk-nightly-201504270341-src.zip 207311520 SHA256 acf9098ac80b152d852b40943cbf6ec50878ee0d089ce4bf7666aab656303127 SHA512 344f9e396f20c463801b44a264ca55ba4d05c7c51f83c650f2a6ee9d4858947962db8a7d9f0ab1e77eb921c9d974dafd7cfd8cd641005c468d7511cbfe0be57c WHIRLPOOL 8b5915c7c222f965ac8848b198be9afe4b227d5e3bd87f2c391ee06032914af414aa1ca438a92262b0921f6918fb2135513a648adac56e0dee3ba236225f9dd1
 DIST netbeans-trunk-nightly-201504280001-src.zip 207313287 SHA256 4d9e7bce832a438a5a030d15d0c65c5dd930a81e910efe56a6e98302db7c6aba SHA512 6355cc5666f6cb654bae79e37a06e4ccd4637ea1f093cd6dbdc8d99a109e61de6e644a4e9489bf67d72f27ce6797c175f948244a2d80b59e0f43fc64961b41ba WHIRLPOOL 70666a34cb2cabab59abe6fad18f85cf3cac3c6bc417ac2b0098c881625ec8292b1f2edc6a606370ead0f491be39815022978156d09c4ebd927778f1f8f9291d
 DIST netbeans-trunk-nightly-201504290001-src.zip 207321088 SHA256 65f4b2406259c40afa0207688a0e3250ae12c9d160dbeb70ac0fedb68fddac88 SHA512 9ab6957708e2cf7848020f4a298a73b65422815d95729ebe294f77237fc0ae42f049ce26a149d1ff249324acbdda4842607d02dcf095e8e186de49edd8c45e9d WHIRLPOOL 7c7d8c960a1791dd0c743fe8c19a54cdde50043efbdd06e2a68140f370a82ef70321524f64e5ac649e738e64a6a01a1bdcf5fcdc573969decfce203d4dd8da24
+DIST netbeans-trunk-nightly-201505040001-src.zip 207344087 SHA256 a60787b743a7a09946775f22bf41441b8be68f9c9a8429c5d5511f6c1ded4275 SHA512 009013edfc9a6221591d3efdb0a2cb25ae68a919554d621c3bb4d058fced5e303586218c0c662b86f8c03f15819bf52ed4e9d66b89bd1001fc3f656d5fefdbad WHIRLPOOL 140b8f2e27d33a32d6f8fc9f2b797dbf5018dd716e62c752e1ebaf27edbd71972e57ea9faf67d243caf23500750cac87a5e0c970ae1264347c6b7f9a3680a46f
 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
@@ -85,5 +86,6 @@ EBUILD netbeans-platform-9999_p20150423.ebuild 9652 SHA256 ca973ab7c88079bd9a3e3
 EBUILD netbeans-platform-9999_p20150427.ebuild 9652 SHA256 9f04dca2fe9cc4cc57a17fa7f1deae2ef2b78f6df535a5a374a87dd11f71b9d9 SHA512 d67506e345f99a9a6125e45724c2f99af1f773cf1050aab298b81bf2102a00502f997a5222292b174a90211f069a88541082a815a5cca4cf31f3deff0365ae07 WHIRLPOOL fb219e7a90a676f9b5a0e4f121311f29bbadd1a2bc20516e19b783af1b85f1d5e82e1eb03021e50d0e72eb53685251e84574c3162a7828cc5b8da2422fd50400
 EBUILD netbeans-platform-9999_p20150428.ebuild 9652 SHA256 e675ff3ebfaea0f48a281aade2510b0ecd36e035c20feaf78d8ddc86f31dd61a SHA512 61621a91c58ec46923385bc51faabf3ce7b46f420ab3c1af229b23f785b01c15423719d2809460ddea54930896f7828287a55dec61f788b9bbe6800fc6750e21 WHIRLPOOL a4eea3c1d9e3879376c88957db67a1d0beabbb24635157e45be92000b3d6fccb9e88b7f94c22ff0844063cd7edc24d4e2296e36bb1207fb974df8d70a1fe8456
 EBUILD netbeans-platform-9999_p20150429.ebuild 9652 SHA256 67a926bd2a63c6f4632b2987e47765679ff324636f728b5509ee171b08180da4 SHA512 d5933e1f873e7470a351bdc007c8e7093d2b9b2661fe81e0a104c5c1dd39e377934ef557239ea95ed6964dca595bb5cedbc9534786b4b8c8d9584cd3ffa55e11 WHIRLPOOL 8cba47978fbcd86a92ce8a11446df59271112682323399e7ecc343851375f0da494944ade65a482312d10d31d1438b656460bc5b79ed8ccaf4f38653350be9e6
-MISC ChangeLog 166002 SHA256 11dfdf006732b0c0ade333e9120778bd13658031042821b6ea26fb5cb43089c7 SHA512 2735ca3557dae7b5c5f78530e63af39d91bf1e71e81fa212c49753fd8d28c189f8d3d16c21fe386f93a6f3775a681d74a4667536b0fbb524e04da248bb2ded77 WHIRLPOOL 2d4a0c86d9cbac4bad375b29f42151bc349014c9b32073d82f65bf289c7c3c52ef766e89e322ee3e1d1ba0a8b9c6dc69c68c5bd7e2eaa6fcacde13287201a4b3
+EBUILD netbeans-platform-9999_p20150504.ebuild 9652 SHA256 a5dc846e2e65bbf1c9e76df517898d45495171732778bd6cdc61c83afdf78baf SHA512 787cef7c2c32739affd33424e7a5b882b238047628cd885c5389691f99432816098a69d9619b4794642bd7dacdb6cb8f3c6a012e0ba859b5980836beb2d010be WHIRLPOOL bb1e51fa2a5ec52142542912e2035e4df4843f29586cf0dd05ff1cd8bc969970ab895ef8c67db42171ed848de31a3b9d6d64ec04bb311f13d6a202c9c5289abb
+MISC ChangeLog 166179 SHA256 e607faaf497d38f14becf5ce257a05fa9e0b628c62ce492dd0f48c449bf0a3ce SHA512 927510c854a8719ff0dd6727a4eb6b8a1a5d932bf264b1ee24d5e4bdb495ca4a7b07fadd290baa8c6af10f211b05a618ac70a6bdadc3a99439da4ba2390c806c WHIRLPOOL 219fda06bd6472129ed720df588bfadf37d1dd1cec835c538ce5335af73019b2aafcf6401b35e4408cc398352593ada75a49d1e8574172d27c5c519bc43ce127
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-profiler/ChangeLog b/dev-java/netbeans-profiler/ChangeLog
index 48a50c2..e964c1b 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_p20150504 (04 May 2015)
+
+  04 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-profiler-9999_p20150504.ebuild:
+  bumped to the latest sources
+
   04 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
   -netbeans-profiler-9999_p20150314.ebuild,
   -netbeans-profiler-9999_p20150315.ebuild,

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 1c5f28d..0957599 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9e
 DIST netbeans-trunk-nightly-201504270341-src.zip 207311520 SHA256 acf9098ac80b152d852b40943cbf6ec50878ee0d089ce4bf7666aab656303127 SHA512 344f9e396f20c463801b44a264ca55ba4d05c7c51f83c650f2a6ee9d4858947962db8a7d9f0ab1e77eb921c9d974dafd7cfd8cd641005c468d7511cbfe0be57c WHIRLPOOL 8b5915c7c222f965ac8848b198be9afe4b227d5e3bd87f2c391ee06032914af414aa1ca438a92262b0921f6918fb2135513a648adac56e0dee3ba236225f9dd1
 DIST netbeans-trunk-nightly-201504280001-src.zip 207313287 SHA256 4d9e7bce832a438a5a030d15d0c65c5dd930a81e910efe56a6e98302db7c6aba SHA512 6355cc5666f6cb654bae79e37a06e4ccd4637ea1f093cd6dbdc8d99a109e61de6e644a4e9489bf67d72f27ce6797c175f948244a2d80b59e0f43fc64961b41ba WHIRLPOOL 70666a34cb2cabab59abe6fad18f85cf3cac3c6bc417ac2b0098c881625ec8292b1f2edc6a606370ead0f491be39815022978156d09c4ebd927778f1f8f9291d
 DIST netbeans-trunk-nightly-201504290001-src.zip 207321088 SHA256 65f4b2406259c40afa0207688a0e3250ae12c9d160dbeb70ac0fedb68fddac88 SHA512 9ab6957708e2cf7848020f4a298a73b65422815d95729ebe294f77237fc0ae42f049ce26a149d1ff249324acbdda4842607d02dcf095e8e186de49edd8c45e9d WHIRLPOOL 7c7d8c960a1791dd0c743fe8c19a54cdde50043efbdd06e2a68140f370a82ef70321524f64e5ac649e738e64a6a01a1bdcf5fcdc573969decfce203d4dd8da24
+DIST netbeans-trunk-nightly-201505040001-src.zip 207344087 SHA256 a60787b743a7a09946775f22bf41441b8be68f9c9a8429c5d5511f6c1ded4275 SHA512 009013edfc9a6221591d3efdb0a2cb25ae68a919554d621c3bb4d058fced5e303586218c0c662b86f8c03f15819bf52ed4e9d66b89bd1001fc3f656d5fefdbad WHIRLPOOL 140b8f2e27d33a32d6f8fc9f2b797dbf5018dd716e62c752e1ebaf27edbd71972e57ea9faf67d243caf23500750cac87a5e0c970ae1264347c6b7f9a3680a46f
 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
@@ -58,5 +59,6 @@ EBUILD netbeans-profiler-9999_p20150423.ebuild 3478 SHA256 9162330ec844e959136d1
 EBUILD netbeans-profiler-9999_p20150427.ebuild 3478 SHA256 af507e9b79e69c1afda97e176b1fbd9f72ea71739b562d7e7b586421a9a49af2 SHA512 f6cbccbf58f9295c4444ec57bc46ab32aa124482d09760cfa53c2bea5a497e33e9492d9efccf074975c1fd1f3745bb045abc451f473a3a5a5b249075eab3c254 WHIRLPOOL 47f5b39158da0ddbcfc168a76a5cf156f5267f57633fa5881c9d94cf3e0eb8e0e8e36e2b05a89eacd0ac2f19fc03e991a0b2d5a463ddf5e7f3f8eb89951cf39e
 EBUILD netbeans-profiler-9999_p20150428.ebuild 3478 SHA256 757f9e27561411acdea981714a3fa51e5f38b2f05250aca1baec58042081c87d SHA512 607d4b9cf5e38d36bd43de7fff124f51f5be8d3a44dbd5c114d222e2b815b95a2b0c49e1b3aed3f3fd330025137f032093afa8ed1b41e1e9485226cfeeaa87b2 WHIRLPOOL 39aca8304897e0075c5b590483740fd19bf715b1a2d85b1d5fe0e7fabb1101c696d444054a9567ceabc5955ee708ca1aec9a92b7d401dde3878f177c194878dc
 EBUILD netbeans-profiler-9999_p20150429.ebuild 3478 SHA256 ebd2e32163c9932043e0131ed939f5132c1b98d5aae279ed071b0eafc8dffcf6 SHA512 08a27ee39d95aeff31a7ec5dcdf388ada72e312758f37e85aa210d3c6f8cf47743fa26b5cb127d2ea9e975c309b8a4dc279a2f209fa3835d04857dbc920bf81e WHIRLPOOL b7ebec2b44bdcf1ba103f496f20a77466f4ba88e79b39528f8657cc54ba9123b6a068b6e467124100fa58c5e18a4bd613a44329fb728111190c56f9f6acdfced
-MISC ChangeLog 165463 SHA256 2dd2aef4b43ba8e2d192a1858c375a5128a9a6925a65da1d64fccf9dfcce429c SHA512 384beec23192c9c210d9530ddb26694bf6d3a0965d067aed28e9daa41273fc6079e9f2feafa55337a620ded5f851e8bd4caff067532087d94a4a2e815f2bdd63 WHIRLPOOL b4210d2b6684a0a6ca1d67f952c137649f447c0c51df32573a021444526d5afb0eadd84cae9d41029c844c91092d9d119d5ec3e390073bcc023982831424b849
+EBUILD netbeans-profiler-9999_p20150504.ebuild 3478 SHA256 aaea51984a4f2510b7ef61f2a1226917748059f19edd61956afa280f97c0a7d5 SHA512 429d4b183387ee1f1ac97976cdc46c69fe54ab83ab2632a70162bec4803de079aaceef839d920f42d5c5dcfb820ff113eefbae1b6ca04ffbf34a8b4a2288c737 WHIRLPOOL d58ad47405afa9445f1f638dc317dff1a8f62f620dd938cd0256e129e5b71ae65e4553fe6189f6d28079f723888805ff93e904c0c09fe59b6bee2e3bb397e92c
+MISC ChangeLog 165640 SHA256 a1e0a555655aa75e1cc0fffca233d5eb4dd4a1e415cc26f96aff684ea3834ad4 SHA512 a5b9972d0f7d33d5eb5d471d0171820ecb3f565998caedcce905a61c75f32419b0d57b1c1a0c25cc9eecfeaa74df7c9b213f7619210edb5e5131749cc2012479 WHIRLPOOL 3250117a30222803642e7e0ebdd3f1012862b733c3af6e3c0a60f6110e57b00a25c66fcafc6bfebd4d19cebac5fca8d03338eaf41843eb69c15fdae2841da12e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index 338c565..f4a1a8c 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9e
 DIST netbeans-trunk-nightly-201504270341-src.zip 207311520 SHA256 acf9098ac80b152d852b40943cbf6ec50878ee0d089ce4bf7666aab656303127 SHA512 344f9e396f20c463801b44a264ca55ba4d05c7c51f83c650f2a6ee9d4858947962db8a7d9f0ab1e77eb921c9d974dafd7cfd8cd641005c468d7511cbfe0be57c WHIRLPOOL 8b5915c7c222f965ac8848b198be9afe4b227d5e3bd87f2c391ee06032914af414aa1ca438a92262b0921f6918fb2135513a648adac56e0dee3ba236225f9dd1
 DIST netbeans-trunk-nightly-201504280001-src.zip 207313287 SHA256 4d9e7bce832a438a5a030d15d0c65c5dd930a81e910efe56a6e98302db7c6aba SHA512 6355cc5666f6cb654bae79e37a06e4ccd4637ea1f093cd6dbdc8d99a109e61de6e644a4e9489bf67d72f27ce6797c175f948244a2d80b59e0f43fc64961b41ba WHIRLPOOL 70666a34cb2cabab59abe6fad18f85cf3cac3c6bc417ac2b0098c881625ec8292b1f2edc6a606370ead0f491be39815022978156d09c4ebd927778f1f8f9291d
 DIST netbeans-trunk-nightly-201504290001-src.zip 207321088 SHA256 65f4b2406259c40afa0207688a0e3250ae12c9d160dbeb70ac0fedb68fddac88 SHA512 9ab6957708e2cf7848020f4a298a73b65422815d95729ebe294f77237fc0ae42f049ce26a149d1ff249324acbdda4842607d02dcf095e8e186de49edd8c45e9d WHIRLPOOL 7c7d8c960a1791dd0c743fe8c19a54cdde50043efbdd06e2a68140f370a82ef70321524f64e5ac649e738e64a6a01a1bdcf5fcdc573969decfce203d4dd8da24
+DIST netbeans-trunk-nightly-201505040001-src.zip 207344087 SHA256 a60787b743a7a09946775f22bf41441b8be68f9c9a8429c5d5511f6c1ded4275 SHA512 009013edfc9a6221591d3efdb0a2cb25ae68a919554d621c3bb4d058fced5e303586218c0c662b86f8c03f15819bf52ed4e9d66b89bd1001fc3f656d5fefdbad WHIRLPOOL 140b8f2e27d33a32d6f8fc9f2b797dbf5018dd716e62c752e1ebaf27edbd71972e57ea9faf67d243caf23500750cac87a5e0c970ae1264347c6b7f9a3680a46f
 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
@@ -62,5 +63,6 @@ EBUILD netbeans-webcommon-9999_p20150423.ebuild 4997 SHA256 02f1c52b633ae50b4b48
 EBUILD netbeans-webcommon-9999_p20150427.ebuild 4997 SHA256 e0cd428c7cb03d78fd7023ef2b6d59c899092a727bac6e4326912e7e62d0c11b SHA512 c22b88cb84fb94e6719d4cb4b550b99c8e9af2ada53e556a9c6617213b85b7cc821a5bd3bd60b73a909eb1e3d8bb18ad36127131b99b14d094ee09bd13133b61 WHIRLPOOL 26d2f0dc7518b0bfd36df5c2f14f581e576e4071c8206633f574cf4d2ad9c18f3e1f3535a3ed26bb7034df67910d50c632f57c09a94f9c356a0727f26fa879f3
 EBUILD netbeans-webcommon-9999_p20150428.ebuild 4997 SHA256 9a3272fc2fedcde2a3d805a47be2e017f296848373098f8a110a59bcb422727f SHA512 681996db36bfc44668a1092f6b56aaad0220d254377c88e03528bd47389c15149cfb23c77a3827f4663a6a255f16a11c07eace07f54f0cc1379703217bdd899a WHIRLPOOL 3c1334403f41b71d4fe792d8918e5cf0f64380665e6c9cc2abe96a153c39decb4faa69568161bdd1e1b4b4079067614adc5ac813888b8a7fc03530474121912e
 EBUILD netbeans-webcommon-9999_p20150429.ebuild 4997 SHA256 05a4bfd0eb4f624dddb8bcb38c2e4ae36295506920265f4204f88c616eaa0bff SHA512 9951f2c9f958773ede49d83877292d6290e49ce765c24e2a70a69ed2a02b04a7679856478a2eba33eb296a94c16c55c59c3ec26fc0bab186062182979d1b1b6b WHIRLPOOL f97cf490554710b63e4f35a9a4ef28595fb94bb601fee9edc44ce7d9f5f319d6ad5d76835552df17dfacd547b8ad784335e390efc0530920192485870e071d1a
-MISC ChangeLog 138509 SHA256 4012e2ed4b95cc86771c6298bffb5855a316718ed9ec8cc7cade0bb12b2313c6 SHA512 eead5576228a03fe530656b466ed34f8d097c816c58dba2ebb1929e5ce88b5708bb951d990a52e2a0ddf892a694057a4a202c235ce20d997f1cc87766f375d01 WHIRLPOOL 6cf2cccfef0941196a31028a36000c2986fcd8f76b42ba6fe87319e3b3de608cc6b6e0ef4840aba3353b3dfee514e95e377b6f479057720e2ec8edaa081f1fb8
+EBUILD netbeans-webcommon-9999_p20150504.ebuild 4997 SHA256 aeb447ad05d121cfd62017caf2a1563c982ffac976dd5e68985685452468a800 SHA512 7b4bebde0d1fe5e416cd7933ee4e5bfdcda1b4fb0fe629919f18cb8348c2766052c164a412e667b778b378ccd1ea63c23b9f504b9a45da8f1b7e7878d4933c51 WHIRLPOOL 069aba8b8e0739f7afd042227ea3ce9e10771f27381fa95c71275d3621b5f7dc479616900faee133a5cf9188beaa62fce90096707285c407849cb6a4960f7672
+MISC ChangeLog 138688 SHA256 217e4fb22495e60ad027905619a231eb036cc74d72515bbef674128afc9e86c3 SHA512 967f8548dd2e9d09197246c6281162c914850967654c9ed58d18531a5d1128ba05092a1301868f10dfde48bb3a2e95070cb27e12f9a026563a1970e1f18f3c9c WHIRLPOOL 56fbb194540c158acd763059d7d15da7e2acb8805e5f80d28145209f019573201eff26dafe85651decb3f8d7f08a92a4dac00dfff9fbb225cf8302de4cd8b177
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 4fe6002..36da6fa 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9e
 DIST netbeans-trunk-nightly-201504270341-src.zip 207311520 SHA256 acf9098ac80b152d852b40943cbf6ec50878ee0d089ce4bf7666aab656303127 SHA512 344f9e396f20c463801b44a264ca55ba4d05c7c51f83c650f2a6ee9d4858947962db8a7d9f0ab1e77eb921c9d974dafd7cfd8cd641005c468d7511cbfe0be57c WHIRLPOOL 8b5915c7c222f965ac8848b198be9afe4b227d5e3bd87f2c391ee06032914af414aa1ca438a92262b0921f6918fb2135513a648adac56e0dee3ba236225f9dd1
 DIST netbeans-trunk-nightly-201504280001-src.zip 207313287 SHA256 4d9e7bce832a438a5a030d15d0c65c5dd930a81e910efe56a6e98302db7c6aba SHA512 6355cc5666f6cb654bae79e37a06e4ccd4637ea1f093cd6dbdc8d99a109e61de6e644a4e9489bf67d72f27ce6797c175f948244a2d80b59e0f43fc64961b41ba WHIRLPOOL 70666a34cb2cabab59abe6fad18f85cf3cac3c6bc417ac2b0098c881625ec8292b1f2edc6a606370ead0f491be39815022978156d09c4ebd927778f1f8f9291d
 DIST netbeans-trunk-nightly-201504290001-src.zip 207321088 SHA256 65f4b2406259c40afa0207688a0e3250ae12c9d160dbeb70ac0fedb68fddac88 SHA512 9ab6957708e2cf7848020f4a298a73b65422815d95729ebe294f77237fc0ae42f049ce26a149d1ff249324acbdda4842607d02dcf095e8e186de49edd8c45e9d WHIRLPOOL 7c7d8c960a1791dd0c743fe8c19a54cdde50043efbdd06e2a68140f370a82ef70321524f64e5ac649e738e64a6a01a1bdcf5fcdc573969decfce203d4dd8da24
+DIST netbeans-trunk-nightly-201505040001-src.zip 207344087 SHA256 a60787b743a7a09946775f22bf41441b8be68f9c9a8429c5d5511f6c1ded4275 SHA512 009013edfc9a6221591d3efdb0a2cb25ae68a919554d621c3bb4d058fced5e303586218c0c662b86f8c03f15819bf52ed4e9d66b89bd1001fc3f656d5fefdbad WHIRLPOOL 140b8f2e27d33a32d6f8fc9f2b797dbf5018dd716e62c752e1ebaf27edbd71972e57ea9faf67d243caf23500750cac87a5e0c970ae1264347c6b7f9a3680a46f
 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
@@ -58,5 +59,6 @@ EBUILD netbeans-websvccommon-9999_p20150423.ebuild 2727 SHA256 6e542e53ab1e09803
 EBUILD netbeans-websvccommon-9999_p20150427.ebuild 2727 SHA256 183a2484dd3677211f3de5839523cc44d9a54f1365ce6ddaebc2e67ecde83c54 SHA512 2eeff1fbaae77c6fd3dbba42b8459c630e7a1893702c5742c78122e59e7f5cdd796e3370c060a690b1cc92a8d2d8c70e9ae4c8bf93f3e8f39f47ebc20ff45803 WHIRLPOOL 34f5d7de78c8b30093b663e295b7121e62d23ab0904f9e0823155131b0852c1ab28b3d10a9f211f187c1d601a4e5e3244b8dfdacc4f55682e4ea9a103ecbe3c4
 EBUILD netbeans-websvccommon-9999_p20150428.ebuild 2727 SHA256 8662f239f1e2d05d0174bb8c7dd529358bb04408bf79f388a3d0cf184e0f1daf SHA512 dd6b5e3ff736e99fdfc30b162c2fa26da49281f79b113351e0d9fc4b49be1b95d26ec3afcbe97eab8e382a5df05fe81776a68e7e4c0e08e0ada59450547ad614 WHIRLPOOL 6b93dd9c05ae3f2a3ac520f250cce8ed8a777b872b0c39794f5bd545677ca3d6fc4d127cda9b3e44f5282f910b748c5f0b3feea1178e8dffb3cbbb8979ba9c2a
 EBUILD netbeans-websvccommon-9999_p20150429.ebuild 2727 SHA256 9b0565f899933310102b1feec923e365d528b2b0f485e5fa74424de50982ab69 SHA512 7161c54eb709d7183ea9e776aff284c01f90ba1083e7b6caa6561ece9960efad203c6055c5bd84bcdfb184289e43c6f3363fd6fed962c52a6b711bfcfd9b5074 WHIRLPOOL 606ebf04aab9a66705213bb98c73a4916eb6ad191876de2ba5c7b18247e9d5e622676713bea6f5dd72954f5299585311b97e3d45cc756082352e6844de9f2f66
-MISC ChangeLog 173388 SHA256 92e8bbc7acf4fb8b2fbb686ff0146dd531b467ce014c3e4e327e96b7020b9fe8 SHA512 2fe38d704b6bbe057522c12fbc30159237173c00e9ae2825e56241feb259923d8670229e355eb130aa976e0ede8a085fc3a79f6be8864b14957db79b5f3e887a WHIRLPOOL 70bc7d149f6ce02856d53a244c82c0a851042479c5abafbe37209e6fb0e19886e8b255a8c14f513b45cb592e5e20e2d873a8e6307ffbe16a5fbe5522ca10ed5d
+EBUILD netbeans-websvccommon-9999_p20150504.ebuild 2727 SHA256 b8b98474dade6868674c6fdf459a346bab899490366a229810b6adab54981ed3 SHA512 b01794d7c93b8eab3e3be2b6edad95ac9b05f51651c9e34bcc0b1a135f84564e4964a66a94f04defed04502d7c0f426c6ec16678f2a674c896cdcd0b742d0ae7 WHIRLPOOL 219511c1a7a2fa1d9074c33706bcb03fb77d531cae01b87de41232842231e9ef37c5b7ca486a379bf1dd4ec5a54577dc7dee8779089e605c515bb8d9521c7823
+MISC ChangeLog 173573 SHA256 965fa67f42debd8aa17a1be17a430fe1f7c403aaceb80207060f42ebbc84d3a5 SHA512 100c50982d5318541ffb83d3ab3944f85f0fe0225c92fe40356523a8a9ea728933f7e33e083f26a6f41b4ad497f1687d19dc103e0ec1136b0c0c297f7bf64afa WHIRLPOOL 2c007525f2587162bdaca9f6f45793e640f7daaed4069b50a0b418ab32a16da9f6719fbcab1e79aacfec2fe3919ffc2bef5792cd9db533f2dd6d95f4c79c9ab8
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150504.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150504.ebuild
new file mode 100644
index 0000000..3aa789e
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150504.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Common Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-05-04_00-01-56/zip/netbeans-trunk-nightly-201505040001-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 7ff8dbb..d050ecd 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_p20150504 (04 May 2015)
+
+  04 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-9999_p20150504.ebuild:
+  bumped to the latest sources
+
   04 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
   -netbeans-9999_p20150314.ebuild, -netbeans-9999_p20150315.ebuild,
   -netbeans-9999_p20150316.ebuild:

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index a3f5a24..892e7af 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -40,6 +40,7 @@ DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9e
 DIST netbeans-trunk-nightly-201504270341-src.zip 207311520 SHA256 acf9098ac80b152d852b40943cbf6ec50878ee0d089ce4bf7666aab656303127 SHA512 344f9e396f20c463801b44a264ca55ba4d05c7c51f83c650f2a6ee9d4858947962db8a7d9f0ab1e77eb921c9d974dafd7cfd8cd641005c468d7511cbfe0be57c WHIRLPOOL 8b5915c7c222f965ac8848b198be9afe4b227d5e3bd87f2c391ee06032914af414aa1ca438a92262b0921f6918fb2135513a648adac56e0dee3ba236225f9dd1
 DIST netbeans-trunk-nightly-201504280001-src.zip 207313287 SHA256 4d9e7bce832a438a5a030d15d0c65c5dd930a81e910efe56a6e98302db7c6aba SHA512 6355cc5666f6cb654bae79e37a06e4ccd4637ea1f093cd6dbdc8d99a109e61de6e644a4e9489bf67d72f27ce6797c175f948244a2d80b59e0f43fc64961b41ba WHIRLPOOL 70666a34cb2cabab59abe6fad18f85cf3cac3c6bc417ac2b0098c881625ec8292b1f2edc6a606370ead0f491be39815022978156d09c4ebd927778f1f8f9291d
 DIST netbeans-trunk-nightly-201504290001-src.zip 207321088 SHA256 65f4b2406259c40afa0207688a0e3250ae12c9d160dbeb70ac0fedb68fddac88 SHA512 9ab6957708e2cf7848020f4a298a73b65422815d95729ebe294f77237fc0ae42f049ce26a149d1ff249324acbdda4842607d02dcf095e8e186de49edd8c45e9d WHIRLPOOL 7c7d8c960a1791dd0c743fe8c19a54cdde50043efbdd06e2a68140f370a82ef70321524f64e5ac649e738e64a6a01a1bdcf5fcdc573969decfce203d4dd8da24
+DIST netbeans-trunk-nightly-201505040001-src.zip 207344087 SHA256 a60787b743a7a09946775f22bf41441b8be68f9c9a8429c5d5511f6c1ded4275 SHA512 009013edfc9a6221591d3efdb0a2cb25ae68a919554d621c3bb4d058fced5e303586218c0c662b86f8c03f15819bf52ed4e9d66b89bd1001fc3f656d5fefdbad WHIRLPOOL 140b8f2e27d33a32d6f8fc9f2b797dbf5018dd716e62c752e1ebaf27edbd71972e57ea9faf67d243caf23500750cac87a5e0c970ae1264347c6b7f9a3680a46f
 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
@@ -66,5 +67,6 @@ EBUILD netbeans-9999_p20150423.ebuild 7216 SHA256 828f90dd1fa9106f4576de2f9ce712
 EBUILD netbeans-9999_p20150427.ebuild 7216 SHA256 be3ee4a2b3383442eb360729053227c5ba5c5f7b752775977dd8d0a52c983328 SHA512 c62ecd4f4122107927ec79c867b483e28da84c34d2d027b531325fe55f503153f80f0f74425cba50ede6a9c7c5d82e1ba556c64157f7c309206b249467f3f8f4 WHIRLPOOL 7cee809a3ac9514a5c88944f724ea5f4dcea4c538d46a402530535a7818e2e3ae48dc6d60fc05c845d5bb1efb2ca8c33ac0033acfac0add3acad70ac144ba8e1
 EBUILD netbeans-9999_p20150428.ebuild 7216 SHA256 b25a91f0f1379c46ffb3a25159b86c8e5ca3388c41e9356078548b9f78e44325 SHA512 5a192f0de1d4e2abaa365e240f281acf1822cd6fdef53d17b964427a4940d0ac2f2ebdc4b4144721e515fb47b661b7455978622af55922e73d04a40df7f7d95d WHIRLPOOL 583c7edcb67afc32a8919f90a22bfed00e6f9b266bd6f2a52b38f07919569d8f084702c84b7b444a0f6f45097f5eb4710b55f8a847e400d4a21395b7acdc7415
 EBUILD netbeans-9999_p20150429.ebuild 7216 SHA256 b9e9e7103dfa361d485d134d983b65c4373eb8289fa15c844609a5c7377d6695 SHA512 77a446f3eb6f57d6091918d32fc95d768958a8d2153a6c73f43e20c1d1ec6e73701d8c0f704933ecaa6452e1dcd46dfcdd5e3bdc7ff506574fdf25ebb5abfb64 WHIRLPOOL 3803d88c4ef2e211b76d14c33784c43f3bcff46889b10298b7266aeb1fbe34a9f177ceb52aa796576226230f804e16f4e30b848c6cc46ee4d93b763067c51201
-MISC ChangeLog 147400 SHA256 540896c3b4ef542a26bc9dc73fd149511faf73403e2cd4a74f1357ba30f29772 SHA512 e583d968f2284af6e774c44d93583c5c2cd493eeb700f93948f418916ee1113ca2933d9cacbfdc27e04452b2ca5e0c088de4d4ea1b66d6a7e83f7f8b0ab6f90d WHIRLPOOL e54c4b58ab0d6ef28ffa7547055c4a293f1f2da26a4670323489ae9761a2d81d70299090a01729a14d75d9db810d704350c5c732d4fd3568ad4afc7923595c52
+EBUILD netbeans-9999_p20150504.ebuild 7216 SHA256 fa2fda7bef963ff3a3be05a32415897f32e6ccecf533f3e5cd038a7d392b5125 SHA512 a7fed6e4d23b163f8a2c2ad55e751935d71b3d429ea5d1a40848778eaf3bc167a5e3b65652e27db3e7bbefa402f5f50e5cf549c9b549f250a5219ca75bd9f9ef WHIRLPOOL 11cbd4c96dcd568f0a999469a2dc10bde32a35c0ea6f3459c204c7dab5610d6b30abe04ee3f1354f05b08509c75acff6d6bde89b11295f540810af069364caab
+MISC ChangeLog 147559 SHA256 2a52981d8cc75a1d35ccd1c3ad5b2bfcd303e114f7653e54f028be0e0a813348 SHA512 d8dc9da3995efd7501b7152e05aed0d9259c0abb7d5efc609e4e875cd4ed65976b3d7adad12ff06303f12d843b59a76b267a6a682fb69db941d9130e7f6cb720 WHIRLPOOL acda48e71886f4de943a5d5257a33fe9f6ea9bdad3114598c20aab4d0fea1ba80b9babd799e3f01b16719d87def4993a9ae68c8ac47ee94bc3e9caa489a05256
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

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

commit:     201cc9ea2955d730f2066ca17893f0dd628a8b7d
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  5 06:34:51 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Aug  5 06:34:51 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=201cc9ea

netbeans: removed obsolete ebuilds

Package-Manager: portage-2.3.0

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 0f15df0..5a0a9de 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -3,8 +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-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
-DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844efa871baadaea93f02572d7c43164130d7e7dea58e5a1d421232 SHA512 d7e869bd42a00a40030c012fb895ae358eafb5039bca76ae626eb5b0dd2ed7516cbedfd6d0336190e72d7a0ddfa4c6d4ce759085cbe05d38dbf66b52806b3e16 WHIRLPOOL e5430b55c5685d1a1126d60cdeffb535d673200d7da1638f8085969b81ddf42e619ba2d8b92ce01c59edf990f6c56721406a9f04a5dab6e8d81fd135235f8648
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
@@ -32,8 +30,6 @@ DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0b
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 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_p20160627.ebuild 3384 SHA256 cafb20753781552fa43f0b09ba11712fdfc6cfd76c1a2b4179f588c3572258dd SHA512 85b7e2a07cf82d1abba314f8ab19e3add7fb913d98dd0a3b26a0bf7fa10c82c6dd5104e437078c9e1b07d9f7e6a1c7c0ff6082abfd27f270f3221f2cc551453e WHIRLPOOL abd3451b3d769f6c6ab0bec5395674c32a199be5c5d03c33a3ddf586351e137c1ad4015f133b0ff2de32057d6bc9af192b96480b356011f88c19b03a63221085
-EBUILD netbeans-apisupport-9999_p20160628.ebuild 3384 SHA256 d093e9cf6916a4096cb2736b9709177296fc91de4f2cd4e1d0e8ec3c984724e5 SHA512 84e76376aef57d84b499d6e0c85b7807c1699bbd8f32bb1fc259cba7f00b966ded6d543d82e5acb675044a2b9ad23654b444c38c14f5ec19f763328248653493 WHIRLPOOL 82e1c75564815e929eabc5ce9fb25d149c3d1f3084ca00ffb733148a8d0081df82f9ed0daa1ef36c69fa5e8f58c6ca69dc4475b5f1f957091503f8d12f661ef0
 EBUILD netbeans-apisupport-9999_p20160629.ebuild 3384 SHA256 3fdfcf8f51c94feebff30161abaf8596121dff51ae4a5094dc34f3024daaaf08 SHA512 7428e5a53211d40fea6c9d9d586d463b24ef903b91f4b72da6b82952341ae635932797a68cc95f3cd1bd6af246be2896fc94a1bf8092385b35429db7c005d84d WHIRLPOOL c6b26d3994d587f3f4d8e67a51810e8e8060110b806725d726117197f5966b6006fc31be3eebe63db6ba3887a21f8a2e59289e1f11451cad497d233aae06e50b
 EBUILD netbeans-apisupport-9999_p20160630.ebuild 3384 SHA256 c0b6d124da980cd4d2a690a2029b260f2147a12e827b957a9f2608090635a6cb SHA512 43f13339305c6b25df318a6f9754cdd1d847f952a3176b80f46c8883e4bb5a55a9c8695472267792e926f0f883e1670cd27865cffc622fab3d8d59498905273b WHIRLPOOL f4430df4b3bf4d26f5257e9f35274cd9644ca940a38ea5cbfcee03efe71fd64e25f45363a0c039e6de984788d8669828ab89d8348c5fbc40cbef2daee6257c64
 EBUILD netbeans-apisupport-9999_p20160701.ebuild 3384 SHA256 23ddf90569b909e034103f3833b095c9b80aa2ddf369b8447e48c837fc615e8e SHA512 d32cdc40e4e928572805643841606f69e5517e8e010561b36c50dc6890524bed236ca442d8718149ff6dcd65e7c8412ed4bdfbb228e663e1eba4197c79c53953 WHIRLPOOL 18a0b2e081835ab23b41e2da27e91b4b217f80deb3b8f4e4b2e01470219d1b2f46ff43164d016ca214d2b9f5d1fcfdb8d3f32297e1b078edbeb86667a015a3c2

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160627.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160627.ebuild
deleted file mode 100644
index 537720a..0000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160627.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-06-27_00-02-33/zip/netbeans-trunk-nightly-201606270002-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-apisupport/netbeans-apisupport-9999_p20160628.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160628.ebuild
deleted file mode 100644
index c0a5728..0000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160628.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-06-28_00-02-33/zip/netbeans-trunk-nightly-201606280002-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 e426f6c..391f99f 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -16,8 +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-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
-DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844efa871baadaea93f02572d7c43164130d7e7dea58e5a1d421232 SHA512 d7e869bd42a00a40030c012fb895ae358eafb5039bca76ae626eb5b0dd2ed7516cbedfd6d0336190e72d7a0ddfa4c6d4ce759085cbe05d38dbf66b52806b3e16 WHIRLPOOL e5430b55c5685d1a1126d60cdeffb535d673200d7da1638f8085969b81ddf42e619ba2d8b92ce01c59edf990f6c56721406a9f04a5dab6e8d81fd135235f8648
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
@@ -45,8 +43,6 @@ DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0b
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 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_p20160627.ebuild 4790 SHA256 f05d34b4cdfdd349f7ba75085688be31364eb73ca0ff759457289a3aa67da52b SHA512 8385f2ea862f5a4800995844e413e24be3a22a25a15b5d3e9315a3f538622b6bbc6551cb36902cf84e93b19a7ebf2e675801ca81c8b5808351d0fa879017f390 WHIRLPOOL a5512e971dc695387f0eab7248eeff5130bd437e6b960b054e92fd684138b6f5f06faa88671005a8782fe028444fe049d9bc0d5fc703d4cc27182b8b307714f8
-EBUILD netbeans-cnd-9999_p20160628.ebuild 4790 SHA256 3469d0cf8dc53cc5d9d6fb077c45c8a56505dd4a8a90725f04890dcbb71c1b33 SHA512 6b21672564922bc14808a24dbd39f9bbfec94b7465b021be768f59eca4787fd999cb60db3e44f27fa23cc398424cfceefdb7df3ebf13a8754fd9684411f766b2 WHIRLPOOL 047fbac6a4c7c0f983807ff63a760ebe85de3641ef0aaff5811a385866884934fa53236dc3d71b12fbe6c6cfa142f341292c1956d76a4c22152ee5ae0b69e768
 EBUILD netbeans-cnd-9999_p20160629.ebuild 4790 SHA256 3947dba3a41d59419448c102176ec03d42a202cfe2581c69c2e43b55665f1230 SHA512 726f246e63511149d5745dbb8e69e3d7627692c2dad034b890afd5e947c12b8aedfe0bbf1f349a4b234f01ccb0357771f11fb8e40c78026e29493fa583894731 WHIRLPOOL c681e4673b980acb05a3eb7a1cb1dfdefdb63e7bc8b31964fd2d07b3f3fe82b38509a4ef88b5a0e9b11807c0adae1702761f525944b68b311a5be1965f883a1c
 EBUILD netbeans-cnd-9999_p20160630.ebuild 4790 SHA256 4fbd1088c37f203ef0bcf1fff49366a6d8fc6865ac02afe0bebebf8a84403332 SHA512 f2b297e1abe3a6987109384d2317d541320f25a125026dca43dc5b8041725c4821ef1d8df585c01fed6d35940cc64d2e5eb2e005f8d2502cbc47f18dacdc71f5 WHIRLPOOL a485f8b5b39f034af07dd830ef01f746c7a7fd8a2cc33bc910e2e26b2ba6d4325ecc73c51637d251a754dc79b945f4d4f115edb6829efb06889221f132c76944
 EBUILD netbeans-cnd-9999_p20160701.ebuild 4790 SHA256 2408eb3f64253d3f307d2c423a8a161a6bfbc900aeadda0f277d60c2ad56762e SHA512 7c7f8739a628fa9a76cf835c7a535bb02dc20fefff441085e98be115c4bfd70a68027f414f574a8691dd67847d177af11446830a329c42c99fde9f890e433bc6 WHIRLPOOL da6455a33ea8a7022491ff6b2bc4b07a58e1d811b8a6e7ecf199085bbef0185f7a515beb1f8b14335f7b4e6ec8f44f00893f3c1be371ade69b3fdfd181b16b00

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

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

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index f4006d6..a22fe77 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -6,8 +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-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
-DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844efa871baadaea93f02572d7c43164130d7e7dea58e5a1d421232 SHA512 d7e869bd42a00a40030c012fb895ae358eafb5039bca76ae626eb5b0dd2ed7516cbedfd6d0336190e72d7a0ddfa4c6d4ce759085cbe05d38dbf66b52806b3e16 WHIRLPOOL e5430b55c5685d1a1126d60cdeffb535d673200d7da1638f8085969b81ddf42e619ba2d8b92ce01c59edf990f6c56721406a9f04a5dab6e8d81fd135235f8648
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
@@ -35,8 +33,6 @@ DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0b
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 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_p20160627.ebuild 2968 SHA256 7fd9685273d8d68ae9cec2f93e2419f3ac65ac9990e1b9a7a63fe0811897a8a3 SHA512 9e4f6d9cac819b49af0f2fdfdde5dfe645efbf2320970319ffb20ed1efcf2de7c05aeffa8e37475b3d8e650a6ba23eeda90468f3fbb45a9674e56ded22167af1 WHIRLPOOL 08e8f72a67bd7f0d728c1178c79a830a0d4091f486ec935f34e18502abf4d7286b1371c2e84f2a48d0a998134cb84215e8beaafe56fbfefc7e0280b02345c9ac
-EBUILD netbeans-dlight-9999_p20160628.ebuild 2968 SHA256 61b97b5463c8df3ff13b78fd9e166ffa850f69534e7c2d1f77d85fb2a0682d72 SHA512 a63c45792893595ad97b09b8133d3c42e7ef87f0c6f44ffd73e81b0c5572ba6cc02eb882fe187c574cbae4c0e0a5de6aadef27c424b6d203ed655ea86d6ee390 WHIRLPOOL 319eceb445044ed09af28ad85a552c9e983bfa4772885f2e767a21a2ffce2544971157cd96770c6e2b190d59c8956ed44d8666e2501dcb0b111ffb284a1cf4c1
 EBUILD netbeans-dlight-9999_p20160629.ebuild 2968 SHA256 9c6a5702731dd8d67223462b16d07c889cd18318f4738fce2cbca0a52fa40afa SHA512 530f7d5d9089173f25d1dd19681903e396b80db9d46b17202615e1e3f4cecf0040124d247ad442de1eeacf8205dce08bb4f18749ff7d8efd09a11690fdfdfcd3 WHIRLPOOL 18fea7b2e26ef4ef2457ce88d26e35298373f50ccabdbbd118d3a054f8695aa6343e6e26db392053791e516e32aa1e92b211d8d91d27137b09a7b7e5856f4897
 EBUILD netbeans-dlight-9999_p20160630.ebuild 2968 SHA256 151f88f9c269e103fe3a319810e477c10414b25f772c39150055779ae1e5013c SHA512 8108cca35d437cf6a0f790e8b404ecce4a7194ac07b47e246dd0e1d69e5ef409bbc6a7effb16d72f3afd3774aeef329d7ddf96dba20535b072d022ec14d53bb3 WHIRLPOOL 3f1086fd3be26688fa97dec41e0e9bcbda0d662bcaefe9c8738aa39d9a8ca1024273ce87eb5f7d2c4c3ff9a1473255cf39b3abe12a7838d9f6bc54ca38328014
 EBUILD netbeans-dlight-9999_p20160701.ebuild 2968 SHA256 c42d40f303a188eb4eab79422cebd86d57380ad3055bba40519cc673fd04fc93 SHA512 5d19b80f6599808ac4b1d228b3e51d294ba2f8a10a78bf8671ee7aaf5c6cef1210019c573ae3ab4c821c0da6571200cb9c175c12b2142f601dc219045c827857 WHIRLPOOL 1f89275128b17e0733ab61dab34e9ce032e7e215ed93e9681d9a145e986cd8b33459e808fe7cc776eaeaa6e3eddf71d6ee6dddf293ed0c91d3c10850ccedfa07

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160627.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160627.ebuild
deleted file mode 100644
index 96feb3f..0000000
--- a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160627.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-06-27_00-02-33/zip/netbeans-trunk-nightly-201606270002-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-dlight/netbeans-dlight-9999_p20160628.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160628.ebuild
deleted file mode 100644
index 2f6a683..0000000
--- a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160628.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-06-28_00-02-33/zip/netbeans-trunk-nightly-201606280002-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 7ae3af0..be4fef2 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -35,8 +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-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
-DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844efa871baadaea93f02572d7c43164130d7e7dea58e5a1d421232 SHA512 d7e869bd42a00a40030c012fb895ae358eafb5039bca76ae626eb5b0dd2ed7516cbedfd6d0336190e72d7a0ddfa4c6d4ce759085cbe05d38dbf66b52806b3e16 WHIRLPOOL e5430b55c5685d1a1126d60cdeffb535d673200d7da1638f8085969b81ddf42e619ba2d8b92ce01c59edf990f6c56721406a9f04a5dab6e8d81fd135235f8648
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
@@ -64,8 +62,6 @@ DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0b
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 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_p20160627.ebuild 15825 SHA256 4bbec74b5aa599919e345d9b2021417e00560165648b9c030dedf482a48cdf84 SHA512 895d045cb5c28b36323f83cd23435faea56dbb31da0cebc8f2f02bf50a6b614e2033d374023ae9641d1aa3db00891a48e40091f13060567fec98fbd02bae3f90 WHIRLPOOL f55cb1e1a7ce262144be804649f721c29d2f5f7fb28851dcd5e1d4f87d2881443639acca2ac0afea411811684244920badb72ab6e197668d13e58a131dd9cacd
-EBUILD netbeans-enterprise-9999_p20160628.ebuild 15825 SHA256 c51d5097dd3efce0350470fd0dce927c182e8106ba37e00a64ca38aa47297ae3 SHA512 d039f812d5835222de6f08ba0e021c9d650de1ae1b4be05952c0c5c76930c40636c773278c4e372c6e7d69a3c0b884a42f46fe5db1100eb32706011e773ae4cf WHIRLPOOL d9238220c6f80480c6605b6e175f147a5baeb1d0d322daed5f6fd2927ebd8cdda6b6931939fed5b29cae0998cc82a2ec51645b257d0bd8e391406c3950c4072e
 EBUILD netbeans-enterprise-9999_p20160629.ebuild 15825 SHA256 11f57bfcb0e6c75c5b6db35bc5287fb9ef0962faee72895d733e02182bbfcd04 SHA512 89e2c89a917a48198a2642e83e3f9e84b07c19bc9b6e4ba4ae96f831fd210a55bcb101614664828ee1df3167fe84a0372d326b13b248c5b5c09b7f41b732a99f WHIRLPOOL 9206c61df238922a70e4647cb8cd15971a9962ce70f4692d3e47b841d9fb4a89c54ce21307a50fcfc71bb4c1472ab3413575e7c935df6d8102b89abce1e53eb6
 EBUILD netbeans-enterprise-9999_p20160630.ebuild 15825 SHA256 bc6797d11f7ae5c6fa0733383639e2009ede80a1e0cd3b97b4ce432a340a598c SHA512 1b0d67dc1cb7a7b7a5d5072fbf48f6be0e35538d488e97a79b07a9a3ac8265d7113c0c6f97886c624c56089fa050a21962e8ba35f6f1b4b944e62a60688b8b67 WHIRLPOOL f0701486928212650fe3e287e6460999a109d913cb8b35b9e6262a3e6b2e90e7ed8ee35b16cbd68499dab3f82a3b8837e9b4dedd5424e4b5b54b0b018a575bac
 EBUILD netbeans-enterprise-9999_p20160701.ebuild 15825 SHA256 972d11302e41244601dc8bf7b9a7de574fe7d7536f87c507e79077c367314e45 SHA512 36c7a9637ae9c73de230cb361efa06c85262ba2d4d9dc68cc9c2bcdaf35826d664f05aafb38ebc0792d89e15e88ef72519bbe832ce38c9519c1dbc4d59e85d70 WHIRLPOOL 5b4cf8f2b40c641a44ab8b6590d5128fc264d9881d618eab5ad5ad8158a436cafd731cb0083e82ffe7e9750681d53d5f528a730a0763df67fd2ea9e373b4c9b9

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160627.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160627.ebuild
deleted file mode 100644
index 8fa6671..0000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160627.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-06-27_00-02-33/zip/netbeans-trunk-nightly-201606270002-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-enterprise/netbeans-enterprise-9999_p20160628.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160628.ebuild
deleted file mode 100644
index 1bdd519..0000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160628.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-06-28_00-02-33/zip/netbeans-trunk-nightly-201606280002-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 d43320e..7f1e7ca 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -3,8 +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-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
-DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844efa871baadaea93f02572d7c43164130d7e7dea58e5a1d421232 SHA512 d7e869bd42a00a40030c012fb895ae358eafb5039bca76ae626eb5b0dd2ed7516cbedfd6d0336190e72d7a0ddfa4c6d4ce759085cbe05d38dbf66b52806b3e16 WHIRLPOOL e5430b55c5685d1a1126d60cdeffb535d673200d7da1638f8085969b81ddf42e619ba2d8b92ce01c59edf990f6c56721406a9f04a5dab6e8d81fd135235f8648
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
@@ -32,8 +30,6 @@ DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0b
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 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_p20160627.ebuild 2913 SHA256 6d60db206ce50a1eee95d3da37089c61e17775eeba08c15b5f0c3bb5ac282ddb SHA512 75a922b8c6a5268a52abd5f32d4e430aa60c40c906e0ddf5681b49edbf947a029bd661e56ad6eb19d3c82fd276cfcbe69487f079f477b431410dd4cd14597295 WHIRLPOOL 1933b4d6792bee6a8a1f10745867b83a0632ecebefdf45221d29da4397fe5dddae1c7ebfc8911d22d8ac48392b95618563c16c1632796650670e3c975a110d2c
-EBUILD netbeans-ergonomics-9999_p20160628.ebuild 2913 SHA256 083a2230fb97cdc75ebe1f25441f1a04efa503c344db897ae379cafa7ac043ea SHA512 6ed53a9808e6ee0158fb1caadfbe1e25c5f141b0e52689b3f8b71cb1932d41a953c63a7c1c1701ded90f7195c9c2a20088661b8481a280709e3fcb942a3c285e WHIRLPOOL 030e01dc0409bde7c4e1e0d5aac9542c4d5eb715a2a69bedb737a3304f3604fa7e7c020173121c2053ff060e327024208788aff8c1c84e1d8ef83475eb66741c
 EBUILD netbeans-ergonomics-9999_p20160629.ebuild 2913 SHA256 13940f982e267ed269408cad3fbc8dc90ebb9159f2edc60633c7742b24da5ce7 SHA512 db512c205ed6539b19ea670783b268630a7fafd4f755c999e3e5e17a8fa0bb336f6d9842183a1cf9d3f046a46e4a649174437c99e78ae0b840d3acd31a8f12f3 WHIRLPOOL 42be192d17e6f9977d68c5b85052cbc4fc6c62c548e007fea8cdafa322e725c83ceaf3172c1335b4e21d1caab1ad2bb55583bd276eb539aa58cc0cefd3deeaa0
 EBUILD netbeans-ergonomics-9999_p20160630.ebuild 2913 SHA256 d1f52c185611e0203dba0b6653d18805a93cd83cecc09bc90a95467f325f3d37 SHA512 f4b30de29908f98adf987f70ce6ae99879ce0c625b65719652a89db32cc38670878041e4089a108fda8ccb1e6c7c99280383d1687aec8d6da120625547f5c2a1 WHIRLPOOL d81aea7642c1c197b7ce214a9784c31d10cca10dabe7111babe3afeb48837b4a91e168bae55b6f50633281a312abda514226e3ba2533707c0d7db1ab259f14c2
 EBUILD netbeans-ergonomics-9999_p20160701.ebuild 2913 SHA256 3a18a7f12e35e887afffb69d4949102032578c10cfd865d1ba4e76368abae25b SHA512 635b3424c39000343302fbf4e07d48f1275b42c6ae24e4ce41be3f1f5f3752df92e5b963e066d8fd087f2330dd4f079bdbaa6caf6a75bdfe9eef6fd9fe1fc7e3 WHIRLPOOL f0d27ec9b86089d603cab707736ffb77948ce8f0094813314f25e82c7fe94936f74385f9d611c4c44d44c8f2436ef06ec661d62a48e9f5f73872da065d5f14ef

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160627.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160627.ebuild
deleted file mode 100644
index 5279052..0000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160627.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-06-27_00-02-33/zip/netbeans-trunk-nightly-201606270002-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-ergonomics/netbeans-ergonomics-9999_p20160628.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160628.ebuild
deleted file mode 100644
index e9b0c8f..0000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160628.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-06-28_00-02-33/zip/netbeans-trunk-nightly-201606280002-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 c334aae..c80974c 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -7,8 +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-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
-DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844efa871baadaea93f02572d7c43164130d7e7dea58e5a1d421232 SHA512 d7e869bd42a00a40030c012fb895ae358eafb5039bca76ae626eb5b0dd2ed7516cbedfd6d0336190e72d7a0ddfa4c6d4ce759085cbe05d38dbf66b52806b3e16 WHIRLPOOL e5430b55c5685d1a1126d60cdeffb535d673200d7da1638f8085969b81ddf42e619ba2d8b92ce01c59edf990f6c56721406a9f04a5dab6e8d81fd135235f8648
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
@@ -36,8 +34,6 @@ DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0b
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 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_p20160627.ebuild 3377 SHA256 a1f35439d93238fe2e8f80b6e95e17aab6e1b6048a20980279673d55d804edd4 SHA512 459e52e6e76879087ab2b3c5d80f153bc45e3489a77330d4026555bcf659d1e90952fb8affcab40f0b13a5f6069947a310e2977187ed69316f8a79aa7b40ba9b WHIRLPOOL 5aa65d0ca5659cf37bf4cac1b548a2ca53613303cf80f8ece263bac536bbac549aa448e761ed5e426cc705e493e98719156eae3306d7ec367e1449f53047527b
-EBUILD netbeans-extide-9999_p20160628.ebuild 3377 SHA256 9a3f1a9d41a6f420dc7e581dc55ba4cd7ec71b9393311990a8b784df0e6d996e SHA512 45bdbe586af233661530cb3d8da3528ad8d1602cbaae6166713e378ce5cd8229a704b29f0e1356e0a9eea192604668437a89f3371fc29675f4415a9ac6a9fb42 WHIRLPOOL 7e3267f706be77336d46a1fbabdcd931cce91af7e19d7aa2a35372648d214f1bc3e0e2447b29ae18f81624b6904989cb3e031a3cf4861332708c43b5aa072519
 EBUILD netbeans-extide-9999_p20160629.ebuild 3377 SHA256 3170816d19c52c4655d6659fc0e5c3d1b3213051f8b57af1aeffcbbcfd9d860a SHA512 8dd8d4fda80dc6f215ebe4b2b2cdd25bdb7c4258f1452bf6715375d9f1f17561f914c0d7f9285c288bcf9673ba34c34b51a4e0f0660b9d68198f49fd4ca72696 WHIRLPOOL 26cced4c04ca73c74d87db2a864957845405ddc57ff540584b867c21bac3ab36e74667803218c0bf5962eb998caeba1820e73de54624b5e021c50bc692c8a2f6
 EBUILD netbeans-extide-9999_p20160630.ebuild 3377 SHA256 0d3c6af9a0e8161b3fa0b9b60c262ab5117d719f885486bdc4e2081dadbf63c5 SHA512 930b68b6f394bf920db722250619530be4deab7d175df5093d1f44b98633d4c31772567ef3944210f66fda68723d53e9e256a095a13f643bd468ba88204c3d93 WHIRLPOOL 2abaee375b4b3896b2732b5f7efdcdf97bc2170f21849cc720adf9e66154c2c33bde50553cce66889b951fe03b3ceb9bd00b25717b92ce9c27e40b9ea7f69041
 EBUILD netbeans-extide-9999_p20160701.ebuild 3377 SHA256 ccc4f9c6cb22ffd678ef66f6b60aea2717f8bfa18abf5c51da28c8a72e76236c SHA512 c9ee93605a215518e4f0b68e007cb78f7767913fb4d4b39f2468aef3d0d9cc06578f388f6c9431e105b0f72a1219742838da04c1b80e5b04e015b98f23f63dad WHIRLPOOL 71bdc5a14c664d4344b57e408ee55a0ccd83d06cf70f61a266841f740ee37195a9fb2104a2b574a625fa29c660530919d27209638eb817e94c23ea75c67c0270

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160627.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160627.ebuild
deleted file mode 100644
index e692ed1..0000000
--- a/dev-java/netbeans-extide/netbeans-extide-9999_p20160627.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-06-27_00-02-33/zip/netbeans-trunk-nightly-201606270002-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-extide/netbeans-extide-9999_p20160628.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160628.ebuild
deleted file mode 100644
index 7d5adf3..0000000
--- a/dev-java/netbeans-extide/netbeans-extide-9999_p20160628.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-06-28_00-02-33/zip/netbeans-trunk-nightly-201606280002-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 68d11df..c788bca 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -5,8 +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-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
-DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844efa871baadaea93f02572d7c43164130d7e7dea58e5a1d421232 SHA512 d7e869bd42a00a40030c012fb895ae358eafb5039bca76ae626eb5b0dd2ed7516cbedfd6d0336190e72d7a0ddfa4c6d4ce759085cbe05d38dbf66b52806b3e16 WHIRLPOOL e5430b55c5685d1a1126d60cdeffb535d673200d7da1638f8085969b81ddf42e619ba2d8b92ce01c59edf990f6c56721406a9f04a5dab6e8d81fd135235f8648
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
@@ -34,8 +32,6 @@ DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0b
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 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_p20160627.ebuild 3416 SHA256 627ace0d9803f4ad6bbe0fbdf1a8145a1d826d7175944cb35b22634b131dc7f9 SHA512 41ac61b8f0ca65fa04500882235ebf056b441822a29d5e8e397e43d34904de1cbd862f77537ef99d652b1ab52537d3d96f8512f9017da3006531b5d6fa100170 WHIRLPOOL 75be63b355ba9ad881cf9235c70f89b97a2920608ac66a34d7133d1747bda30c448cc6eb5edea3a3aa95af77d7a517024678bdf68d7d6871a390bcda2e9f541e
-EBUILD netbeans-groovy-9999_p20160628.ebuild 3416 SHA256 227f993a830d5b655d17b6bc0411b592656a6380a3b178cfcd96da943d8bdf20 SHA512 ceae6009ddafa42162dc5e9f3b02fe4bd98348d9c354c8439b25e685f5480712d753085e588fb230fe15bf270e7ed843d930ff4926685ca35da0913b3d197d02 WHIRLPOOL 3c2b6af26dcb4a159febfe4c1e2d3c0c320a863f5f99c10bc66e7803380677c8af0844797eda815fdd12725214d3ea97dc15dfc50c39f3df4560846b2c9b7957
 EBUILD netbeans-groovy-9999_p20160629.ebuild 3416 SHA256 b9a83d04dd6f79e5ad9aa01c9519da1e2087d2365b14a07dc98ff5f13a8a20ff SHA512 c8d2ea2b8fd411aff0dfb534e1742f91ee9fedf133636fb8a128cc066b0924466b910e13ef5d616dffd045e383a30cfe4fd7ceb73d5997d665660d99ce25bd7b WHIRLPOOL 7c9bae88294805c2bb98fe6de1675a533a009c4bd1537fc986c2ff63c4b606e1a2386f55ddb3ec5298b84edecdc0e69c809582b752ceab1df4b06d3d58f2c8d6
 EBUILD netbeans-groovy-9999_p20160630.ebuild 3416 SHA256 9ef9707035ebefaca0a3ec2c8aa6bdb934e77456ef96a97eaaaebe82ecaeb172 SHA512 a3920b6427d5cc808034ccaea68ec67c599d6369c99276c0341be7640b71761041cbdd4f3a62a3317ef4da638a32b8bac1238cc197e53f6401797b7a3a8e15a3 WHIRLPOOL 03b8c56d92f037ca96a7e90849533638d03172149745f0d0a680e43ecdc6f172102622561b2662377f355a5a16348c025b87ab5a8a1b444dbf4d39cc5a768b56
 EBUILD netbeans-groovy-9999_p20160701.ebuild 3416 SHA256 ea0bbd8112d5bf8d41e44b5bc43a1d9444ed551a37cc0618000e502a0c0aea9d SHA512 ec83732bdfdd2d2974f492048f746d2ebcf359a601d3c2714d744901395fcc2c11704698bea7beeda7062c063eefec1cae2f13ef307d168dd34c15b0e2831e7d WHIRLPOOL af3d6b95378cca5c6b8d0ecdfbe3ae74e1a9fc57e9ec7543f7f621628df15aa24b67b6a667e573ffbb2951423a01fb36adc3dd8802672b1ce417d1c05c1bcef0

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160627.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160627.ebuild
deleted file mode 100644
index fc7254f..0000000
--- a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160627.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-06-27_00-02-33/zip/netbeans-trunk-nightly-201606270002-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-groovy/netbeans-groovy-9999_p20160628.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160628.ebuild
deleted file mode 100644
index 2e1f670..0000000
--- a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160628.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-06-28_00-02-33/zip/netbeans-trunk-nightly-201606280002-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 90fc33f..2c4f302 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -8,8 +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-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
-DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844efa871baadaea93f02572d7c43164130d7e7dea58e5a1d421232 SHA512 d7e869bd42a00a40030c012fb895ae358eafb5039bca76ae626eb5b0dd2ed7516cbedfd6d0336190e72d7a0ddfa4c6d4ce759085cbe05d38dbf66b52806b3e16 WHIRLPOOL e5430b55c5685d1a1126d60cdeffb535d673200d7da1638f8085969b81ddf42e619ba2d8b92ce01c59edf990f6c56721406a9f04a5dab6e8d81fd135235f8648
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
@@ -37,8 +35,6 @@ DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0b
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 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_p20160627.ebuild 4126 SHA256 38bf8dcd9133256f5d299cf86e47b5fe5b5a16025b733cd8897288ba03afdbe0 SHA512 f921fc694b28e3b9ad7c385af23c733d89a814deeb03335cae2a9bed6cfcde3ba27b01c9b55f9651bb8ae0e34108448a2914f47e8887f6d85f552c11ec8cb8c5 WHIRLPOOL 8d285a12a9c91b8a6767bd0a826bdd6028a6dd0df69d3797e72b671690983f0bd0e8fcae823bfd91b6827d3d10230bdf03cfe43c49c25e5dfd02a0e9fc86b9d8
-EBUILD netbeans-harness-9999_p20160628.ebuild 4126 SHA256 349e123741fbf8e943b011356320801f538fe1e2e933020d066a87ece2c787e6 SHA512 b11c14c1ab2494ad8ae2375bcdb799c569b0e322ab03b962ebeb9c6d18cc9441f73ad9b42cd543945094030c4efc38e372bac84ed1640fa3646aa765fb53b89b WHIRLPOOL 5103bed540597b045e618b55050aef8ecdfdc850f42bdf71a13ef3de25d0cbf06ab8ccb3fe18317bcd0c8fa5e6dbdb3a4d6c9bbe17f9c676260771ea72d2ec19
 EBUILD netbeans-harness-9999_p20160629.ebuild 4126 SHA256 34ca6fef3595b72a03737a92c6b15f8875c2820b32cca229f19ef8e3d1be88d7 SHA512 4e49f975d8db981e1e55eb67e92bc5145e972cabcfb8dff452ffb1459ee26f0befe64b739a0b5938a25cd84aa36d687dd235d85623cba4e94b333e08f48fdeec WHIRLPOOL 743e3b95b6221223ffb18df4b93d29935b7e1bae4855cd0c7f3e0440f6bae666814c94554559985c92454d467c4c219044b1bee8a26705edb120efecc6739550
 EBUILD netbeans-harness-9999_p20160630.ebuild 4126 SHA256 1e20afd829afbee3b5383b89eb72c5f8d2cb5434b8ae07d69a35e2ef62766fb2 SHA512 680bfad181ae0dd712d628b778e4b5a1127ec47ff5b420dffd89719a43251dd0bbee2759f1f2026d04b75bff36a268a81d61b1215ace2a10b6acc50dd6a7a75e WHIRLPOOL 36b1bc8e8f1d97a2dc9888bb607979882a1e2dae6b08c585fa85beba0447ee2eda06e2384f3b01c0e81d8499c385c56e43f09e52fbb8fb882d5be8be5661a343
 EBUILD netbeans-harness-9999_p20160701.ebuild 4126 SHA256 556fb4c378f146091a5449097c6898309dc7e95890009f162e69e058cda113a0 SHA512 99d11f7e1e61d132dcc4693cb65b4921dc907cf8a0b9489beb11510f879e3d102c79608f37ffffce185c198c2dfb99318f37f4e0ee10f0af305e478feba69ee9 WHIRLPOOL a8c8c124e58b393e864c2ed054891333d6141b170e3b40abd87cdfe7ef42763b47bd7f748ac9b98d1a2646697eb3f401433d2f5d96ce96144addd30c4a7e51fa

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160627.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160627.ebuild
deleted file mode 100644
index 879b9f9..0000000
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20160627.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-06-27_00-02-33/zip/netbeans-trunk-nightly-201606270002-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-harness/netbeans-harness-9999_p20160628.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160628.ebuild
deleted file mode 100644
index 83709ef..0000000
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20160628.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-06-28_00-02-33/zip/netbeans-trunk-nightly-201606280002-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 8ac3283..27d60da 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -142,8 +142,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
-DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844efa871baadaea93f02572d7c43164130d7e7dea58e5a1d421232 SHA512 d7e869bd42a00a40030c012fb895ae358eafb5039bca76ae626eb5b0dd2ed7516cbedfd6d0336190e72d7a0ddfa4c6d4ce759085cbe05d38dbf66b52806b3e16 WHIRLPOOL e5430b55c5685d1a1126d60cdeffb535d673200d7da1638f8085969b81ddf42e619ba2d8b92ce01c59edf990f6c56721406a9f04a5dab6e8d81fd135235f8648
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
@@ -171,8 +169,6 @@ DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0b
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 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_p20160627.ebuild 29867 SHA256 b08d643a6b73f16d73d4d0cd7148ec71e333a1199b01a03f637043a5dc71e432 SHA512 f60c4e606c1d7efbee98356f5e39fa2bc0eea4a676342e244e362efa91ddc4b66df90645846244580dd58a994f95d4aa55499ebd50210ac0e7aa7142196625df WHIRLPOOL 6b134d56033b9654b2cd4df48ece779a65feada24da904a14b7bd3b15e158902de1085ed9d4174695b538c44b99383c0883e738e99b6d82c1f2669d0bcaa7f70
-EBUILD netbeans-ide-9999_p20160628.ebuild 29867 SHA256 9db76b0033ab96966ed4aa50fe8cb36976fd6fc4a9d1375900e834ad2cde1168 SHA512 0679950086c5eeda841cd4d06e3584730a417a78575057dee9708f34372ad9eae2bc6cf6f69a3d17933b9283356959d0fe7cf383d504c572ab1cda7eeee34770 WHIRLPOOL d2c9079ffc49c9038d5bd5c4ab5dd941bf4afa35108ee64a10549838c83b2b4ec31e43a4a28e409826d48243c26fa0e686a6ca5c085eba9aeeb020ecc640de21
 EBUILD netbeans-ide-9999_p20160629.ebuild 29867 SHA256 760997dd43b5afbea24aeb5132459f93f607110bb15155b010c2626dd65568f8 SHA512 474343f31eca8eab0b6bd9bf029519e1e904909ff45925cc867f9e96e6a39bce2abc82a1af63729cfa2ccb0340dc8ea85994500629629e11a194acc2b6718604 WHIRLPOOL 9c0fc771f3cc4ccec359307d9e5c9a20d5666b82e05b3deb8c85e511b099601f840fe0280dcb583959d95e1514469bde45442591a09e336855ecc03020dc7a3e
 EBUILD netbeans-ide-9999_p20160630.ebuild 29867 SHA256 4430d70cb7fa21c71b8ca406cf82ffab4608487e74ab3d45e09ddaec795a15a2 SHA512 f23eef33aaf47f0e71722965280dc742dea2502d9a91f224a16541c70851a5352603bda4657257f9e7071bc6940c34c6d37bf3e53c12e16db5cd2bb54e2aa13b WHIRLPOOL 24189670d441eb2a8aefb0c35a1af63ae030873eb373fa12183e5c2b127bf7d3cd933df19d14b8d65fb8dd58bf08a51ca133b01202f9b48a2a07da4e61fffdb7
 EBUILD netbeans-ide-9999_p20160701.ebuild 29867 SHA256 dd31ada77eb33d9ec31d6b157bc0e47b73a2c3821d4aa8797bfff8cdff853d0c SHA512 4183db5276dd53946121d309fdf0696e011bf52939161819117aea6afd2b25a735559920205636ad1c5754da4c10f0e874ba2f29942ea84d82e706b7b752ca02 WHIRLPOOL 3884a49c0303bc1e77a50d772c22018601d17b51db51b28c361ce71e431e8e343e1157696b1cc31b7d5aee2b45d2362a9189c9df7e71ddf749048c77d7e532ce

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160627.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160627.ebuild
deleted file mode 100644
index 2fa4d6c..0000000
--- a/dev-java/netbeans-ide/netbeans-ide-9999_p20160627.ebuild
+++ /dev/null
@@ -1,374 +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-06-27_00-02-33/zip/netbeans-trunk-nightly-201606270002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
-	http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
-	http://hg.netbeans.org/binaries/DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar
-	http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar
-	http://hg.netbeans.org/binaries/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar
-	http://hg.netbeans.org/binaries/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar
-	http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip
-	http://hg.netbeans.org/binaries/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip
-	http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
-	http://hg.netbeans.org/binaries/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip
-	http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar
-	http://hg.netbeans.org/binaries/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar
-	http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
-	http://hg.netbeans.org/binaries/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip
-	http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar
-	http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar
-	http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar
-	http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip
-	http://hg.netbeans.org/binaries/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar
-	http://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar
-	http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
-	http://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar
-	http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar
-	http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar
-	http://hg.netbeans.org/binaries/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar
-	http://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar
-	http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar
-	http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar
-	http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar
-	http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar
-	http://hg.netbeans.org/binaries/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar
-	http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
-	http://hg.netbeans.org/binaries/AA2671239EBB762FEEE8B908E9F35473A72AFE1B-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar
-	http://hg.netbeans.org/binaries/1605B38BB28EAE32C11EAB8F9E238A497754A5B8-org.eclipse.core.jobs-3.5.101_nosignature.jar
-	http://hg.netbeans.org/binaries/20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar
-	http://hg.netbeans.org/binaries/D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-org.eclipse.core.runtime-3.7.0_nosignature.jar
-	http://hg.netbeans.org/binaries/16507EAFDC2B95121AA718895BDB54D616EE4B0F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar
-	http://hg.netbeans.org/binaries/BD55836AABD558DC643A7844B78866AD990544BC-org.eclipse.equinox.app-1.3.100_nosignature.jar
-	http://hg.netbeans.org/binaries/4EE275AE73A140A403903D7E4DBA68C8FBB07001-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar
-	http://hg.netbeans.org/binaries/B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-org.eclipse.equinox.preferences-3.4.2_nosignature.jar
-	http://hg.netbeans.org/binaries/C647079E36A4EB7A24AED2C545E4F0F94194C4D1-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar
-	http://hg.netbeans.org/binaries/9267CF311F979078211A70C1B19AF8A8EE71DC8E-org.eclipse.equinox.security-1.1.1_nosignature.jar
-	http://hg.netbeans.org/binaries/B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar
-	http://hg.netbeans.org/binaries/244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar
-	http://hg.netbeans.org/binaries/8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar
-	http://hg.netbeans.org/binaries/D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar
-	http://hg.netbeans.org/binaries/4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar
-	http://hg.netbeans.org/binaries/8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar
-	http://hg.netbeans.org/binaries/50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar
-	http://hg.netbeans.org/binaries/4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar
-	http://hg.netbeans.org/binaries/11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar
-	http://hg.netbeans.org/binaries/A3FEF6144ED1622E4CDD506B9D745527CC675D8D-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar
-	http://hg.netbeans.org/binaries/825DC870D1D423E347F4F8229A211A2C297BB15D-org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar
-	http://hg.netbeans.org/binaries/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar
-	http://hg.netbeans.org/binaries/17C0C8D6DEBF5EBE734881C131888D8088BD9E7D-org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar
-	http://hg.netbeans.org/binaries/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar
-	http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar
-	http://hg.netbeans.org/binaries/DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8-svnClientAdapter-javahl-1.10.12.jar
-	http://hg.netbeans.org/binaries/C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8-svnClientAdapter-main-1.10.12.jar
-	http://hg.netbeans.org/binaries/AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8-svnClientAdapter-svnkit-1.10.12.jar
-	http://hg.netbeans.org/binaries/5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.jar
-	http://hg.netbeans.org/binaries/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar
-	http://hg.netbeans.org/binaries/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar
-	http://hg.netbeans.org/binaries/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar
-	http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar
-	http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar
-	http://hg.netbeans.org/binaries/15ACB06E2E3A70FC188782BA51369CA81ACFE860-validator.jar
-	http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar
-	http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar
-	http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar
-	http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-platform-${PV}
-	dev-java/antlr:4
-	dev-java/commons-compress:0
-	dev-java/commons-httpclient:3
-	dev-java/commons-logging:0
-	dev-java/icu4j:55
-	dev-java/iso-relax:0
-	dev-java/jdbc-mysql:0
-	dev-java/jdbc-postgresql:0
-	>=dev-java/jsch-0.1.46:0
-	>=dev-java/json-simple-1.1:0
-	dev-java/jsr173:0
-	dev-java/jvyamlb:0
-	dev-java/log4j:0
-	dev-java/lucene:3.5
-	dev-java/rhino:1.6
-	dev-java/saxon:9
-	dev-java/smack:2.2
-	dev-java/sun-jaf:0
-	dev-java/tomcat-servlet-api:2.2
-	dev-java/ws-commons-util:0
-	dev-java/xerces:2"
-#	dev-vcs/subversion>=1.8.4:0[java] missing from the tree
-#	app-text/jing:0 our version is probably too old
-#	dev-java/commons-io:1 fails with "Missing manifest tag OpenIDE-Module"
-#	dev-java/commons-lang:2.1 fails with "Missing manifest tag OpenIDE-Module"
-#	dev-java/freemarker:2.3
-#	dev-java/guava:15 fails with "Missing manifest tag OpenIDE-Module"
-#	dev-java/ini4j:0 our version is too old
-#	dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours
-#	dev-java/jzlib:0 fails with "Missing manifest tag OpenIDE-Module"
-#	dev-java/trilead-ssh2:0 in overlay
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	dev-java/commons-codec:0
-	${CDEPEND}
-	dev-java/javacc:0
-	dev-java/javahelp:0
-	dev-java/jna:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ide -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-JAVA_PKG_WANT_SOURCE="1.7"
-JAVA_PKG_WANT_TARGET="1.7"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
-	ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
-	ln -s "${DISTDIR}"/DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar || die
-	ln -s "${DISTDIR}"/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar o.apache.commons.io/external/commons-io-1.4.jar || die
-	ln -s "${DISTDIR}"/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar o.apache.commons.lang/external/commons-lang-2.6.jar || die
-	ln -s "${DISTDIR}"/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar libs.commons_net/external/commons-net-3.3.jar || die
-	ln -s "${DISTDIR}"/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip css.editor/external/css21-spec.zip || die
-	ln -s "${DISTDIR}"/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip css.editor/external/css3-spec.zip || die
-	ln -s "${DISTDIR}"/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip derby/external/derbysampledb.zip || die
-	ln -s "${DISTDIR}"/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip dlight.nativeexecution/external/exechlp-1.0.zip || die
-	ln -s "${DISTDIR}"/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar libs.freemarker/external/freemarker-2.3.19.jar || die
-	ln -s "${DISTDIR}"/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar c.google.guava/external/guava-15.0.jar || die
-	ln -s "${DISTDIR}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
-	ln -s "${DISTDIR}"/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip html.parser/external/html5doc.zip || die
-	ln -s "${DISTDIR}"/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar html.parser/external/htmlparser-1.2.1.jar || die
-	ln -s "${DISTDIR}"/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar libs.ini4j/external/ini4j-0.5.1.jar || die
-	ln -s "${DISTDIR}"/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar html.validation/external/iri.jar || die
-	ln -s "${DISTDIR}"/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip spellchecker.dictionary_en/external/ispell-enwl-3.1.20.zip || die
-	ln -s "${DISTDIR}"/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar c.googlecode.javaewah.JavaEWAH/external/JavaEWAH-0.7.9.jar || die
-	ln -s "${DISTDIR}"/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar xml.jaxb.api/external/jaxb-api.jar || die
-	ln -s "${DISTDIR}"/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip libs.jaxb/external/jaxb-api-doc.zip || die
-	ln -s "${DISTDIR}"/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar libs.jaxb/external/jaxb-impl.jar || die
-	ln -s "${DISTDIR}"/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar libs.jaxb/external/jaxb-xjc.jar || die
-	ln -s "${DISTDIR}"/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar libs.jaxb/external/jaxb1-impl.jar || die
-	ln -s "${DISTDIR}"/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar libs.javafx/external/jfxrt.jar || die
-	ln -s "${DISTDIR}"/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar html.validation/external/jing.jar || die
-	ln -s "${DISTDIR}"/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.core-0.0.7.jar || die
-	ln -s "${DISTDIR}"/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.sshagent-0.0.7.jar || die
-	ln -s "${DISTDIR}"/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.pageant-0.0.7.jar || die
-	ln -s "${DISTDIR}"/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.usocket-jna-0.0.7.jar || die
-	ln -s "${DISTDIR}"/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar c.jcraft.jzlib/external/jzlib-1.0.7.jar || die
-	ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.process/external/libpam4j-1.1.jar || die
-	ln -s "${DISTDIR}"/AA2671239EBB762FEEE8B908E9F35473A72AFE1B-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar o.eclipse.core.contenttype/external/org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar || die
-	ln -s "${DISTDIR}"/1605B38BB28EAE32C11EAB8F9E238A497754A5B8-org.eclipse.core.jobs-3.5.101_nosignature.jar o.eclipse.core.jobs/external/org.eclipse.core.jobs-3.5.101_nosignature.jar || die
-	ln -s "${DISTDIR}"/20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar o.eclipse.core.net/external/org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar || die
-	ln -s "${DISTDIR}"/D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-org.eclipse.core.runtime-3.7.0_nosignature.jar o.eclipse.core.runtime/external/org.eclipse.core.runtime-3.7.0_nosignature.jar || die
-	ln -s "${DISTDIR}"/16507EAFDC2B95121AA718895BDB54D616EE4B0F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar o.eclipse.core.runtime.compatibility.auth/external/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar || die
-	ln -s "${DISTDIR}"/BD55836AABD558DC643A7844B78866AD990544BC-org.eclipse.equinox.app-1.3.100_nosignature.jar o.eclipse.equinox.app/external/org.eclipse.equinox.app-1.3.100_nosignature.jar || die
-	ln -s "${DISTDIR}"/4EE275AE73A140A403903D7E4DBA68C8FBB07001-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar o.eclipse.equinox.common/external/org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar || die
-	ln -s "${DISTDIR}"/B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-org.eclipse.equinox.preferences-3.4.2_nosignature.jar o.eclipse.equinox.preferences/external/org.eclipse.equinox.preferences-3.4.2_nosignature.jar || die
-	ln -s "${DISTDIR}"/C647079E36A4EB7A24AED2C545E4F0F94194C4D1-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar o.eclipse.equinox.registry/external/org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar || die
-	ln -s "${DISTDIR}"/9267CF311F979078211A70C1B19AF8A8EE71DC8E-org.eclipse.equinox.security-1.1.1_nosignature.jar o.eclipse.equinox.security/external/org.eclipse.equinox.security-1.1.1_nosignature.jar || die
-	ln -s "${DISTDIR}"/B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit/external/org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar || die
-	ln -s "${DISTDIR}"/244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit.java7/external/org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar || die
-	ln -s "${DISTDIR}"/8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar || die
-	ln -s "${DISTDIR}"/D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar || die
-	ln -s "${DISTDIR}"/4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar || die
-	ln -s "${DISTDIR}"/8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar || die
-	ln -s "${DISTDIR}"/50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar || die
-	ln -s "${DISTDIR}"/4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar || die
-	ln -s "${DISTDIR}"/11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar || die
-	ln -s "${DISTDIR}"/A3FEF6144ED1622E4CDD506B9D745527CC675D8D-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar || die
-	ln -s "${DISTDIR}"/825DC870D1D423E347F4F8229A211A2C297BB15D-org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.markdown.core/external/org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar || die
-	ln -s "${DISTDIR}"/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar || die
-	ln -s "${DISTDIR}"/17C0C8D6DEBF5EBE734881C131888D8088BD9E7D-org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar || die
-	ln -s "${DISTDIR}"/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar extexecution.process/external/processtreekiller-1.0.7.jar || die
-	ln -s "${DISTDIR}"/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar libs.svnClientAdapter.svnkit/external/svnkit_1.7.8.r9538_v20130107_2001.jar || die
-	ln -s "${DISTDIR}"/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar o.apache.xml.resolver/external/resolver-1.2.jar || die
-	ln -s "${DISTDIR}"/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar libs.svnClientAdapter.svnkit/external/sqljet-1.1.10.jar || die
-	ln -s "${DISTDIR}"/DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8-svnClientAdapter-javahl-1.10.12.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.10.12.jar || die
-	ln -s "${DISTDIR}"/C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8-svnClientAdapter-main-1.10.12.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.10.12.jar || die
-	ln -s "${DISTDIR}"/AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8-svnClientAdapter-svnkit-1.10.12.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.10.12.jar || die
-	ln -s "${DISTDIR}"/5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.jar libs.svnClientAdapter.javahl/external/svnjavahl-1.9.3.jar || die
-	ln -s "${DISTDIR}"/3B91269E9055504778F57744D24F505856698602-svnkit-1.7.0-beta4-20120316.233307-1.jar libs.svnClientAdapter.svnkit/external/svnkit-1.7.0-beta4-20120316.233307-1.jar || die
-	ln -s "${DISTDIR}"/015525209A02BD74254930FF844C7C13498B7FB9-svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar libs.svnClientAdapter.svnkit/external/svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar || die
-	ln -s "${DISTDIR}"/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar libs.swingx/external/swingx-all-1.6.4.jar || die
-	ln -s "${DISTDIR}"/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar httpserver/external/tomcat-webserver-3.2.jar || die
-	ln -s "${DISTDIR}"/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar swing.validation/external/ValidationAPI.jar || die
-	ln -s "${DISTDIR}"/15ACB06E2E3A70FC188782BA51369CA81ACFE860-validator.jar html.validation/external/validator.jar || die
-	ln -s "${DISTDIR}"/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar extexecution.process/external/winp-1.14-patched.jar || die
-	ln -s "${DISTDIR}"/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar o.apache.xmlrpc/external/xmlrpc-client-3.0.jar || die
-	ln -s "${DISTDIR}"/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar o.apache.xmlrpc/external/xmlrpc-common-3.0.jar || die
-	ln -s "${DISTDIR}"/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar o.apache.xmlrpc/external/xmlrpc-server-3.0.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.53.jar
-	java-pkg_jar-from --into db.drivers/external jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
-	java-pkg_jar-from --into db.drivers/external jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
-	java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar
-	java-pkg_jar-from --into html.parser/external icu4j-55 icu4j.jar icu4j-4_4_2.jar
-	java-pkg_jar-from --into html.validation/external iso-relax iso-relax.jar isorelax.jar
-	java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
-	java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into libs.antlr4.runtime/external antlr-4 antlr-runtime.jar antlr-runtime-4.5.3.jar
-	java-pkg_jar-from --into libs.commons_compress/external commons-compress commons-compress.jar commons-compress-1.8.1.jar
-	# java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.19.jar
-	java-pkg_jar-from --build-only --into libs.jna/external jna jna.jar jna-4.2.2.jar
-	java-pkg_jar-from --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
-	java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
-	java-pkg_jar-from --into libs.lucene/external lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
-	java-pkg_jar-from --into libs.smack/external smack-2.2 smack.jar smack.jar
-	java-pkg_jar-from --into libs.smack/external smack-2.2 smackx.jar smackx.jar
-	# java-pkg_jar-from --into libs.svnClientAdapter.javahl/external subversion svn-javahl.jar svnjavahl-1.8.4.jar
-	java-pkg_jar-from --into libs.xerces/external xerces-2 xercesImpl.jar xerces-2.8.0.jar
-	java-pkg_jar-from --build-only --into o.apache.commons.codec/external commons-codec commons-codec.jar apache-commons-codec-1.3.jar
-	java-pkg_jar-from --into o.apache.commons.httpclient/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.1.jar
-	java-pkg_jar-from --into o.apache.commons.logging/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
-	java-pkg_jar-from --into o.apache.ws.commons.util/external ws-commons-util ws-commons-util.jar ws-commons-util-1.0.1.jar
-	java-pkg_jar-from --into servletapi/external tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
-	java-pkg_jar-from --into xml.jaxb.api/external sun-jaf activation.jar activation.jar
-	java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_1.0_api.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	unset DISPLAY
-	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
-}
-
-src_install() {
-	pushd nbbuild/netbeans/ide >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/ide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	rm -fr "${D}"/${INSTALL_DIR}/bin/nativeexecution || die
-	rm -fr "${D}"/${INSTALL_DIR}/modules/lib || die
-
-	insinto ${INSTALL_DIR}/bin/nativeexecution
-	doins bin/nativeexecution/*
-
-	pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution >/dev/null || die
-	for file in *.sh ; do
-		fperms 755 ${file}
-	done
-	popd >/dev/null || die
-
-	if use x86 ; then
-		doins -r bin/nativeexecution/Linux-x86
-		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86 >/dev/null || die
-		for file in * ; do
-			fperms 755 ${file}
-		done
-		popd >/dev/null || die
-	elif use amd64 ; then
-		doins -r bin/nativeexecution/Linux-x86_64
-		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86_64 >/dev/null || die
-		for file in * ; do
-			fperms 755 ${file}
-		done
-		popd >/dev/null || die
-	fi
-
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules
-	pushd "${instdir}" >/dev/null || die
-	rm com-jcraft-jsch.jar && java-pkg_jar-from --into "${instdir}" jsch jsch.jar com-jcraft-jsch.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext
-	pushd "${instdir}" >/dev/null || die
-	rm antlr-runtime-4.5.3.jar && java-pkg_jar-from --into "${instdir}" antlr-4 antlr-runtime.jar antlr-runtime-4.5.3.jar
-	rm commons-compress-1.8.1.jar && java-pkg_jar-from --into "${instdir}" commons-compress commons-compress.jar commons-compress-1.8.1.jar
-	# rm freemarker-2.3.19.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.19.jar || die
-	rm icu4j-4_4_2.jar && java-pkg_jar-from --into "${instdir}" icu4j-55 icu4j.jar icu4j-4_4_2.jar
-	rm isorelax.jar && java-pkg_jar-from --into "${instdir}" iso-relax iso-relax.jar isorelax.jar
-	rm json-simple-1.1.1.jar && java-pkg_jar-from --into "${instdir}" json-simple json-simple.jar json-simple-1.1.1.jar
-	rm jvyamlb-0.2.7.jar && java-pkg_jar-from --into "${instdir}" jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
-	rm log4j-1.2.15.jar && java-pkg_jar-from --into "${instdir}" log4j log4j.jar log4j-1.2.15.jar
-	rm lucene-core-3.5.0.jar && java-pkg_jar-from --into "${instdir}" lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
-	rm mysql-connector-java-5.1.23-bin.jar && java-pkg_jar-from --into "${instdir}" jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
-	rm postgresql-9.2-1002.jdbc4.jar && java-pkg_jar-from --into "${instdir}" jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
-	rm saxon9B.jar && java-pkg_jar-from --into "${instdir}" saxon-9 saxon.jar saxon9B.jar
-	rm servlet-2.2.jar && java-pkg_jar-from --into "${instdir}" tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
-	rm smack.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smack.jar
-	rm smackx.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smackx.jar
-	# rm svnjavahl.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl.jar || die
-	rm xerces-2.8.0.jar && java-pkg_jar-from --into "${instdir}" xerces-2 xercesImpl.jar xerces-2.8.0.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb
-	pushd "${instdir}" >/dev/null || die
-	rm activation.jar && java-pkg_jar-from --into "${instdir}" sun-jaf activation.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb/api
-	pushd "${instdir}" >/dev/null || die
-	rm jsr173_1.0_api.jar && java-pkg_jar-from --into "${instdir}" jsr173 jsr173.jar jsr173_1.0_api.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ide
-}

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160628.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160628.ebuild
deleted file mode 100644
index 825dd1f..0000000
--- a/dev-java/netbeans-ide/netbeans-ide-9999_p20160628.ebuild
+++ /dev/null
@@ -1,374 +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-06-28_00-02-33/zip/netbeans-trunk-nightly-201606280002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
-	http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
-	http://hg.netbeans.org/binaries/DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar
-	http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar
-	http://hg.netbeans.org/binaries/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar
-	http://hg.netbeans.org/binaries/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar
-	http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip
-	http://hg.netbeans.org/binaries/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip
-	http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
-	http://hg.netbeans.org/binaries/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip
-	http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar
-	http://hg.netbeans.org/binaries/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar
-	http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
-	http://hg.netbeans.org/binaries/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip
-	http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar
-	http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar
-	http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar
-	http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip
-	http://hg.netbeans.org/binaries/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar
-	http://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar
-	http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
-	http://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar
-	http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar
-	http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar
-	http://hg.netbeans.org/binaries/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar
-	http://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar
-	http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar
-	http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar
-	http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar
-	http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar
-	http://hg.netbeans.org/binaries/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar
-	http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
-	http://hg.netbeans.org/binaries/AA2671239EBB762FEEE8B908E9F35473A72AFE1B-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar
-	http://hg.netbeans.org/binaries/1605B38BB28EAE32C11EAB8F9E238A497754A5B8-org.eclipse.core.jobs-3.5.101_nosignature.jar
-	http://hg.netbeans.org/binaries/20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar
-	http://hg.netbeans.org/binaries/D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-org.eclipse.core.runtime-3.7.0_nosignature.jar
-	http://hg.netbeans.org/binaries/16507EAFDC2B95121AA718895BDB54D616EE4B0F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar
-	http://hg.netbeans.org/binaries/BD55836AABD558DC643A7844B78866AD990544BC-org.eclipse.equinox.app-1.3.100_nosignature.jar
-	http://hg.netbeans.org/binaries/4EE275AE73A140A403903D7E4DBA68C8FBB07001-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar
-	http://hg.netbeans.org/binaries/B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-org.eclipse.equinox.preferences-3.4.2_nosignature.jar
-	http://hg.netbeans.org/binaries/C647079E36A4EB7A24AED2C545E4F0F94194C4D1-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar
-	http://hg.netbeans.org/binaries/9267CF311F979078211A70C1B19AF8A8EE71DC8E-org.eclipse.equinox.security-1.1.1_nosignature.jar
-	http://hg.netbeans.org/binaries/B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar
-	http://hg.netbeans.org/binaries/244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar
-	http://hg.netbeans.org/binaries/8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar
-	http://hg.netbeans.org/binaries/D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar
-	http://hg.netbeans.org/binaries/4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar
-	http://hg.netbeans.org/binaries/8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar
-	http://hg.netbeans.org/binaries/50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar
-	http://hg.netbeans.org/binaries/4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar
-	http://hg.netbeans.org/binaries/11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar
-	http://hg.netbeans.org/binaries/A3FEF6144ED1622E4CDD506B9D745527CC675D8D-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar
-	http://hg.netbeans.org/binaries/825DC870D1D423E347F4F8229A211A2C297BB15D-org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar
-	http://hg.netbeans.org/binaries/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar
-	http://hg.netbeans.org/binaries/17C0C8D6DEBF5EBE734881C131888D8088BD9E7D-org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar
-	http://hg.netbeans.org/binaries/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar
-	http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar
-	http://hg.netbeans.org/binaries/DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8-svnClientAdapter-javahl-1.10.12.jar
-	http://hg.netbeans.org/binaries/C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8-svnClientAdapter-main-1.10.12.jar
-	http://hg.netbeans.org/binaries/AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8-svnClientAdapter-svnkit-1.10.12.jar
-	http://hg.netbeans.org/binaries/5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.jar
-	http://hg.netbeans.org/binaries/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar
-	http://hg.netbeans.org/binaries/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar
-	http://hg.netbeans.org/binaries/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar
-	http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar
-	http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar
-	http://hg.netbeans.org/binaries/15ACB06E2E3A70FC188782BA51369CA81ACFE860-validator.jar
-	http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar
-	http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar
-	http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar
-	http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-platform-${PV}
-	dev-java/antlr:4
-	dev-java/commons-compress:0
-	dev-java/commons-httpclient:3
-	dev-java/commons-logging:0
-	dev-java/icu4j:55
-	dev-java/iso-relax:0
-	dev-java/jdbc-mysql:0
-	dev-java/jdbc-postgresql:0
-	>=dev-java/jsch-0.1.46:0
-	>=dev-java/json-simple-1.1:0
-	dev-java/jsr173:0
-	dev-java/jvyamlb:0
-	dev-java/log4j:0
-	dev-java/lucene:3.5
-	dev-java/rhino:1.6
-	dev-java/saxon:9
-	dev-java/smack:2.2
-	dev-java/sun-jaf:0
-	dev-java/tomcat-servlet-api:2.2
-	dev-java/ws-commons-util:0
-	dev-java/xerces:2"
-#	dev-vcs/subversion>=1.8.4:0[java] missing from the tree
-#	app-text/jing:0 our version is probably too old
-#	dev-java/commons-io:1 fails with "Missing manifest tag OpenIDE-Module"
-#	dev-java/commons-lang:2.1 fails with "Missing manifest tag OpenIDE-Module"
-#	dev-java/freemarker:2.3
-#	dev-java/guava:15 fails with "Missing manifest tag OpenIDE-Module"
-#	dev-java/ini4j:0 our version is too old
-#	dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours
-#	dev-java/jzlib:0 fails with "Missing manifest tag OpenIDE-Module"
-#	dev-java/trilead-ssh2:0 in overlay
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	dev-java/commons-codec:0
-	${CDEPEND}
-	dev-java/javacc:0
-	dev-java/javahelp:0
-	dev-java/jna:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ide -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-JAVA_PKG_WANT_SOURCE="1.7"
-JAVA_PKG_WANT_TARGET="1.7"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
-	ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
-	ln -s "${DISTDIR}"/DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar || die
-	ln -s "${DISTDIR}"/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar o.apache.commons.io/external/commons-io-1.4.jar || die
-	ln -s "${DISTDIR}"/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar o.apache.commons.lang/external/commons-lang-2.6.jar || die
-	ln -s "${DISTDIR}"/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar libs.commons_net/external/commons-net-3.3.jar || die
-	ln -s "${DISTDIR}"/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip css.editor/external/css21-spec.zip || die
-	ln -s "${DISTDIR}"/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip css.editor/external/css3-spec.zip || die
-	ln -s "${DISTDIR}"/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip derby/external/derbysampledb.zip || die
-	ln -s "${DISTDIR}"/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip dlight.nativeexecution/external/exechlp-1.0.zip || die
-	ln -s "${DISTDIR}"/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar libs.freemarker/external/freemarker-2.3.19.jar || die
-	ln -s "${DISTDIR}"/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar c.google.guava/external/guava-15.0.jar || die
-	ln -s "${DISTDIR}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
-	ln -s "${DISTDIR}"/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip html.parser/external/html5doc.zip || die
-	ln -s "${DISTDIR}"/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar html.parser/external/htmlparser-1.2.1.jar || die
-	ln -s "${DISTDIR}"/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar libs.ini4j/external/ini4j-0.5.1.jar || die
-	ln -s "${DISTDIR}"/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar html.validation/external/iri.jar || die
-	ln -s "${DISTDIR}"/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip spellchecker.dictionary_en/external/ispell-enwl-3.1.20.zip || die
-	ln -s "${DISTDIR}"/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar c.googlecode.javaewah.JavaEWAH/external/JavaEWAH-0.7.9.jar || die
-	ln -s "${DISTDIR}"/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar xml.jaxb.api/external/jaxb-api.jar || die
-	ln -s "${DISTDIR}"/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip libs.jaxb/external/jaxb-api-doc.zip || die
-	ln -s "${DISTDIR}"/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar libs.jaxb/external/jaxb-impl.jar || die
-	ln -s "${DISTDIR}"/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar libs.jaxb/external/jaxb-xjc.jar || die
-	ln -s "${DISTDIR}"/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar libs.jaxb/external/jaxb1-impl.jar || die
-	ln -s "${DISTDIR}"/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar libs.javafx/external/jfxrt.jar || die
-	ln -s "${DISTDIR}"/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar html.validation/external/jing.jar || die
-	ln -s "${DISTDIR}"/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.core-0.0.7.jar || die
-	ln -s "${DISTDIR}"/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.sshagent-0.0.7.jar || die
-	ln -s "${DISTDIR}"/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.pageant-0.0.7.jar || die
-	ln -s "${DISTDIR}"/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.usocket-jna-0.0.7.jar || die
-	ln -s "${DISTDIR}"/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar c.jcraft.jzlib/external/jzlib-1.0.7.jar || die
-	ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.process/external/libpam4j-1.1.jar || die
-	ln -s "${DISTDIR}"/AA2671239EBB762FEEE8B908E9F35473A72AFE1B-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar o.eclipse.core.contenttype/external/org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar || die
-	ln -s "${DISTDIR}"/1605B38BB28EAE32C11EAB8F9E238A497754A5B8-org.eclipse.core.jobs-3.5.101_nosignature.jar o.eclipse.core.jobs/external/org.eclipse.core.jobs-3.5.101_nosignature.jar || die
-	ln -s "${DISTDIR}"/20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar o.eclipse.core.net/external/org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar || die
-	ln -s "${DISTDIR}"/D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-org.eclipse.core.runtime-3.7.0_nosignature.jar o.eclipse.core.runtime/external/org.eclipse.core.runtime-3.7.0_nosignature.jar || die
-	ln -s "${DISTDIR}"/16507EAFDC2B95121AA718895BDB54D616EE4B0F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar o.eclipse.core.runtime.compatibility.auth/external/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar || die
-	ln -s "${DISTDIR}"/BD55836AABD558DC643A7844B78866AD990544BC-org.eclipse.equinox.app-1.3.100_nosignature.jar o.eclipse.equinox.app/external/org.eclipse.equinox.app-1.3.100_nosignature.jar || die
-	ln -s "${DISTDIR}"/4EE275AE73A140A403903D7E4DBA68C8FBB07001-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar o.eclipse.equinox.common/external/org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar || die
-	ln -s "${DISTDIR}"/B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-org.eclipse.equinox.preferences-3.4.2_nosignature.jar o.eclipse.equinox.preferences/external/org.eclipse.equinox.preferences-3.4.2_nosignature.jar || die
-	ln -s "${DISTDIR}"/C647079E36A4EB7A24AED2C545E4F0F94194C4D1-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar o.eclipse.equinox.registry/external/org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar || die
-	ln -s "${DISTDIR}"/9267CF311F979078211A70C1B19AF8A8EE71DC8E-org.eclipse.equinox.security-1.1.1_nosignature.jar o.eclipse.equinox.security/external/org.eclipse.equinox.security-1.1.1_nosignature.jar || die
-	ln -s "${DISTDIR}"/B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit/external/org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar || die
-	ln -s "${DISTDIR}"/244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit.java7/external/org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar || die
-	ln -s "${DISTDIR}"/8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar || die
-	ln -s "${DISTDIR}"/D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar || die
-	ln -s "${DISTDIR}"/4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar || die
-	ln -s "${DISTDIR}"/8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar || die
-	ln -s "${DISTDIR}"/50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar || die
-	ln -s "${DISTDIR}"/4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar || die
-	ln -s "${DISTDIR}"/11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar || die
-	ln -s "${DISTDIR}"/A3FEF6144ED1622E4CDD506B9D745527CC675D8D-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar || die
-	ln -s "${DISTDIR}"/825DC870D1D423E347F4F8229A211A2C297BB15D-org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.markdown.core/external/org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar || die
-	ln -s "${DISTDIR}"/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar || die
-	ln -s "${DISTDIR}"/17C0C8D6DEBF5EBE734881C131888D8088BD9E7D-org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar || die
-	ln -s "${DISTDIR}"/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar extexecution.process/external/processtreekiller-1.0.7.jar || die
-	ln -s "${DISTDIR}"/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar libs.svnClientAdapter.svnkit/external/svnkit_1.7.8.r9538_v20130107_2001.jar || die
-	ln -s "${DISTDIR}"/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar o.apache.xml.resolver/external/resolver-1.2.jar || die
-	ln -s "${DISTDIR}"/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar libs.svnClientAdapter.svnkit/external/sqljet-1.1.10.jar || die
-	ln -s "${DISTDIR}"/DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8-svnClientAdapter-javahl-1.10.12.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.10.12.jar || die
-	ln -s "${DISTDIR}"/C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8-svnClientAdapter-main-1.10.12.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.10.12.jar || die
-	ln -s "${DISTDIR}"/AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8-svnClientAdapter-svnkit-1.10.12.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.10.12.jar || die
-	ln -s "${DISTDIR}"/5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.jar libs.svnClientAdapter.javahl/external/svnjavahl-1.9.3.jar || die
-	ln -s "${DISTDIR}"/3B91269E9055504778F57744D24F505856698602-svnkit-1.7.0-beta4-20120316.233307-1.jar libs.svnClientAdapter.svnkit/external/svnkit-1.7.0-beta4-20120316.233307-1.jar || die
-	ln -s "${DISTDIR}"/015525209A02BD74254930FF844C7C13498B7FB9-svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar libs.svnClientAdapter.svnkit/external/svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar || die
-	ln -s "${DISTDIR}"/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar libs.swingx/external/swingx-all-1.6.4.jar || die
-	ln -s "${DISTDIR}"/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar httpserver/external/tomcat-webserver-3.2.jar || die
-	ln -s "${DISTDIR}"/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar swing.validation/external/ValidationAPI.jar || die
-	ln -s "${DISTDIR}"/15ACB06E2E3A70FC188782BA51369CA81ACFE860-validator.jar html.validation/external/validator.jar || die
-	ln -s "${DISTDIR}"/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar extexecution.process/external/winp-1.14-patched.jar || die
-	ln -s "${DISTDIR}"/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar o.apache.xmlrpc/external/xmlrpc-client-3.0.jar || die
-	ln -s "${DISTDIR}"/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar o.apache.xmlrpc/external/xmlrpc-common-3.0.jar || die
-	ln -s "${DISTDIR}"/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar o.apache.xmlrpc/external/xmlrpc-server-3.0.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.53.jar
-	java-pkg_jar-from --into db.drivers/external jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
-	java-pkg_jar-from --into db.drivers/external jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
-	java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar
-	java-pkg_jar-from --into html.parser/external icu4j-55 icu4j.jar icu4j-4_4_2.jar
-	java-pkg_jar-from --into html.validation/external iso-relax iso-relax.jar isorelax.jar
-	java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
-	java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into libs.antlr4.runtime/external antlr-4 antlr-runtime.jar antlr-runtime-4.5.3.jar
-	java-pkg_jar-from --into libs.commons_compress/external commons-compress commons-compress.jar commons-compress-1.8.1.jar
-	# java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.19.jar
-	java-pkg_jar-from --build-only --into libs.jna/external jna jna.jar jna-4.2.2.jar
-	java-pkg_jar-from --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
-	java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
-	java-pkg_jar-from --into libs.lucene/external lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
-	java-pkg_jar-from --into libs.smack/external smack-2.2 smack.jar smack.jar
-	java-pkg_jar-from --into libs.smack/external smack-2.2 smackx.jar smackx.jar
-	# java-pkg_jar-from --into libs.svnClientAdapter.javahl/external subversion svn-javahl.jar svnjavahl-1.8.4.jar
-	java-pkg_jar-from --into libs.xerces/external xerces-2 xercesImpl.jar xerces-2.8.0.jar
-	java-pkg_jar-from --build-only --into o.apache.commons.codec/external commons-codec commons-codec.jar apache-commons-codec-1.3.jar
-	java-pkg_jar-from --into o.apache.commons.httpclient/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.1.jar
-	java-pkg_jar-from --into o.apache.commons.logging/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
-	java-pkg_jar-from --into o.apache.ws.commons.util/external ws-commons-util ws-commons-util.jar ws-commons-util-1.0.1.jar
-	java-pkg_jar-from --into servletapi/external tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
-	java-pkg_jar-from --into xml.jaxb.api/external sun-jaf activation.jar activation.jar
-	java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_1.0_api.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	unset DISPLAY
-	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
-}
-
-src_install() {
-	pushd nbbuild/netbeans/ide >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/ide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	rm -fr "${D}"/${INSTALL_DIR}/bin/nativeexecution || die
-	rm -fr "${D}"/${INSTALL_DIR}/modules/lib || die
-
-	insinto ${INSTALL_DIR}/bin/nativeexecution
-	doins bin/nativeexecution/*
-
-	pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution >/dev/null || die
-	for file in *.sh ; do
-		fperms 755 ${file}
-	done
-	popd >/dev/null || die
-
-	if use x86 ; then
-		doins -r bin/nativeexecution/Linux-x86
-		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86 >/dev/null || die
-		for file in * ; do
-			fperms 755 ${file}
-		done
-		popd >/dev/null || die
-	elif use amd64 ; then
-		doins -r bin/nativeexecution/Linux-x86_64
-		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86_64 >/dev/null || die
-		for file in * ; do
-			fperms 755 ${file}
-		done
-		popd >/dev/null || die
-	fi
-
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules
-	pushd "${instdir}" >/dev/null || die
-	rm com-jcraft-jsch.jar && java-pkg_jar-from --into "${instdir}" jsch jsch.jar com-jcraft-jsch.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext
-	pushd "${instdir}" >/dev/null || die
-	rm antlr-runtime-4.5.3.jar && java-pkg_jar-from --into "${instdir}" antlr-4 antlr-runtime.jar antlr-runtime-4.5.3.jar
-	rm commons-compress-1.8.1.jar && java-pkg_jar-from --into "${instdir}" commons-compress commons-compress.jar commons-compress-1.8.1.jar
-	# rm freemarker-2.3.19.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.19.jar || die
-	rm icu4j-4_4_2.jar && java-pkg_jar-from --into "${instdir}" icu4j-55 icu4j.jar icu4j-4_4_2.jar
-	rm isorelax.jar && java-pkg_jar-from --into "${instdir}" iso-relax iso-relax.jar isorelax.jar
-	rm json-simple-1.1.1.jar && java-pkg_jar-from --into "${instdir}" json-simple json-simple.jar json-simple-1.1.1.jar
-	rm jvyamlb-0.2.7.jar && java-pkg_jar-from --into "${instdir}" jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
-	rm log4j-1.2.15.jar && java-pkg_jar-from --into "${instdir}" log4j log4j.jar log4j-1.2.15.jar
-	rm lucene-core-3.5.0.jar && java-pkg_jar-from --into "${instdir}" lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
-	rm mysql-connector-java-5.1.23-bin.jar && java-pkg_jar-from --into "${instdir}" jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
-	rm postgresql-9.2-1002.jdbc4.jar && java-pkg_jar-from --into "${instdir}" jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
-	rm saxon9B.jar && java-pkg_jar-from --into "${instdir}" saxon-9 saxon.jar saxon9B.jar
-	rm servlet-2.2.jar && java-pkg_jar-from --into "${instdir}" tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
-	rm smack.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smack.jar
-	rm smackx.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smackx.jar
-	# rm svnjavahl.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl.jar || die
-	rm xerces-2.8.0.jar && java-pkg_jar-from --into "${instdir}" xerces-2 xercesImpl.jar xerces-2.8.0.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb
-	pushd "${instdir}" >/dev/null || die
-	rm activation.jar && java-pkg_jar-from --into "${instdir}" sun-jaf activation.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb/api
-	pushd "${instdir}" >/dev/null || die
-	rm jsr173_1.0_api.jar && java-pkg_jar-from --into "${instdir}" jsr173 jsr173.jar jsr173_1.0_api.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ide
-}

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 70ffeb3..f94f76a 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -38,8 +38,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-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
-DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844efa871baadaea93f02572d7c43164130d7e7dea58e5a1d421232 SHA512 d7e869bd42a00a40030c012fb895ae358eafb5039bca76ae626eb5b0dd2ed7516cbedfd6d0336190e72d7a0ddfa4c6d4ce759085cbe05d38dbf66b52806b3e16 WHIRLPOOL e5430b55c5685d1a1126d60cdeffb535d673200d7da1638f8085969b81ddf42e619ba2d8b92ce01c59edf990f6c56721406a9f04a5dab6e8d81fd135235f8648
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
@@ -67,8 +65,6 @@ DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0b
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 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_p20160627.ebuild 15656 SHA256 d5bd2ef557d74bfc8f582355ba0df1540233c73793c67e7f54554bcba5f13b1a SHA512 7c84ccd089ba94492aa9d680c105040c12d16ddbc4a29ea7058f34e359983be0c24a280c6a1a312499f47ba3a58a764de849337ddc539696592b6a9ea8f79790 WHIRLPOOL b1d98073bd89da4508012ad7d3aadecf02c1d523cb461e46628c0db762fe2f6b3098dc02c990fcbe3cfd58f4594e3ae80da8997203164da6d6123ed511bc54aa
-EBUILD netbeans-java-9999_p20160628.ebuild 15656 SHA256 597866aec6dc88cf3b93d35386cfee0cce825cd4bebf01629bf6cbfd75815fde SHA512 b54ed315fe027bb57fe6ce549a22b3799eec8bc67d3890465d9becbedae0cda868245d035a4816f3571a2dab786daa0d929ce13eef625c412468b1c7560ed6f5 WHIRLPOOL 2ab3026586338969876a9cf4395744b6bc2ad732c9c27189ba099f4c010b717a207be4095dfe6f1d81d03d69c1760020334f2ab25c0a05a2bafd26f4aa7d432e
 EBUILD netbeans-java-9999_p20160629.ebuild 15656 SHA256 94b39fc264595d8874ad8ac4e32be9ef9ed3772dd39cee46913a061c2c7e4c06 SHA512 09d3f1a6a959a2a39a4fdedfb3a5a0e37bb4f065b1654d0f7a6247c88463b51dcca65ca8e24b7c99dbe8a6c756520068d895331a3c2066321847c669f39fae1b WHIRLPOOL 75f086471489a3503f1f000966bb0017d11ed5c26b68e525c4d58566d7162456d4d6f0f2a10127fc3b623ee0853a619ead15f50c3d39368c9d89bbeace295c6c
 EBUILD netbeans-java-9999_p20160630.ebuild 15656 SHA256 e8c32ea6da188a35c907c524a58461fc42937cfb3fe2bbe73c39c13da831c2ae SHA512 4e391402d049f4920413f6dfd2cea54eeca5fca7678f0c1c835e640a7b51dc72d5b1baef15f9394797e07f679d24d2dcc734ba61c7250295171b55222b817685 WHIRLPOOL 19330ffec1177c233bfbc4c264d8b5d896b5f993afe3696f5c9a645d66e554056a54261af923e1fdee36b8426bdaadb93c756efef4701de3f507fe93fcc6fd7d
 EBUILD netbeans-java-9999_p20160701.ebuild 15656 SHA256 be7e4a2b002f9a878926a201eac8916ebb017b922149f8aba594c7b4c2cf1e14 SHA512 12d10a6db2cb9d188adc32876c2c3097eba5a8bc68eeaf0227bcbfa4e0d94efa81772b1371a95f59cdd042e1cb44a8f7a09d457a24841c88cd96b4ab031a7f06 WHIRLPOOL 598ba41ef173aa4a2edd32725f96b0d46676566bdd25d6f7cb60ce70343056e76d242e04de77c4f3e463d081d84d32e44cc47cb13f1c33461b50f1c5e1d4edf1

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160627.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160627.ebuild
deleted file mode 100644
index 3b6eeda..0000000
--- a/dev-java/netbeans-java/netbeans-java-9999_p20160627.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-06-27_00-02-33/zip/netbeans-trunk-nightly-201606270002-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/47E8B11BBA8D4796ADC351499A07197ADF03383B-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}"/47E8B11BBA8D4796ADC351499A07197ADF03383B-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-java/netbeans-java-9999_p20160628.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160628.ebuild
deleted file mode 100644
index 04d4a71..0000000
--- a/dev-java/netbeans-java/netbeans-java-9999_p20160628.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-06-28_00-02-33/zip/netbeans-trunk-nightly-201606280002-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/47E8B11BBA8D4796ADC351499A07197ADF03383B-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}"/47E8B11BBA8D4796ADC351499A07197ADF03383B-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 2427936..5b2632a 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -6,8 +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-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
-DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844efa871baadaea93f02572d7c43164130d7e7dea58e5a1d421232 SHA512 d7e869bd42a00a40030c012fb895ae358eafb5039bca76ae626eb5b0dd2ed7516cbedfd6d0336190e72d7a0ddfa4c6d4ce759085cbe05d38dbf66b52806b3e16 WHIRLPOOL e5430b55c5685d1a1126d60cdeffb535d673200d7da1638f8085969b81ddf42e619ba2d8b92ce01c59edf990f6c56721406a9f04a5dab6e8d81fd135235f8648
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
@@ -35,8 +33,6 @@ DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0b
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 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_p20160627.ebuild 4971 SHA256 96d1bd0392bf4ca09dabd5cb0cc3ad6638cb14126808142389ad12888cd736e4 SHA512 28eb14a17ff58829aa6f34caf75d1dfd592dfc1588956a289f8cb973e624f6ee9af4cb25fb4b1073b0ecc54084202fb28326e032d1ba00e184086410dea73a5e WHIRLPOOL 9d9f52fd79d853f1ed034b1778d6dc0a479fab7c120625eabfa1f20abcc1317bc01b9d32980f75636754c8a58b42143006312aab9cc574e037a0a69b897bc0eb
-EBUILD netbeans-javacard-9999_p20160628.ebuild 4971 SHA256 e77426b654419ca7d1c19a79903ac728e62e63fe31a44a62ee49f2e3df7e1c70 SHA512 6f823b78a1a21e95cdcb86e1acb3403566e7b2e43e19d43c6853cc9feb0885c5d9697f09aa2786875cbe4de15201b0043d0711e215a9f4cce06d80af4420aaa9 WHIRLPOOL e763c491756a74e78fe3513e91a1c25bf1ccf6baca9813d442b92fe58375dee52a7aeab399c6f93025df922dea84a5e5cd5b91db12f053d8a9a243686c3b69ba
 EBUILD netbeans-javacard-9999_p20160629.ebuild 4971 SHA256 4dd26a24283478bb99d31c49c03a548d6817a005fbfbec6069c13febebdb7aad SHA512 0eabb5dfd298cf60c7d766c85146d592efd2df0f948d6de28ae70fc9fda41cdf6a8568bf2838aca4f4b58a210fcaca3df7b320f56e4fc60987490c5599bd9662 WHIRLPOOL ce7a60d2461b148ce333f10835fa447dddf2cfe9ec83ef7f4e91d66854499bea1541c6fbd7899a7150a9f1c3fc1199b3856407f4273a037e32ff2555138326e0
 EBUILD netbeans-javacard-9999_p20160630.ebuild 4971 SHA256 c91aa9f5cf3d3be652368a7b839a544141e58e69f2b08b4620c1e702187660cf SHA512 2224a4a2d6c13d954aaf50afa9d04adf90fb108bc91213963dce7919c17146a9178a431669a34b0423890238c1bddb5d11b880b30f5624ab2be9cbec52ba2168 WHIRLPOOL 38ff77cb87c27a75af1e665a4ad977b124bc49656a7ff140b7b734f070fe0fe947577ea4915601fc2d096c52a33a13cdbc6319ab80438d9b384dfb0fb2e1cb29
 EBUILD netbeans-javacard-9999_p20160701.ebuild 4971 SHA256 ca20c7b1f0f49e4d72f14aeb8c0656eba4e601fdb19f33da9067b7e62acbdbd0 SHA512 c86db0f8f1915a20fdcf9e697e7af5c62a7a4740e25cb31a82aa7159814faaa90d8f1c7aab8392f3dcd9110d8942d8ce866bae0c8764b6aa4b7c43c64134010f WHIRLPOOL e6d299bbfe786f30fd8a640be8bbf5f3ff3ffa3b3a290fe334982c820ac464915e69909b43eb4c6b49f585cd04bc50f3c9e4dc4b1389d93eb8192ce24a04c15f

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160627.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160627.ebuild
deleted file mode 100644
index 4928f21..0000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160627.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-06-27_00-02-33/zip/netbeans-trunk-nightly-201606270002-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-javacard/netbeans-javacard-9999_p20160628.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160628.ebuild
deleted file mode 100644
index 9d4fe4d..0000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160628.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-06-28_00-02-33/zip/netbeans-trunk-nightly-201606280002-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 8f05ad3..bb588d3 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -5,8 +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-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
-DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844efa871baadaea93f02572d7c43164130d7e7dea58e5a1d421232 SHA512 d7e869bd42a00a40030c012fb895ae358eafb5039bca76ae626eb5b0dd2ed7516cbedfd6d0336190e72d7a0ddfa4c6d4ce759085cbe05d38dbf66b52806b3e16 WHIRLPOOL e5430b55c5685d1a1126d60cdeffb535d673200d7da1638f8085969b81ddf42e619ba2d8b92ce01c59edf990f6c56721406a9f04a5dab6e8d81fd135235f8648
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
@@ -34,8 +32,6 @@ DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0b
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 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_p20160627.ebuild 6293 SHA256 04f6e4b2679577d84d112ab5b21cc43ae226d2490f811fc2e1283286b45c124a SHA512 abb63987bad569987dcd893da2e97ccb6c30c028858a65d0848da08336495f55f5aeaff1b89e16e2d88aaab35126e3aecf59077ac9ac02b7a7fbe414a0130b93 WHIRLPOOL 0ed5554a6bc82e09ebdc116d25fa6a4b01e6cf5f15122ca3000a285520bf566ef958cf01f43ea080b7eb5b6722ffffab0fc331e845ddb0b6edff2cb5d6d79994
-EBUILD netbeans-javadoc-9999_p20160628.ebuild 6293 SHA256 511ffdadf987250383b39686077d0fb1ee9dc91894f56a3a00124dd23c9676f0 SHA512 9e326140cf9db6958705d8628c735548946db945caa65514acc5d7ec233221ec0d16a584fae3284bba4714ecf212b71a7017000bc8d0b6675fe9ffacd4c6c5bc WHIRLPOOL ee4c9b3ddf779d778920622b8b034e46922798099bb9bf5cd8a7e6af0d4f387eb6b84899b289edb5852b92a0a7ebdaaf571243eab9045b4f26241bc501af2c97
 EBUILD netbeans-javadoc-9999_p20160629.ebuild 6293 SHA256 9e8876f9264bc95d99ac059b4eb580c81ea6ecf52b238c3b607ffc6ea6bd2a2e SHA512 6bb65358523a64d814d451e4953faaea5fba5a9abe24582d03732e2a3122ae18f315076414420a38425252976a9ed5a39e69b1efaa72a2a21a3017cf17d7b9dc WHIRLPOOL 097a0f24eb060a2d85d47042705e4dc28c88a0797405745334a72a09683731a417829e3e62de170b4afc8fa9df6fbe0541078c8dc6b582a914f0ae2e84fe37c5
 EBUILD netbeans-javadoc-9999_p20160630.ebuild 6293 SHA256 c4d9d977a855f64423f0ad73f72b2a3a43fe3b06a5cd6bf165bc3a727af55316 SHA512 600a7ca4c423837031fcbf7cd3bc5437d0b5e286e52f5f70a457e281432b3dcfa9719053752850103818746ee1a615ab25e9021cdfe58bd9c8364c64efca8f74 WHIRLPOOL 83b6d4ebe0918323150a3d609894c3cba34c58ddafd8f04481bdeaadedb654765520583870af7c989dc07f19430980bf42d9f6be36d72ad5c21d2ff5413edd7e
 EBUILD netbeans-javadoc-9999_p20160701.ebuild 6293 SHA256 e8545a0e790c537c163bc273e7dd33f76acfa7ff9bb9738ebd7c430b12b2b0fe SHA512 9de182fb4b3f72b2a7444f199c002769601be156792836b5096eb289cafa2c1ad3fd27538f35e97e5b4685bed872209d5eb1242ea84b26b7c307a09725a6a484 WHIRLPOOL 1b82a54dd811f83d89ca4bb80a773ab173f70b636354c2bc7682185a6f0e3aebcb95b86412f64bc7261c4c2a9a729bcaba81ec28577a2e161abcd025fb6e4788

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160627.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160627.ebuild
deleted file mode 100644
index b0b274b..0000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160627.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-06-27_00-02-33/zip/netbeans-trunk-nightly-201606270002-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-javadoc/netbeans-javadoc-9999_p20160628.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160628.ebuild
deleted file mode 100644
index c312a91..0000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160628.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-06-28_00-02-33/zip/netbeans-trunk-nightly-201606280002-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 f9dbbd9..a1e8506 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -11,8 +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-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
-DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844efa871baadaea93f02572d7c43164130d7e7dea58e5a1d421232 SHA512 d7e869bd42a00a40030c012fb895ae358eafb5039bca76ae626eb5b0dd2ed7516cbedfd6d0336190e72d7a0ddfa4c6d4ce759085cbe05d38dbf66b52806b3e16 WHIRLPOOL e5430b55c5685d1a1126d60cdeffb535d673200d7da1638f8085969b81ddf42e619ba2d8b92ce01c59edf990f6c56721406a9f04a5dab6e8d81fd135235f8648
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
@@ -40,8 +38,6 @@ DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0b
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 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_p20160627.ebuild 4717 SHA256 a331a00f06cf750c742ceccdf4a68ec2600bba52cd0a4a6a1a4768d9d7a0acf8 SHA512 c426d98f28a139388ee3a6dc1705019af46bd9b15f6a5271008955eb28ba2be6aedc5368ba043792ebfe3b3a4151d8b542e370708dd39ed53dbf3ed35e96dde1 WHIRLPOOL 25a46e2d76067a2e1cac860ee3cf61f39fb3707739302fb88aaa4c6c4219824ad9131d05b02cb9556c60a9bd3508f5516fabb2e86a8412c987e708fe575558d6
-EBUILD netbeans-javafx-9999_p20160628.ebuild 4717 SHA256 0f133776e6cc6b3279127ea903b4182f2cc2f30bf625628652e7146f7e58f230 SHA512 863f3f32b4bf0947dcf51ac02bd0b8b3b94dc332302542d23d44aca10f71d11f9c4dd739753408eee1b7e1a2f326c96e0dd1abbe610399abdbe6431e0f013ae5 WHIRLPOOL 1133120c823bb11ddeba22b177fe02cce5fffc4fe5f10cceba01cdb0f24d308b608f513022ded98c6cfebedc9639602d1e389a45f8992d33600983ba2efb244e
 EBUILD netbeans-javafx-9999_p20160629.ebuild 4717 SHA256 bc5e4d8cdeefc3dfae713e53e12787e0d6066dfdc7dfefefc5897b90580f6781 SHA512 7c71831c87f2fb55704f5c6286420ed55a1dcc61b8a1db7d38f5ce07a329a5edb45fe17813bbce063dcd446ed6c63f2afa50f8fe8b5d0681e9e21fe36749972a WHIRLPOOL 5195604559ea7dc003739f155053bc7afd5205c5b26ab06a06ce2fce4e60887497290c97fb6f5b4d5b3a4baf9b188d2b1fb9a8ace25005a1a1e29880d234861b
 EBUILD netbeans-javafx-9999_p20160630.ebuild 4717 SHA256 6edabee784826f7c2d071397b7247faa325fddbac560f9601f79b87067263466 SHA512 63ddc4a2f48745b7be67f6ba0575792833e596fdbfa39fc8f49a301bb8ce4866346bf72d1f7f1bc1d79df43da58217ca7bdf00dfd09294ffa74b578998ebdb7d WHIRLPOOL 5e432f9205528ffebbbc105997b2f15df264491b9e4a3b31794166b21a921822b063541eab502eac05844f15b38bcfbd3dee7d38cccb2eafd705a0cde6eb4863
 EBUILD netbeans-javafx-9999_p20160701.ebuild 4717 SHA256 073a4aa3261480f4ccaf57e6f5379a86c3ad20f8b282b1263b6ccece556773c1 SHA512 aca1cab07c16d19d5cf127d6aaf32594d35550510347020c89d988e344d6836fb4b68496cf7dd19b441c666d328aa8ed0895bbca98d3f5b9265e13478ed5695a WHIRLPOOL 6380e563ffcb7e47bdcdcd00c4386b9b6d3eeca8e0be9f4c555ba199fff29b4dce242c49570e984a262ae256d50cc42a06c55ce8d9a7d2b1fa5d04daa6f3e15e

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160627.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160627.ebuild
deleted file mode 100644
index 3e2de3f..0000000
--- a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160627.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-06-27_00-02-33/zip/netbeans-trunk-nightly-201606270002-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-javafx/netbeans-javafx-9999_p20160628.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160628.ebuild
deleted file mode 100644
index 6458cdc..0000000
--- a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160628.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-06-28_00-02-33/zip/netbeans-trunk-nightly-201606280002-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 8996d95..b82ab77 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -3,8 +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-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
-DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844efa871baadaea93f02572d7c43164130d7e7dea58e5a1d421232 SHA512 d7e869bd42a00a40030c012fb895ae358eafb5039bca76ae626eb5b0dd2ed7516cbedfd6d0336190e72d7a0ddfa4c6d4ce759085cbe05d38dbf66b52806b3e16 WHIRLPOOL e5430b55c5685d1a1126d60cdeffb535d673200d7da1638f8085969b81ddf42e619ba2d8b92ce01c59edf990f6c56721406a9f04a5dab6e8d81fd135235f8648
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
@@ -32,8 +30,6 @@ DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0b
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 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_p20160627.ebuild 4412 SHA256 43e79ccd0235c324319902441d5be38ee69e0b77ad9d644f7febdc00cdbe9ed1 SHA512 9b8fba2be34720a95d5f45f31a5174da1d3fc09c9a486acadb3ae39aa61395567ba1bebf9bc3e4e1b6f89e7ddf414edbf0b8bfeda7d7f6e2d619aa74f90e26ea WHIRLPOOL b6a6fa4c2c261e77254e46117f7c4c1a75fc316595f5c37b1d7656a926fc70caf6fd59e8b881fa77ac8f05904757b37f3c471b6de3447408117e3fb3a5b476e0
-EBUILD netbeans-mobility-9999_p20160628.ebuild 4412 SHA256 1ba265dbea4fe8ef002d01b74b606050faae23c5c44f14100ef4d36a43b02832 SHA512 8d4a071e81db74866acbcf1cf3d1dc74632a5075fb74ca241c18a30b9568bfee00dce1d8b5af83071e3cb55f56ae50d92e2337e90b4065515fa42a6b2312a0f5 WHIRLPOOL 4fb35551e38154be62585efa5dce2f99b1e018e8bb188e787043dff8798a015cacafae0a3f5f0a456e7011e3546885f43b8e081e2e6acad705179c40d5d6b71a
 EBUILD netbeans-mobility-9999_p20160629.ebuild 4412 SHA256 648e2262c5bbb91513d395f2f86f056e10f4a77f60970131987da3e13f454233 SHA512 2c74f3b4e3ff7079fb47e62d57f4107b082752a3c17456f62b86022763e875fa3597a78b3816fbe244af0a44fd7df74cff8630c52b42f1f1a2c7c15cb53d1c8c WHIRLPOOL c596a045e493fedcb96ec368890a7d14f28f24d564ba82321fa34ea0cbf730abe6361bf43675dddfa94b1c022adfc31e5b82347faf7c843e3205cbbfca0144a0
 EBUILD netbeans-mobility-9999_p20160630.ebuild 4412 SHA256 e32b041292bf8e4bc05873c668f64aca27078eb053592d1da441202e9703113b SHA512 7a278d841edf7d34b004f2ecd335ace3bc7a9ff3df4a2510b35db0a92c908672d17a8c12cb2b8a81962275453d89f4022ea75e9a1fe9f63dc6bdf6ed2167b71d WHIRLPOOL 10daf018f5277004fca61c9dc68eb029332f2f6967461e2ea636d0b046993cd2e2426c303675b0c16a5aaae7d7c764a0bce3f9fbee5fc5c20d6aeb1f428451b6
 EBUILD netbeans-mobility-9999_p20160701.ebuild 4412 SHA256 0e7dc45b843f10c2b39d47ff65d37093bf1615a5a5182d61f7f0e4c00428988b SHA512 54b00648496dde999076b408cb327679c175ab755d8e009b2ae58de6909472dcd5b21384e3badbaf757f78aca904728ec7e8725df38e3db704a7a087e27f8c43 WHIRLPOOL ce27785a1b6d36f3702222401d632c46649b0520694798ec76233760080b765c31771db17a0bc4ecac544975fb71d524ed06d1b1b37df843dfc17ad854afca96

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160627.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160627.ebuild
deleted file mode 100644
index ef89d7c..0000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160627.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-06-27_00-02-33/zip/netbeans-trunk-nightly-201606270002-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-mobility/netbeans-mobility-9999_p20160628.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160628.ebuild
deleted file mode 100644
index 2740409..0000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160628.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-06-28_00-02-33/zip/netbeans-trunk-nightly-201606280002-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 f3cabb8..5ceb2a0 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -6,8 +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-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
-DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844efa871baadaea93f02572d7c43164130d7e7dea58e5a1d421232 SHA512 d7e869bd42a00a40030c012fb895ae358eafb5039bca76ae626eb5b0dd2ed7516cbedfd6d0336190e72d7a0ddfa4c6d4ce759085cbe05d38dbf66b52806b3e16 WHIRLPOOL e5430b55c5685d1a1126d60cdeffb535d673200d7da1638f8085969b81ddf42e619ba2d8b92ce01c59edf990f6c56721406a9f04a5dab6e8d81fd135235f8648
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
@@ -35,8 +33,6 @@ DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0b
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 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_p20160627.ebuild 4111 SHA256 69eac502e7b633b2e09d936726e1cc01410e1b1e1d2473a1e1bd35ab2e7fea7f SHA512 6f2905abc0348f0d20ba0971b57b63f2a89bac30591663fb0d4d9c0afda2f02fd036ed97910f56d7f950a4b1c361ed63631a864b0152a2f47c7d67a7fd104e03 WHIRLPOOL 1d8b5078b89de223c20381ad2beeae903f86ee6c7908bca86d59610a30fcbf036426ff0d524c6bc2cce1604e92dca528ffcb4001809313b71707df46042f9a42
-EBUILD netbeans-nb-9999_p20160628.ebuild 4111 SHA256 18d95e390dffaed3fe0175b8c2051ea1f31ebc30287e0997d122e7a7fa8221fe SHA512 47993ec8c1cb99a9ead508cf6fefd33cb4da988f3edf49bb2b80e9e2c1bca4780ed4cd410cf015624cfb66460afd4f16a9be740ed5828657dc36883b889e0985 WHIRLPOOL 4c32a52bcd28da56d09d311e311e3cb6cfb0836029d3e81ee7ca4fa3cbaf541761cc819a7f3d3de0941a72923d9c980151c53392dbb3570b11b8bbfc482ccccf
 EBUILD netbeans-nb-9999_p20160629.ebuild 4111 SHA256 44b08b44dc2978d1df916fb039640a8fae17d81a4486108df922b250d97d7af3 SHA512 8d31ff0d73f1c107a595daa66486a4622a654d4bf5def914ce096c9348f43ffa0e07ba796b8daec2ac46114175a9bcc212954819f8e1fd524695fff8f0f0bbd2 WHIRLPOOL 41be443ca44390dfe17b270b7ff6a0d84c3a9aca0d98c124a41d4ecc8062984ddebb39f793a92f9ee9d67914a1f81388d9baecd83e38e6e04f6927a384adecd5
 EBUILD netbeans-nb-9999_p20160630.ebuild 4111 SHA256 25848c805cee3d0cdf442978db8376fcb147ebbe4dd7b3806d709c64093c15c1 SHA512 d72896f92f985d35f0f21c72ad710b381243ecf5ffaba7a3d47f0e93b27656368cb6a51b5576a1e8545a0553a82fb9e6f89fbe98defaae7a5c6eacf26e81fdfa WHIRLPOOL 7e0e162afc6d40c89fa96dc2edd6785d1e4d2b96b1b71e16420e890f636f33d54dcabc7e82e387b3beceb1cc9e87305960e8cac4e332a72ec24637912f10af02
 EBUILD netbeans-nb-9999_p20160701.ebuild 4111 SHA256 362d6a095e1c257ba1666b31df4bfb23fdc8d4f8088f7908ec113ded940940cf SHA512 98937edd208e7a88a4a80ccbf2f7b856c6a7fd53ff1c58280aaf52864bd0c321696a054b92613e94aefe664eaa58e562936546bf8bd484a80d4a7da3643d31ad WHIRLPOOL 1038f5c84e1a0fd07bae5b17b447cfdfec91bc210bc925ddf14b0fa2378e3a64b29c43d3c5703f3e7a9a341aaa513778c767a4ced152196737b3dcdd80fa3cae

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160627.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160627.ebuild
deleted file mode 100644
index d7ccb7f..0000000
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20160627.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-06-27_00-02-33/zip/netbeans-trunk-nightly-201606270002-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-nb/netbeans-nb-9999_p20160628.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160628.ebuild
deleted file mode 100644
index 901256b..0000000
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20160628.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-06-28_00-02-33/zip/netbeans-trunk-nightly-201606280002-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 a890224..3a514ed 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -8,8 +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-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
-DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844efa871baadaea93f02572d7c43164130d7e7dea58e5a1d421232 SHA512 d7e869bd42a00a40030c012fb895ae358eafb5039bca76ae626eb5b0dd2ed7516cbedfd6d0336190e72d7a0ddfa4c6d4ce759085cbe05d38dbf66b52806b3e16 WHIRLPOOL e5430b55c5685d1a1126d60cdeffb535d673200d7da1638f8085969b81ddf42e619ba2d8b92ce01c59edf990f6c56721406a9f04a5dab6e8d81fd135235f8648
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
@@ -37,8 +35,6 @@ DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0b
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 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_p20160627.ebuild 4418 SHA256 678ba4d3aa31423d93ebbacc46d1e27f6aa7a09b705114a93addcb338d003214 SHA512 d30bc908455185d3f647840b8fdb5051af8a4accaea320266a377d0ca8962f2ad8cc781aa212814bf30c4d0e3c3c303bf331ae23cac5636520bfc91eee898342 WHIRLPOOL 7ec6c21d66e0a37bd986b1bec3bc31154297b3575811f705a3207b671482af88b242654e873700057e9fc0c9e8116269e04eee89bec24aec41828864898c06ff
-EBUILD netbeans-php-9999_p20160628.ebuild 4418 SHA256 fd1055888559f33745240af3bb155d99abd80f669946e74312d83d6b082aa514 SHA512 9178a2bcb89a4bf2d26e950869ac418bfab773c3393da31a7da85fcfed83774b69363335c5ef116f78f7f4c25b24b310447afa4a5ea7648eda6c13bbf84f1260 WHIRLPOOL 8e0444f86e8a3030046e406b07eaa3584a98c992c5967a9184dfa54bedaccb4eacb67160dcc43862de15938ca7a36f0045d89332db7df0c33c7755b3466fcd11
 EBUILD netbeans-php-9999_p20160629.ebuild 4418 SHA256 11d47be338b1ca237c468a5fe3185f818fda7f46f8927e4023dcf5af02303c8e SHA512 81526613c6fbe4059453be97ce75d1fc121bcaa248c318cdead82a29bcde2ee16100c7afce783f051900fdbf745fbd99ae7319d1117b71fdc948b2d45e85e50b WHIRLPOOL bd11c27e91385a7527d0fd8fe2084873f3fa4b287b1e13ec4ec53c59bcc77c4f8e8a5b831a9e07d3dc221c6f5a9111c76589753cd93957ace920c808aa65c1fd
 EBUILD netbeans-php-9999_p20160630.ebuild 4418 SHA256 6010aaf38fd8362861f9b806c2b64677b04dfa1c58d9ec66883b8538acef6d40 SHA512 383ce987bfd97089a1b378a29444677d9af8cf7a76c3cf2eeca7c2dd9efe4df14ace107815aaac7cd6e48c7e7533491415e5374c79a061fdfed24deea4498d60 WHIRLPOOL b9b0f59d8ad9057582008479ee1e512cc654088a1e7ad41b001510dc65c0c128bc32b2ec9b377da3f2649c87e6bf49d943176c6bd68145325e22fbcc8af304ee
 EBUILD netbeans-php-9999_p20160701.ebuild 4418 SHA256 01223f49ba6b96b258d2c7e7c502b168f12b2edf2e0e8af7fdacdf4446796136 SHA512 5b8e985e1c5e443c345ff621b38810ec1626aed1fc28aa4dfb6d7f4fdd7cd8b493346666bcb69fdd2539ed6fdd0ed73a3cfdab744eaa723f22203dadf8f8e540 WHIRLPOOL d2ef1262516dc9b42cd3ac6a2ccf01a526c67cd1988bd44fbf55c0db909d5f4da92dc19d790e67e0ff912b8ad350ad8cd97ac92ab32c8c812362c71dd97b9736

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160627.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160627.ebuild
deleted file mode 100644
index 1d72f4f..0000000
--- a/dev-java/netbeans-php/netbeans-php-9999_p20160627.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-06-27_00-02-33/zip/netbeans-trunk-nightly-201606270002-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-php/netbeans-php-9999_p20160628.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160628.ebuild
deleted file mode 100644
index 875f05e..0000000
--- a/dev-java/netbeans-php/netbeans-php-9999_p20160628.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-06-28_00-02-33/zip/netbeans-trunk-nightly-201606280002-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 0122ce8..33bae1a 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -29,8 +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-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
-DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844efa871baadaea93f02572d7c43164130d7e7dea58e5a1d421232 SHA512 d7e869bd42a00a40030c012fb895ae358eafb5039bca76ae626eb5b0dd2ed7516cbedfd6d0336190e72d7a0ddfa4c6d4ce759085cbe05d38dbf66b52806b3e16 WHIRLPOOL e5430b55c5685d1a1126d60cdeffb535d673200d7da1638f8085969b81ddf42e619ba2d8b92ce01c59edf990f6c56721406a9f04a5dab6e8d81fd135235f8648
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
@@ -58,8 +56,6 @@ DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0b
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 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_p20160627.ebuild 9520 SHA256 c292b6fe79fd036789bbb7525897b5eba90a2d7252f81cc7eb0e245c015a0bd8 SHA512 cf48c7b08e817c33914686acd3cbf431c22a390688d8686f5bd571e7cd9cb958ba106f0247e34afe244d66ec4202412e69f105ed752698315d4cac90972b8c9a WHIRLPOOL 7c53da4a387c7c89008bb86e67dfcf87a71512c74bfb654db89e35e2dea387af48c2e41bbc94248c629c3c8bc9374a0faa4203ce7336c49bc370a4612da7c715
-EBUILD netbeans-platform-9999_p20160628.ebuild 9520 SHA256 e5c185ec19e1555a1331b4f92820d363178da11a2e40e685305b6c28ee10b0b1 SHA512 441108d2e5984770beec7f7e205315a54e19f934aedeeb4b084324dd633de9f38421e5812217f1fe3042c65de2c75eb6a6588287c2218d723f31bc73e1d02404 WHIRLPOOL 1012b8490fb0784fc18edc887afce92c662a6f4a1616679c74bf8fa9b9c75c7229233a6b75b75bdfc46c46c91d4fa88248003c754ea7c35f75550d478b40ee4a
 EBUILD netbeans-platform-9999_p20160629.ebuild 9520 SHA256 0bf3526d550909a3f9395d5982093199a23ccd632d07a65f06a1eec59745287c SHA512 19cedab72e8ca9a692557fdfa8d669f06d270b3ab9fcbbfca24d6d7ebf92ab0588f008d114d40185d3d070c2523f51374ece866af29d4197194f8680bac50892 WHIRLPOOL 6b35d62ea994764e82492bf169c7e590d6a6a21fda5d220d35e1188d1b673c0405b2bb7ecbc3e1070b95e13c919609d1f30551135acb78ff0624c904b9ab1af6
 EBUILD netbeans-platform-9999_p20160630.ebuild 9520 SHA256 8d27a23a3f18d02205b602f815c308a4c8246ce753be78be741857c76ad3513f SHA512 298b1e8e8f31a0e84daeb1edfac9db9a6b6c51e1605a224600a7a6f6c8b775467469cc9d526ff2b5f6660501eefd8bab4a5741a8a431bc1d677b9280e05dc037 WHIRLPOOL 9fecf9a6b5eddd1c9f152073c2323bf70b59ecb506df9ed524d0a0b84da320d96e9cd209342b4b29a56bc82a1ebd5ef1027f10817b0d5a0dd4bcb6d4fa5df9b0
 EBUILD netbeans-platform-9999_p20160701.ebuild 9520 SHA256 ffd5c1ab67582e5447635fbea6628fded4bd4538ae0132f23355bb6c02b18f6f SHA512 16312c828596ddea8f21d1d03f94c2e7628bdfdfd22aad8292a475b8da1193573cf72ab919d28bb65d96920a96b2ea766aa431afbc8660d831ef1addc8e460ba WHIRLPOOL 72252feff38fe227f5001ab9fc55fb173ac921da30f81f2c4457c82f9c09166a1711f9bba1cd4efd34aff6f755c9e05344eba2b603dc2744aebc4338c817c3a8

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160627.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160627.ebuild
deleted file mode 100644
index 5b30458..0000000
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20160627.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-06-27_00-02-33/zip/netbeans-trunk-nightly-201606270002-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-platform/netbeans-platform-9999_p20160628.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160628.ebuild
deleted file mode 100644
index df7c44d..0000000
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20160628.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-06-28_00-02-33/zip/netbeans-trunk-nightly-201606280002-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 db5a687..8886fb9 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -3,8 +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-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
-DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844efa871baadaea93f02572d7c43164130d7e7dea58e5a1d421232 SHA512 d7e869bd42a00a40030c012fb895ae358eafb5039bca76ae626eb5b0dd2ed7516cbedfd6d0336190e72d7a0ddfa4c6d4ce759085cbe05d38dbf66b52806b3e16 WHIRLPOOL e5430b55c5685d1a1126d60cdeffb535d673200d7da1638f8085969b81ddf42e619ba2d8b92ce01c59edf990f6c56721406a9f04a5dab6e8d81fd135235f8648
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
@@ -32,8 +30,6 @@ DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0b
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 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_p20160627.ebuild 3472 SHA256 795845575a1ca8fc3ecc03ff839995fdfb50261a24b37d0fa9dfb6215d223983 SHA512 9d3983705b31dac9f54bf7030b2e3a1de1a62a4697f7c41549418a3478ad1db46bb600e121035e5e2e65e1eec43175e998d9b9c6896ab45cb299da88af37bca4 WHIRLPOOL 92fecd4ec1162852dbce53ba021d652ade8dcbe3e6d2f23bdfae63884801f555f468a32e38580f1d55ec43f584bfdce6cbf721bb1173b95dbaa0383129d142c7
-EBUILD netbeans-profiler-9999_p20160628.ebuild 3472 SHA256 a76fd7e4668ca54313fc3885f96e6fdf4cc74b73c8ed26a9292b384065650046 SHA512 0cd7d9049d356066c4483e2430ebed00c30783a02bffe6594108d75065fa9895da16269f60fd2385b6e7ca2b30b6ee1a54f3ccc785e5b9c7a02cab9e8d09e28e WHIRLPOOL b131491b052ac388765818793c7493b548faa624ed62958cc99f97336a8ac0e238db53fdf9834105147780d53ba06e5725f78de4c92462dde3d19abdbbb559b5
 EBUILD netbeans-profiler-9999_p20160629.ebuild 3472 SHA256 400f9c8fd8d2ac203576d74f7f2124b0eb0c0b8c3195d7631f07def1ef16901c SHA512 540230b9d19253d3268fd0219a677c586efd9232526c75e8cea53d19c05e8c0a1d9619fc8f49708ff0b086c7b0d2aef3b6e845db7ab3d64100b86b8746082903 WHIRLPOOL c1bf20139867706bcafa86bc1978f1ea379c6699532f40b3da644736d0eaccc9bd5066509301cd4a192d40e14c78247ecf6ebd63d8c9401f8e1917e79474f570
 EBUILD netbeans-profiler-9999_p20160630.ebuild 3472 SHA256 99b2aabe6c38e44e9da1223f800bc2264bd27716b3325696d851669aa02e4327 SHA512 b34a95550e7c81284e89aa6a4db42ce9375eda58749a1c4ab4b16af17d859624be96667fbccc5e00d7311a84804b7a2f512e1fc56488c1753603f5c97053b13b WHIRLPOOL d047fa55173d99b94048e3e7b87d4d421ab8255f898e36112daa7e2e7c01de44c245b261e8cadf75ca9319b1f0acd9850ec4bf8f22067f21ca472610816dcc71
 EBUILD netbeans-profiler-9999_p20160701.ebuild 3472 SHA256 b003e864b0d1b28e937959eb1922f8b000e2cd0c1ccb7a31d84cce81b705bf20 SHA512 c9999b8c8552f22e957f0c25c9b07a9c759f824c02a623f27d69132fd98281d3c6f133fbb089170216792a6aa1e101e50d644e77da99253e88840a080832b4a8 WHIRLPOOL e7348d82b438e95ee58ecdfad13b85de3f82115e4157454fd40f0195e8e39ff41b66ad85b54d43aaa114f335cce526fd4c603e102019b0bbc98ab71f6c5d99a4

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160627.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160627.ebuild
deleted file mode 100644
index ea2ebcc..0000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160627.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-06-27_00-02-33/zip/netbeans-trunk-nightly-201606270002-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-profiler/netbeans-profiler-9999_p20160628.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160628.ebuild
deleted file mode 100644
index 2053319..0000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160628.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-06-28_00-02-33/zip/netbeans-trunk-nightly-201606280002-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 58d63cc..98e5b63 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -12,13 +12,11 @@ DIST 7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip 10012 SHA256 aeea
 DIST 7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim 72664 SHA256 affb03622da4c950db1dc5cee8d3ec8f30894571a1f4677142d64809b00454d6 SHA512 6dfa8f474073cf46c3a08ff3fe78d2bf2444e4ec6d17c779f3171d964bb0c5837ded5c8a4b16bbe08ac14508e335845f5e39d6a0d57679602482de8e30c3bcd3 WHIRLPOOL 6942cdb9d4717cff3212da2640617ae53a5bc88e257d6fc67f0e7cf7f078d53cfcf9dcd7b7a5666d865ba75a0c5477970e3110891cae8ef3e1f4d80a4660cb65
 DIST 7CA13589F586F659BB0E1561719A91CA47BF1897-com.oracle.js.parser.jar 278471 SHA256 ff359d533fbfcbb7afe6c2c8c25157f2a621fd7d8727e0fc8a54061682eb411d SHA512 fe228b770fa390b8b470282c1ff09bfa80d006e78d555842bbd1cd1230fb80420b8ebc5ae8fc75a063dfceac5080ede0144f13c43048c95e540fec244672e2c0 WHIRLPOOL c9f8fea359809f57280d90b25041efa67cd281dd4b9722d2de6389c4b4c65ea8a2a56dccda4f169adb9ff87b7fccabcf5e04f8e4a140b072937adc5503675d20
 DIST 81483881778F37D0495C07323E445361084CA1DB-ios-sim 102548 SHA256 eeecd2d1ec484095f1d1d354212bfaf28578ec26588b42cff0f987f4a8b5023f SHA512 a1255952d7558552ddc25cb4e880429c7d7251dc6ccafda4380c688c8e4398f6274b41003b31fd445cee5811ede02f0c46417fd323983a412fd1bf7429034589 WHIRLPOOL 3930f1c1e17b63f3a0216de6dcfe0ed7eacd0df7ead08dcad8bbfcfec588e8b26788e72e7f0185595e577479451aa150ce7ec275610432f7dd365770544e918a
-DIST 913947D60B9AE208A20A4CEAD4D033F141ABF9F4-js-corestubs.zip 32804 SHA256 301f6eaf81fca2ed5eb5f610756cb1e65fcac468036e038a9da427bc88f1fc4a SHA512 7c6b38d11bd6ab0678e9b6f9c94581254a9ad06be485db78f260c5a76bd5abbdebf699adb7777d751b57bfff006e66e76a60ac613734c69aab7ed8891f218ee2 WHIRLPOOL 371fe80866f008bdbb8c5498a082c5bb08a7d8cd2bbab30f50e95ad6f15bd9ceb8220bf6f0c62c2a683796c40c968b14b463fd54772041c5d8575b23c032ba66
 DIST 9D29F2A9722C91A403F32971E97DD0E49E97B02E-libiDeviceNativeBinding.dylib 10084 SHA256 862445bab777d39a227ab422dbd5dca457adefb35fcdbb036318e3bb11e303f2 SHA512 29949fed6bb31ec878416fae691dea24425c3785ccc717ef5b86ced9bacb87d8c698d74485474b39a66e61c0d05b41045059444805808b90a904a5b306fa3012 WHIRLPOOL 19a56da07d776c61ee688c0d1c03536cc4604b63ed2d17c408a283758153c9cc2c8fc00d39728ad78d2a3dba7906d0910ed5c5941e7fc7098e8528504c42a8b7
 DIST 9F0D0D95F57E73C0110FA023813A4F9756D543B1-libimobiledevice.4.dylib 159252 SHA256 052a881362a6d99e7b5a8c70531d4f70d15706e4b16570d0ff363f1a24e2130e SHA512 71d8d0c7b6ed247f705815c9e21cf9224c9c724c33cf6172ee864b5fb1807c4f2504e9b23e03c2636e5acaff89a09313b9e1d0bb3bf0ec9a26c16598abe98376 WHIRLPOOL fb85a22a37b265f3c630d5fed48b9f0a00fa41310c4a5c6702b6b93075b59c130da15e3ca4cc60f5615f1ba1c92d48009b9e4949053315bea6b790ee44babbfb
 DIST B68D8E16F5FDDB40C481465198E2768516E3D741-com.oracle.js.parser.jar 266524 SHA256 8831b8de9b0a50bdc7195191d13867ce58f13ac01afd47c009eeae2bcc1bc6d6 SHA512 084e8ca1f848a073d171dad3d78cadeae2d2f5dea7922849fb03f4b2f6c8730b99be6633cc0ab4700f7961a1791aed3995099bc2f98b07c8661d26f4d07f8df3 WHIRLPOOL cb6b04716992a672a6c935fb3d91d3bfba68ab7b175ac3874997155294c81277c6bd166e13769cd8caa4885eb2610e3bfeef118d6eccda7835c2557b87aeb28a
 DIST C1BB9FF4232248B0054E5A26A33474A251EA19CB-libusbmuxd.2.dylib 29404 SHA256 8e9a93c247c814e597e6cda3102d0cfc540d6692bab44ce5fe069269eb64c2c8 SHA512 c7ffc8890d7c605a6815edb34fe9b5578fa42b9111d2b40ddb128917ae04066292303c3cd11223d2e79526bc4b2f25025e1eee1449e60dc90ca98ffb11cc70ba WHIRLPOOL 652f0da52d04d35a11e828f0b85356780f39215a61ff72a9ddbe9493d5c940c2a72ac5f1ae9de830d6afd684f5f34f1cd53d90609e656095b2f26860e4f5a283
 DIST C8EEAB10E4539BEAF97476EBA252BD4B40377FA9-js-corestubs.zip 32928 SHA256 97442d0827a10745f607db2fc1471cc0cdf860add3eeb15d113f3b94ee343d1c SHA512 055810e141e29ef139bd6bcb0578d2f4790dc43ef6e4fd044f26a59c69ab6fe8af8ac9cb39b336e74bc3235d6a5de6aa7ca93b797c508ed8061c20b5d4588f6b WHIRLPOOL 202a4c5941a557af634d2d00ed1a1de5a2724a14b841e686a5619e9b711be32a1f0b3bfa08875e44c63137e9bff56f091c8a4c7241d5a26ba651283dde445e33
-DIST C926927CC9D32F80BF93D2F9623E5C1C8425A75E-com.oracle.js.parser.jar 263201 SHA256 93637e23b9f04b160d886dfc095beefa53f7ad71cef2de04594b2da848aded1d SHA512 bf193d49c528c0f77854b949be5ad93ca1309c90f05fb56259d7e4888f5e9f2e3484e600d4fcbd0c5ef43a212f5572ebbe31ff1aeae95bc8d45ce4e289065bf1 WHIRLPOOL da659a335d463de683655d95ae33e6f52481e4720b12d7aa71a197ba44889803dc3aec4d40a42147dc037a090a01e8993a1fd1a94406e302f59b06ce748f3696
 DIST CA8F6968FED0BE20E786C70CF9B603F4D7B66C68-ojetdocs-2_0_0.zip 2179489 SHA256 9e60b24c8cd7930d04517872e5926dffd761f06501b14caabd9456eba5f882c0 SHA512 bafbf999c1e64da8a4b72896514d1b9e6dca2dc5fb4d66dbd62fb5a986348faa42834da7960db4cd1455104f0d0dd0eaf6e56edd47affefdbc903a2320110da6 WHIRLPOOL 4a05b2eabf3688729d4a7f77c4b18fb6de4d2c88a1f206ec6a49094826a3fcfb9c5eae5947b9d8461e284c10743c7bd35c909caeba896b4f7bb1d1aaeb3c7d91
 DIST D05B7274396C8EED185207399B6D0400DE347DB7-libusbmuxd.2.dylib 29404 SHA256 692d95da66fbbe01d59ff23b20ad576aea4901017dca125b3f3cf67c49a8bdac SHA512 cf3df4552032065ee4dcfa5b2ef95e8fba27bee353211f3c05bb152c2e0c160b482911d5bf2acf668cf501825e184eb015bea3030edc89d2380dfd69282e310d WHIRLPOOL 970c9ea93e62aa9ef51fe1defee95d6da7a014b04725a113dfebea3abea9affb4fcea40661195e8994ff0783d9ef57131b3dfdfaf97dc8bb450da08fbc583e26
 DIST D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip 912402 SHA256 2fd1ecfc79700868afbf5915bc6196185eb66dae30c721b131bf41d732391f9c SHA512 0bc0a65bb7b6d78a003634027c93d842e2f1d928fcfedc9b12db4b508752b06931429a4a580a08b5fd5e666e4f3a208aed86eb21e81377973b43cb77b48cf4ce WHIRLPOOL 611461579d65306a303a58dcfde5a547a544750a7f77a82983dce741fff8fcf7ff259f2c201966cf1f9e1fb2e7ded4afe551ec9b04d707c0c92314074b0f378f
@@ -27,8 +25,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-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
-DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844efa871baadaea93f02572d7c43164130d7e7dea58e5a1d421232 SHA512 d7e869bd42a00a40030c012fb895ae358eafb5039bca76ae626eb5b0dd2ed7516cbedfd6d0336190e72d7a0ddfa4c6d4ce759085cbe05d38dbf66b52806b3e16 WHIRLPOOL e5430b55c5685d1a1126d60cdeffb535d673200d7da1638f8085969b81ddf42e619ba2d8b92ce01c59edf990f6c56721406a9f04a5dab6e8d81fd135235f8648
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
@@ -56,8 +52,6 @@ DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0b
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 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_p20160627.ebuild 6242 SHA256 a3851e9c84a81b1148eddb0ca6ae6a69a02a1fcf7024a344f78b93be4e053bb5 SHA512 85ffe56646202790b6af847d1d0b404aeb8085e0caa6ab18d5c4dc7e8023d53308a755cb288715f1ed38ed70abe72ca626a76d189ac751735cca7e4d36f6d1ef WHIRLPOOL fc8e3be758ce15726f50063c9f6ba6f147db3b3a66422df8623ac909ead127106f433267e1facc03a30882580cb8dd29c9fe6b6e6174b9f5c352e299aae9bcd3
-EBUILD netbeans-webcommon-9999_p20160628.ebuild 6242 SHA256 ae90066637168b6647b664aa0122addfeff595f681feb56c08ae4282721e9d19 SHA512 6f552c4a2f25091223d80bc16a5c9b227ec5f808ead6f9de347300868a5f0d7a19f73b9c6135b481c99297d5703d944f8ac95ea88d67ec4a9993465441aa2d80 WHIRLPOOL 4e8b74fb04d04f2d6edd31c7bac918f04e7ed10754d9532b1416876042e32d603cb98ec92d3207e844acb2bed74a07c6579b5dea51ed64e2dc69108b5494bc1c
 EBUILD netbeans-webcommon-9999_p20160629.ebuild 6242 SHA256 26fa0c9759e3ecca05171327d4b5f6f6f19c4c211b13bf6f5d2a4aab0a2a9161 SHA512 52c38e186e47668946cf14f0bd0898e7dad972f52473365d7911a0a5f58635fb43fc0183afead37ef7b7ac91872fff0fbdd3c74cc43bc3f4e8676094802b6434 WHIRLPOOL f0c7761e48852a8621d2cc155dabf8c6190f4376a803407d328aca00859860dac14521d4e03b4724b8af7589a64335f1d239a1cba3b0d4ff95973df3c8ca3e59
 EBUILD netbeans-webcommon-9999_p20160630.ebuild 6242 SHA256 9c217ac02417695459edba8050d2360bd5f1e0f085f8706d0ad2a1807c82aaa3 SHA512 be4ecd6cc59e877398f96bfdceb17048e3f4c69fc03fa6e896646b25d84a998736294e9f2c6cc82d3d3964f1ecfd9fa2f6defaa60227df28c3590d918abd6874 WHIRLPOOL 3cd416e9664794e970e23af2d9fcd9b3fae05667d5ed7ece7b794cb4abf89dc1d34e4718dc97717a718ed0a41cc8e1b8b6749ec91e638e773f215efe93e7c56b
 EBUILD netbeans-webcommon-9999_p20160701.ebuild 6242 SHA256 0c39818df923716655598daac17daf8a191217bb24783b8fe1ed45898a32d76a SHA512 669f6ea6473c4e92bd2e99ff7d108a173f4458c497e061438995e7ec0699ce363ff9fa56bce0d01983ea0e12f800fde337b6237860c48b2fb2b75c54e3e9af7d WHIRLPOOL 7e239f05594127725b00f5c1619465cfc183ff36c0b6da96497b97d28c1129cb5efae1b265183bccc7f8cd64a56d3e337ab7f86837f6684f062f0169a578c3e0

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160627.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160627.ebuild
deleted file mode 100644
index e04d304..0000000
--- a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160627.ebuild
+++ /dev/null
@@ -1,132 +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-06-27_00-02-33/zip/netbeans-trunk-nightly-201606270002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/C926927CC9D32F80BF93D2F9623E5C1C8425A75E-com.oracle.js.parser.jar
-	http://hg.netbeans.org/binaries/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar
-	http://hg.netbeans.org/binaries/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim
-	http://hg.netbeans.org/binaries/913947D60B9AE208A20A4CEAD4D033F141ABF9F4-js-corestubs.zip
-	http://hg.netbeans.org/binaries/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip
-	http://hg.netbeans.org/binaries/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip
-	http://hg.netbeans.org/binaries/0929AC5F40B5A8667021408748D64F30F77B3165-libiDeviceNativeBinding.dylib
-	http://hg.netbeans.org/binaries/2A38DA3DB5D36DBBDC0B03990B46810F72430D5E-libimobiledevice.4.dylib
-	http://hg.netbeans.org/binaries/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib
-	http://hg.netbeans.org/binaries/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar
-	http://hg.netbeans.org/binaries/C1BB9FF4232248B0054E5A26A33474A251EA19CB-libusbmuxd.2.dylib
-	http://hg.netbeans.org/binaries/D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip
-	http://hg.netbeans.org/binaries/1EFED55F8C442E4DB1C2338A5C35D494364F9ECD-ojetdocs-1_1_2.zip
-	http://hg.netbeans.org/binaries/CA8F6968FED0BE20E786C70CF9B603F4D7B66C68-ojetdocs-2_0_0.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-ide-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0
-	dev-java/jna:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.webcommon -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/C926927CC9D32F80BF93D2F9623E5C1C8425A75E-com.oracle.js.parser.jar libs.nashorn/external/com.oracle.js.parser.jar || die
-	ln -s "${DISTDIR}"/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar libs.plist/external/dd-plist.jar || die
-	ln -s "${DISTDIR}"/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim cordova.platforms.ios/external/ios-sim || die
-	ln -s "${DISTDIR}"/913947D60B9AE208A20A4CEAD4D033F141ABF9F4-js-corestubs.zip javascript2.editor/external/js-corestubs.zip || die
-	ln -s "${DISTDIR}"/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip javascript2.editor/external/js-domstubs.zip || die
-	ln -s "${DISTDIR}"/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip javascript2.editor/external/js-reststubs.zip || die
-	ln -s "${DISTDIR}"/0929AC5F40B5A8667021408748D64F30F77B3165-libiDeviceNativeBinding.dylib cordova.platforms.ios/external/libiDeviceNativeBinding.dylib || die
-	ln -s "${DISTDIR}"/2A38DA3DB5D36DBBDC0B03990B46810F72430D5E-libimobiledevice.4.dylib cordova.platforms.ios/external/libimobiledevice.4.dylib || die
-	ln -s "${DISTDIR}"/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib cordova.platforms.ios/external/libplist.1.dylib || die
-	ln -s "${DISTDIR}"/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar libs.jstestdriver/external/libs.jstestdriver-ext.jar || die
-	ln -s "${DISTDIR}"/C1BB9FF4232248B0054E5A26A33474A251EA19CB-libusbmuxd.2.dylib cordova.platforms.ios/external/libusbmuxd.2.dylib || die
-	ln -s "${DISTDIR}"/D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip html.ojet/external/ojetdocs-1_0_0.zip || die
-	ln -s "${DISTDIR}"/1EFED55F8C442E4DB1C2338A5C35D494364F9ECD-ojetdocs-1_1_2.zip html.ojet/external/ojetdocs-1_1_2.zip || die
-	ln -s "${DISTDIR}"/CA8F6968FED0BE20E786C70CF9B603F4D7B66C68-ojetdocs-2_0_0.zip html.ojet/external/ojetdocs-2_0_0.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --build-only --into libs.jna/external jna jna.jar jna-4.2.2.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/webcommon >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-	grep -E "/webcommon$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/webcommon
-}

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160628.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160628.ebuild
deleted file mode 100644
index 20824c0..0000000
--- a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160628.ebuild
+++ /dev/null
@@ -1,132 +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-06-28_00-02-33/zip/netbeans-trunk-nightly-201606280002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/C926927CC9D32F80BF93D2F9623E5C1C8425A75E-com.oracle.js.parser.jar
-	http://hg.netbeans.org/binaries/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar
-	http://hg.netbeans.org/binaries/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim
-	http://hg.netbeans.org/binaries/913947D60B9AE208A20A4CEAD4D033F141ABF9F4-js-corestubs.zip
-	http://hg.netbeans.org/binaries/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip
-	http://hg.netbeans.org/binaries/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip
-	http://hg.netbeans.org/binaries/0929AC5F40B5A8667021408748D64F30F77B3165-libiDeviceNativeBinding.dylib
-	http://hg.netbeans.org/binaries/2A38DA3DB5D36DBBDC0B03990B46810F72430D5E-libimobiledevice.4.dylib
-	http://hg.netbeans.org/binaries/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib
-	http://hg.netbeans.org/binaries/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar
-	http://hg.netbeans.org/binaries/C1BB9FF4232248B0054E5A26A33474A251EA19CB-libusbmuxd.2.dylib
-	http://hg.netbeans.org/binaries/D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip
-	http://hg.netbeans.org/binaries/1EFED55F8C442E4DB1C2338A5C35D494364F9ECD-ojetdocs-1_1_2.zip
-	http://hg.netbeans.org/binaries/CA8F6968FED0BE20E786C70CF9B603F4D7B66C68-ojetdocs-2_0_0.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-ide-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0
-	dev-java/jna:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.webcommon -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/C926927CC9D32F80BF93D2F9623E5C1C8425A75E-com.oracle.js.parser.jar libs.nashorn/external/com.oracle.js.parser.jar || die
-	ln -s "${DISTDIR}"/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar libs.plist/external/dd-plist.jar || die
-	ln -s "${DISTDIR}"/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim cordova.platforms.ios/external/ios-sim || die
-	ln -s "${DISTDIR}"/913947D60B9AE208A20A4CEAD4D033F141ABF9F4-js-corestubs.zip javascript2.editor/external/js-corestubs.zip || die
-	ln -s "${DISTDIR}"/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip javascript2.editor/external/js-domstubs.zip || die
-	ln -s "${DISTDIR}"/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip javascript2.editor/external/js-reststubs.zip || die
-	ln -s "${DISTDIR}"/0929AC5F40B5A8667021408748D64F30F77B3165-libiDeviceNativeBinding.dylib cordova.platforms.ios/external/libiDeviceNativeBinding.dylib || die
-	ln -s "${DISTDIR}"/2A38DA3DB5D36DBBDC0B03990B46810F72430D5E-libimobiledevice.4.dylib cordova.platforms.ios/external/libimobiledevice.4.dylib || die
-	ln -s "${DISTDIR}"/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib cordova.platforms.ios/external/libplist.1.dylib || die
-	ln -s "${DISTDIR}"/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar libs.jstestdriver/external/libs.jstestdriver-ext.jar || die
-	ln -s "${DISTDIR}"/C1BB9FF4232248B0054E5A26A33474A251EA19CB-libusbmuxd.2.dylib cordova.platforms.ios/external/libusbmuxd.2.dylib || die
-	ln -s "${DISTDIR}"/D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip html.ojet/external/ojetdocs-1_0_0.zip || die
-	ln -s "${DISTDIR}"/1EFED55F8C442E4DB1C2338A5C35D494364F9ECD-ojetdocs-1_1_2.zip html.ojet/external/ojetdocs-1_1_2.zip || die
-	ln -s "${DISTDIR}"/CA8F6968FED0BE20E786C70CF9B603F4D7B66C68-ojetdocs-2_0_0.zip html.ojet/external/ojetdocs-2_0_0.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --build-only --into libs.jna/external jna jna.jar jna-4.2.2.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/webcommon >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-	grep -E "/webcommon$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/webcommon
-}

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index bd480bf..45f7525 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -3,8 +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-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
-DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844efa871baadaea93f02572d7c43164130d7e7dea58e5a1d421232 SHA512 d7e869bd42a00a40030c012fb895ae358eafb5039bca76ae626eb5b0dd2ed7516cbedfd6d0336190e72d7a0ddfa4c6d4ce759085cbe05d38dbf66b52806b3e16 WHIRLPOOL e5430b55c5685d1a1126d60cdeffb535d673200d7da1638f8085969b81ddf42e619ba2d8b92ce01c59edf990f6c56721406a9f04a5dab6e8d81fd135235f8648
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
@@ -32,8 +30,6 @@ DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0b
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 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_p20160627.ebuild 2721 SHA256 10bf8804a84f868341f2c6c26d03be4c69d18b35cf990bbb0d9201362f005b7c SHA512 885089bc475df0851a6a64b49029c9551143887925f445e8516b6e702be407df35e031d11ff0ae5e7e8039ab0c7859a8e41f3e8dd1dd704c08f21f8d0070e1a0 WHIRLPOOL e1f49293f6da7f2ce870ec71722d0954005627e096da547f082b0b0e047fb9675d8eadc2709025d28b4ef55a81b7ca0194a99510b08a4e8afcdb8354cc18ed3b
-EBUILD netbeans-websvccommon-9999_p20160628.ebuild 2721 SHA256 bd3779b28f96ac28d9cb135cebb82d39d6b820d39a755334797a267943d19fb0 SHA512 1bf7e9801ab82ef335ba8054f3017f9e2cd01080b8b048f5201a2d49378cfa63366732a8047ded49fe407c7271179444308c37bf1eea1d7996b3e5bca975a7a4 WHIRLPOOL 66d0c5e4f64a2ed3d6356da4efa8fc1377cb40ba209eac2037ed17cb654b0373e302aa004ae0f72b1b54c9c98a44b065bdfa0fe02a9f010817caf88eddf9f173
 EBUILD netbeans-websvccommon-9999_p20160629.ebuild 2721 SHA256 31b16740d9c5b5f0dba53536a474ab9ef34841f5414f125cfe1ba0a182affc34 SHA512 1f23b25d36ad6e959f5cad16357bceaba8bd7cb4da62c876b6a13ddb76f069eef18290835896a167c2190d928add56d61a976ec4ac866db26201488237665678 WHIRLPOOL 134ad03608f379efbea024ace5c653519510d3c2e54d8ab2cfc88045c86b737980b2a4fd7a9a7b9d87a5a23f0a354e073c046a9b1681bc9084128618c06c3630
 EBUILD netbeans-websvccommon-9999_p20160630.ebuild 2721 SHA256 23de0fdebdd2cd62dc0d9ef58e18b6d62947ff0c03862ed021f0a2cc48a79684 SHA512 8816743ee02fc3c919e7bfd2409ecad37de6bbbc95ae81baf20fb68234d86c1cef52111446ba5be8e15a2f284c4ec96f152776d3a98f8124a4c61dbd7452ca05 WHIRLPOOL 27088983c59a56537825676f026a8fdd597213fe676e7a76613a63d98c8b5f3f0408d11f702cdc5222bbc23cc9b240320a3dd7c98bb72224b658a6d7dcc9d97b
 EBUILD netbeans-websvccommon-9999_p20160701.ebuild 2721 SHA256 cf027c12663df0a41c36419e8433517530be2d0ca4e8d8d49316aae88529eb43 SHA512 1359eb7cd6bd6c3bdbd4c4e70de12ab00c2c42df6cc253d52102fe2d39281c7c486d5de1305ad4739823b3f3d28fa2bb76b4d2cef4db92cfbf4bfd462c96c04b WHIRLPOOL 0ed8e01e9d265e3d82aab748575f6aa7e2c2cfa062ed7d0d0b64e66f24418183f4cd2fe46e762a52bb26a7038e7afa52cdd1a542dbd0e8103ccf8cb6b7c4a7f9

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160627.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160627.ebuild
deleted file mode 100644
index 05e1428..0000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160627.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-06-27_00-02-33/zip/netbeans-trunk-nightly-201606270002-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-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160628.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160628.ebuild
deleted file mode 100644
index b4e91d1..0000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160628.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-06-28_00-02-33/zip/netbeans-trunk-nightly-201606280002-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 f5cf944..0fa6090 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -6,8 +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-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
-DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844efa871baadaea93f02572d7c43164130d7e7dea58e5a1d421232 SHA512 d7e869bd42a00a40030c012fb895ae358eafb5039bca76ae626eb5b0dd2ed7516cbedfd6d0336190e72d7a0ddfa4c6d4ce759085cbe05d38dbf66b52806b3e16 WHIRLPOOL e5430b55c5685d1a1126d60cdeffb535d673200d7da1638f8085969b81ddf42e619ba2d8b92ce01c59edf990f6c56721406a9f04a5dab6e8d81fd135235f8648
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
@@ -35,8 +33,6 @@ DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0b
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 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_p20160627.ebuild 6939 SHA256 1e4e47f4099b520155e9d6e52034ebf6a5a3575a9f368b2ed0afaabdb02b7d58 SHA512 b95cbce3ddf4d19e50e2a04b5e3eb1c3734c82eb139371cdbc78fcc6703dd0c3c7f4e9ecebc7367652f92afd0de045292d450919f7001817f75059564b22fddf WHIRLPOOL 9f1112d03d996f5035b4eb06f22a096d6213692d31e99c47cea032030baa97982cd61920cd233ef22b8e582e8fe9ff9454bc823c4fce00aae28eec964f899114
-EBUILD netbeans-9999_p20160628.ebuild 6939 SHA256 6a537f5bfa1913170097e03db470bf1e0032ca441d81cd807b6a072cf1e049fa SHA512 076a2861f8c0a853d687c7e3d0ae2a53e78cf2b536d27e6c80a1e3d28a38e050ade2bedb8411fe4e623c78ac623e3b39037f7c81fd3aae64d676643e8ad59919 WHIRLPOOL 20f2ae7829dcbd1a9c0c9ed8b169ebd7e1cce5f77d98a70e83241c9cfd2d98288a34e482163da644bcc1c854a277fa6e8d3db2a795c9487d7402ea851477b179
 EBUILD netbeans-9999_p20160629.ebuild 6939 SHA256 7d7a99cae16080f9451ebfa095406a24ab4b84ff20e7840835992affcbc13602 SHA512 ad291eea5ffa6e139f2ea7284174e7c65df5bc59b741a463cc2d3b07f6678897d2d8debd92e957d284ef071261f3ca04064f55a6a58f0fd1a23f88e3134820bc WHIRLPOOL 9c8f78e356e76cc25e2dcb60fc030f2f499e77e9802e4a28bffed4fbde0f73ab1fc8cb56073aeef820f0cd534ccec41723b1d117ae7fbe265de202c506a5281a
 EBUILD netbeans-9999_p20160630.ebuild 6939 SHA256 f5fd58e599cce28a31bbfef0cdd0439e4e9ca2b77e3ad24a2b5aedf03fcc6253 SHA512 f80a07e8255c519770edb3cc7059b6a74411960912fde261004cc09e3bb74fbeedcf4d17e5681cad4054ec977270e3b04796f420ea11667f1c60e60cb775ee36 WHIRLPOOL 97f51865187c7815cca18869c9067c31990eafe1ea314465e830704812e44ea4b263ab387bf4fd470bf0d44f091a6f71e2ea6e710f4235492c6960b733b9be25
 EBUILD netbeans-9999_p20160701.ebuild 6939 SHA256 d0d49ec67a9a634dbd210d5f3348d586a14feeecda8b8acaf9340d4446228645 SHA512 8e30e5b71bf1079b504235bf356c7cc6fcc7e0383eed94982a759252fd5aa6e0517876ba5da24709250259a8ce14e03029753113b0a24bc6bbf85d44d14b0d5c WHIRLPOOL b4752d5d37423c339bd1108c8513a20c72d2eb57c3374419e7559e4e52f41d8df760902cb95cb19709753ad734805b78a29afab56bfc573acae35e54de3bf012

diff --git a/dev-util/netbeans/netbeans-9999_p20160627.ebuild b/dev-util/netbeans/netbeans-9999_p20160627.ebuild
deleted file mode 100644
index 7f4ac76..0000000
--- a/dev-util/netbeans/netbeans-9999_p20160627.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-06-27_00-02-33/zip/netbeans-trunk-nightly-201606270002-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
-}

diff --git a/dev-util/netbeans/netbeans-9999_p20160628.ebuild b/dev-util/netbeans/netbeans-9999_p20160628.ebuild
deleted file mode 100644
index 508426d..0000000
--- a/dev-util/netbeans/netbeans-9999_p20160628.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-06-28_00-02-33/zip/netbeans-trunk-nightly-201606280002-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-08-05  8:09 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-05  8:09 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-php/, dev-java/netbeans-ergonomics/, Miroslav Šulc
  -- strict thread matches above, loose matches on Subject: below --
2015-05-05  7:48 Miroslav Šulc

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