[gentoo-commits] dev/fordfrog:master commit in: dev-util/netbeans/, dev-java/netbeans-ide/, dev-java/netbeans-php/, ...

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] dev/fordfrog:master commit in: dev-util/netbeans/, dev-java/netbeans-ide/, dev-java/netbeans-php/, ...
@ 2015-11-05  9:20 Miroslav Šulc
  0 siblings, 0 replies; only message in thread
From: Miroslav Šulc @ 2015-11-05  9:20 UTC (permalink / raw
  To: gentoo-commits

commit:     c064a70bd67ea118c8a8b87b57145f0b5562ff12
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  5 08:08:14 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Nov  5 08:08:14 2015 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=c064a70b

netbeans: removed obsolete ebuilds

Package-Manager: portage-2.2.24

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 11dbc10..4ce5577 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-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-8.1rc2-201510122201-src.zip 208690047 SHA256 728bfd0c1be5c20d6e7e32251984130e9f00f7d95bcc7e87b25484cd25c40531 SHA512 01636c48d05247ba2a0ab105fdf4736e895ad878e824ab0ffb82d26a258c50ad740092dd6924e27f0bc53fa41dbe4ad67c98252ce0ef301388feca57231d8e09 WHIRLPOOL dae4e5c5f0d97a64b1c905dd046c8584150eea26ec99aeafc5f152e82d5770619e6999854729dcf4dd538b372f1827a8c0a4169c6e199bd730e970db6ced323a
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
-DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
 DIST netbeans-trunk-nightly-201510030002-src.zip 208672397 SHA256 56d684334f97609098798fc2e9d2bb56073a61dcd7c91be398476163b39b7dda SHA512 18c9b136a3f2bdca433dcd2cf7d0cdba5a6428027e3bd884791278b55af4955058674eeba8c920739896d80b88fc5eb94b67695ac7b81e55878328eec49ae516 WHIRLPOOL 75af86ffcdb1318b46995d168b01d979e8f40f3351ec875dfa8732c7ace713bd20ee38559ea2f5d2558088573831d545956e4efd228eaf697d17a2b14f74c3f0
 DIST netbeans-trunk-nightly-201510040002-src.zip 208672385 SHA256 ebc1f4ac878d56d41dcaf987e4436f5fb4e1f02643c7832ca927c5e3ddbb6a16 SHA512 26c6882a12b5a00cfa54cdca758c81442391b960383d5486dd81b444558c882c003d55fd32d58e8d75866e77a729cafc2ff00a6926b4c05245e1be023a159603 WHIRLPOOL fe7c480835e4458340ab03d6dd1319a2e377370d2f12e0afa3b4080bc128c746480708382e22a3584e61a101c0a97d9274c800a09bb3b784f675fa269a4536f9
 DIST netbeans-trunk-nightly-201510060002-src.zip 208673387 SHA256 dda7070cc82f15e7d8504a67a497be2405d3ed7e87525c332f1b71422c4a9f36 SHA512 94dd66c25fdb26b04bbedfc102e491893508ead55e66d3b61057a1544d5ffcfb898aacf197268213d139f214f033addb3e74630c3e5863cd5c417807988e1703 WHIRLPOOL 247f24bd2c8aa831b77319367fb4ca917b5300bc5916d5c0352100f1daf567a6a746fe4904f59fdb561490eeccb1442f1b01b7129c7e86830a207494345c7b31
@@ -28,8 +26,6 @@ DIST netbeans-trunk-nightly-201511010002-src.zip 208677648 SHA256 a23eb7aa0c1932
 DIST netbeans-trunk-nightly-201511030002-src.zip 208707811 SHA256 3d6beefb37d5b74cc273fbdbaf41bb9ed636b04276bb3ce72d289b55d74ed8e6 SHA512 496e8d8f4c04463f55ac01954dadcf8e80bdb6db81e2cefd66a5445c86c3c429950c4397ef781670a3f32b563812c792cf20ebc3542c33a6c9a87b38dcb26b84 WHIRLPOOL 2a119b5a7ac7b77dd7d93c61ef150e4eef67bbdd9e5ad41a851852493e189c87b7d9a889b74a215be61cfa1c3fddd90edf1089fedacbd8db54cff070a9100507
 EBUILD netbeans-apisupport-8.0.2.ebuild 3314 SHA256 b68fe791f275fe4fcc8b00888688949b8927cb39db2cf9ad7860017c6d20adee SHA512 35c4bbcd34ec0eaef8a2de86c13333d2bf092db61af48558c3e173bb17dbf8fcd15001307bd7c498f4ccdbaa4277e1ee42ff0909af6170039165b547f646c383 WHIRLPOOL 206fe8d5f64e76827d3eb958a629ba087e8a16c2797752f5d9e62dff4166653677587a81be19e0a2c6adcf49292255d532e1f542c02550b1cf6ffd51467bde3c
 EBUILD netbeans-apisupport-8.1_rc2.ebuild 3339 SHA256 a5952c7ca966bb14f072fd1ad4b92464f12e1d9ef04ee18616b1ba4de33f016e SHA512 bf26818a2701f01dd4340d73f479fe38e4b8f7b94da83ff0d90a779ece651474fd353730c518b5dba5c7164f2b62f8c2f49df5e3e7b9dc9ae292b6648875fec9 WHIRLPOOL ee1e8769b8656dc81059a91673be35f43aeda9cb1ed43c1b3379508b4d62ea10bdce7423499046567f0d61c6410f3c26faaafc288cc41aef3ded36086e2d715f
-EBUILD netbeans-apisupport-9999_p20151001.ebuild 3384 SHA256 9b0a84fced88d25678a0fda5fd8bf40be0b9c7a8dccc17f70087ad49c187979f SHA512 696c46f929a272dfdebb76a2b969819106b60dd416df1cf0f040fcdd422b47d99eb55c6d7ad4d9c6a18b7ed5aeb87a4b5ff2cc7574be21c8fc20574b4ce3d514 WHIRLPOOL 1a5108cff46424afc2cbceddf570482bf8912e8565444b5e76e886f179e04bcec29b64844e0b5576812c6390a80f6e73c942acee0130075da483152b254d1c90
-EBUILD netbeans-apisupport-9999_p20151002.ebuild 3384 SHA256 6f24772ec5ccf5cecd52bf4588d161adea100ddf121627b8a111ec3d203bc92b SHA512 fdbd10eb251e5faea44dce3a785de04af6a755f5b6a43e355330f7bfe8880b0ff079f1a30eccb490ada2b5c5aee93caa6204caed5dd0d998deaa1e5659423ecc WHIRLPOOL a9b99f47e816623e00c60a2e3f7514032703df6072a5df5fb127ea0c146866524e216f4e83b925c3ef93a732f62b6a96105ec78c337061f8f78a7c49b49edaaf
 EBUILD netbeans-apisupport-9999_p20151003.ebuild 3384 SHA256 ea74ccdcc63b59faf4badf83bbf5e5273b37eb3fb639f1fba7fa8b8df72e5293 SHA512 5d46bcbeed549a2099a951f78067953c9947810048702e5baf40a13d1cbb156068a263d92be798aa0e80f2c97a51144677c218f8777be1994dd3d46d11ce5d3e WHIRLPOOL 09e66faccd3b6d7bd066aeabc6c38eb843ad107128dbf451579a4c6f1d0ff94c846645af3ce6c14cab9448fdcb96a6dcf3ce386e8331ce2b650361b3e5f99d19
 EBUILD netbeans-apisupport-9999_p20151004.ebuild 3384 SHA256 2d6cad1f94e734f75da4589c2a4039870bf842f33f04a84f1984fbf1181da2a4 SHA512 57e2222421f868095e55115c3b3fd43bdadd04406a2bd5fd6ae4b31f8e4d6e40f45932936dc1b2fb3b1cb995e3d373108602b4f8d7ad1cc1c65b743d8c02ad1d WHIRLPOOL 7ff75b2e0a63d471f6533b03dece03ad7cbded0bc1c8151c0b37514ace2d7c4a22c3b3e268f45dbacd22f4041e36269e200067911e7da4c6afc2b1d9e14eee70
 EBUILD netbeans-apisupport-9999_p20151006.ebuild 3384 SHA256 6b229cf3c543ed300ce15811d3c1eff03839a47dd99968c82b5b1e4423efa4a3 SHA512 5e5adf7d1b72c3998b1cd598d94b48afa89d9ab31e8b4a437724d2bc35866815528d29209e6e9675fe8cff611f905264aa4565b9c3f4c43f5f0af5db41ee514f WHIRLPOOL 59cfea2c30aac5046ac7c0995c6acbce8a1e9a583e5365bdfc9b4ec51294c8a0696584cb2b20f59a930cd6946c8dfd36f53bb6b7075696b7833408dbdfd42773

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20151001.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20151001.ebuild
deleted file mode 100644
index 6d9e348..0000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20151001.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2015 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/2015-10-01_03-28-59/zip/netbeans-trunk-nightly-201510010328-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-apisupport/netbeans-apisupport-9999_p20151002.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20151002.ebuild
deleted file mode 100644
index 8a442b7..0000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20151002.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2015 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/2015-10-02_00-02-28/zip/netbeans-trunk-nightly-201510020002-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/Manifest b/dev-java/netbeans-cnd/Manifest
index 7c00e46..c04ec8f 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -1,5 +1,4 @@
 DIST 05DF72202917B78CCD9012D4CA2990DCC5D30A9A-clank_0.3.6.zip 7977290 SHA256 5588da55c54ffb5901695d970f464bff55191ee8908ba11c8c10c0cce54a5acc SHA512 574bf7fa8312bbceb7df856343c3a7df904de3bdfa0b9bb934c3c262aab8025f89776fab3d8e5504c72068b0b133f9db472686718bfddcedd7e472f7ae192107 WHIRLPOOL 7e0db7dea3820d61f39f3fef55fa03874d942db762f55da93fb1c65925ae3f9cdfef01b60df242bd07edcad92a24da3fd920fe660e6be97df7f40891f8fdd40d
-DIST 1D4EAF7EC4687B3AB3C2636B10DF0E8683429286-clank_0.3.6.zip 8563036 SHA256 baa23a792137da9c587d869c2f8b14ca10738ada9292caa3536685f0388046d6 SHA512 ef6bc5a7427f0c18cf3faa875b9515dc964367fa6a40312584d735201387d0f4d3281a239bc588e885491ce5396bac9e9e9f5a6b0ed4735682b0ff91b9637eec WHIRLPOOL af716ee0b453a6fc40ea6ff10e7cde1aebc0dbd0ee8df65dd42b45f56cfb8d2f57d23efe119d4d13393ec138f72748e49a95b3192e33849ef01e4ed193d63d3d
 DIST 24C58A1D3C410AD3E23CD828871630C17068B238-cnd-build-trace-1.0.zip 28980 SHA256 205a14a41fb7232c2a20779278ee1e303e6d3dedb3c84496b370ae397a7767b5 SHA512 0e570745cfb163cb54ac8b6b0f6feb6c76e3c414f03eab213f93637dc84471c0bb5b786af096acdd6265383474bf26db763ebda066add398efe601e5749a51b9 WHIRLPOOL 2d0042e180eba66269d4ccdf6279dcd166b4a34947406b5f7279b0017ebed27b2ea95f1565e57908e3567b303fb69d2cb5ca6504653126611ced84f103650a0c
 DIST 2BCF2047382FB68A2F275677745C80E79B4046AB-cnd-rfs-1.0.zip 152701 SHA256 ee454c52dab7af01a0c292bbbd9bd5fa62e07480d4284a34e38746aba4bb501b SHA512 222ae7d6fc8a1f5610a107264fd249180a7a865094979dd5426fb266b94e1d24ef421199cdcb923ab58577c292a183863c45a1434b4dcb35bd67dbdcde945e54 WHIRLPOOL 821c0e5e9534955ee9b4200476fa1fe65b453520551cb71a71a225bb96ac69ba6c408e9d59b5df7008ec1b8d173035e76358172cf3ebafbbd50d0971db3a8983
 DIST 2F4C7072A9AAC358270D2682E3DF89473FC4DEDE-clank_0.3.6.zip 7839786 SHA256 59fb821b72a24242563fd5ffa97948c70bc33ae83cdc4b1f1ead6349a4c0e87b SHA512 52520f3800f9b4e92adc02de98bc39d540ae8fe1deda61d8cf836ca9b366f4fefb14406c42ba5674fcd7399795cc79fd971dc6e37b2c28422d7f818f743af98e WHIRLPOOL 61c8e39d14201f70fb26b711a7bdf8bf80847858caae2bb5ee79507fb0733ed0156ddbe062c2c52cfd21633d85a71644920dac219a7dc7c48130498202ce7138
@@ -20,8 +19,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-8.1rc2-201510122201-src.zip 208690047 SHA256 728bfd0c1be5c20d6e7e32251984130e9f00f7d95bcc7e87b25484cd25c40531 SHA512 01636c48d05247ba2a0ab105fdf4736e895ad878e824ab0ffb82d26a258c50ad740092dd6924e27f0bc53fa41dbe4ad67c98252ce0ef301388feca57231d8e09 WHIRLPOOL dae4e5c5f0d97a64b1c905dd046c8584150eea26ec99aeafc5f152e82d5770619e6999854729dcf4dd538b372f1827a8c0a4169c6e199bd730e970db6ced323a
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
-DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
 DIST netbeans-trunk-nightly-201510030002-src.zip 208672397 SHA256 56d684334f97609098798fc2e9d2bb56073a61dcd7c91be398476163b39b7dda SHA512 18c9b136a3f2bdca433dcd2cf7d0cdba5a6428027e3bd884791278b55af4955058674eeba8c920739896d80b88fc5eb94b67695ac7b81e55878328eec49ae516 WHIRLPOOL 75af86ffcdb1318b46995d168b01d979e8f40f3351ec875dfa8732c7ace713bd20ee38559ea2f5d2558088573831d545956e4efd228eaf697d17a2b14f74c3f0
 DIST netbeans-trunk-nightly-201510040002-src.zip 208672385 SHA256 ebc1f4ac878d56d41dcaf987e4436f5fb4e1f02643c7832ca927c5e3ddbb6a16 SHA512 26c6882a12b5a00cfa54cdca758c81442391b960383d5486dd81b444558c882c003d55fd32d58e8d75866e77a729cafc2ff00a6926b4c05245e1be023a159603 WHIRLPOOL fe7c480835e4458340ab03d6dd1319a2e377370d2f12e0afa3b4080bc128c746480708382e22a3584e61a101c0a97d9274c800a09bb3b784f675fa269a4536f9
 DIST netbeans-trunk-nightly-201510060002-src.zip 208673387 SHA256 dda7070cc82f15e7d8504a67a497be2405d3ed7e87525c332f1b71422c4a9f36 SHA512 94dd66c25fdb26b04bbedfc102e491893508ead55e66d3b61057a1544d5ffcfb898aacf197268213d139f214f033addb3e74630c3e5863cd5c417807988e1703 WHIRLPOOL 247f24bd2c8aa831b77319367fb4ca917b5300bc5916d5c0352100f1daf567a6a746fe4904f59fdb561490eeccb1442f1b01b7129c7e86830a207494345c7b31
@@ -45,8 +42,6 @@ DIST netbeans-trunk-nightly-201511010002-src.zip 208677648 SHA256 a23eb7aa0c1932
 DIST netbeans-trunk-nightly-201511030002-src.zip 208707811 SHA256 3d6beefb37d5b74cc273fbdbaf41bb9ed636b04276bb3ce72d289b55d74ed8e6 SHA512 496e8d8f4c04463f55ac01954dadcf8e80bdb6db81e2cefd66a5445c86c3c429950c4397ef781670a3f32b563812c792cf20ebc3542c33a6c9a87b38dcb26b84 WHIRLPOOL 2a119b5a7ac7b77dd7d93c61ef150e4eef67bbdd9e5ad41a851852493e189c87b7d9a889b74a215be61cfa1c3fddd90edf1089fedacbd8db54cff070a9100507
 EBUILD netbeans-cnd-8.0.2.ebuild 4510 SHA256 0a9a4e58e28f395b5bcb017016b6ddb1b77afe393d0e5bd81cc05e3a32076c71 SHA512 2b1fedfe292fa140920fd11829e77127f9535e08b8307886accfa37e6d11195a1204e6b71b2640937da0711c3ce0bbf80c0eaa3c248a64fd61b6a3d99d5de14e WHIRLPOOL 10b1518360ade5d6f1f27c79a10f630b94a2ec5062e18df11f9828d4b374e6cbdea0b9f770e01c117ca90fa194dff9bd3be6a468075c2d35167fb78a7bb32794
 EBUILD netbeans-cnd-8.1_rc2.ebuild 4745 SHA256 b1c5a9a27ec1c22ea6eda555bce70adc6735c02d0eb47ebe676bffba4a2c3db7 SHA512 d50cb168b724476bbcb280e0e78a5ca3659721639f8e678be20523f0a491e2edbd78759cdbbeb86cc5ab039af7e46a92eebcabba5aeb366a5592fd3ed53d57a7 WHIRLPOOL a395a72b1acf8156dcb0185c5236986d40e01e1fec475f629c7a54f1e0cec2754a3d2de1883bf17e08264059d3d3009c54de019c4b5f156c1c884252b7240081
-EBUILD netbeans-cnd-9999_p20151001.ebuild 4790 SHA256 b699f830d6365a79195b7b411d5b764aeb1c67c243c633fc8ec9076ccecd387a SHA512 0488b2027a00ece43bbda93220c366926d4a96a87c380db3157495c45e0ef1c6da70725882d7c449b555a1eb641f066b8868100ef112da0ad66ad80ec79fce0b WHIRLPOOL c13484878e87d25a9ca8ce0556b464778c47528b345971101b870291787b2b2835e5ba06cbe31e29fbcb2964eed15a5259041c344cc96f6546d78f4f51365f56
-EBUILD netbeans-cnd-9999_p20151002.ebuild 4790 SHA256 b594fe449b56ca1f3ea527c8825fca3180ede5c6e25d039af2cfeeb1243f6116 SHA512 f1b447f992183aad7180ef5630ca225d2b93b5c874c9e282d6565ca89129c43372f4535557cfcb81a47c27815997c6e051df224a8e9527d67c1ccb588e8e7129 WHIRLPOOL cc7c3c4d969c9a970ce0d1b3ff758fb934655e50326d32f11ed825fca008d089cede1201172872508bbda377e6266f5572e9e1e0199abb886093d566fbc04e5b
 EBUILD netbeans-cnd-9999_p20151003.ebuild 4790 SHA256 94fffae05a79f51102df6f08dd5cc640e811d6cf613c7dc7fb88ebe35600faa9 SHA512 d103617e2a0d9583e304cfda6a2ac9ab1d667f8c7b120f7b0b8d117899ba1e9b9fe02940088997a7d908d5650a2e20098a33ca45a0a8caf8125450d3d11dcd09 WHIRLPOOL b1bea6f6f91613239e41b256c5c1fad1d4162c64580d8729e395a42c03f400bec63f1150551b853798ca17dd2b961b85b6cc4dfbf6e126f8b8d8b77896b00347
 EBUILD netbeans-cnd-9999_p20151004.ebuild 4790 SHA256 fd479cbfc2356f3641b12448b1ba4090863a3898d3075c083a1fc6f28bd0e993 SHA512 866c0bcec5eedd6f0ae6489c7127dd85a5202d9dce2048d26cc5878aec2bc83c71fbd1dd676220193f02cd498a54c18e59fee94373757de1eb71f0b1d32ebfba WHIRLPOOL a10cafdb6cc3ec0308936c279e8abce9388c8856035456506d02b9cff0c849f52fafc024da4a7df4ed9479e5a5b194011a5c5060672daa0814cdb607bd02d631
 EBUILD netbeans-cnd-9999_p20151006.ebuild 4790 SHA256 13e3c77a879d36e65e0b4f6dc87c2b9b0ddf4e768ecf0491a1c0a97560f08321 SHA512 48a127ff530d67b2401b293d210b4b4b4ebef73f935c7ae0fe78400e8baf08d96092ada97ea771f308b8860347c7c688c734097808b9f2898efc6a43d606f71d WHIRLPOOL 66fed18f482a390ca25f6dedf3c8825cfdd039f3cfb08f2a5d9a7ccdb37db42de42a0fdba9083ddb9af42bab77c773f9c9450f94f3fdfd274d2a14841a03c212

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

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

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 3d76c59..0e39e02 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-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-8.1rc2-201510122201-src.zip 208690047 SHA256 728bfd0c1be5c20d6e7e32251984130e9f00f7d95bcc7e87b25484cd25c40531 SHA512 01636c48d05247ba2a0ab105fdf4736e895ad878e824ab0ffb82d26a258c50ad740092dd6924e27f0bc53fa41dbe4ad67c98252ce0ef301388feca57231d8e09 WHIRLPOOL dae4e5c5f0d97a64b1c905dd046c8584150eea26ec99aeafc5f152e82d5770619e6999854729dcf4dd538b372f1827a8c0a4169c6e199bd730e970db6ced323a
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
-DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
 DIST netbeans-trunk-nightly-201510030002-src.zip 208672397 SHA256 56d684334f97609098798fc2e9d2bb56073a61dcd7c91be398476163b39b7dda SHA512 18c9b136a3f2bdca433dcd2cf7d0cdba5a6428027e3bd884791278b55af4955058674eeba8c920739896d80b88fc5eb94b67695ac7b81e55878328eec49ae516 WHIRLPOOL 75af86ffcdb1318b46995d168b01d979e8f40f3351ec875dfa8732c7ace713bd20ee38559ea2f5d2558088573831d545956e4efd228eaf697d17a2b14f74c3f0
 DIST netbeans-trunk-nightly-201510040002-src.zip 208672385 SHA256 ebc1f4ac878d56d41dcaf987e4436f5fb4e1f02643c7832ca927c5e3ddbb6a16 SHA512 26c6882a12b5a00cfa54cdca758c81442391b960383d5486dd81b444558c882c003d55fd32d58e8d75866e77a729cafc2ff00a6926b4c05245e1be023a159603 WHIRLPOOL fe7c480835e4458340ab03d6dd1319a2e377370d2f12e0afa3b4080bc128c746480708382e22a3584e61a101c0a97d9274c800a09bb3b784f675fa269a4536f9
 DIST netbeans-trunk-nightly-201510060002-src.zip 208673387 SHA256 dda7070cc82f15e7d8504a67a497be2405d3ed7e87525c332f1b71422c4a9f36 SHA512 94dd66c25fdb26b04bbedfc102e491893508ead55e66d3b61057a1544d5ffcfb898aacf197268213d139f214f033addb3e74630c3e5863cd5c417807988e1703 WHIRLPOOL 247f24bd2c8aa831b77319367fb4ca917b5300bc5916d5c0352100f1daf567a6a746fe4904f59fdb561490eeccb1442f1b01b7129c7e86830a207494345c7b31
@@ -31,8 +29,6 @@ DIST netbeans-trunk-nightly-201511010002-src.zip 208677648 SHA256 a23eb7aa0c1932
 DIST netbeans-trunk-nightly-201511030002-src.zip 208707811 SHA256 3d6beefb37d5b74cc273fbdbaf41bb9ed636b04276bb3ce72d289b55d74ed8e6 SHA512 496e8d8f4c04463f55ac01954dadcf8e80bdb6db81e2cefd66a5445c86c3c429950c4397ef781670a3f32b563812c792cf20ebc3542c33a6c9a87b38dcb26b84 WHIRLPOOL 2a119b5a7ac7b77dd7d93c61ef150e4eef67bbdd9e5ad41a851852493e189c87b7d9a889b74a215be61cfa1c3fddd90edf1089fedacbd8db54cff070a9100507
 EBUILD netbeans-dlight-8.0.2.ebuild 2898 SHA256 08402481b573b90396431be03bda45904b2dd29f0086e09a111fe362e310c3f7 SHA512 3f6d6c9ea0043382562fbe47ad16e3273032407a74cb44ec7ff26736f96483835af4be8674361e910912a550b9fe592cc5a28c2b93b6b993076553195c35eac5 WHIRLPOOL 9d8706ccbc0d97b0f5d64ebf22c36316b08d8fbccd57408119ca5f5faef08c7f82677bf67488ff611eabeaa730e4c9a730c50966d94d738cfe79330ac147863d
 EBUILD netbeans-dlight-8.1_rc2.ebuild 2923 SHA256 70d3c3729f4e669f1f2a2c7d71f4abd2f171402c95290546e0f34413ccdf9bcc SHA512 641b633b048dca1b1d94d212de023f5977c08d9aa8bb25bf2047255698135e0ad0ea7173360d9deac09a25b9f0844dea192a378adc164aa62dfa4d52a8ce2b80 WHIRLPOOL 0c2abb5028cbc0717e54601a125a016d7c208694adf8cadcae274096b8c7e200de13a0ede6c0815dc38c16c63633a3974fca6051b64156aa839155e31604f380
-EBUILD netbeans-dlight-9999_p20151001.ebuild 2968 SHA256 2662d9bd51c05b8c97c5be11ffaa9afd8e290d6be1f9c8e766267d1a945359d3 SHA512 f30c71dab1c3cc99c31885997c2e3a85912e1b34ce2dcd46fdcee3a7f76b8a50f50d3bac170d7055f268969bb13cfd5ad3564ff0df57cab88ab2c5f92b712edd WHIRLPOOL 44e5db72ef794b2fc8a26d1c1e3558d7420756a907fc2ff599922a36c65bf2c2de5423a328c7131ecf1637ef27965179aca5983359b7c678d8e50d8ce5a68981
-EBUILD netbeans-dlight-9999_p20151002.ebuild 2968 SHA256 bb30a82d5a88b90855c74166981189f2e78b9a8421f730bb4c4d67362ca9ad67 SHA512 33ed0667c9696c2c57ff4884afd50876e2990a790e843ef10ca6d999dace666adb02376c5f1b9e3089d0ffa5bcf9f0669cddee584a2540a92406ca24d6487fe4 WHIRLPOOL d2846314b3702b53e947899006d3e5b19f98d405ab622e4253b6f7e931957ac5529a00362c1ea15905f95bdacd3359a3bd993102cf5fbabaa93a292198cecda8
 EBUILD netbeans-dlight-9999_p20151003.ebuild 2968 SHA256 d361d4a4cafee000ffce4b45b1d6a3c620e03920fb8f3dc07dc5f4ac41893816 SHA512 5fa9eee3e893461d55018fd42e134d499bce6bc49883c858ceaad02601a5bca15aa9f8bd6572bd1dadc63a50297e01786e093b08276ba8881b1e263db8243175 WHIRLPOOL 7cdb3fe2fd8d96110b58745d595687bfb44867323e0622039c0144734ae0ff1a72092ff2711c87aedf1999784d4cc5d1f53ca284b6122dca0127ef9a2f982a5d
 EBUILD netbeans-dlight-9999_p20151004.ebuild 2968 SHA256 3f85f2f73870e1218fb6da93e52404768f09c497f04d825c56088cddb2a38ae0 SHA512 2afce2388091f11d51bc004dd163fd05640df523361e3f26a68800995f29c3f34bc92e0e5d6c5c9a391869f0439f7d6afbc574de517c40d8b6b52cae96a3ca65 WHIRLPOOL 33547fdef6dbefd99165e1999133bd715586d1a26a103e66ab5e859bd01c3bbfa6a0868ad6a5b4cbdfb7e1f21d145c53556e6edb674c3f80915ed20610442c44
 EBUILD netbeans-dlight-9999_p20151006.ebuild 2968 SHA256 55f8b71b7ee7575805a184ffbf69a02aa6ece4abf7b06247a81d0ab0d2ee3bd2 SHA512 29de5bde3ddd42526fa05d286357dabeb261cb04ca659ab41b27d5cd59ac87b6c37e0148bb21bc4d077507103d1037ecec3c0aa1db1c3e4b4aca74a486608ea5 WHIRLPOOL 63967dad69607c8a1d4c0db69a7f27f3ee492bc7e8cf937dc423af6a1cec4bfb811a6fcf9abe4c32aadde42b80b7fcc0c3e8fe7d6c432082f36a3f1cb04464f8

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

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

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index dab0cf8..623e23a 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-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-8.1rc2-201510122201-src.zip 208690047 SHA256 728bfd0c1be5c20d6e7e32251984130e9f00f7d95bcc7e87b25484cd25c40531 SHA512 01636c48d05247ba2a0ab105fdf4736e895ad878e824ab0ffb82d26a258c50ad740092dd6924e27f0bc53fa41dbe4ad67c98252ce0ef301388feca57231d8e09 WHIRLPOOL dae4e5c5f0d97a64b1c905dd046c8584150eea26ec99aeafc5f152e82d5770619e6999854729dcf4dd538b372f1827a8c0a4169c6e199bd730e970db6ced323a
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
-DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
 DIST netbeans-trunk-nightly-201510030002-src.zip 208672397 SHA256 56d684334f97609098798fc2e9d2bb56073a61dcd7c91be398476163b39b7dda SHA512 18c9b136a3f2bdca433dcd2cf7d0cdba5a6428027e3bd884791278b55af4955058674eeba8c920739896d80b88fc5eb94b67695ac7b81e55878328eec49ae516 WHIRLPOOL 75af86ffcdb1318b46995d168b01d979e8f40f3351ec875dfa8732c7ace713bd20ee38559ea2f5d2558088573831d545956e4efd228eaf697d17a2b14f74c3f0
 DIST netbeans-trunk-nightly-201510040002-src.zip 208672385 SHA256 ebc1f4ac878d56d41dcaf987e4436f5fb4e1f02643c7832ca927c5e3ddbb6a16 SHA512 26c6882a12b5a00cfa54cdca758c81442391b960383d5486dd81b444558c882c003d55fd32d58e8d75866e77a729cafc2ff00a6926b4c05245e1be023a159603 WHIRLPOOL fe7c480835e4458340ab03d6dd1319a2e377370d2f12e0afa3b4080bc128c746480708382e22a3584e61a101c0a97d9274c800a09bb3b784f675fa269a4536f9
 DIST netbeans-trunk-nightly-201510060002-src.zip 208673387 SHA256 dda7070cc82f15e7d8504a67a497be2405d3ed7e87525c332f1b71422c4a9f36 SHA512 94dd66c25fdb26b04bbedfc102e491893508ead55e66d3b61057a1544d5ffcfb898aacf197268213d139f214f033addb3e74630c3e5863cd5c417807988e1703 WHIRLPOOL 247f24bd2c8aa831b77319367fb4ca917b5300bc5916d5c0352100f1daf567a6a746fe4904f59fdb561490eeccb1442f1b01b7129c7e86830a207494345c7b31
@@ -60,8 +58,6 @@ DIST netbeans-trunk-nightly-201511010002-src.zip 208677648 SHA256 a23eb7aa0c1932
 DIST netbeans-trunk-nightly-201511030002-src.zip 208707811 SHA256 3d6beefb37d5b74cc273fbdbaf41bb9ed636b04276bb3ce72d289b55d74ed8e6 SHA512 496e8d8f4c04463f55ac01954dadcf8e80bdb6db81e2cefd66a5445c86c3c429950c4397ef781670a3f32b563812c792cf20ebc3542c33a6c9a87b38dcb26b84 WHIRLPOOL 2a119b5a7ac7b77dd7d93c61ef150e4eef67bbdd9e5ad41a851852493e189c87b7d9a889b74a215be61cfa1c3fddd90edf1089fedacbd8db54cff070a9100507
 EBUILD netbeans-enterprise-8.0.2.ebuild 15071 SHA256 84621e3bb946cfa254bb70ca3c3f61202882a7e6d631769ad2f0f4639b0de875 SHA512 6ad38e840764661e6bc5b89b5925e9665871009ba0b640c0a78c555ec104214dbee1200a93cb48e655bc620e07bb6e4d8932b23a00fe458f8a5e9e5c3200d79d WHIRLPOOL b2c2bbf2ff72f8cd9b4cdbe039fdbf7cd074b0fdc20f634aa0b6f79f5c639be358c61fab30854a6e3ab9714a285d9461ac4e39e94e10c14c5068422d6c873c56
 EBUILD netbeans-enterprise-8.1_rc2.ebuild 15886 SHA256 ffb03c95fbd05cc80ffd8d1590037ec6fd4e607a22160b986a0614edc7de0ba7 SHA512 f58ce52ccb40d5079502a1a43c3ac49b1b0607875d88c50f03295f78e0b6e586f5f52c809cfa8e9d803d07b351a2b75eefc91a0d5d4cd310b549b7a5e4b0f508 WHIRLPOOL 0b5550062f4a527614a107094a81e1e26492395a60190d50c0a76f0ce166f10153f37683344aab0c6b11741299e28fdc6d35eb91618f679dc4ce0df0e5ff6555
-EBUILD netbeans-enterprise-9999_p20151001.ebuild 15931 SHA256 0149922936b3fbf9c74723ede45a126dd4715025589ea8cb8b90ecb12499b16a SHA512 85c65a25883f3161a04524139128f726d2ba672ea17eca95541be54c1a5ce779003de558cbb22df4935b498500a675661a96b2cd24caa0b85906aa1857b23023 WHIRLPOOL 24b427e9eb51d20f7c06dbdfb31476bf9a01b0a9934ad177c7175510cb61d7d5e847a96211b268cd4cca26221b9a5c64e64902258388b39512e3391003753013
-EBUILD netbeans-enterprise-9999_p20151002.ebuild 15931 SHA256 4d8b137e7f98d1360c3dc67bbdbafb9ecc5f56cacd291f2ee8ec93571e127700 SHA512 b5cc45431d637b59204c6fe4dc92bc37f7a349e79e53afcab1f11551a315666192be86eae9b92023e4f5ef65bc40b815f63306becf04f56a71b2a24d31f92f1d WHIRLPOOL 7a8d0002b9783cbd3ded70084d1e0ade55f5db6adb9815c7a2f9f56db2819a20d4f9f539e7742e029c04994fa11ab7d597e9cb3b3e60506e6b715adea584e579
 EBUILD netbeans-enterprise-9999_p20151003.ebuild 15931 SHA256 356f1942ef0aabc2d057c85c3820224f8920ab55d4db9097653a51e2ce8dfe4d SHA512 17c689ed512039239724e6bcebf6b0a859e97ce85e86dc0d18187269b6bec218ddb28151346a36c7837d9197a11d7b63c953eb7c44c81c3ed175ea5c625bd5c2 WHIRLPOOL a82015685d9b9b35ab90c3f4f3f3656c60b635c83a5fecb7275fcfa1f4eec5a87ee71d4da490186f889c5899f3194b8c739cec3c204cc4b8f61468b541bc601f
 EBUILD netbeans-enterprise-9999_p20151004.ebuild 15931 SHA256 e54921f3c44d7701323cbba720bc8069d56410563ef6bc95b0021e77724bddc6 SHA512 5be02cd50b15dc66fb2e994081466f02f5a6bf09620e172cc9b6998b8a8d7463bc99690c7e55070593d1c0e8c138792591812be360c97ed35213d88616a9086f WHIRLPOOL 93646eff084156292eb20eb985b91e2fd99b6fe15cd05deb090cf80d6d2e8603608fae610da3a39b330f01617847cae09f7f0c9d21da2816607fb275b68d8837
 EBUILD netbeans-enterprise-9999_p20151006.ebuild 15931 SHA256 862ebf8dd23c6b35679efce9831d1103bae0144bda9183de1fa6aec2c8177322 SHA512 52b274bec10691f4f360a1c6bfe9c816822376f1adb23b226514d410bf2f076f85548799b46d17281946bd19c3aa56a5acf6d86527317fb27d2ec6c15fb718ec WHIRLPOOL 077817da055b8d5a9cd950f50ace53a9ae08251558d63f24c0cff7f2c9b9738050e7bb10ba3045ab0309ed5f9b2cb97eb5c5789bfe0168cac0500a0fa6ef5568

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151001.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151001.ebuild
deleted file mode 100644
index c12a1cb..0000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151001.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2015 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/2015-10-01_03-28-59/zip/netbeans-trunk-nightly-201510010328-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-enterprise/netbeans-enterprise-9999_p20151002.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151002.ebuild
deleted file mode 100644
index 6e54476..0000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151002.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2015 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/2015-10-02_00-02-28/zip/netbeans-trunk-nightly-201510020002-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/Manifest b/dev-java/netbeans-ergonomics/Manifest
index c258b3f..d77f411 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-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-8.1rc2-201510122201-src.zip 208690047 SHA256 728bfd0c1be5c20d6e7e32251984130e9f00f7d95bcc7e87b25484cd25c40531 SHA512 01636c48d05247ba2a0ab105fdf4736e895ad878e824ab0ffb82d26a258c50ad740092dd6924e27f0bc53fa41dbe4ad67c98252ce0ef301388feca57231d8e09 WHIRLPOOL dae4e5c5f0d97a64b1c905dd046c8584150eea26ec99aeafc5f152e82d5770619e6999854729dcf4dd538b372f1827a8c0a4169c6e199bd730e970db6ced323a
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
-DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
 DIST netbeans-trunk-nightly-201510030002-src.zip 208672397 SHA256 56d684334f97609098798fc2e9d2bb56073a61dcd7c91be398476163b39b7dda SHA512 18c9b136a3f2bdca433dcd2cf7d0cdba5a6428027e3bd884791278b55af4955058674eeba8c920739896d80b88fc5eb94b67695ac7b81e55878328eec49ae516 WHIRLPOOL 75af86ffcdb1318b46995d168b01d979e8f40f3351ec875dfa8732c7ace713bd20ee38559ea2f5d2558088573831d545956e4efd228eaf697d17a2b14f74c3f0
 DIST netbeans-trunk-nightly-201510040002-src.zip 208672385 SHA256 ebc1f4ac878d56d41dcaf987e4436f5fb4e1f02643c7832ca927c5e3ddbb6a16 SHA512 26c6882a12b5a00cfa54cdca758c81442391b960383d5486dd81b444558c882c003d55fd32d58e8d75866e77a729cafc2ff00a6926b4c05245e1be023a159603 WHIRLPOOL fe7c480835e4458340ab03d6dd1319a2e377370d2f12e0afa3b4080bc128c746480708382e22a3584e61a101c0a97d9274c800a09bb3b784f675fa269a4536f9
 DIST netbeans-trunk-nightly-201510060002-src.zip 208673387 SHA256 dda7070cc82f15e7d8504a67a497be2405d3ed7e87525c332f1b71422c4a9f36 SHA512 94dd66c25fdb26b04bbedfc102e491893508ead55e66d3b61057a1544d5ffcfb898aacf197268213d139f214f033addb3e74630c3e5863cd5c417807988e1703 WHIRLPOOL 247f24bd2c8aa831b77319367fb4ca917b5300bc5916d5c0352100f1daf567a6a746fe4904f59fdb561490eeccb1442f1b01b7129c7e86830a207494345c7b31
@@ -28,8 +26,6 @@ DIST netbeans-trunk-nightly-201511010002-src.zip 208677648 SHA256 a23eb7aa0c1932
 DIST netbeans-trunk-nightly-201511030002-src.zip 208707811 SHA256 3d6beefb37d5b74cc273fbdbaf41bb9ed636b04276bb3ce72d289b55d74ed8e6 SHA512 496e8d8f4c04463f55ac01954dadcf8e80bdb6db81e2cefd66a5445c86c3c429950c4397ef781670a3f32b563812c792cf20ebc3542c33a6c9a87b38dcb26b84 WHIRLPOOL 2a119b5a7ac7b77dd7d93c61ef150e4eef67bbdd9e5ad41a851852493e189c87b7d9a889b74a215be61cfa1c3fddd90edf1089fedacbd8db54cff070a9100507
 EBUILD netbeans-ergonomics-8.0.2.ebuild 2843 SHA256 f9262f6ee7f2aed1fab9bf4cf756f565272e9894afa50b349735e39961e7acc3 SHA512 f158c27640541f7aef31da050e0811c07a251ae4797cc663b95a074a47eaf9d6bb7a9aa11ba38ea55e75c185f7dba74629ba6716a819e8ad68eb3db9ada71451 WHIRLPOOL 4fe9634fb673fb05dbba25996efc3a212ef3bb23ab6e7c732cb75de076feb930735e3901806fd9c801abc7ee8aa8eb800718065325d415371255a886474061d4
 EBUILD netbeans-ergonomics-8.1_rc2.ebuild 2868 SHA256 7d268bf5a12b5937222eea504fe2cb34afbceaa9b04c4a34a098bc4d6868c1ac SHA512 739350bd2dea25d5e40096e33818bdb9a21f80ef90699cbaf0c5010d0b3986b5b642da343c3fd9a85fb66367fe086898554e928bf0496293e93900591df3dc04 WHIRLPOOL 068204fe9949561b5a4b4e5271c465ff6adbbeef19041cbbcadc345ab5fbd639fb32e99267a59b17b5541016cf464b1a0cc301f6d2858591a2cb7a4340e30a38
-EBUILD netbeans-ergonomics-9999_p20151001.ebuild 2913 SHA256 298a7adb7de6b3d67d0e0766d3d15ff94d15e5a8cc3158452a397d0861975685 SHA512 eb5d42a9417b03e97e556b78a345fae80121d191f528a10fc0589d1b9e90a8cf673fa75b0bce1cf7c8c8cdcc9d08f40a130f4eff48a898bd758cc836ee6011a1 WHIRLPOOL 62f9172cf7a7670932270e567606adf3a5624f542f0c174887fd8be6ff61b8376899ae5b3711aa0eb766c4a718675e116afe71246dbeae2b619a460b9d8ce8a6
-EBUILD netbeans-ergonomics-9999_p20151002.ebuild 2913 SHA256 a339af6e44667c67ae5f00b6dfb130b1f3ea3e6d5bbad20a7c3ab2ae37681059 SHA512 74851d3beee09bf4bae478271756ceca819a57dee328791bde5a2a27afe32b4540c4ec5c9fbbf3bfe4d769f69b2c52cf365dbab4b4dfc8e24b46d8c1efbdd211 WHIRLPOOL 6ce40af3d909d24ad3b17d664515cc052e8cc8799616a5cea1f675e6f55de9a76f5ab286fab9bc1909e478c551bc4c0fe69cda85171781316641180f6ec94805
 EBUILD netbeans-ergonomics-9999_p20151003.ebuild 2913 SHA256 70013b10fd740d2ea8ba3c4f96317c18aeb9c8eba90113d480122f10cfb7c619 SHA512 d748b04dd9faf8165de4645f5882e9955ca3843e0692d34205c42d4da3994b23d478ee8ec9d7d71dffef0363c42f4f660df25608b927d84a75653b8dc6b154da WHIRLPOOL 238459b724e035b73b4afe8873d8c1f5eb19d551964b80d4e0ef0ea153c266a637eb1f4b630ca549d1ea0fe85839d49a5f045a03c759be803dc8192fd5e97bd5
 EBUILD netbeans-ergonomics-9999_p20151004.ebuild 2913 SHA256 34b5846fa27f98fc13790c76eba538a1b709cf62696f0d3afb738081bea2d6e2 SHA512 c3a6d97e27e005064521964439f132964b5f9bad838e4cf18a9d5166b1dbc440fe01b5cf120035f27692f0b96bc3039dbdc8fe5661a32824530d6f209d7efd9c WHIRLPOOL cdfe9b5febe5b5fc1ecca5827fa88c774bf9227cf8ea037f49f0d8f49179af31838ddd6b00808ac4e9d80ab63e5ada94e80534fd696ec199f35c574fb5889898
 EBUILD netbeans-ergonomics-9999_p20151006.ebuild 2913 SHA256 e66d0d8e983a0487218021d8aea994edd121b57dcab3ba2a4b792cb13b57e0a4 SHA512 c78e402598ef5cd42f20b34e00ad2d539f50346d9ed7a720438c5f77170a374de68109b675c896e44c2e1b96ab3ff77c9895f55ca25075be0af32a77067484c5 WHIRLPOOL 367a0ed353efe51ee7b122f5214f1e0db0716fcc4667f5aa2b3718a8db6d03bbba78b05d0af9eee277e7003ea5b2e4f885f84da5d8bab659ecb9d7dbbbd41695

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20151001.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20151001.ebuild
deleted file mode 100644
index e97348a..0000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20151001.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2015 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/2015-10-01_03-28-59/zip/netbeans-trunk-nightly-201510010328-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-ergonomics/netbeans-ergonomics-9999_p20151002.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20151002.ebuild
deleted file mode 100644
index 18178d6..0000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20151002.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2015 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/2015-10-02_00-02-28/zip/netbeans-trunk-nightly-201510020002-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/Manifest b/dev-java/netbeans-extide/Manifest
index a0d1044..c16fbf2 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -5,8 +5,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-8.1rc2-201510122201-src.zip 208690047 SHA256 728bfd0c1be5c20d6e7e32251984130e9f00f7d95bcc7e87b25484cd25c40531 SHA512 01636c48d05247ba2a0ab105fdf4736e895ad878e824ab0ffb82d26a258c50ad740092dd6924e27f0bc53fa41dbe4ad67c98252ce0ef301388feca57231d8e09 WHIRLPOOL dae4e5c5f0d97a64b1c905dd046c8584150eea26ec99aeafc5f152e82d5770619e6999854729dcf4dd538b372f1827a8c0a4169c6e199bd730e970db6ced323a
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
-DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
 DIST netbeans-trunk-nightly-201510030002-src.zip 208672397 SHA256 56d684334f97609098798fc2e9d2bb56073a61dcd7c91be398476163b39b7dda SHA512 18c9b136a3f2bdca433dcd2cf7d0cdba5a6428027e3bd884791278b55af4955058674eeba8c920739896d80b88fc5eb94b67695ac7b81e55878328eec49ae516 WHIRLPOOL 75af86ffcdb1318b46995d168b01d979e8f40f3351ec875dfa8732c7ace713bd20ee38559ea2f5d2558088573831d545956e4efd228eaf697d17a2b14f74c3f0
 DIST netbeans-trunk-nightly-201510040002-src.zip 208672385 SHA256 ebc1f4ac878d56d41dcaf987e4436f5fb4e1f02643c7832ca927c5e3ddbb6a16 SHA512 26c6882a12b5a00cfa54cdca758c81442391b960383d5486dd81b444558c882c003d55fd32d58e8d75866e77a729cafc2ff00a6926b4c05245e1be023a159603 WHIRLPOOL fe7c480835e4458340ab03d6dd1319a2e377370d2f12e0afa3b4080bc128c746480708382e22a3584e61a101c0a97d9274c800a09bb3b784f675fa269a4536f9
 DIST netbeans-trunk-nightly-201510060002-src.zip 208673387 SHA256 dda7070cc82f15e7d8504a67a497be2405d3ed7e87525c332f1b71422c4a9f36 SHA512 94dd66c25fdb26b04bbedfc102e491893508ead55e66d3b61057a1544d5ffcfb898aacf197268213d139f214f033addb3e74630c3e5863cd5c417807988e1703 WHIRLPOOL 247f24bd2c8aa831b77319367fb4ca917b5300bc5916d5c0352100f1daf567a6a746fe4904f59fdb561490eeccb1442f1b01b7129c7e86830a207494345c7b31
@@ -30,8 +28,6 @@ DIST netbeans-trunk-nightly-201511010002-src.zip 208677648 SHA256 a23eb7aa0c1932
 DIST netbeans-trunk-nightly-201511030002-src.zip 208707811 SHA256 3d6beefb37d5b74cc273fbdbaf41bb9ed636b04276bb3ce72d289b55d74ed8e6 SHA512 496e8d8f4c04463f55ac01954dadcf8e80bdb6db81e2cefd66a5445c86c3c429950c4397ef781670a3f32b563812c792cf20ebc3542c33a6c9a87b38dcb26b84 WHIRLPOOL 2a119b5a7ac7b77dd7d93c61ef150e4eef67bbdd9e5ad41a851852493e189c87b7d9a889b74a215be61cfa1c3fddd90edf1089fedacbd8db54cff070a9100507
 EBUILD netbeans-extide-8.0.2.ebuild 3307 SHA256 084e952eae1708b0fab785fd34313985e864dbc74a8531a0d5cdcf906e88f85a SHA512 ade8dc37aa932d7ec20966199e521311716061c23df08d02635f78efd2776f1d7bf040b0f9c9488b947bbbdfb3e33fa764723e3dfffa2214892bc6d685428f6f WHIRLPOOL ad2c26b005675ebca7d902ff1e6caa28552f3fda6795e327cc3584cf109f0ad6efad6516e15af5e70d689be236298b0948003e09a3da4991b3e29a1c85607b2f
 EBUILD netbeans-extide-8.1_rc2.ebuild 3332 SHA256 43580bab7453f294442683c85e5b1ba58d212977551240bb22c24627a4b442db SHA512 83e55ac4d2a424aad4685a2f77ce3e4944fab7330ca09fd6b6635bfec30895eaa09af60dd03a67bc4d66d0b387f4481787f9a6297e1c9382550bae894805cce3 WHIRLPOOL 10d30dfe7d188a67ab1d5afcb408064272fa68180c126d6bab5500c2726afd253f32db043b91e531c89841d8b857053a7fe250c5b8aed1e85506c42b7e2df7d8
-EBUILD netbeans-extide-9999_p20151001.ebuild 3377 SHA256 c6e0674a87d64595344e0dd9011ec485b3aaf1c900d67ba14e6ea766c0e8efc0 SHA512 7c36b2a7932e8002a80a776dd14d2bfb82677e90cda7531295bac39063a354bd0d1fd2e587774c2d484ea75d2a88f4d4f37684dafab23ba700aebd23de8cd03c WHIRLPOOL 498bfe06ea235fb7c4588426e69fa3aa31595283231488c7d4612810af791cdc580f270b23f382108e549c3150765d191f57cf159e39f9203725cc269a770c1f
-EBUILD netbeans-extide-9999_p20151002.ebuild 3377 SHA256 5a475e917cb56e6afae58d3fd8c8c1c9d5a5652faaf6715ff3b6af9f336a2a2a SHA512 765e312a4739a14965f534f9e3951eee000dda22c167f47e27df7b88509f4ed36febb87ec791dcb2e09a7e0a5e7b6a14281ce2116aad4cada577bb70f79dec33 WHIRLPOOL b1e783f4b5f208ee3f95299c39044b184d38201f9d8eb16628cc9f9319ba9291d8ed493408bc5b4896d60fc3bd65aa05fde4edd94e96d2d1bb4ebc35665cfa69
 EBUILD netbeans-extide-9999_p20151003.ebuild 3377 SHA256 284338598a5a923b3a100ab3c471a5b16180b4a0aa3d190851dad87287e2215d SHA512 67a3e69a4d9ee03f3f0f19874c6e19d821201770de2262117767c338ff7e3ff50177c01973a9dbf90426f297fe4f4f3be9dce7034448ef7965ea15a06ebe39a9 WHIRLPOOL fb2dcafc94ecb98e79283c418b01f9b0190fd78e6c8147ad188b56988b41a0228fd7d7c5e4df7f5923b5dd4ea4ee5eee3d0da7cc504b1de157df9c1127bc4a3b
 EBUILD netbeans-extide-9999_p20151004.ebuild 3377 SHA256 13c5a6523f6205400d439d9a7a52714c66c22a790f0a8d9694d9c59f6c123c51 SHA512 fc19df7d7547537d15be59be14257f2f4156f8a336ed758abcd71a4a47ded84e40af64cfc7943e2fc83b4082638734c96ed4474186e0d5787e1609df05e0b3a4 WHIRLPOOL 47d081d5fa053e20dcaca9a911b33cf9451a59bd32fb494573ef580799a357d002c2ea372b0d4bcd644d1b42a5a8798b0dbfbe798f5ab5628c6890f04323c131
 EBUILD netbeans-extide-9999_p20151006.ebuild 3377 SHA256 5a6a5b1810300e0127d56b0c2b4c0150ea76c50ff453f31ef8128da831bd8517 SHA512 4797b9ad9de942d750de56d9fab534ae29fa88bf73de0370dd6acf1b8cf9dbda7b7e61b71ec2548a13565566f1d76bd281ed8cba227d3b20fc8405720dd51661 WHIRLPOOL 61e3c047bc5f5393c0b624f16558671ed21a88f0e03bdbd5d9b790e233aa5bb52f3dc187b80d284e0808f389ce58ed60f365fd23683dd880df23b7c60b1737f6

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20151001.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20151001.ebuild
deleted file mode 100644
index d8f1d33..0000000
--- a/dev-java/netbeans-extide/netbeans-extide-9999_p20151001.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2015 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/2015-10-01_03-28-59/zip/netbeans-trunk-nightly-201510010328-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-extide/netbeans-extide-9999_p20151002.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20151002.ebuild
deleted file mode 100644
index 16f167e..0000000
--- a/dev-java/netbeans-extide/netbeans-extide-9999_p20151002.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2015 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/2015-10-02_00-02-28/zip/netbeans-trunk-nightly-201510020002-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/Manifest b/dev-java/netbeans-groovy/Manifest
index 0092fbb..ddfc4f5 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -4,8 +4,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-8.1rc2-201510122201-src.zip 208690047 SHA256 728bfd0c1be5c20d6e7e32251984130e9f00f7d95bcc7e87b25484cd25c40531 SHA512 01636c48d05247ba2a0ab105fdf4736e895ad878e824ab0ffb82d26a258c50ad740092dd6924e27f0bc53fa41dbe4ad67c98252ce0ef301388feca57231d8e09 WHIRLPOOL dae4e5c5f0d97a64b1c905dd046c8584150eea26ec99aeafc5f152e82d5770619e6999854729dcf4dd538b372f1827a8c0a4169c6e199bd730e970db6ced323a
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
-DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
 DIST netbeans-trunk-nightly-201510030002-src.zip 208672397 SHA256 56d684334f97609098798fc2e9d2bb56073a61dcd7c91be398476163b39b7dda SHA512 18c9b136a3f2bdca433dcd2cf7d0cdba5a6428027e3bd884791278b55af4955058674eeba8c920739896d80b88fc5eb94b67695ac7b81e55878328eec49ae516 WHIRLPOOL 75af86ffcdb1318b46995d168b01d979e8f40f3351ec875dfa8732c7ace713bd20ee38559ea2f5d2558088573831d545956e4efd228eaf697d17a2b14f74c3f0
 DIST netbeans-trunk-nightly-201510040002-src.zip 208672385 SHA256 ebc1f4ac878d56d41dcaf987e4436f5fb4e1f02643c7832ca927c5e3ddbb6a16 SHA512 26c6882a12b5a00cfa54cdca758c81442391b960383d5486dd81b444558c882c003d55fd32d58e8d75866e77a729cafc2ff00a6926b4c05245e1be023a159603 WHIRLPOOL fe7c480835e4458340ab03d6dd1319a2e377370d2f12e0afa3b4080bc128c746480708382e22a3584e61a101c0a97d9274c800a09bb3b784f675fa269a4536f9
 DIST netbeans-trunk-nightly-201510060002-src.zip 208673387 SHA256 dda7070cc82f15e7d8504a67a497be2405d3ed7e87525c332f1b71422c4a9f36 SHA512 94dd66c25fdb26b04bbedfc102e491893508ead55e66d3b61057a1544d5ffcfb898aacf197268213d139f214f033addb3e74630c3e5863cd5c417807988e1703 WHIRLPOOL 247f24bd2c8aa831b77319367fb4ca917b5300bc5916d5c0352100f1daf567a6a746fe4904f59fdb561490eeccb1442f1b01b7129c7e86830a207494345c7b31
@@ -29,8 +27,6 @@ DIST netbeans-trunk-nightly-201511010002-src.zip 208677648 SHA256 a23eb7aa0c1932
 DIST netbeans-trunk-nightly-201511030002-src.zip 208707811 SHA256 3d6beefb37d5b74cc273fbdbaf41bb9ed636b04276bb3ce72d289b55d74ed8e6 SHA512 496e8d8f4c04463f55ac01954dadcf8e80bdb6db81e2cefd66a5445c86c3c429950c4397ef781670a3f32b563812c792cf20ebc3542c33a6c9a87b38dcb26b84 WHIRLPOOL 2a119b5a7ac7b77dd7d93c61ef150e4eef67bbdd9e5ad41a851852493e189c87b7d9a889b74a215be61cfa1c3fddd90edf1089fedacbd8db54cff070a9100507
 EBUILD netbeans-groovy-8.0.2.ebuild 3346 SHA256 907e6cd11c222f15c826494b44929483803f0e4249de0d54db51e6855b574148 SHA512 8bb37121e7e32621959318d109b1d982e2c705a9deb7171f5fef1dcaed55fc5718b0bc9e6bbb2592cdaa5e96d874bb6e6bfa96d06fe09f14d5250c1485eb1da5 WHIRLPOOL d5e09fa1e975835f05c6132c091fee4ae9fc9dd671af9f5f88a9195d5cd4a93804f96687ed3f2bd741117fa65773f2c464b3cfd6697425039cc51a940efa2a31
 EBUILD netbeans-groovy-8.1_rc2.ebuild 3371 SHA256 6ace63d0b75118b4e82bc5fcd42fcff4af16aa94909f6b7ce53901f9df92117c SHA512 12f629d795a38c2d5220ed1c1b1d15db2446c464a3713fef2fa8c95d3c41365f346dabd6d408b899997c618d39e759e319d1cdc63c02c3a07994877ca75d9ecc WHIRLPOOL 5fa0e845cb4597c5a7a24dd19e464e491ec99b7be5b9040fd98ad4f12a399dc08f4707b046bb02bd4e04e0bef4f39a23f040816d5559edb7f782f397dd3007a8
-EBUILD netbeans-groovy-9999_p20151001.ebuild 3416 SHA256 3a45101e291ed46b58227eb22e6350d10249826f237793009cd9c68b4a13be49 SHA512 bef697cadc1a6ccb36be3b449cb1cf56bb644c2c5ed7189bb69daed9d16c18b18ba4b903362e1d80e9d8fe29702b5ccff58250c6efbf9bfefa968f94e2105abc WHIRLPOOL cdcc6244e9e24c0d7b7b0ae2d592f95813e3d8f1b5ce63d3f24315b5f4af559b3ca6668cc5ae5bdfd6817b2c7ed3b82fae1737123156ed597ada2e10d7e3c5df
-EBUILD netbeans-groovy-9999_p20151002.ebuild 3416 SHA256 a885a118d6bc446213eee0f4172d618b85908c7eba446e9267cc25a8d8a17d8d SHA512 be8c07d5a041141d597086eb1a8ee64f43edb30f12dc2aa040fa11fb61bc6a79ae235682d9c42d4dbfc356ecd85e1c06c651c3679a66293d1c887f6960f79a86 WHIRLPOOL 13b663a9186c990fb0570d8a767b699c027403b3e4037ad85f5e139cdb7b25edc5ead649be02fd7c88f7ea942a090d4b996e18875db1fa6b1c44039acf2ad7d3
 EBUILD netbeans-groovy-9999_p20151003.ebuild 3416 SHA256 67a93aa7218a65bda8a08a0a20ac030b3e0fa592c01d70562b9c676ce3f0d446 SHA512 8b659109c28d8a1a4dda141c10d41e3bfa0577bf539e87c86cb05afb40c08ec62ed3f88d9ced2df7c09afebda3f1f57833f0e1fc8e6dd065da9bb2c914485d62 WHIRLPOOL 8e1dba2c469e89ca985089eccf8e5de190990b624dc225fb924cccb9faf00d662d58e43266bf0653484554bbb3a2fc8dbe328886281a5aa0f3c65d4b6ebf7250
 EBUILD netbeans-groovy-9999_p20151004.ebuild 3416 SHA256 8792623920bc2fbf8ca2a39138aaa2be81beeae0f2b4164bf6d4bfb20c517f4a SHA512 0fbe4d07f37c70a106dc13d33cd279fb925dd1d6dc955925ff9dfb42a14fc14dc93f0d1ea8c5ae580a440758225a609ed332aa8db8b16333d0e27dff0fbd71fc WHIRLPOOL 1646bf795be3465c1d89b8a75f694952415986242072ee68fa3d957d89d2f1265a2797ca5202a90652af585496481ad98fd064285eb9333d029d149c940142bb
 EBUILD netbeans-groovy-9999_p20151006.ebuild 3416 SHA256 bce28b2f038b0c2d8fb30ae61481399a31e915614d0a9b884a5d71c6e4009111 SHA512 69482b67824fd188e2ef44db0940d48a98522c6940b8109f775d57a4b4ca15c8f8991f80e40ab343926bb854decd75ffef6606119625f6096d8da1fc5b079f42 WHIRLPOOL a1c70736c121fefc56ec0142a1804c77c912ae42a81cfb7af03b91d5cf09788c6142992dd1be846b0fb6100f72fdeca9085ae6e07be5722f6e3f3c85e8c0b489

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20151001.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20151001.ebuild
deleted file mode 100644
index 32dc1ad..0000000
--- a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20151001.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2015 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/2015-10-01_03-28-59/zip/netbeans-trunk-nightly-201510010328-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-groovy/netbeans-groovy-9999_p20151002.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20151002.ebuild
deleted file mode 100644
index b49228a..0000000
--- a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20151002.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2015 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/2015-10-02_00-02-28/zip/netbeans-trunk-nightly-201510020002-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/Manifest b/dev-java/netbeans-harness/Manifest
index 43d99c0..3f9fd13 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-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-8.1rc2-201510122201-src.zip 208690047 SHA256 728bfd0c1be5c20d6e7e32251984130e9f00f7d95bcc7e87b25484cd25c40531 SHA512 01636c48d05247ba2a0ab105fdf4736e895ad878e824ab0ffb82d26a258c50ad740092dd6924e27f0bc53fa41dbe4ad67c98252ce0ef301388feca57231d8e09 WHIRLPOOL dae4e5c5f0d97a64b1c905dd046c8584150eea26ec99aeafc5f152e82d5770619e6999854729dcf4dd538b372f1827a8c0a4169c6e199bd730e970db6ced323a
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
-DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
 DIST netbeans-trunk-nightly-201510030002-src.zip 208672397 SHA256 56d684334f97609098798fc2e9d2bb56073a61dcd7c91be398476163b39b7dda SHA512 18c9b136a3f2bdca433dcd2cf7d0cdba5a6428027e3bd884791278b55af4955058674eeba8c920739896d80b88fc5eb94b67695ac7b81e55878328eec49ae516 WHIRLPOOL 75af86ffcdb1318b46995d168b01d979e8f40f3351ec875dfa8732c7ace713bd20ee38559ea2f5d2558088573831d545956e4efd228eaf697d17a2b14f74c3f0
 DIST netbeans-trunk-nightly-201510040002-src.zip 208672385 SHA256 ebc1f4ac878d56d41dcaf987e4436f5fb4e1f02643c7832ca927c5e3ddbb6a16 SHA512 26c6882a12b5a00cfa54cdca758c81442391b960383d5486dd81b444558c882c003d55fd32d58e8d75866e77a729cafc2ff00a6926b4c05245e1be023a159603 WHIRLPOOL fe7c480835e4458340ab03d6dd1319a2e377370d2f12e0afa3b4080bc128c746480708382e22a3584e61a101c0a97d9274c800a09bb3b784f675fa269a4536f9
 DIST netbeans-trunk-nightly-201510060002-src.zip 208673387 SHA256 dda7070cc82f15e7d8504a67a497be2405d3ed7e87525c332f1b71422c4a9f36 SHA512 94dd66c25fdb26b04bbedfc102e491893508ead55e66d3b61057a1544d5ffcfb898aacf197268213d139f214f033addb3e74630c3e5863cd5c417807988e1703 WHIRLPOOL 247f24bd2c8aa831b77319367fb4ca917b5300bc5916d5c0352100f1daf567a6a746fe4904f59fdb561490eeccb1442f1b01b7129c7e86830a207494345c7b31
@@ -33,8 +31,6 @@ DIST netbeans-trunk-nightly-201511010002-src.zip 208677648 SHA256 a23eb7aa0c1932
 DIST netbeans-trunk-nightly-201511030002-src.zip 208707811 SHA256 3d6beefb37d5b74cc273fbdbaf41bb9ed636b04276bb3ce72d289b55d74ed8e6 SHA512 496e8d8f4c04463f55ac01954dadcf8e80bdb6db81e2cefd66a5445c86c3c429950c4397ef781670a3f32b563812c792cf20ebc3542c33a6c9a87b38dcb26b84 WHIRLPOOL 2a119b5a7ac7b77dd7d93c61ef150e4eef67bbdd9e5ad41a851852493e189c87b7d9a889b74a215be61cfa1c3fddd90edf1089fedacbd8db54cff070a9100507
 EBUILD netbeans-harness-8.0.2.ebuild 4055 SHA256 2674d562adc57648c82cac9f714f74f9d29dd7b7ff7fa7f0ef37c43ef0975489 SHA512 7d72bed5b955b2365a4c11fcd97a2d6f2372ab939fb9a03b3ff7915053f24d695373c1aa154f6e6916d37ef3ace7b38864d575419460382760500576dae52e49 WHIRLPOOL 72f54a6cb83f282a75f0abb073109414a7b8bcd4e9263466281e68ff34148a7343ed3bd78ebdc8afd109b6b9f5b9f15bfd0e250f418fcaa4986a7c886b57b9f6
 EBUILD netbeans-harness-8.1_rc2.ebuild 4080 SHA256 93049f23b2ad31b40c784de1a3abb7b8332f59e5203e6058f6ada092e45fd01a SHA512 9cf8e85f62a03d1fd5c43a8ff746229d0d8e91f10a67a08b5634cef2c6d7e3c31a2f309b53c158fb5580ea1334fe3e0e5f84d555f07a5c3174e78c58e6a14cba WHIRLPOOL 40cf8d1fb75674c49e1af12292f7bace10d74724d1b034b6cd1ecc9c4a816b4a711ed9c49e6b0719dfec638349ab9669685e605d0e481c8b62958a9c82231ef9
-EBUILD netbeans-harness-9999_p20151001.ebuild 4125 SHA256 13f8d1786b191f9fc161f267d8fee56c14846964eb8f6a9b9d7731c0d90a7a1c SHA512 d36a32bf08585f17658b0dc5b38b0a8a2ef6d1265ebb9feb93feeb1e0e3c900b85101b3572e8a63edaf07cb8623907ba9e775a643623ac3d8f0f52de7b2a5a64 WHIRLPOOL f891e812e45303986bbc9be420811fecf008450e16507747299aad4cafc6ecf7ec09e7a3803bd25374033cb4cbf5ff9f901c678612f6cc134e65b9640ff3bc1b
-EBUILD netbeans-harness-9999_p20151002.ebuild 4125 SHA256 c82d8f80bddf85498b7f74ce03091988896de0e56b35f0c45adc68f7c2c852ab SHA512 45959abac3fce686701af5d9e812b5d3d8764c59f4278c91db17d2deb4fb9bdd4a7f840b9ea3240bd69c1258ea36a1cd9b3a5aa5ed494e0afa536b3b4b4770f0 WHIRLPOOL d4cc543b085739b1615319793ba2ee6deacd53c85d96103fc9c075ffec54dec68b00ac54028a1d7128e97a29825be9ebbc549f6e82cf0e368d4c4c60d4a39957
 EBUILD netbeans-harness-9999_p20151003.ebuild 4125 SHA256 2b8b30b7e6ae46bec6532b918373fa23a82d5400bf6254065865c7d81c0f815f SHA512 f9089f270667a7e5974d629ce8c88605b6ed6d1707b6b2a49bcc4e4f83b3fbdfb8fd88678bd6232f81de449b16db4720b5cd99f6484b175113ac089e1ee0b3d1 WHIRLPOOL 795e568cc97a966f423050816cf1408923b5f747a9a35c9db4927229b432a18ad24dfde82247d4c2951c233cedd57ee5a34e12438cc863e4728e8bb10232bab4
 EBUILD netbeans-harness-9999_p20151004.ebuild 4125 SHA256 fdca3b489e912d68ac92e879ece3be7d655e6aca874edf1ddc3e87c6c499825a SHA512 d24cfe796148e58542adf42904bd001dca04b9821b46c21460a5e83e87044834a810dc94005dc05d93f5568b29097254d0a7ae33a8d91af332d37b094cb4db65 WHIRLPOOL b6c2f7c491ccc00689305aca664bab58ce7c24e648aba016e65e42156a27d29928b17558874bfd7e445c0019c999b8c503ab9f31ac43dc9dbfbc704cd783a8f8
 EBUILD netbeans-harness-9999_p20151006.ebuild 4125 SHA256 6e932ce40dd3b2741a9c3600a3fa5161504b270f51a2e2d2d36f131f5db294d5 SHA512 5140f5e94ba5626ae3a88218a7badc118344437e7853966e7f61d3ee59a5ac3c67fb47b490900a4353f6f8bfde16997c22dbdc39e9b97cf24168a157ca6f6c6f WHIRLPOOL c75db67f9c98f223b60db4bd1feb24dff61203d03b15b170f994f62d4d6b9272f164d909defdcc8488e268b00adfde4e0abe647ca658efbd3154a5371dcf7f29

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20151001.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20151001.ebuild
deleted file mode 100644
index 6e91569..0000000
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20151001.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2015 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/2015-10-01_03-28-59/zip/netbeans-trunk-nightly-201510010328-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-harness/netbeans-harness-9999_p20151002.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20151002.ebuild
deleted file mode 100644
index 54ec1cf..0000000
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20151002.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2015 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/2015-10-02_00-02-28/zip/netbeans-trunk-nightly-201510020002-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/Manifest b/dev-java/netbeans-ide/Manifest
index d0740d9..00eb795 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -110,8 +110,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-8.1rc2-201510122201-src.zip 208690047 SHA256 728bfd0c1be5c20d6e7e32251984130e9f00f7d95bcc7e87b25484cd25c40531 SHA512 01636c48d05247ba2a0ab105fdf4736e895ad878e824ab0ffb82d26a258c50ad740092dd6924e27f0bc53fa41dbe4ad67c98252ce0ef301388feca57231d8e09 WHIRLPOOL dae4e5c5f0d97a64b1c905dd046c8584150eea26ec99aeafc5f152e82d5770619e6999854729dcf4dd538b372f1827a8c0a4169c6e199bd730e970db6ced323a
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
-DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
 DIST netbeans-trunk-nightly-201510030002-src.zip 208672397 SHA256 56d684334f97609098798fc2e9d2bb56073a61dcd7c91be398476163b39b7dda SHA512 18c9b136a3f2bdca433dcd2cf7d0cdba5a6428027e3bd884791278b55af4955058674eeba8c920739896d80b88fc5eb94b67695ac7b81e55878328eec49ae516 WHIRLPOOL 75af86ffcdb1318b46995d168b01d979e8f40f3351ec875dfa8732c7ace713bd20ee38559ea2f5d2558088573831d545956e4efd228eaf697d17a2b14f74c3f0
 DIST netbeans-trunk-nightly-201510040002-src.zip 208672385 SHA256 ebc1f4ac878d56d41dcaf987e4436f5fb4e1f02643c7832ca927c5e3ddbb6a16 SHA512 26c6882a12b5a00cfa54cdca758c81442391b960383d5486dd81b444558c882c003d55fd32d58e8d75866e77a729cafc2ff00a6926b4c05245e1be023a159603 WHIRLPOOL fe7c480835e4458340ab03d6dd1319a2e377370d2f12e0afa3b4080bc128c746480708382e22a3584e61a101c0a97d9274c800a09bb3b784f675fa269a4536f9
 DIST netbeans-trunk-nightly-201510060002-src.zip 208673387 SHA256 dda7070cc82f15e7d8504a67a497be2405d3ed7e87525c332f1b71422c4a9f36 SHA512 94dd66c25fdb26b04bbedfc102e491893508ead55e66d3b61057a1544d5ffcfb898aacf197268213d139f214f033addb3e74630c3e5863cd5c417807988e1703 WHIRLPOOL 247f24bd2c8aa831b77319367fb4ca917b5300bc5916d5c0352100f1daf567a6a746fe4904f59fdb561490eeccb1442f1b01b7129c7e86830a207494345c7b31
@@ -135,8 +133,6 @@ DIST netbeans-trunk-nightly-201511010002-src.zip 208677648 SHA256 a23eb7aa0c1932
 DIST netbeans-trunk-nightly-201511030002-src.zip 208707811 SHA256 3d6beefb37d5b74cc273fbdbaf41bb9ed636b04276bb3ce72d289b55d74ed8e6 SHA512 496e8d8f4c04463f55ac01954dadcf8e80bdb6db81e2cefd66a5445c86c3c429950c4397ef781670a3f32b563812c792cf20ebc3542c33a6c9a87b38dcb26b84 WHIRLPOOL 2a119b5a7ac7b77dd7d93c61ef150e4eef67bbdd9e5ad41a851852493e189c87b7d9a889b74a215be61cfa1c3fddd90edf1089fedacbd8db54cff070a9100507
 EBUILD netbeans-ide-8.0.2.ebuild 29317 SHA256 42218788ab0fc7c7cd1bb42a8b0c72a66543a3260b752aa55365833c355bcc63 SHA512 c712b66b6bee654390a45e5c616479df2be624bb770f3838d4fcce875f71a8d165703dffd55c4fd7d30e19c392784203e5fe01e2404907d88c935d439efaf578 WHIRLPOOL 67763e4a36215ac002fd321556ce2269affc15ba48ad5069d7ccc746d918179994f174e09305a9d9ddadddbea690778c2769e0ea1993eafc09e01580485e2292
 EBUILD netbeans-ide-8.1_rc2.ebuild 30289 SHA256 601a026a6ded95edde37912caab8d873aba2fd1466d3d5ac66fb33df95df3e9f SHA512 d1cdd2be0baf271f53978da38a9d7198074b2c91d84671aa1919cc03374715697c13fa182515010377e4773517fe560960d28a50db62e0d19f038baa06e91bec WHIRLPOOL f73fae56638de9ab520f428b82954212ddd22e55e4958b5c43252768985e5cc0358854237e0318a384fdf828ba2395754bed1fe3aedfcb1efa999b75e5c64bd4
-EBUILD netbeans-ide-9999_p20151001.ebuild 30334 SHA256 b78d36ee165147dbfba19a14e77783963c4f7377b4c418d6bfb1738507973bd4 SHA512 4c9ef09a23a310badc7c2f119d9ef7a9ce450a719a0d2b112af157b22aaccea8e5806e2ba015951b9be1c4ea38e6f27c071d025e22cb5c017f83cb009e4bf748 WHIRLPOOL 20a7706618dfccad4c186f512c05206516f92aeb8ee1243f924bc63fbc3b560e21fe8bf2f5cd976e8763dc08693be81ad961168197efbf054d2c5efc864754de
-EBUILD netbeans-ide-9999_p20151002.ebuild 30334 SHA256 77ef9c2ee951343d8d1fa0b3e46ff55d5c2e7ee485a5f57db84925d148ba8590 SHA512 fe793e1ef37e789aa6e47fea9dd92e82c7b2678c2c5dd63a033349a62e229d5a586b4064bdf69fcc888531b3956465e955f070a25eb9c7f7734c7457c0186e39 WHIRLPOOL 2641f7d21223b53871b77d57b74d16bf73d984f936fe187ed3221a9267f18bf30642dd1011d360647766e806cc4ba785c66ad1074b99999be602b7bb1791469c
 EBUILD netbeans-ide-9999_p20151003.ebuild 30334 SHA256 f48fd5cd26ccae08abafc8364cccfc25c322bb453fde01f38c261801e6a7202b SHA512 48fc055d19cbe539cbb525a380a649626291a1f07234d5f499ed16d3036718ec85cd9b4bdfc7c21c94589eb890aa5b5b4d42e736c06e80c26de9b5f8a2f4f740 WHIRLPOOL d93f6f0ed2679bff540604e73b62bc32774b2e27bcdf2afcea15f2d37a6e867610568c48257cca23febbb5e35ecd22dc935f7df2abe008e45ed61798ba4ed874
 EBUILD netbeans-ide-9999_p20151004.ebuild 30334 SHA256 839c8e0ce49bc7be83649d38bcb328259baed86700a8817d8881dbc49799cec4 SHA512 5b0e97194366cf1564e67689721b889b66dd72f86ec64afe5c8f05000c3a87f6272cfdea1de4d61c92bc62e0edaca817bc5f80ff8ae529297579c8a13ed63192 WHIRLPOOL b5205514f28ad405d5304fe125b0e3039ace8a0c6fed09a5f85785b896bf6fbef6875dc2a7abcf253c64d876537f71701a8e0141f49ef41340d86d8bca3646bf
 EBUILD netbeans-ide-9999_p20151006.ebuild 30334 SHA256 776ecdd271c07ff5786c13bd84c58e97cc26e7297360086bc0d96aa6569e1d66 SHA512 b70f5999cf814300923b58088079429a944587baf677f12b4bab7b14e59f74e2ddb5f72a8df790a67423259b5801ef127537510ab3a55968e8eebf89f147e8d5 WHIRLPOOL 78b500bd7bb340408c9cdb35375e318bb77f5d9a314a3c0640aee7ef2e6960d8b571ef360f9f51850dbed77879e5656ea9ff2004bcee5e3387fe99c066821cfd

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20151001.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20151001.ebuild
deleted file mode 100644
index cddf43c..0000000
--- a/dev-java/netbeans-ide/netbeans-ide-9999_p20151001.ebuild
+++ /dev/null
@@ -1,377 +0,0 @@
-# Copyright 1999-2015 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/2015-10-01_03-28-59/zip/netbeans-trunk-nightly-201510010328-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/ACAB7C860DF78C4A528FD8A64F2C62A0A96639E5-com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar
-	http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar
-	http://hg.netbeans.org/binaries/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar
-	http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip
-	http://hg.netbeans.org/binaries/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip
-	http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
-	http://hg.netbeans.org/binaries/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip
-	http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar
-	http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
-	http://hg.netbeans.org/binaries/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar
-	http://hg.netbeans.org/binaries/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/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar
-	http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar
-	http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip
-	http://hg.netbeans.org/binaries/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar
-	http://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar
-	http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
-	http://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar
-	http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar
-	http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar
-	http://hg.netbeans.org/binaries/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar
-	http://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar
-	http://hg.netbeans.org/binaries/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip
-	http://hg.netbeans.org/binaries/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip
-	http://hg.netbeans.org/binaries/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip
-	http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar
-	http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar
-	http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar
-	http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar
-	http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
-	http://hg.netbeans.org/binaries/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar
-	http://hg.netbeans.org/binaries/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar
-	http://hg.netbeans.org/binaries/F27BF427BE72709F3094BF76ECA8C5A2B9AC6DA9-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar
-	http://hg.netbeans.org/binaries/9BC512C5BB9A9F5276B9E8672F6B30AD0BD97D88-org.eclipse.core.jobs-3.5.101_nosignature.jar
-	http://hg.netbeans.org/binaries/105DC9A1A93E6EA9A6CD368AD12897B1F247D6AE-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar
-	http://hg.netbeans.org/binaries/E99C3C29A90F8AB29078A38CF8EBC3860249640C-org.eclipse.core.runtime-3.7.0_nosignature.jar
-	http://hg.netbeans.org/binaries/84FC6D443CD0816FA87093B6B7AD6876ADFC4207-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar
-	http://hg.netbeans.org/binaries/74069BFD03B2C66A9EBB4370C0B8064E3F5B6594-org.eclipse.equinox.app-1.3.100_nosignature.jar
-	http://hg.netbeans.org/binaries/A7953EEE9D4D7CD896C7D0AD6D21902E6259979B-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar
-	http://hg.netbeans.org/binaries/3FB169C95F095B70F05B96BE9496DA63FAE7F707-org.eclipse.equinox.preferences-3.4.2_nosignature.jar
-	http://hg.netbeans.org/binaries/CD5919A707EB6B5C1FC29964C8EF5E2CF3F5A3D4-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar
-	http://hg.netbeans.org/binaries/A4634373DC60650C49CC98AEA2090889F7ADC68F-org.eclipse.equinox.security-1.1.1_nosignature.jar
-	http://hg.netbeans.org/binaries/278049664FFA5447191BD5FE96B0B62B0CFD15D1-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar
-	http://hg.netbeans.org/binaries/9039A0C1FA0E56CB56A1A192908814478FA747C5-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar
-	http://hg.netbeans.org/binaries/DAA45A7EE529A7532F5DC08625A5A3E81DB2D4CB-org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar
-	http://hg.netbeans.org/binaries/F5AC8FBA216A8C52F319EC2CB455B44FFD734B38-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar
-	http://hg.netbeans.org/binaries/B43E7CE55F0DECA3BE1A6E695A3E3ABC6D62567F-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar
-	http://hg.netbeans.org/binaries/1B9CBEC0FCB47C279519E52D360199C24EC99B01-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar
-	http://hg.netbeans.org/binaries/6B0A6E9F9179E314944E4ADB831A9D6FCADED3DC-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar
-	http://hg.netbeans.org/binaries/B28B8EE777232102471EA5334FD70E20851845DD-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar
-	http://hg.netbeans.org/binaries/24A15BD37950663933CC4975EE6E518BEB2C28A3-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar
-	http://hg.netbeans.org/binaries/01CD242F06F6F7E4E61C9E05ABBE07318E501D51-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar
-	http://hg.netbeans.org/binaries/75928E4368CA748131A6767BA1A97D9DA643C306-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar
-	http://hg.netbeans.org/binaries/8307A44D3F150F1BB317532097A0C7D125C00F2D-org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.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/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}"/ACAB7C860DF78C4A528FD8A64F2C62A0A96639E5-com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar || die
-	ln -s "${DISTDIR}"/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar o.apache.commons.io/external/commons-io-1.4.jar || die
-	ln -s "${DISTDIR}"/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar libs.commons_net/external/commons-net-3.3.jar || die
-	ln -s "${DISTDIR}"/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip css.editor/external/css21-spec.zip || die
-	ln -s "${DISTDIR}"/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip css.editor/external/css3-spec.zip || die
-	ln -s "${DISTDIR}"/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip derby/external/derbysampledb.zip || die
-	ln -s "${DISTDIR}"/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip dlight.nativeexecution/external/exechlp-1.0.zip || die
-	ln -s "${DISTDIR}"/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar libs.freemarker/external/freemarker-2.3.19.jar || die
-	ln -s "${DISTDIR}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
-	ln -s "${DISTDIR}"/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar html.validation/external/html5-datatypes.jar || die
-	ln -s "${DISTDIR}"/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}"/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar html.validation/external/io-xml-util.jar || die
-	ln -s "${DISTDIR}"/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar html.validation/external/iri.jar || die
-	ln -s "${DISTDIR}"/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip spellchecker.dictionary_en/external/ispell-enwl-3.1.20.zip || die
-	ln -s "${DISTDIR}"/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar c.googlecode.javaewah.JavaEWAH/external/JavaEWAH-0.7.9.jar || die
-	ln -s "${DISTDIR}"/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar xml.jaxb.api/external/jaxb-api.jar || die
-	ln -s "${DISTDIR}"/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip libs.jaxb/external/jaxb-api-doc.zip || die
-	ln -s "${DISTDIR}"/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar libs.jaxb/external/jaxb-impl.jar || die
-	ln -s "${DISTDIR}"/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar libs.jaxb/external/jaxb-xjc.jar || die
-	ln -s "${DISTDIR}"/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar libs.jaxb/external/jaxb1-impl.jar || die
-	ln -s "${DISTDIR}"/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar libs.javafx/external/jfxrt.jar || die
-	ln -s "${DISTDIR}"/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar html.validation/external/jing.jar || die
-	ln -s "${DISTDIR}"/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip javascript2.editor/external/js-corestubs.zip || die
-	ln -s "${DISTDIR}"/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip javascript2.editor/external/js-domstubs.zip || die
-	ln -s "${DISTDIR}"/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip javascript2.editor/external/js-reststubs.zip || die
-	ln -s "${DISTDIR}"/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.core-0.0.7.jar || die
-	ln -s "${DISTDIR}"/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.sshagent-0.0.7.jar || die
-	ln -s "${DISTDIR}"/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.pageant-0.0.7.jar || die
-	ln -s "${DISTDIR}"/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.usocket-jna-0.0.7.jar || die
-	ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.process/external/libpam4j-1.1.jar || die
-	ln -s "${DISTDIR}"/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar libs.nashorn/external/nashorn-02f810c26ff9-patched.jar || die
-	ln -s "${DISTDIR}"/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar html.validation/external/non-schema.jar || die
-	ln -s "${DISTDIR}"/F27BF427BE72709F3094BF76ECA8C5A2B9AC6DA9-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar o.eclipse.core.contenttype/external/org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar || die
-	ln -s "${DISTDIR}"/9BC512C5BB9A9F5276B9E8672F6B30AD0BD97D88-org.eclipse.core.jobs-3.5.101_nosignature.jar o.eclipse.core.jobs/external/org.eclipse.core.jobs-3.5.101_nosignature.jar || die
-	ln -s "${DISTDIR}"/105DC9A1A93E6EA9A6CD368AD12897B1F247D6AE-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar o.eclipse.core.net/external/org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar || die
-	ln -s "${DISTDIR}"/E99C3C29A90F8AB29078A38CF8EBC3860249640C-org.eclipse.core.runtime-3.7.0_nosignature.jar o.eclipse.core.runtime/external/org.eclipse.core.runtime-3.7.0_nosignature.jar || die
-	ln -s "${DISTDIR}"/84FC6D443CD0816FA87093B6B7AD6876ADFC4207-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar o.eclipse.core.runtime.compatibility.auth/external/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar || die
-	ln -s "${DISTDIR}"/74069BFD03B2C66A9EBB4370C0B8064E3F5B6594-org.eclipse.equinox.app-1.3.100_nosignature.jar o.eclipse.equinox.app/external/org.eclipse.equinox.app-1.3.100_nosignature.jar || die
-	ln -s "${DISTDIR}"/A7953EEE9D4D7CD896C7D0AD6D21902E6259979B-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar o.eclipse.equinox.common/external/org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar || die
-	ln -s "${DISTDIR}"/3FB169C95F095B70F05B96BE9496DA63FAE7F707-org.eclipse.equinox.preferences-3.4.2_nosignature.jar o.eclipse.equinox.preferences/external/org.eclipse.equinox.preferences-3.4.2_nosignature.jar || die
-	ln -s "${DISTDIR}"/CD5919A707EB6B5C1FC29964C8EF5E2CF3F5A3D4-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar o.eclipse.equinox.registry/external/org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar || die
-	ln -s "${DISTDIR}"/A4634373DC60650C49CC98AEA2090889F7ADC68F-org.eclipse.equinox.security-1.1.1_nosignature.jar o.eclipse.equinox.security/external/org.eclipse.equinox.security-1.1.1_nosignature.jar || die
-	ln -s "${DISTDIR}"/278049664FFA5447191BD5FE96B0B62B0CFD15D1-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit/external/org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar || die
-	ln -s "${DISTDIR}"/9039A0C1FA0E56CB56A1A192908814478FA747C5-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit.java7/external/org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar || die
-	ln -s "${DISTDIR}"/DAA45A7EE529A7532F5DC08625A5A3E81DB2D4CB-org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar || die
-	ln -s "${DISTDIR}"/F5AC8FBA216A8C52F319EC2CB455B44FFD734B38-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar || die
-	ln -s "${DISTDIR}"/B43E7CE55F0DECA3BE1A6E695A3E3ABC6D62567F-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar || die
-	ln -s "${DISTDIR}"/1B9CBEC0FCB47C279519E52D360199C24EC99B01-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar || die
-	ln -s "${DISTDIR}"/6B0A6E9F9179E314944E4ADB831A9D6FCADED3DC-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar || die
-	ln -s "${DISTDIR}"/B28B8EE777232102471EA5334FD70E20851845DD-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar || die
-	ln -s "${DISTDIR}"/24A15BD37950663933CC4975EE6E518BEB2C28A3-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar || die
-	ln -s "${DISTDIR}"/01CD242F06F6F7E4E61C9E05ABBE07318E501D51-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar || die
-	ln -s "${DISTDIR}"/75928E4368CA748131A6767BA1A97D9DA643C306-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar  || die
-	ln -s "${DISTDIR}"/8307A44D3F150F1BB317532097A0C7D125C00F2D-org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.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}"/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.53.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-ide/netbeans-ide-9999_p20151002.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20151002.ebuild
deleted file mode 100644
index a12a951..0000000
--- a/dev-java/netbeans-ide/netbeans-ide-9999_p20151002.ebuild
+++ /dev/null
@@ -1,377 +0,0 @@
-# Copyright 1999-2015 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/2015-10-02_00-02-28/zip/netbeans-trunk-nightly-201510020002-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/ACAB7C860DF78C4A528FD8A64F2C62A0A96639E5-com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar
-	http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar
-	http://hg.netbeans.org/binaries/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar
-	http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip
-	http://hg.netbeans.org/binaries/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip
-	http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
-	http://hg.netbeans.org/binaries/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip
-	http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar
-	http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
-	http://hg.netbeans.org/binaries/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar
-	http://hg.netbeans.org/binaries/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/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar
-	http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar
-	http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip
-	http://hg.netbeans.org/binaries/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar
-	http://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar
-	http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
-	http://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar
-	http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar
-	http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar
-	http://hg.netbeans.org/binaries/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar
-	http://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar
-	http://hg.netbeans.org/binaries/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip
-	http://hg.netbeans.org/binaries/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip
-	http://hg.netbeans.org/binaries/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip
-	http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar
-	http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar
-	http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar
-	http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar
-	http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
-	http://hg.netbeans.org/binaries/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar
-	http://hg.netbeans.org/binaries/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar
-	http://hg.netbeans.org/binaries/F27BF427BE72709F3094BF76ECA8C5A2B9AC6DA9-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar
-	http://hg.netbeans.org/binaries/9BC512C5BB9A9F5276B9E8672F6B30AD0BD97D88-org.eclipse.core.jobs-3.5.101_nosignature.jar
-	http://hg.netbeans.org/binaries/105DC9A1A93E6EA9A6CD368AD12897B1F247D6AE-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar
-	http://hg.netbeans.org/binaries/E99C3C29A90F8AB29078A38CF8EBC3860249640C-org.eclipse.core.runtime-3.7.0_nosignature.jar
-	http://hg.netbeans.org/binaries/84FC6D443CD0816FA87093B6B7AD6876ADFC4207-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar
-	http://hg.netbeans.org/binaries/74069BFD03B2C66A9EBB4370C0B8064E3F5B6594-org.eclipse.equinox.app-1.3.100_nosignature.jar
-	http://hg.netbeans.org/binaries/A7953EEE9D4D7CD896C7D0AD6D21902E6259979B-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar
-	http://hg.netbeans.org/binaries/3FB169C95F095B70F05B96BE9496DA63FAE7F707-org.eclipse.equinox.preferences-3.4.2_nosignature.jar
-	http://hg.netbeans.org/binaries/CD5919A707EB6B5C1FC29964C8EF5E2CF3F5A3D4-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar
-	http://hg.netbeans.org/binaries/A4634373DC60650C49CC98AEA2090889F7ADC68F-org.eclipse.equinox.security-1.1.1_nosignature.jar
-	http://hg.netbeans.org/binaries/278049664FFA5447191BD5FE96B0B62B0CFD15D1-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar
-	http://hg.netbeans.org/binaries/9039A0C1FA0E56CB56A1A192908814478FA747C5-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar
-	http://hg.netbeans.org/binaries/DAA45A7EE529A7532F5DC08625A5A3E81DB2D4CB-org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar
-	http://hg.netbeans.org/binaries/F5AC8FBA216A8C52F319EC2CB455B44FFD734B38-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar
-	http://hg.netbeans.org/binaries/B43E7CE55F0DECA3BE1A6E695A3E3ABC6D62567F-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar
-	http://hg.netbeans.org/binaries/1B9CBEC0FCB47C279519E52D360199C24EC99B01-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar
-	http://hg.netbeans.org/binaries/6B0A6E9F9179E314944E4ADB831A9D6FCADED3DC-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar
-	http://hg.netbeans.org/binaries/B28B8EE777232102471EA5334FD70E20851845DD-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar
-	http://hg.netbeans.org/binaries/24A15BD37950663933CC4975EE6E518BEB2C28A3-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar
-	http://hg.netbeans.org/binaries/01CD242F06F6F7E4E61C9E05ABBE07318E501D51-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar
-	http://hg.netbeans.org/binaries/75928E4368CA748131A6767BA1A97D9DA643C306-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar
-	http://hg.netbeans.org/binaries/8307A44D3F150F1BB317532097A0C7D125C00F2D-org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.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/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}"/ACAB7C860DF78C4A528FD8A64F2C62A0A96639E5-com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar || die
-	ln -s "${DISTDIR}"/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar o.apache.commons.io/external/commons-io-1.4.jar || die
-	ln -s "${DISTDIR}"/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar libs.commons_net/external/commons-net-3.3.jar || die
-	ln -s "${DISTDIR}"/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip css.editor/external/css21-spec.zip || die
-	ln -s "${DISTDIR}"/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip css.editor/external/css3-spec.zip || die
-	ln -s "${DISTDIR}"/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip derby/external/derbysampledb.zip || die
-	ln -s "${DISTDIR}"/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip dlight.nativeexecution/external/exechlp-1.0.zip || die
-	ln -s "${DISTDIR}"/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar libs.freemarker/external/freemarker-2.3.19.jar || die
-	ln -s "${DISTDIR}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
-	ln -s "${DISTDIR}"/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar html.validation/external/html5-datatypes.jar || die
-	ln -s "${DISTDIR}"/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}"/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar html.validation/external/io-xml-util.jar || die
-	ln -s "${DISTDIR}"/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar html.validation/external/iri.jar || die
-	ln -s "${DISTDIR}"/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip spellchecker.dictionary_en/external/ispell-enwl-3.1.20.zip || die
-	ln -s "${DISTDIR}"/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar c.googlecode.javaewah.JavaEWAH/external/JavaEWAH-0.7.9.jar || die
-	ln -s "${DISTDIR}"/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar xml.jaxb.api/external/jaxb-api.jar || die
-	ln -s "${DISTDIR}"/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip libs.jaxb/external/jaxb-api-doc.zip || die
-	ln -s "${DISTDIR}"/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar libs.jaxb/external/jaxb-impl.jar || die
-	ln -s "${DISTDIR}"/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar libs.jaxb/external/jaxb-xjc.jar || die
-	ln -s "${DISTDIR}"/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar libs.jaxb/external/jaxb1-impl.jar || die
-	ln -s "${DISTDIR}"/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar libs.javafx/external/jfxrt.jar || die
-	ln -s "${DISTDIR}"/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar html.validation/external/jing.jar || die
-	ln -s "${DISTDIR}"/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip javascript2.editor/external/js-corestubs.zip || die
-	ln -s "${DISTDIR}"/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip javascript2.editor/external/js-domstubs.zip || die
-	ln -s "${DISTDIR}"/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip javascript2.editor/external/js-reststubs.zip || die
-	ln -s "${DISTDIR}"/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.core-0.0.7.jar || die
-	ln -s "${DISTDIR}"/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.sshagent-0.0.7.jar || die
-	ln -s "${DISTDIR}"/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.pageant-0.0.7.jar || die
-	ln -s "${DISTDIR}"/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.usocket-jna-0.0.7.jar || die
-	ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.process/external/libpam4j-1.1.jar || die
-	ln -s "${DISTDIR}"/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar libs.nashorn/external/nashorn-02f810c26ff9-patched.jar || die
-	ln -s "${DISTDIR}"/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar html.validation/external/non-schema.jar || die
-	ln -s "${DISTDIR}"/F27BF427BE72709F3094BF76ECA8C5A2B9AC6DA9-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar o.eclipse.core.contenttype/external/org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar || die
-	ln -s "${DISTDIR}"/9BC512C5BB9A9F5276B9E8672F6B30AD0BD97D88-org.eclipse.core.jobs-3.5.101_nosignature.jar o.eclipse.core.jobs/external/org.eclipse.core.jobs-3.5.101_nosignature.jar || die
-	ln -s "${DISTDIR}"/105DC9A1A93E6EA9A6CD368AD12897B1F247D6AE-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar o.eclipse.core.net/external/org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar || die
-	ln -s "${DISTDIR}"/E99C3C29A90F8AB29078A38CF8EBC3860249640C-org.eclipse.core.runtime-3.7.0_nosignature.jar o.eclipse.core.runtime/external/org.eclipse.core.runtime-3.7.0_nosignature.jar || die
-	ln -s "${DISTDIR}"/84FC6D443CD0816FA87093B6B7AD6876ADFC4207-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar o.eclipse.core.runtime.compatibility.auth/external/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar || die
-	ln -s "${DISTDIR}"/74069BFD03B2C66A9EBB4370C0B8064E3F5B6594-org.eclipse.equinox.app-1.3.100_nosignature.jar o.eclipse.equinox.app/external/org.eclipse.equinox.app-1.3.100_nosignature.jar || die
-	ln -s "${DISTDIR}"/A7953EEE9D4D7CD896C7D0AD6D21902E6259979B-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar o.eclipse.equinox.common/external/org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar || die
-	ln -s "${DISTDIR}"/3FB169C95F095B70F05B96BE9496DA63FAE7F707-org.eclipse.equinox.preferences-3.4.2_nosignature.jar o.eclipse.equinox.preferences/external/org.eclipse.equinox.preferences-3.4.2_nosignature.jar || die
-	ln -s "${DISTDIR}"/CD5919A707EB6B5C1FC29964C8EF5E2CF3F5A3D4-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar o.eclipse.equinox.registry/external/org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar || die
-	ln -s "${DISTDIR}"/A4634373DC60650C49CC98AEA2090889F7ADC68F-org.eclipse.equinox.security-1.1.1_nosignature.jar o.eclipse.equinox.security/external/org.eclipse.equinox.security-1.1.1_nosignature.jar || die
-	ln -s "${DISTDIR}"/278049664FFA5447191BD5FE96B0B62B0CFD15D1-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit/external/org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar || die
-	ln -s "${DISTDIR}"/9039A0C1FA0E56CB56A1A192908814478FA747C5-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit.java7/external/org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar || die
-	ln -s "${DISTDIR}"/DAA45A7EE529A7532F5DC08625A5A3E81DB2D4CB-org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar || die
-	ln -s "${DISTDIR}"/F5AC8FBA216A8C52F319EC2CB455B44FFD734B38-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar || die
-	ln -s "${DISTDIR}"/B43E7CE55F0DECA3BE1A6E695A3E3ABC6D62567F-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar || die
-	ln -s "${DISTDIR}"/1B9CBEC0FCB47C279519E52D360199C24EC99B01-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar || die
-	ln -s "${DISTDIR}"/6B0A6E9F9179E314944E4ADB831A9D6FCADED3DC-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar || die
-	ln -s "${DISTDIR}"/B28B8EE777232102471EA5334FD70E20851845DD-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar || die
-	ln -s "${DISTDIR}"/24A15BD37950663933CC4975EE6E518BEB2C28A3-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar || die
-	ln -s "${DISTDIR}"/01CD242F06F6F7E4E61C9E05ABBE07318E501D51-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar || die
-	ln -s "${DISTDIR}"/75928E4368CA748131A6767BA1A97D9DA643C306-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar  || die
-	ln -s "${DISTDIR}"/8307A44D3F150F1BB317532097A0C7D125C00F2D-org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.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}"/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.53.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/Manifest b/dev-java/netbeans-java/Manifest
index 0f635fd..4593b63 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -31,8 +31,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-8.1rc2-201510122201-src.zip 208690047 SHA256 728bfd0c1be5c20d6e7e32251984130e9f00f7d95bcc7e87b25484cd25c40531 SHA512 01636c48d05247ba2a0ab105fdf4736e895ad878e824ab0ffb82d26a258c50ad740092dd6924e27f0bc53fa41dbe4ad67c98252ce0ef301388feca57231d8e09 WHIRLPOOL dae4e5c5f0d97a64b1c905dd046c8584150eea26ec99aeafc5f152e82d5770619e6999854729dcf4dd538b372f1827a8c0a4169c6e199bd730e970db6ced323a
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
-DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
 DIST netbeans-trunk-nightly-201510030002-src.zip 208672397 SHA256 56d684334f97609098798fc2e9d2bb56073a61dcd7c91be398476163b39b7dda SHA512 18c9b136a3f2bdca433dcd2cf7d0cdba5a6428027e3bd884791278b55af4955058674eeba8c920739896d80b88fc5eb94b67695ac7b81e55878328eec49ae516 WHIRLPOOL 75af86ffcdb1318b46995d168b01d979e8f40f3351ec875dfa8732c7ace713bd20ee38559ea2f5d2558088573831d545956e4efd228eaf697d17a2b14f74c3f0
 DIST netbeans-trunk-nightly-201510040002-src.zip 208672385 SHA256 ebc1f4ac878d56d41dcaf987e4436f5fb4e1f02643c7832ca927c5e3ddbb6a16 SHA512 26c6882a12b5a00cfa54cdca758c81442391b960383d5486dd81b444558c882c003d55fd32d58e8d75866e77a729cafc2ff00a6926b4c05245e1be023a159603 WHIRLPOOL fe7c480835e4458340ab03d6dd1319a2e377370d2f12e0afa3b4080bc128c746480708382e22a3584e61a101c0a97d9274c800a09bb3b784f675fa269a4536f9
 DIST netbeans-trunk-nightly-201510060002-src.zip 208673387 SHA256 dda7070cc82f15e7d8504a67a497be2405d3ed7e87525c332f1b71422c4a9f36 SHA512 94dd66c25fdb26b04bbedfc102e491893508ead55e66d3b61057a1544d5ffcfb898aacf197268213d139f214f033addb3e74630c3e5863cd5c417807988e1703 WHIRLPOOL 247f24bd2c8aa831b77319367fb4ca917b5300bc5916d5c0352100f1daf567a6a746fe4904f59fdb561490eeccb1442f1b01b7129c7e86830a207494345c7b31
@@ -56,8 +54,6 @@ DIST netbeans-trunk-nightly-201511010002-src.zip 208677648 SHA256 a23eb7aa0c1932
 DIST netbeans-trunk-nightly-201511030002-src.zip 208707811 SHA256 3d6beefb37d5b74cc273fbdbaf41bb9ed636b04276bb3ce72d289b55d74ed8e6 SHA512 496e8d8f4c04463f55ac01954dadcf8e80bdb6db81e2cefd66a5445c86c3c429950c4397ef781670a3f32b563812c792cf20ebc3542c33a6c9a87b38dcb26b84 WHIRLPOOL 2a119b5a7ac7b77dd7d93c61ef150e4eef67bbdd9e5ad41a851852493e189c87b7d9a889b74a215be61cfa1c3fddd90edf1089fedacbd8db54cff070a9100507
 EBUILD netbeans-java-8.0.2-r3.ebuild 13294 SHA256 4abac657cff75400e92b1f2b19bca696113cdc37611c8c0f49dfa8c82fec4296 SHA512 32e41d7acc3aca026993e5edc791f1314f2bfda47413538af655b0335973c4fe50d998c67f129307b164075c3e0503280b4c1729d700431644ca6610d7f0f635 WHIRLPOOL d7f99c13421d08529b54085138fcffd2959a3c3f97d94a1dbe6e726a6dbc2cded69ec0bf97e1458b56847ac121954e8f173c1adde0703fd2969defa53ac37c51
 EBUILD netbeans-java-8.1_rc2.ebuild 14773 SHA256 4028adb2993d8a7cd8a4434afb5bc4d2a29bc2812c7ffda3131f2bfe3d4a6b8f SHA512 373ea3bb9175ef0cb4b74c67af69ea0409bbf364220f4b690cc628769cc748594e518efa9a35f890c1da952830b4dc7a1d316e7c020f2f1d704ce6973dd13859 WHIRLPOOL a8adc3fd9e2e9459ebe06d32939d92f5eb2cad81521d2f7f08445d8d000d34fd6f6bb7b69a274e60499637c866ec4654f789fa431382393db5538e5f57090f69
-EBUILD netbeans-java-9999_p20151001.ebuild 14818 SHA256 9ab4fd89bdaaad622116497f3e113e05b29acbbb83bc36fa6062b7eeff7c13f9 SHA512 060b6d6b4852fca9830f0067c218e775bd23854affbd4b254d6148e80f696e9704df24af93ff962c3419d3bf62157ccc54032647e6b84c8beb3d16596dd355b8 WHIRLPOOL a02fffb34b3439853100d5630559ee832d617140b3f52e81f789abfa2787835d7e13f74cde0d8ba8af9556bc23d4b032f188d1b16facc5abadddb7465b098c98
-EBUILD netbeans-java-9999_p20151002.ebuild 14818 SHA256 75fabd2d1daa267b808eb69b3efc6ae9392d61bb39ba579a12d7f6c2d34d8438 SHA512 0903e337632ec3328a0847727d13f04f5813275a7da9c653f8ded21847ec7fd97c79e16559de23fbbea69c30156c53a3477aca4b91f02ab7a55d19a8681eb3dc WHIRLPOOL b11fe21dce01e1b22a2a0e4b2cb8c1ef86a315e67dfac782b1ffd1dd7eed1eb6de6c67ed589d42a392d59f2999df359d2ea29535dc18778a05823ddc872a71f9
 EBUILD netbeans-java-9999_p20151003.ebuild 14818 SHA256 aab7d1a7d6ff497d668d8de99f4b04d420824e2c69be2d005374d3f73f4f1694 SHA512 43a524b96d401bc2d3db19c07e88db66d089a470a4d307954e846ae8dc948157f9a8973a0bd22faa0a77bb1fdfe363be20b47a2aa5d46f3e45f9a47ef1e19b93 WHIRLPOOL 333889b94ae9b842d3e86b204e8b3ec9260c9bf0266046877d2c08a3ef2d5ad935b068c3dd939036f758c66afdd36089015b57be46885fc1957945ce02056058
 EBUILD netbeans-java-9999_p20151004.ebuild 14818 SHA256 255b5b53ed364d185a94077483e86784831713ed98610c14e28a5355ed7dd33f SHA512 d174ead32a6b904be04c933812fbc511571d48f0b1bc8a8cdae384b14295a38314d6c57d277055ccbca3e8c70da9b028d4e15554dd6be37556eaa73fb4a9771f WHIRLPOOL 09000b512249493bd232efd59960f76847e13fdbc3c58d7f1681947211eda92bb198d2f33db7988fdf1129a50ef65ec462b27bbd35cc12bbe4f22bc5639e39a6
 EBUILD netbeans-java-9999_p20151006.ebuild 14818 SHA256 0e9017b4d9f3cdb220dc46b57d7379e29846412cf52b37340fdc16194fb454cb SHA512 e31de16829ae56980c64e0957e8fd3538d0d2da00db1077152d3328b2d910766f8e9ada03fcb0851cb14212dc8dfa843e50d317746fb0c8e3662d150790d7bb0 WHIRLPOOL 0df6b3ac45ba0bad77c7b5c40f267bf5ebe15943fe2b2d0f6f10ff54885a3800deacce4695b2f8d6ca35fd9427c64a79e692a53767f6d815f344c69742c35471

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20151001.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20151001.ebuild
deleted file mode 100644
index ef75453..0000000
--- a/dev-java/netbeans-java/netbeans-java-9999_p20151001.ebuild
+++ /dev/null
@@ -1,273 +0,0 @@
-# Copyright 1999-2015 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/2015-10-01_03-28-59/zip/netbeans-trunk-nightly-201510010328-src.zip"
-# jarjar-1.4 contains also asm libraries
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip
-	http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
-	http://hg.netbeans.org/binaries/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar
-	http://hg.netbeans.org/binaries/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip
-	http://hg.netbeans.org/binaries/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar
-	http://hg.netbeans.org/binaries/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar
-	http://hg.netbeans.org/binaries/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar
-	http://hg.netbeans.org/binaries/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar
-	http://hg.netbeans.org/binaries/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip
-	http://hg.netbeans.org/binaries/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip
-	http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip
-	http://hg.netbeans.org/binaries/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip
-	http://hg.netbeans.org/binaries/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar
-	http://hg.netbeans.org/binaries/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar
-	http://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar
-	http://hg.netbeans.org/binaries/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar
-	http://hg.netbeans.org/binaries/7B98BEC9E6D1A447C9C3DDC61EF6658BA000008C-nb-javac-impl.jar
-	http://hg.netbeans.org/binaries/CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.jar
-	http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
-	http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar
-	http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip
-	http://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip
-	http://hg.netbeans.org/binaries/B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.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: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}"/7B98BEC9E6D1A447C9C3DDC61EF6658BA000008C-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}"/B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.jar maven.embedder/external/wagon-http-2.8-shaded.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.cglib/external cglib-3 cglib.jar cglib-2.2.jar
-	java-pkg_jar-from --build-only --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
-	java-pkg_jar-from --into maven.embedder/external jdom jdom.jar jdom-1.0.jar
-	java-pkg_jar-from --into o.jdesktop.beansbinding/external beansbinding beansbinding.jar beansbinding-1.2.1.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/java >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-	grep -E "/java$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	chmod 755 "${D}"/${INSTALL_DIR}/maven/bin/mvn* || die
-	rm -fr "${D}"/${INSTALL_DIR}/maven/bin/*.bat || die
-
-	popd >/dev/null || die
-
-	local instdir=/${INSTALL_DIR}/maven/lib
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm commons-cli-1.2.jar && dosym /usr/share/commons-cli-1/lib/commons-cli.jar ${instdir}/commons-cli-1.2.jar || die
-	popd >/dev/null || die
-
-	local instdir=/${INSTALL_DIR}/modules/ext
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm AbsoluteLayout.jar  && dosym /usr/share/absolutelayout/lib/absolutelayout.jar ${instdir}/AbsoluteLayout.jar || die
-	rm beansbinding-1.2.1.jar && dosym /usr/share/beansbinding/lib/beansbinding.jar ${instdir}/beansbinding-1.2.1.jar || die
-	rm cglib-2.2.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/hibernate4
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm antlr-2.7.7.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.7.jar || die
-	rm c3p0-0.9.2.1.jar && dosym /usr/share/c3p0/lib/c3p0.jar ${instdir}/c3p0-0.9.2.1.jar || die
-	rm cglib-2.2.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
-	rm commons-collections-3.2.1.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections-3.2.1.jar || die
-	rm dom4j-1.6.1.jar && dosym /usr/share/dom4j-1/lib/dom4j.jar ${instdir}/dom4j-1.6.1.jar || die
-	rm javassist-3.18.1-GA.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist-3.18.1-GA.jar || die
-	rm jboss-logging-3.1.3.GA.jar && dosym /usr/share/jboss-logging/lib/jboss-logging.jar ${instdir}/jboss-logging-3.1.3.GA.jar || die
-	rm jboss-transaction-api_1.2_spec-1.0.0.Final.jar && dosym /usr/share/glassfish-transaction-api/lib/jta.jar ${instdir}/jboss-transaction-api_1.2_spec-1.0.0.Final.jar || die
-	rm jtidy-r8-20060801.jar && dosym /usr/share/jtidy/lib/Tidy.jar ${instdir}/jtidy-r8-20060801.jar || die
-	rm log4j-1.2.12.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.12.jar || die
-	rm slf4j-api-1.6.1.jar && dosym /usr/share/slf4j-api/lib/slf4j-api.jar ${instdir}/slf4j-api-1.6.1.jar || die
-	rm slf4j-log4j12-1.6.1.jar && dosym /usr/share/slf4j-log4j12/lib/slf4j-log4j12.jar ${instdir}/slf4j-log4j12-1.6.1.jar || die
-	rm slf4j-simple-1.6.1.jar && dosym /usr/share/slf4j-simple/lib/slf4j-simple.jar ${instdir}/slf4j-simple-1.6.1.jar || die
-	popd >/dev/null || die
-
-	local instdir=/${INSTALL_DIR}/modules/ext/jaxws22
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm FastInfoset.jar && dosym /usr/share/fastinfoset/lib/fastinfoset.jar ${instdir}/FastInfoset.jar || die
-	rm javax.mail_1.4.jar && dosym /usr/share/oracle-javamail/lib/mail.jar ${instdir}/javax.mail_1.4.jar || die
-	rm mimepull.jar && dosym /usr/share/mimepull/lib/mimepull.jar ${instdir}/mimepull.jar || die
-	rm saaj-impl.jar && dosym /usr/share/saaj/lib/saaj.jar ${instdir}/saaj-impl.jar || die
-	rm stax-ex.jar && dosym /usr/share/stax-ex/lib/stax-ex.jar ${instdir}/stax-ex.jar || die
-	rm stax2-api.jar && dosym /usr/share/stax2-api/lib/stax2-api.jar ${instdir}/stax2-api.jar || die
-	rm streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/xmlstreambuffer.jar ${instdir}/streambuffer.jar || die
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/jaxws22/api
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
-	rm saaj-api.jar && dosym /usr/share/jsr67/lib/jsr67.jar ${instdir}/saaj-api.jar || die
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/maven
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm jdom-1.0.jar && dosym /usr/share/jdom/lib/jdom.jar ${instdir}/jdom-1.0.jar || die
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java
-}

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20151002.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20151002.ebuild
deleted file mode 100644
index 6492aa1..0000000
--- a/dev-java/netbeans-java/netbeans-java-9999_p20151002.ebuild
+++ /dev/null
@@ -1,273 +0,0 @@
-# Copyright 1999-2015 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/2015-10-02_00-02-28/zip/netbeans-trunk-nightly-201510020002-src.zip"
-# jarjar-1.4 contains also asm libraries
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip
-	http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
-	http://hg.netbeans.org/binaries/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar
-	http://hg.netbeans.org/binaries/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip
-	http://hg.netbeans.org/binaries/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar
-	http://hg.netbeans.org/binaries/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar
-	http://hg.netbeans.org/binaries/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar
-	http://hg.netbeans.org/binaries/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar
-	http://hg.netbeans.org/binaries/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip
-	http://hg.netbeans.org/binaries/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip
-	http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip
-	http://hg.netbeans.org/binaries/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip
-	http://hg.netbeans.org/binaries/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar
-	http://hg.netbeans.org/binaries/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar
-	http://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar
-	http://hg.netbeans.org/binaries/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar
-	http://hg.netbeans.org/binaries/7B98BEC9E6D1A447C9C3DDC61EF6658BA000008C-nb-javac-impl.jar
-	http://hg.netbeans.org/binaries/CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.jar
-	http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
-	http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar
-	http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip
-	http://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip
-	http://hg.netbeans.org/binaries/B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.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: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}"/7B98BEC9E6D1A447C9C3DDC61EF6658BA000008C-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}"/B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.jar maven.embedder/external/wagon-http-2.8-shaded.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.cglib/external cglib-3 cglib.jar cglib-2.2.jar
-	java-pkg_jar-from --build-only --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
-	java-pkg_jar-from --into maven.embedder/external jdom jdom.jar jdom-1.0.jar
-	java-pkg_jar-from --into o.jdesktop.beansbinding/external beansbinding beansbinding.jar beansbinding-1.2.1.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/java >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-	grep -E "/java$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	chmod 755 "${D}"/${INSTALL_DIR}/maven/bin/mvn* || die
-	rm -fr "${D}"/${INSTALL_DIR}/maven/bin/*.bat || die
-
-	popd >/dev/null || die
-
-	local instdir=/${INSTALL_DIR}/maven/lib
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm commons-cli-1.2.jar && dosym /usr/share/commons-cli-1/lib/commons-cli.jar ${instdir}/commons-cli-1.2.jar || die
-	popd >/dev/null || die
-
-	local instdir=/${INSTALL_DIR}/modules/ext
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm AbsoluteLayout.jar  && dosym /usr/share/absolutelayout/lib/absolutelayout.jar ${instdir}/AbsoluteLayout.jar || die
-	rm beansbinding-1.2.1.jar && dosym /usr/share/beansbinding/lib/beansbinding.jar ${instdir}/beansbinding-1.2.1.jar || die
-	rm cglib-2.2.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/hibernate4
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm antlr-2.7.7.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.7.jar || die
-	rm c3p0-0.9.2.1.jar && dosym /usr/share/c3p0/lib/c3p0.jar ${instdir}/c3p0-0.9.2.1.jar || die
-	rm cglib-2.2.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
-	rm commons-collections-3.2.1.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections-3.2.1.jar || die
-	rm dom4j-1.6.1.jar && dosym /usr/share/dom4j-1/lib/dom4j.jar ${instdir}/dom4j-1.6.1.jar || die
-	rm javassist-3.18.1-GA.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist-3.18.1-GA.jar || die
-	rm jboss-logging-3.1.3.GA.jar && dosym /usr/share/jboss-logging/lib/jboss-logging.jar ${instdir}/jboss-logging-3.1.3.GA.jar || die
-	rm jboss-transaction-api_1.2_spec-1.0.0.Final.jar && dosym /usr/share/glassfish-transaction-api/lib/jta.jar ${instdir}/jboss-transaction-api_1.2_spec-1.0.0.Final.jar || die
-	rm jtidy-r8-20060801.jar && dosym /usr/share/jtidy/lib/Tidy.jar ${instdir}/jtidy-r8-20060801.jar || die
-	rm log4j-1.2.12.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.12.jar || die
-	rm slf4j-api-1.6.1.jar && dosym /usr/share/slf4j-api/lib/slf4j-api.jar ${instdir}/slf4j-api-1.6.1.jar || die
-	rm slf4j-log4j12-1.6.1.jar && dosym /usr/share/slf4j-log4j12/lib/slf4j-log4j12.jar ${instdir}/slf4j-log4j12-1.6.1.jar || die
-	rm slf4j-simple-1.6.1.jar && dosym /usr/share/slf4j-simple/lib/slf4j-simple.jar ${instdir}/slf4j-simple-1.6.1.jar || die
-	popd >/dev/null || die
-
-	local instdir=/${INSTALL_DIR}/modules/ext/jaxws22
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm FastInfoset.jar && dosym /usr/share/fastinfoset/lib/fastinfoset.jar ${instdir}/FastInfoset.jar || die
-	rm javax.mail_1.4.jar && dosym /usr/share/oracle-javamail/lib/mail.jar ${instdir}/javax.mail_1.4.jar || die
-	rm mimepull.jar && dosym /usr/share/mimepull/lib/mimepull.jar ${instdir}/mimepull.jar || die
-	rm saaj-impl.jar && dosym /usr/share/saaj/lib/saaj.jar ${instdir}/saaj-impl.jar || die
-	rm stax-ex.jar && dosym /usr/share/stax-ex/lib/stax-ex.jar ${instdir}/stax-ex.jar || die
-	rm stax2-api.jar && dosym /usr/share/stax2-api/lib/stax2-api.jar ${instdir}/stax2-api.jar || die
-	rm streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/xmlstreambuffer.jar ${instdir}/streambuffer.jar || die
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/jaxws22/api
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
-	rm saaj-api.jar && dosym /usr/share/jsr67/lib/jsr67.jar ${instdir}/saaj-api.jar || die
-	popd >/dev/null || die
-
-	local instdir=${INSTALL_DIR}/modules/ext/maven
-	pushd "${D}"/${instdir} >/dev/null || die
-	rm jdom-1.0.jar && dosym /usr/share/jdom/lib/jdom.jar ${instdir}/jdom-1.0.jar || die
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java
-}

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 7595bb9..1d3b33b 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-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-8.1rc2-201510122201-src.zip 208690047 SHA256 728bfd0c1be5c20d6e7e32251984130e9f00f7d95bcc7e87b25484cd25c40531 SHA512 01636c48d05247ba2a0ab105fdf4736e895ad878e824ab0ffb82d26a258c50ad740092dd6924e27f0bc53fa41dbe4ad67c98252ce0ef301388feca57231d8e09 WHIRLPOOL dae4e5c5f0d97a64b1c905dd046c8584150eea26ec99aeafc5f152e82d5770619e6999854729dcf4dd538b372f1827a8c0a4169c6e199bd730e970db6ced323a
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
-DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
 DIST netbeans-trunk-nightly-201510030002-src.zip 208672397 SHA256 56d684334f97609098798fc2e9d2bb56073a61dcd7c91be398476163b39b7dda SHA512 18c9b136a3f2bdca433dcd2cf7d0cdba5a6428027e3bd884791278b55af4955058674eeba8c920739896d80b88fc5eb94b67695ac7b81e55878328eec49ae516 WHIRLPOOL 75af86ffcdb1318b46995d168b01d979e8f40f3351ec875dfa8732c7ace713bd20ee38559ea2f5d2558088573831d545956e4efd228eaf697d17a2b14f74c3f0
 DIST netbeans-trunk-nightly-201510040002-src.zip 208672385 SHA256 ebc1f4ac878d56d41dcaf987e4436f5fb4e1f02643c7832ca927c5e3ddbb6a16 SHA512 26c6882a12b5a00cfa54cdca758c81442391b960383d5486dd81b444558c882c003d55fd32d58e8d75866e77a729cafc2ff00a6926b4c05245e1be023a159603 WHIRLPOOL fe7c480835e4458340ab03d6dd1319a2e377370d2f12e0afa3b4080bc128c746480708382e22a3584e61a101c0a97d9274c800a09bb3b784f675fa269a4536f9
 DIST netbeans-trunk-nightly-201510060002-src.zip 208673387 SHA256 dda7070cc82f15e7d8504a67a497be2405d3ed7e87525c332f1b71422c4a9f36 SHA512 94dd66c25fdb26b04bbedfc102e491893508ead55e66d3b61057a1544d5ffcfb898aacf197268213d139f214f033addb3e74630c3e5863cd5c417807988e1703 WHIRLPOOL 247f24bd2c8aa831b77319367fb4ca917b5300bc5916d5c0352100f1daf567a6a746fe4904f59fdb561490eeccb1442f1b01b7129c7e86830a207494345c7b31
@@ -31,8 +29,6 @@ DIST netbeans-trunk-nightly-201511010002-src.zip 208677648 SHA256 a23eb7aa0c1932
 DIST netbeans-trunk-nightly-201511030002-src.zip 208707811 SHA256 3d6beefb37d5b74cc273fbdbaf41bb9ed636b04276bb3ce72d289b55d74ed8e6 SHA512 496e8d8f4c04463f55ac01954dadcf8e80bdb6db81e2cefd66a5445c86c3c429950c4397ef781670a3f32b563812c792cf20ebc3542c33a6c9a87b38dcb26b84 WHIRLPOOL 2a119b5a7ac7b77dd7d93c61ef150e4eef67bbdd9e5ad41a851852493e189c87b7d9a889b74a215be61cfa1c3fddd90edf1089fedacbd8db54cff070a9100507
 EBUILD netbeans-javacard-8.0.2.ebuild 4906 SHA256 944fee40d693c2c287e748f70ba565f3cd84bb7c19110f8be716134ec20694a7 SHA512 1f66cd2756effbfde7d43f9da7d8d93cb6252c58a02ee3d821f6faeaf63bf3c63e28f80c6eb44689e3aa954452a2f3893c65e75de84158dff1da0d94cafea14a WHIRLPOOL 88197e03008b8acb1ce62f72783bb096d9a3fc2a289b83367841a8adbee2bf822031f9bd6051831515ee44b1d5d2a109c5646f98ca723506f27c874301fb4189
 EBUILD netbeans-javacard-8.1_rc2.ebuild 4931 SHA256 e97ff379323330f47a1f1e13d0492b4308e4c377008b4e203d24988a7e412bab SHA512 48dd7e817df729322de3ee165e4cadebc2bb23e8a6831d9084d298ca01f456c2035c96808080a7b62021154146924dbe98af5ed862271701f25fa07e4fe40e9c WHIRLPOOL cb81b1c27069e86f45acc87bfd1191e876b44ff676333ccc73320311f6f8de5923d7f052029f42bfc614b93f1aabe6489ddf76f4c788224140878c6081938f4d
-EBUILD netbeans-javacard-9999_p20151001.ebuild 4976 SHA256 714a98fde31d797fa8e50c0564ef66829e9e51f9fd740df1441b09bad904f433 SHA512 fd6dfd7720bb16541a2c0938ed5debc3c7ec313ceed2f8006d6aa801b89dd9d8ac12f6b865a6571fffe7fecf24720c34a10b4c50718cf6b505bcc7b659abbeca WHIRLPOOL f332fcb29ae308cec3c6ecf6b1b637742d5b8bcd420dcce3926b7ff3301f1949c2db7d1eb12ca06813aeb449d4526b4272e58d30f2c8a7c9003218e05479efbf
-EBUILD netbeans-javacard-9999_p20151002.ebuild 4976 SHA256 f82032cb69c8bdfabdd873e04b1ee11fe8cb04dbc3291f2eb4868731fa7457d9 SHA512 d45ffafe072f2f0cff7c4a369289196fbf789d3f694b3772c771a3579636d289d9f86a8e83c5a440707322c8361a9457c2ac91d08cfc1eabe533ed75af631ebd WHIRLPOOL c6f13eea72bd4a848f3d250b6f9c9c5fb1ad01444ae96c785740c45561a0333faf13fe6376ecd80eec0ff615b5eaee53a0ba6b5d253e6904fd2873139418ce79
 EBUILD netbeans-javacard-9999_p20151003.ebuild 4976 SHA256 0cbe49060b268c5b21c25ad8a83323e7f9be06f6d780eec9b8db6c66f8ba2a64 SHA512 c7d706d6e91535a401dea4723c22b430f35dd2b5baf0c521d7f9482a436f4361554855cdcf8efe488216628170bf6d41bd40de70f92f13c3fcca7d35bec67ac6 WHIRLPOOL f64b3a0e0b0120d855171ffb3f7ddfdc720e31915529c453c38f39b2149dd98da4dd3e9122b30b9a7ef430fbc387681c7d7e5cf4d38caae33aa2bba397327b29
 EBUILD netbeans-javacard-9999_p20151004.ebuild 4976 SHA256 29507a873668e70268cd520b94cd653fb174adf23f994be13de63d0845717b26 SHA512 ed64943994259ec7ac9e3c0767417718142219eb585d272378c011696f58f6b7c495bc7f8813ccc2d4e64aa65804b1214d3a3410294be389bae81f87f1d596e1 WHIRLPOOL 04c69dc31b821b60eb01193f4621bb5136dc5a102f6d11461b4ad43ce361795d97f83caae87ff51b6f0a28bed6c85c6ea4832a33c46db39352c75dbfff186244
 EBUILD netbeans-javacard-9999_p20151006.ebuild 4976 SHA256 2ba4ccbac644f3e8c1baf14bc7a723f27b4fa90d09cb1a46e400c4c39532fd0e SHA512 48cd51953962599bb55f64deddf9cd9e5d88b4ce1f137e217b1decc71affc1fa57255330b487c22841d5312e04d0b6d0cb8251712fcfea0b1c8345d5813b2497 WHIRLPOOL 12369652f310f5cc39950b4aec462624898e970e2ea99d4cb40d2d5c5d3fb92d35d4fbff68ba3c0c5d69c1a6e996a3329cc51ec92facfc45b6e0102afc586385

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151001.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151001.ebuild
deleted file mode 100644
index 106bca7..0000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151001.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2015 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/2015-10-01_03-28-59/zip/netbeans-trunk-nightly-201510010328-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-javacard/netbeans-javacard-9999_p20151002.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151002.ebuild
deleted file mode 100644
index 974fcf7..0000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151002.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2015 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/2015-10-02_00-02-28/zip/netbeans-trunk-nightly-201510020002-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/Manifest b/dev-java/netbeans-javadoc/Manifest
index fd3e139..f52c537 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -4,8 +4,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-8.1rc2-201510122201-src.zip 208690047 SHA256 728bfd0c1be5c20d6e7e32251984130e9f00f7d95bcc7e87b25484cd25c40531 SHA512 01636c48d05247ba2a0ab105fdf4736e895ad878e824ab0ffb82d26a258c50ad740092dd6924e27f0bc53fa41dbe4ad67c98252ce0ef301388feca57231d8e09 WHIRLPOOL dae4e5c5f0d97a64b1c905dd046c8584150eea26ec99aeafc5f152e82d5770619e6999854729dcf4dd538b372f1827a8c0a4169c6e199bd730e970db6ced323a
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
-DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
 DIST netbeans-trunk-nightly-201510030002-src.zip 208672397 SHA256 56d684334f97609098798fc2e9d2bb56073a61dcd7c91be398476163b39b7dda SHA512 18c9b136a3f2bdca433dcd2cf7d0cdba5a6428027e3bd884791278b55af4955058674eeba8c920739896d80b88fc5eb94b67695ac7b81e55878328eec49ae516 WHIRLPOOL 75af86ffcdb1318b46995d168b01d979e8f40f3351ec875dfa8732c7ace713bd20ee38559ea2f5d2558088573831d545956e4efd228eaf697d17a2b14f74c3f0
 DIST netbeans-trunk-nightly-201510040002-src.zip 208672385 SHA256 ebc1f4ac878d56d41dcaf987e4436f5fb4e1f02643c7832ca927c5e3ddbb6a16 SHA512 26c6882a12b5a00cfa54cdca758c81442391b960383d5486dd81b444558c882c003d55fd32d58e8d75866e77a729cafc2ff00a6926b4c05245e1be023a159603 WHIRLPOOL fe7c480835e4458340ab03d6dd1319a2e377370d2f12e0afa3b4080bc128c746480708382e22a3584e61a101c0a97d9274c800a09bb3b784f675fa269a4536f9
 DIST netbeans-trunk-nightly-201510060002-src.zip 208673387 SHA256 dda7070cc82f15e7d8504a67a497be2405d3ed7e87525c332f1b71422c4a9f36 SHA512 94dd66c25fdb26b04bbedfc102e491893508ead55e66d3b61057a1544d5ffcfb898aacf197268213d139f214f033addb3e74630c3e5863cd5c417807988e1703 WHIRLPOOL 247f24bd2c8aa831b77319367fb4ca917b5300bc5916d5c0352100f1daf567a6a746fe4904f59fdb561490eeccb1442f1b01b7129c7e86830a207494345c7b31
@@ -29,8 +27,6 @@ DIST netbeans-trunk-nightly-201511010002-src.zip 208677648 SHA256 a23eb7aa0c1932
 DIST netbeans-trunk-nightly-201511030002-src.zip 208707811 SHA256 3d6beefb37d5b74cc273fbdbaf41bb9ed636b04276bb3ce72d289b55d74ed8e6 SHA512 496e8d8f4c04463f55ac01954dadcf8e80bdb6db81e2cefd66a5445c86c3c429950c4397ef781670a3f32b563812c792cf20ebc3542c33a6c9a87b38dcb26b84 WHIRLPOOL 2a119b5a7ac7b77dd7d93c61ef150e4eef67bbdd9e5ad41a851852493e189c87b7d9a889b74a215be61cfa1c3fddd90edf1089fedacbd8db54cff070a9100507
 EBUILD netbeans-javadoc-8.0.2.ebuild 5993 SHA256 baf9da38d87b86eb8ed10ef46017361f36ca8583dd90885c9d1667a51851bc52 SHA512 892bc25b30dc26e3ee7c8be9aaf8542c00a7fa1d1d8f883d82bebb816edfa93e1ee9abeac1b0c47ecc8b4169bcaded56c5c71f18151fdc22fe241fcee0fd4521 WHIRLPOOL 2012f28f3ba5074b4d262b20e9a1c8ddf590ce444339ec1a404c890867c1271e38f9f9e09717d0648fae061553f5c8da3d97a70c35c8e853fe4894fb6fd4ec96
 EBUILD netbeans-javadoc-8.1_rc2.ebuild 6183 SHA256 160de5384af53a4ff95958ba30c1d3d0b3dbcf4e8f8209c67ff2447d504108c8 SHA512 cd7d0ecc527dc8c6a7ac59f27a39c332500ff60dd59b5c26d2579258adf75cff762083727b18172607d494a597143261423c97faa7f705015c372bff1a54908d WHIRLPOOL 39a55f84ccb43df6537b1276406d46d70cdc9e5b5c428aec33eeed091f5e580c752557319cbab5f6d6325de1509c87d8913f6c1b8712e72e148fb1883c684d76
-EBUILD netbeans-javadoc-9999_p20151001.ebuild 6228 SHA256 e1a3b029266e3b470f00a50bdfd40ae55bd55704e05c349b61f95d634b61dd16 SHA512 46ca2c05feaffb2bc02ef2b13db9ed0f73c250dc9264a72045680c75c31a78eeff3afba43cf4a491bc6f06740b817cc4a69cad1ced802d7760be20450a2b56a3 WHIRLPOOL f81a54053408f205ca6b71b67977ffd3ccfc12173334713c7f604fe805da3db7e588ca002043e83a4f45cc62408d0a1b093538536481545f3e8f925a91b5f0f3
-EBUILD netbeans-javadoc-9999_p20151002.ebuild 6228 SHA256 a687fddec18e191fecbb9aed6a6a2390688e8f2ee2a73ee10691c5062eeb933c SHA512 75ed80ad34847f6b20974067f47bae25e2ab9e1c2e7e24ed29e1a10a95c3178764f6bd51bfff1ec9c8a52fc6691b834b7854eeed0762f041db644a99bba8dc6f WHIRLPOOL f8c57073ce593060d8829bbe8e6174082797dcd11665733d86b5548d29b9e7c4b76bf777fb18bc6b123bad55d92c37753b772ec490e9553f937a4d26a8412f12
 EBUILD netbeans-javadoc-9999_p20151003.ebuild 6228 SHA256 699e9a51f3f2f67cd645c26e3e71473e173e86bc65fec4f79f322359b0fda501 SHA512 4c3126c9007b76c676720357671bdc04bad90c56de7d0b568c9de3ae17f348fd96c0176deb36531f2eb832d649c544e056ffecf4e19e25127d9640bb542026ea WHIRLPOOL 42dd2ce70c6c823a3fbeb93dbcf623a49bd4d2d10beda37e862a932ca625813bfe0685e0a0c637a3ad40ac547823d94a5f19c7d26112b177f4287cce12869760
 EBUILD netbeans-javadoc-9999_p20151004.ebuild 6228 SHA256 aeee0edbb37ff7feda48809509e0817726f12a03095c831188d0dc697a0d03ca SHA512 9daec0d7d018fdfeb5423ebefbd3bc35d3e392b5d264b86f4e075a6fcf617faccfe2f8cb4e1ff72946a24b55fd2766458719dbe97e2857c9d58e38f3f39a18df WHIRLPOOL c8fcaaaa314958390aae2faf643cde43ce6b90d9d08833700646780c627a02c659a8cef83f0d83e7f646b14e4a103723a435e2d7541325ca0a8db291cd4e97fb
 EBUILD netbeans-javadoc-9999_p20151006.ebuild 6228 SHA256 f760645f1a3153daf67150731ab0db32eed2bf4c325902d7feeff29961a141f8 SHA512 b83437b70058c1e114b9b1d099373c7fca03403aad70dedb6def6b8468a00f096d7a1022b4b12c1a3e608aa2d3f543e392de86a1ab01a4e637d2e601abc8a7ab WHIRLPOOL 6e5abef383be306d9476c5fad35d2fdda8ba3e2c0ff8109a8210cc69cd4bb0751362ea93bd9a00c7005a09dee5eb376c2d8b170f972382bd04e0fadfc8364a41

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20151001.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20151001.ebuild
deleted file mode 100644
index 05954ba..0000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20151001.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2015 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/2015-10-01_03-28-59/zip/netbeans-trunk-nightly-201510010328-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-javadoc/netbeans-javadoc-9999_p20151002.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20151002.ebuild
deleted file mode 100644
index 0023795..0000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20151002.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2015 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/2015-10-02_00-02-28/zip/netbeans-trunk-nightly-201510020002-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/Manifest b/dev-java/netbeans-javafx/Manifest
index d89d2dd..ff44d63 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -10,8 +10,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-8.1rc2-201510122201-src.zip 208690047 SHA256 728bfd0c1be5c20d6e7e32251984130e9f00f7d95bcc7e87b25484cd25c40531 SHA512 01636c48d05247ba2a0ab105fdf4736e895ad878e824ab0ffb82d26a258c50ad740092dd6924e27f0bc53fa41dbe4ad67c98252ce0ef301388feca57231d8e09 WHIRLPOOL dae4e5c5f0d97a64b1c905dd046c8584150eea26ec99aeafc5f152e82d5770619e6999854729dcf4dd538b372f1827a8c0a4169c6e199bd730e970db6ced323a
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
-DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
 DIST netbeans-trunk-nightly-201510030002-src.zip 208672397 SHA256 56d684334f97609098798fc2e9d2bb56073a61dcd7c91be398476163b39b7dda SHA512 18c9b136a3f2bdca433dcd2cf7d0cdba5a6428027e3bd884791278b55af4955058674eeba8c920739896d80b88fc5eb94b67695ac7b81e55878328eec49ae516 WHIRLPOOL 75af86ffcdb1318b46995d168b01d979e8f40f3351ec875dfa8732c7ace713bd20ee38559ea2f5d2558088573831d545956e4efd228eaf697d17a2b14f74c3f0
 DIST netbeans-trunk-nightly-201510040002-src.zip 208672385 SHA256 ebc1f4ac878d56d41dcaf987e4436f5fb4e1f02643c7832ca927c5e3ddbb6a16 SHA512 26c6882a12b5a00cfa54cdca758c81442391b960383d5486dd81b444558c882c003d55fd32d58e8d75866e77a729cafc2ff00a6926b4c05245e1be023a159603 WHIRLPOOL fe7c480835e4458340ab03d6dd1319a2e377370d2f12e0afa3b4080bc128c746480708382e22a3584e61a101c0a97d9274c800a09bb3b784f675fa269a4536f9
 DIST netbeans-trunk-nightly-201510060002-src.zip 208673387 SHA256 dda7070cc82f15e7d8504a67a497be2405d3ed7e87525c332f1b71422c4a9f36 SHA512 94dd66c25fdb26b04bbedfc102e491893508ead55e66d3b61057a1544d5ffcfb898aacf197268213d139f214f033addb3e74630c3e5863cd5c417807988e1703 WHIRLPOOL 247f24bd2c8aa831b77319367fb4ca917b5300bc5916d5c0352100f1daf567a6a746fe4904f59fdb561490eeccb1442f1b01b7129c7e86830a207494345c7b31
@@ -35,8 +33,6 @@ DIST netbeans-trunk-nightly-201511010002-src.zip 208677648 SHA256 a23eb7aa0c1932
 DIST netbeans-trunk-nightly-201511030002-src.zip 208707811 SHA256 3d6beefb37d5b74cc273fbdbaf41bb9ed636b04276bb3ce72d289b55d74ed8e6 SHA512 496e8d8f4c04463f55ac01954dadcf8e80bdb6db81e2cefd66a5445c86c3c429950c4397ef781670a3f32b563812c792cf20ebc3542c33a6c9a87b38dcb26b84 WHIRLPOOL 2a119b5a7ac7b77dd7d93c61ef150e4eef67bbdd9e5ad41a851852493e189c87b7d9a889b74a215be61cfa1c3fddd90edf1089fedacbd8db54cff070a9100507
 EBUILD netbeans-javafx-8.0.2.ebuild 4647 SHA256 15e5e0b1c4729852dd55e5bfb2dcb520ba7c959bd9927d315c0abcb3f94e4ecc SHA512 520c60264fee67b0ccfd50ced0cc8586d5653d5186fa75c6b7cd8b400aae834de446b7e6145ad38df7e68207391fb360ef4834140e096d48add568fed387ac98 WHIRLPOOL 416a56ceb2ba85e3923ada0c8ef485cdd6fa16b3423b8fd0de523fa54dd082cbaedee5da4f1a92b50e440195f9256376f50e99a850d70ccdcb8c0ff370007f7c
 EBUILD netbeans-javafx-8.1_rc2.ebuild 4672 SHA256 95e0fd3db7cd71b95d3b1a0be1ec35e8b4f0ee2ef8e37e5defcdfb81c8a8ee4b SHA512 0dbdb39db83521ad87f5536c491a8f94d1d6261f1cebc5a80e943128f33364adf04a4a0a23898617eb0b12f770200f0a7df9c7bb8e5cac65aca4b50737a05b2b WHIRLPOOL 0ef3c1159df5dc25474beb8106b65133951ff48699c265d6be1a929e9537a30db8a125740f37a0295ed0e6267141cd1a7be9f5ec5d4412e0221f9734d6625b3b
-EBUILD netbeans-javafx-9999_p20151001.ebuild 4717 SHA256 f7d20a14f73084dd20657f4a6980f669648914eeb87b664570b6b48c2d130430 SHA512 20c414a6f5586949a115c142c0f2500162796eb64784e2bcd05ce611c5a709859994bceeba670ca45dfe1a9ca3e7b3506642347654e15b1336a3da1b466a5123 WHIRLPOOL 936b577abd4722aeb2e35a82422d5490fbf687875759052a635e90a1b6cc9839d67ce65e1de660381e61f9d865ea2583bc8a09f5779a7427274738523c6223cb
-EBUILD netbeans-javafx-9999_p20151002.ebuild 4717 SHA256 9a6e99d919c51b950269a7211ba0706b34e8089fb8597945b255382126897634 SHA512 727f3c917c81692c65527a7c0e5d85898614ca1d84ff3c3cb5eb57656b3f04529abb43c1db2c52074b1a52f99631d88d69c7680b1d01fedd3b827fd4ccf903d0 WHIRLPOOL 4bdef0a6873f39f737d892e8b32a0e2f5af57f52c268b97a0590dd512d27052756fa1f184a9eb27d0a02705a7eab5188e423933a6a13ef7f2ee526a710fe6ee5
 EBUILD netbeans-javafx-9999_p20151003.ebuild 4717 SHA256 03d1d9072581af463e15e1511386ca9fee31f1c0b0c6c61e8dce201ac8b8191b SHA512 49de10a7661e68b166520466b00486892a71d04e62910c85767933f1878c5663ded79da8ac826090b86225683d8a8f5a5bbf7c4355a37bf4606cddc08e093480 WHIRLPOOL 4fb2aa5b95f85a3f68ba998e7bdba9c97e9781c1422018a3c1143bcee7eb60f82efce783a4b3b2bb7fd5e81ca115565a97ebef34a4df7407c19b320ef8321c41
 EBUILD netbeans-javafx-9999_p20151004.ebuild 4717 SHA256 f5cec5382f77bc6cfa2fde0e43fc6d2e82970675451ef637579e01de9dd16660 SHA512 d5301486d787aff45f88759215b486bc7ef5a923750051405892becf9e901154ec839af7f872875a0525affac9b92e7bfa676e970066faae5e68b370cca97a13 WHIRLPOOL 4556a657e2eae1d066c0baafbb5bb7b41f3f890cec2cefa48216725117b23c633f0be2890982480c64fc8b3fdeb14c955d6243a3b7397746cc02283d0320559d
 EBUILD netbeans-javafx-9999_p20151006.ebuild 4717 SHA256 34ad3ad3daa237cbe0168a647d1f7a06b474e68520966d1538f55020796bcd80 SHA512 6cf7e185a82b06bb2eb698a9d83185128691dbd8bbe7efc8fc8208d370cecdcfbc3cad923e4843e4dd0c0b55487037e65aaee8d20a4ca8f6f5bcc34adebb32a9 WHIRLPOOL 38ce3c3ad1a569ce367596044443df5944cfc57fc95b9a959a84f2b6ebe34ed2d7b42e9095e0f5e173abad83d6b0dc777454c4bc018d410eede698e8b3b23723

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20151001.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20151001.ebuild
deleted file mode 100644
index 7e53aac..0000000
--- a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20151001.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2015 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/2015-10-01_03-28-59/zip/netbeans-trunk-nightly-201510010328-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-javafx/netbeans-javafx-9999_p20151002.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20151002.ebuild
deleted file mode 100644
index e6f6a27..0000000
--- a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20151002.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2015 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/2015-10-02_00-02-28/zip/netbeans-trunk-nightly-201510020002-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/Manifest b/dev-java/netbeans-mobility/Manifest
index 3b9b21c..c0e0772 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-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-8.1rc2-201510122201-src.zip 208690047 SHA256 728bfd0c1be5c20d6e7e32251984130e9f00f7d95bcc7e87b25484cd25c40531 SHA512 01636c48d05247ba2a0ab105fdf4736e895ad878e824ab0ffb82d26a258c50ad740092dd6924e27f0bc53fa41dbe4ad67c98252ce0ef301388feca57231d8e09 WHIRLPOOL dae4e5c5f0d97a64b1c905dd046c8584150eea26ec99aeafc5f152e82d5770619e6999854729dcf4dd538b372f1827a8c0a4169c6e199bd730e970db6ced323a
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
-DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
 DIST netbeans-trunk-nightly-201510030002-src.zip 208672397 SHA256 56d684334f97609098798fc2e9d2bb56073a61dcd7c91be398476163b39b7dda SHA512 18c9b136a3f2bdca433dcd2cf7d0cdba5a6428027e3bd884791278b55af4955058674eeba8c920739896d80b88fc5eb94b67695ac7b81e55878328eec49ae516 WHIRLPOOL 75af86ffcdb1318b46995d168b01d979e8f40f3351ec875dfa8732c7ace713bd20ee38559ea2f5d2558088573831d545956e4efd228eaf697d17a2b14f74c3f0
 DIST netbeans-trunk-nightly-201510040002-src.zip 208672385 SHA256 ebc1f4ac878d56d41dcaf987e4436f5fb4e1f02643c7832ca927c5e3ddbb6a16 SHA512 26c6882a12b5a00cfa54cdca758c81442391b960383d5486dd81b444558c882c003d55fd32d58e8d75866e77a729cafc2ff00a6926b4c05245e1be023a159603 WHIRLPOOL fe7c480835e4458340ab03d6dd1319a2e377370d2f12e0afa3b4080bc128c746480708382e22a3584e61a101c0a97d9274c800a09bb3b784f675fa269a4536f9
 DIST netbeans-trunk-nightly-201510060002-src.zip 208673387 SHA256 dda7070cc82f15e7d8504a67a497be2405d3ed7e87525c332f1b71422c4a9f36 SHA512 94dd66c25fdb26b04bbedfc102e491893508ead55e66d3b61057a1544d5ffcfb898aacf197268213d139f214f033addb3e74630c3e5863cd5c417807988e1703 WHIRLPOOL 247f24bd2c8aa831b77319367fb4ca917b5300bc5916d5c0352100f1daf567a6a746fe4904f59fdb561490eeccb1442f1b01b7129c7e86830a207494345c7b31
@@ -28,8 +26,6 @@ DIST netbeans-trunk-nightly-201511010002-src.zip 208677648 SHA256 a23eb7aa0c1932
 DIST netbeans-trunk-nightly-201511030002-src.zip 208707811 SHA256 3d6beefb37d5b74cc273fbdbaf41bb9ed636b04276bb3ce72d289b55d74ed8e6 SHA512 496e8d8f4c04463f55ac01954dadcf8e80bdb6db81e2cefd66a5445c86c3c429950c4397ef781670a3f32b563812c792cf20ebc3542c33a6c9a87b38dcb26b84 WHIRLPOOL 2a119b5a7ac7b77dd7d93c61ef150e4eef67bbdd9e5ad41a851852493e189c87b7d9a889b74a215be61cfa1c3fddd90edf1089fedacbd8db54cff070a9100507
 EBUILD netbeans-mobility-8.0.2.ebuild 4342 SHA256 e9b4ff8fe38904346bc21a82219696e97322bf9df4e9d4cad2259b6f08bbe7f9 SHA512 338711fe61c469cee80e499ddf8c3ad70a3a38e6658311afcd1d24edd1a99b87566fafcbd392bb958b589796e0913d2574b07570870c8d3382a91a324227082f WHIRLPOOL 855b2817c36bea67c8fb368a0740be18b71dbebb2b98a154552f002a56eaff34f54eee2698379d7200a6042c1de699df23e7717b5b6c532776852d8757b74cb0
 EBUILD netbeans-mobility-8.1_rc2.ebuild 4367 SHA256 9b9490b5e2515bf38f69aee76ad664271a0296f68b88d4a005ab12d9048c61d8 SHA512 7eccdf31e705ae6f738995fdcb930c03cf779f02ed64d5e3ee97f1f9a9f6912a2ff56e1c839ddc2b71b9051fcd02ed410d85fff0c706b6ca84f3578c0aa2447d WHIRLPOOL 8d4657fc21b171bf050a272597e7b0567dac5ad480a8822fdcdf76b88b4537aaf8b45a3b1317dd34cef3beee417515a521b7e076e7776b845c0383066503ba3f
-EBUILD netbeans-mobility-9999_p20151001.ebuild 4412 SHA256 fa37c54076909decb1265c7a0f659d19ccb7f66021dc55262bb840d238bdf5ec SHA512 03783d0b84678f37f31e5739113ec02438161775854a05abd52decf8438cbcc29be6126d2926edfa8f65788a293884ea638b6a442f3552f1f0547cbb58560de4 WHIRLPOOL 534bb40d4aefca1435202edb8e4602a6aff3579043f404e7da65badc9dac4fcbb7821c5462d975cbea66bfa9a3e9ae84a8ca28428433385747455b61726e1eb4
-EBUILD netbeans-mobility-9999_p20151002.ebuild 4412 SHA256 df00ff89ea7e700ba86d2fa5200cfe2acebb3dd7e701e73ea0b46f7bf0bb0f01 SHA512 fdf208e110fbcdf52f7c3056348c1927d1442ca9186a432ea84b4d4650723d46f33bbeee7e3a291659675340f102c5f2b009115e68dfc604804c231be27d6c51 WHIRLPOOL db8eff616a20bbcfdd284974501986f19822e098fee0cb8825912b80c512ce6068e1c26cbf1e6f0917edc01a603f6f85ee2b1e5504a106b828c7a78531252692
 EBUILD netbeans-mobility-9999_p20151003.ebuild 4412 SHA256 4008de7070cbd2be6d3e73ebe1c214953cb79dd18f284a9ac8c5e7602bde1e37 SHA512 0cf6b7a3e152677b73e1b81c2cc37a23b66f70213ad567085b936bf1994d92f13270f9a210ec2d97ee4edb42ef79b2c74ea2f2c28ee740f20a2dec005a3a0bdd WHIRLPOOL 9f1f6eebaeb6cded573a16c0e87bff20cf8166767e676fcdc424a13a68a809d7d99d271545365e2eae801c5e0ababf0e455de67d997007b43cb2af2bf4981e98
 EBUILD netbeans-mobility-9999_p20151004.ebuild 4412 SHA256 eec5678d4d7c70f60e7e6a70d41818c848e5bcfbdfdd89b98ec390acfb5478fe SHA512 a44588ae712cca5c0b6e7c3ad63727adb65d6cec8eaba43dccb946b5c57fe6cf94afb7a8d9d9ca08c1d48112ae46f3a71cb2770757f97387a709e918ab0359b5 WHIRLPOOL f69c518216ac8efac79c3cb58c6548197a1de9292f834712340ebac542fbc2f2afe7364512dd2ff6ad12fcad94164916286cd8aa615530f37d266e0b4348ec84
 EBUILD netbeans-mobility-9999_p20151006.ebuild 4412 SHA256 d719b44364efbc267aea6a4c0896832d4465ed5b7472e0ac7cdf477e9f1b1969 SHA512 9a349ff057861512210eb0b50cad0a121e04a552bd52a60c5fb91e14bfb18c5e393acce607c0b2975de2f5fde9756174c0eb945699f7d00c16112263fa4b8ca7 WHIRLPOOL c3e0698d35583f9f3dd04f9f0b2dd1cda16880781e097f7d845d17ec2ea5a9f1e2f781068828278903f6921b2c6f6e5501934de3030c1c4339601dbe20cea0c0

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20151001.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20151001.ebuild
deleted file mode 100644
index 37ff758..0000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20151001.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2015 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/2015-10-01_03-28-59/zip/netbeans-trunk-nightly-201510010328-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-mobility/netbeans-mobility-9999_p20151002.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20151002.ebuild
deleted file mode 100644
index 9afbf35..0000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20151002.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2015 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/2015-10-02_00-02-28/zip/netbeans-trunk-nightly-201510020002-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/Manifest b/dev-java/netbeans-nb/Manifest
index 442b0e5..05d19a1 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-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-8.1rc2-201510122201-src.zip 208690047 SHA256 728bfd0c1be5c20d6e7e32251984130e9f00f7d95bcc7e87b25484cd25c40531 SHA512 01636c48d05247ba2a0ab105fdf4736e895ad878e824ab0ffb82d26a258c50ad740092dd6924e27f0bc53fa41dbe4ad67c98252ce0ef301388feca57231d8e09 WHIRLPOOL dae4e5c5f0d97a64b1c905dd046c8584150eea26ec99aeafc5f152e82d5770619e6999854729dcf4dd538b372f1827a8c0a4169c6e199bd730e970db6ced323a
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
-DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
 DIST netbeans-trunk-nightly-201510030002-src.zip 208672397 SHA256 56d684334f97609098798fc2e9d2bb56073a61dcd7c91be398476163b39b7dda SHA512 18c9b136a3f2bdca433dcd2cf7d0cdba5a6428027e3bd884791278b55af4955058674eeba8c920739896d80b88fc5eb94b67695ac7b81e55878328eec49ae516 WHIRLPOOL 75af86ffcdb1318b46995d168b01d979e8f40f3351ec875dfa8732c7ace713bd20ee38559ea2f5d2558088573831d545956e4efd228eaf697d17a2b14f74c3f0
 DIST netbeans-trunk-nightly-201510040002-src.zip 208672385 SHA256 ebc1f4ac878d56d41dcaf987e4436f5fb4e1f02643c7832ca927c5e3ddbb6a16 SHA512 26c6882a12b5a00cfa54cdca758c81442391b960383d5486dd81b444558c882c003d55fd32d58e8d75866e77a729cafc2ff00a6926b4c05245e1be023a159603 WHIRLPOOL fe7c480835e4458340ab03d6dd1319a2e377370d2f12e0afa3b4080bc128c746480708382e22a3584e61a101c0a97d9274c800a09bb3b784f675fa269a4536f9
 DIST netbeans-trunk-nightly-201510060002-src.zip 208673387 SHA256 dda7070cc82f15e7d8504a67a497be2405d3ed7e87525c332f1b71422c4a9f36 SHA512 94dd66c25fdb26b04bbedfc102e491893508ead55e66d3b61057a1544d5ffcfb898aacf197268213d139f214f033addb3e74630c3e5863cd5c417807988e1703 WHIRLPOOL 247f24bd2c8aa831b77319367fb4ca917b5300bc5916d5c0352100f1daf567a6a746fe4904f59fdb561490eeccb1442f1b01b7129c7e86830a207494345c7b31
@@ -31,8 +29,6 @@ DIST netbeans-trunk-nightly-201511010002-src.zip 208677648 SHA256 a23eb7aa0c1932
 DIST netbeans-trunk-nightly-201511030002-src.zip 208707811 SHA256 3d6beefb37d5b74cc273fbdbaf41bb9ed636b04276bb3ce72d289b55d74ed8e6 SHA512 496e8d8f4c04463f55ac01954dadcf8e80bdb6db81e2cefd66a5445c86c3c429950c4397ef781670a3f32b563812c792cf20ebc3542c33a6c9a87b38dcb26b84 WHIRLPOOL 2a119b5a7ac7b77dd7d93c61ef150e4eef67bbdd9e5ad41a851852493e189c87b7d9a889b74a215be61cfa1c3fddd90edf1089fedacbd8db54cff070a9100507
 EBUILD netbeans-nb-8.0.2.ebuild 4927 SHA256 7531e50c4d76608bf925efdba4f54f522de3a8ceeef4d48807fb4ee48bfabdf6 SHA512 925734f331cf228066c5c9e614f48b756af31cac8b559cfe756347b6a2cb0ce362c7c41489a25084f2ed3f2e415baefd148a54f39fc00269fb14179efe056cb9 WHIRLPOOL e3224c5f22bb8e4792a5f98bbe819e071ff18c99533ce05a3fc1c5898ddcca1e3ce34487ba78159bb4d60155acdf15ae4fe81189ff2d5b1bc77ffd9ee4e20aca
 EBUILD netbeans-nb-8.1_rc2.ebuild 4952 SHA256 7e7fd653bb309c4acbc812e3e4659e0f3f67f943ceaebfdea0e9ff75c2e71174 SHA512 59da938007782e139e0946ef8da1fcb49d2d6d993953222cd2540b0506981279c0f3ad6b9ccaba89af185f4fc9eb7ed23ec16e66c066c22541fe371384eab59b WHIRLPOOL 2be8f9f9cc42829865f393f4a641b73053d460da5c3bbe45bdf470ffd0c519e76af9e4712f0142d0c018801d003c347bcfb4fa99ff1e3a95bfebe8f1e0f02f2d
-EBUILD netbeans-nb-9999_p20151001.ebuild 4997 SHA256 beee62184543011b39e38178684cb39843804f4c34e3296fdf163da2288891a6 SHA512 d21f566eff13f763bcb2c99d16f7a713254d3251eb6c9131acae6b28bc4658055e20d137eb6d526fd77bec7f76d42c1ab7fcba967891e68c42ccd0e44d0d46f3 WHIRLPOOL dbc5168e83e57f4e137b5d29606a10f800bfe50861b3ba80ff05bcf6f8fb74840dec8a10d9717875bfaf32aed11a978169e41962443724c090c5e35230a2003a
-EBUILD netbeans-nb-9999_p20151002.ebuild 4997 SHA256 9ab3d3fd8b6c8ed179f38eb1b4b91adb1097bafce9fdb19fcd070f6e012a846d SHA512 b4f77eedd60ad27e2b79c979da933504c796531078d7b31537a04a16e471baff40fd64866445afdad95c780e27c19d6e898b411c947f84fb6eaf81ba70720a51 WHIRLPOOL fa901af75d59511cff43f7dd67a01ec4dffdbaacb77f64efe08ae28b7d765b377350bb17c7353b285f150bfad33bc9bdff032c08655c9209c506722cf540db35
 EBUILD netbeans-nb-9999_p20151003.ebuild 4997 SHA256 4a3f76f876ef86def5c520bfe25862b967c4a1541afe3482249606b3f25bf834 SHA512 8b7394269188b4ca4fc3ae1c57b8433d1fcbecfec83a65ce24784f15677417c9023a290e13c2815bed8366d9059aaa958e3e8010a0a5c54e1ba6dcae2991babe WHIRLPOOL dfd1bc86f95779e9a8f0058838a3566153b42095f3c4fac7763eccbab6fee0612053c3becb53d01d4000c314a4299c17653e816007a1b51d262e6b39409b9e47
 EBUILD netbeans-nb-9999_p20151004.ebuild 4997 SHA256 fa04d92fff6adbd9130da20623b7543a8688e6049499d626893c89f13c71f35e SHA512 f402582e19c0dea600d2bb222f9aca62671b7a66f8a480a689a70cf0472ced8097a3a9ecdefcefac34c5c03c5e75d56cb6ce1525d347e649559412aa3b5ada72 WHIRLPOOL 7b8dd62345302e778b93a9e27bfadbc8eb559f905362165b9f3c1929141690f521d87dc7d5e783d3fabaa63d0b87cf7d0feee9a47db05277c9723c50cdfa4ba0
 EBUILD netbeans-nb-9999_p20151006.ebuild 4997 SHA256 dc1f754ebd2fce7410291bc925bab61f41de6b6522db6a25501e2c96d8e23b52 SHA512 ebfd154b4099ebcefc2c7744ea7856cf38013c7dadb21d725fd8547577012204f505835e28f166d826536cd7eabad0efd70bc4c3110f35d39fac88558477a69f WHIRLPOOL a8b4cbc40e1f8faca9665f5d5a4f0f59306e4469f2755df186e6290c21fc2de26d0b2909a83fe7a50962e9de262bb4338385d4c9e672a1138a2d2ebbc3dce105

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20151001.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20151001.ebuild
deleted file mode 100644
index 33c9bc4..0000000
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20151001.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2015 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/2015-10-01_03-28-59/zip/netbeans-trunk-nightly-201510010328-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-nb/netbeans-nb-9999_p20151002.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20151002.ebuild
deleted file mode 100644
index f9c52da..0000000
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20151002.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2015 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/2015-10-02_00-02-28/zip/netbeans-trunk-nightly-201510020002-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/Manifest b/dev-java/netbeans-php/Manifest
index a4b1284..b1cfba1 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -7,8 +7,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-8.1rc2-201510122201-src.zip 208690047 SHA256 728bfd0c1be5c20d6e7e32251984130e9f00f7d95bcc7e87b25484cd25c40531 SHA512 01636c48d05247ba2a0ab105fdf4736e895ad878e824ab0ffb82d26a258c50ad740092dd6924e27f0bc53fa41dbe4ad67c98252ce0ef301388feca57231d8e09 WHIRLPOOL dae4e5c5f0d97a64b1c905dd046c8584150eea26ec99aeafc5f152e82d5770619e6999854729dcf4dd538b372f1827a8c0a4169c6e199bd730e970db6ced323a
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
-DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
 DIST netbeans-trunk-nightly-201510030002-src.zip 208672397 SHA256 56d684334f97609098798fc2e9d2bb56073a61dcd7c91be398476163b39b7dda SHA512 18c9b136a3f2bdca433dcd2cf7d0cdba5a6428027e3bd884791278b55af4955058674eeba8c920739896d80b88fc5eb94b67695ac7b81e55878328eec49ae516 WHIRLPOOL 75af86ffcdb1318b46995d168b01d979e8f40f3351ec875dfa8732c7ace713bd20ee38559ea2f5d2558088573831d545956e4efd228eaf697d17a2b14f74c3f0
 DIST netbeans-trunk-nightly-201510040002-src.zip 208672385 SHA256 ebc1f4ac878d56d41dcaf987e4436f5fb4e1f02643c7832ca927c5e3ddbb6a16 SHA512 26c6882a12b5a00cfa54cdca758c81442391b960383d5486dd81b444558c882c003d55fd32d58e8d75866e77a729cafc2ff00a6926b4c05245e1be023a159603 WHIRLPOOL fe7c480835e4458340ab03d6dd1319a2e377370d2f12e0afa3b4080bc128c746480708382e22a3584e61a101c0a97d9274c800a09bb3b784f675fa269a4536f9
 DIST netbeans-trunk-nightly-201510060002-src.zip 208673387 SHA256 dda7070cc82f15e7d8504a67a497be2405d3ed7e87525c332f1b71422c4a9f36 SHA512 94dd66c25fdb26b04bbedfc102e491893508ead55e66d3b61057a1544d5ffcfb898aacf197268213d139f214f033addb3e74630c3e5863cd5c417807988e1703 WHIRLPOOL 247f24bd2c8aa831b77319367fb4ca917b5300bc5916d5c0352100f1daf567a6a746fe4904f59fdb561490eeccb1442f1b01b7129c7e86830a207494345c7b31
@@ -32,8 +30,6 @@ DIST netbeans-trunk-nightly-201511010002-src.zip 208677648 SHA256 a23eb7aa0c1932
 DIST netbeans-trunk-nightly-201511030002-src.zip 208707811 SHA256 3d6beefb37d5b74cc273fbdbaf41bb9ed636b04276bb3ce72d289b55d74ed8e6 SHA512 496e8d8f4c04463f55ac01954dadcf8e80bdb6db81e2cefd66a5445c86c3c429950c4397ef781670a3f32b563812c792cf20ebc3542c33a6c9a87b38dcb26b84 WHIRLPOOL 2a119b5a7ac7b77dd7d93c61ef150e4eef67bbdd9e5ad41a851852493e189c87b7d9a889b74a215be61cfa1c3fddd90edf1089fedacbd8db54cff070a9100507
 EBUILD netbeans-php-8.0.2.ebuild 4347 SHA256 585b2488d748f3d0f87c17c951870e167aac7bf10847428add786e4a8a446583 SHA512 1431305d4f340cb0a2c7c896c54d45f6f02ef82a4201f82053278b98511a5a4a68210317530e9cdf5cf1f495996d3a3f9c4b2c3c479aa407abd375072ab3182f WHIRLPOOL af8476f2ff2d119f2657e6be03cfea1160f86e41bd791f40609f1bc8a8aada46ba1081e4f2417b0fddde931fa4e43d20956c0fe1d4fdf3617b78d01afd23f9b4
 EBUILD netbeans-php-8.1_rc2.ebuild 4372 SHA256 76dac153b77fd368c61ae61aedbda5d9bffd3e713520cfb6e8c6923c6443fd2f SHA512 7a62423b8a60734d337ab08f5a84513ef8246bf2e807b0f88acce1bb64add72cde91739289aa968bd1eecff64a78f4c5947f6e722af7509fb3c9d93f57ee72ac WHIRLPOOL 1effeb1eba78584a32d4b763804cca16383715029247bfc3569ee3e06135dc03cc65425a8769b0ffa259672fd20909699bda99833a9024a924b408c93f4befb1
-EBUILD netbeans-php-9999_p20151001.ebuild 4417 SHA256 df6044e54831ad66583fe0f1e8ae27d25a6dbb768829230ad2f21e3602807732 SHA512 fb840cf50a278f6afb1189e3263405b6dc2404317d677b046e923e01631b5ee1afb476bce60ad647f74cbf0b3560963689cd6c369215a29033620c971d8f94dd WHIRLPOOL 9ebefcf91e9c7e6dfb5d095df07267405caa3f15f5e103f612704cd3658ebaf6c83a2e06b448517c4adddbb34bc6fc0dac4d87f8f9d1c2f54a03bd7878d2fc2a
-EBUILD netbeans-php-9999_p20151002.ebuild 4417 SHA256 d8723db67e98daabf5df80b39d3ccbbf3b657f74b61e79d6676f2af21fdd2fd6 SHA512 fcbe482a156e5933203a13e6c1f54c565fe842cdec988c114c0d69a6c30df680eab745b1b8cf7be68840e8579c9ca8c4fb5938c91436549d509e37300f05a839 WHIRLPOOL 0f390b8e7ce548787ef87a36edbc417f3a436fa0503871fcc11d6d884e37ec0a7ddd2a9a1481c316a11d575b001eab10e34437277474bf0e990c9fa6241d20e1
 EBUILD netbeans-php-9999_p20151003.ebuild 4417 SHA256 1f9f8c33446cf1f316f2f0761f41c231217fe0da960ad4e6e34f3e576b9368c9 SHA512 cc5d7f7b566d0f406abe90af53ec07b8068a5c2838d156389835b029bf96e935e16bbe33cd6063c6eaa5274df4f04a7b00a7685e7ce3b6b63799041253e32482 WHIRLPOOL b85744dcd055cab0c5f9d609493879a01306d759c04a8e192699144a211e02376732f5842a48188f6b6335c36579c0178c7c0f4f7e44e03b6f84dec4fbac6021
 EBUILD netbeans-php-9999_p20151004.ebuild 4417 SHA256 1353199043f1f0f963d632eee04aa8d095d7ddd3b4645cb062a6f4303eda5cce SHA512 2f3568f2a00714b10ca631d3ca1ee3fe965589dbf6f69eed8c74a188c4ed91a2100d34ddab016f395e16c600b6b735a07afc78fd7477d5454bddf9731f71d7a4 WHIRLPOOL b1c6556bf9006336832d1b222bc1256a066f7ed5f20f381116f8eb97f4943a6f0be64ee74ae676fa15e0400f1084abaed079aaa56ab425665e5d9c93365fb08d
 EBUILD netbeans-php-9999_p20151006.ebuild 4417 SHA256 732618239f77df1cc26d291e58610487f8f46974feb0d67e8bb9fde84f635ab9 SHA512 e102c1baeaa04a68518f952d23bf348f6610eee85b83c38e7c127529cfd2cbf32b68fab70fefb54e7119bd395d1c5c9deccd3d106d9e283ac517b780abccab15 WHIRLPOOL be5ee1acaf84d8418dd6d292ac3ea4df2fb05971cd3f88c192772bc3087cb9ad33d5cad637dab5b5ecdee648c2f6e6f9b7ded577fbf888926ea8ea835dfc303a

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20151001.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20151001.ebuild
deleted file mode 100644
index ebfb7d0..0000000
--- a/dev-java/netbeans-php/netbeans-php-9999_p20151001.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2015 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/2015-10-01_03-28-59/zip/netbeans-trunk-nightly-201510010328-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/73E9BC8A7AF36E0C95210F61A85AFEF212AEE1A9-phpsigfiles.zip
-	http://hg.netbeans.org/binaries/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-webcommon-${PV}
-	~dev-java/netbeans-websvccommon-${PV}
-	dev-java/javacup:0"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.php -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-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}"/73E9BC8A7AF36E0C95210F61A85AFEF212AEE1A9-phpsigfiles.zip php.project/external/phpsigfiles.zip || die
-	ln -s "${DISTDIR}"/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip php.editor/external/predefined_vars.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-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-php/netbeans-php-9999_p20151002.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20151002.ebuild
deleted file mode 100644
index 408ee28..0000000
--- a/dev-java/netbeans-php/netbeans-php-9999_p20151002.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2015 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/2015-10-02_00-02-28/zip/netbeans-trunk-nightly-201510020002-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/73E9BC8A7AF36E0C95210F61A85AFEF212AEE1A9-phpsigfiles.zip
-	http://hg.netbeans.org/binaries/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-webcommon-${PV}
-	~dev-java/netbeans-websvccommon-${PV}
-	dev-java/javacup:0"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.php -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-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}"/73E9BC8A7AF36E0C95210F61A85AFEF212AEE1A9-phpsigfiles.zip php.project/external/phpsigfiles.zip || die
-	ln -s "${DISTDIR}"/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip php.editor/external/predefined_vars.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-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/Manifest b/dev-java/netbeans-platform/Manifest
index c1bf16d..f95de3d 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -19,8 +19,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-8.1rc2-201510122201-src.zip 208690047 SHA256 728bfd0c1be5c20d6e7e32251984130e9f00f7d95bcc7e87b25484cd25c40531 SHA512 01636c48d05247ba2a0ab105fdf4736e895ad878e824ab0ffb82d26a258c50ad740092dd6924e27f0bc53fa41dbe4ad67c98252ce0ef301388feca57231d8e09 WHIRLPOOL dae4e5c5f0d97a64b1c905dd046c8584150eea26ec99aeafc5f152e82d5770619e6999854729dcf4dd538b372f1827a8c0a4169c6e199bd730e970db6ced323a
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
-DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
 DIST netbeans-trunk-nightly-201510030002-src.zip 208672397 SHA256 56d684334f97609098798fc2e9d2bb56073a61dcd7c91be398476163b39b7dda SHA512 18c9b136a3f2bdca433dcd2cf7d0cdba5a6428027e3bd884791278b55af4955058674eeba8c920739896d80b88fc5eb94b67695ac7b81e55878328eec49ae516 WHIRLPOOL 75af86ffcdb1318b46995d168b01d979e8f40f3351ec875dfa8732c7ace713bd20ee38559ea2f5d2558088573831d545956e4efd228eaf697d17a2b14f74c3f0
 DIST netbeans-trunk-nightly-201510040002-src.zip 208672385 SHA256 ebc1f4ac878d56d41dcaf987e4436f5fb4e1f02643c7832ca927c5e3ddbb6a16 SHA512 26c6882a12b5a00cfa54cdca758c81442391b960383d5486dd81b444558c882c003d55fd32d58e8d75866e77a729cafc2ff00a6926b4c05245e1be023a159603 WHIRLPOOL fe7c480835e4458340ab03d6dd1319a2e377370d2f12e0afa3b4080bc128c746480708382e22a3584e61a101c0a97d9274c800a09bb3b784f675fa269a4536f9
 DIST netbeans-trunk-nightly-201510060002-src.zip 208673387 SHA256 dda7070cc82f15e7d8504a67a497be2405d3ed7e87525c332f1b71422c4a9f36 SHA512 94dd66c25fdb26b04bbedfc102e491893508ead55e66d3b61057a1544d5ffcfb898aacf197268213d139f214f033addb3e74630c3e5863cd5c417807988e1703 WHIRLPOOL 247f24bd2c8aa831b77319367fb4ca917b5300bc5916d5c0352100f1daf567a6a746fe4904f59fdb561490eeccb1442f1b01b7129c7e86830a207494345c7b31
@@ -44,8 +42,6 @@ DIST netbeans-trunk-nightly-201511010002-src.zip 208677648 SHA256 a23eb7aa0c1932
 DIST netbeans-trunk-nightly-201511030002-src.zip 208707811 SHA256 3d6beefb37d5b74cc273fbdbaf41bb9ed636b04276bb3ce72d289b55d74ed8e6 SHA512 496e8d8f4c04463f55ac01954dadcf8e80bdb6db81e2cefd66a5445c86c3c429950c4397ef781670a3f32b563812c792cf20ebc3542c33a6c9a87b38dcb26b84 WHIRLPOOL 2a119b5a7ac7b77dd7d93c61ef150e4eef67bbdd9e5ad41a851852493e189c87b7d9a889b74a215be61cfa1c3fddd90edf1089fedacbd8db54cff070a9100507
 EBUILD netbeans-platform-8.0.2.ebuild 5406 SHA256 98e9861da45ead0d2d975a0527315df5282870b2d7e71a089724d91c18852e81 SHA512 cadbe66132d3ad81f6d149e20731b558c11c529e2ec15b1fe47ff97d99a3f4b4612fa5c98c435c4ff979eaefab6702721db009a03162202c96b4b411cf9f872a WHIRLPOOL 9552948e8bbad308f4379eaae69d8c214da9fbfab87d75226949b69ddca3e68c2d36c4d05738196073e5b959ab0b764064c9186d421198937122aa4bdc4988dc
 EBUILD netbeans-platform-8.1_rc2.ebuild 9337 SHA256 3c257f2aa4574f4ec2cdcfee98008ed97c8ad08acaf27e4a19a11d6728154bec SHA512 d09eaa53c2a8f7162335ee24832b41c3a5d044f2415e694b895253baab7ced21300cb1eaf509720b261070401fbe71c2f629545705bb4bd41512f12cb432bc4f WHIRLPOOL d36468c532d27fea2d4718a3780175e81e1d2f5df2a6e1bf9a4bad6ee6b2c1f7a7e845a23128d3a5354031970fd6bc2eaa683fe3033b847ec966e9b8db0c4aeb
-EBUILD netbeans-platform-9999_p20151001.ebuild 9382 SHA256 b240d296480c76bbb7064369bd251082dce9e7022846023f345c298d6918e6bd SHA512 7352181ac30b2c867f1a194a36b9ed8bb7df74b2b6b34995327455bcb64603cb94d74c6c8c19f7e0cc8ffefd190731c377e2212661238eb5a0522af5fdd2cf06 WHIRLPOOL d69c8f39aba08877130d96a9a5230be8a201a1cc078648bfb88e718a2042896ffc12d3f2834f40c277cdeefc6f1c25db27dbb3043bceda2c9752d8c044804ef4
-EBUILD netbeans-platform-9999_p20151002.ebuild 9382 SHA256 c854dedc40e4b219058d81b09e6da2efd6ece66af76c1adaef5fbb99c410fb49 SHA512 e3bcb6d9cd44f8987ba9735b0f229123bd3936b070ac81938911c26112961f84c7fba8131ca8557f23a53524f0959074cd928391c1a9718b40ae3dd6d4455c63 WHIRLPOOL f0d6d44be2b67bb4ec1919c704bcd8da4f6160d133cf1e469ced3383dab50a04b9d5a3ca96c134e165913931f322234cd0aa649beb21e1a1d95b99c1906b1ece
 EBUILD netbeans-platform-9999_p20151003.ebuild 9382 SHA256 712a25e3f8b9e514688ef851c975e4577d291be80ea238f104774bec7bd8eb88 SHA512 0ddf1f958cbfdbf9e8500450625df7ab3ef1a452b5272c23e80d38f1c40de246276edd6da3fb3198d8b0a8c7d5e6a375776f99269336e71e87018577f0d24c7c WHIRLPOOL 4616082e1d8f0d97e104d23b49aac0dcf3b28d5d46997031b95533a9779b05f4020fdedbfac0f341e79ff04b78723ae99663aea2a9fd713959ac0f33c1141097
 EBUILD netbeans-platform-9999_p20151004.ebuild 9382 SHA256 9446ced2c5ddcc870d743f425677fe6b2b519c2184251f733a2165497e711e07 SHA512 9acfda937d7b9648040f23b506b05924fbb35848940a1c235bb9df5c819a9ec17c97f99325b29084abe8d15d772ece42b80ab9b1f32a5f54e36aa1bd4621483b WHIRLPOOL e04d50131da498a184297125fffdd9d1faf2b94be34b1d9e2e8866da15a729ae95ece0cfc703a2a6bd107960c21c0aa3ad4ba5a9ac7b3efde06629a19939b171
 EBUILD netbeans-platform-9999_p20151006.ebuild 9382 SHA256 4ceb1ee11888cc1e68ecabd4cab6f9f1f35e5694d12922553680a68a0545d066 SHA512 7e4bbd1197e421430560ed8fd058c41f391b0402e5205f50d589b29cbfcd9626ec6d0470d8e9ea09e56299e0e688e30ca5470652b0b83d6ce3ae0d7d7e896397 WHIRLPOOL 84baf8d6e8de18a6d1887710972298b1dae40056418d4723f3fc0231ad3c6a2e3533b31496a2e42ed3429958b9fee864662ebd3d999a2a18d136cb5c69722787

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

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

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 7feb2e8..6c11658 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-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-8.1rc2-201510122201-src.zip 208690047 SHA256 728bfd0c1be5c20d6e7e32251984130e9f00f7d95bcc7e87b25484cd25c40531 SHA512 01636c48d05247ba2a0ab105fdf4736e895ad878e824ab0ffb82d26a258c50ad740092dd6924e27f0bc53fa41dbe4ad67c98252ce0ef301388feca57231d8e09 WHIRLPOOL dae4e5c5f0d97a64b1c905dd046c8584150eea26ec99aeafc5f152e82d5770619e6999854729dcf4dd538b372f1827a8c0a4169c6e199bd730e970db6ced323a
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
-DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
 DIST netbeans-trunk-nightly-201510030002-src.zip 208672397 SHA256 56d684334f97609098798fc2e9d2bb56073a61dcd7c91be398476163b39b7dda SHA512 18c9b136a3f2bdca433dcd2cf7d0cdba5a6428027e3bd884791278b55af4955058674eeba8c920739896d80b88fc5eb94b67695ac7b81e55878328eec49ae516 WHIRLPOOL 75af86ffcdb1318b46995d168b01d979e8f40f3351ec875dfa8732c7ace713bd20ee38559ea2f5d2558088573831d545956e4efd228eaf697d17a2b14f74c3f0
 DIST netbeans-trunk-nightly-201510040002-src.zip 208672385 SHA256 ebc1f4ac878d56d41dcaf987e4436f5fb4e1f02643c7832ca927c5e3ddbb6a16 SHA512 26c6882a12b5a00cfa54cdca758c81442391b960383d5486dd81b444558c882c003d55fd32d58e8d75866e77a729cafc2ff00a6926b4c05245e1be023a159603 WHIRLPOOL fe7c480835e4458340ab03d6dd1319a2e377370d2f12e0afa3b4080bc128c746480708382e22a3584e61a101c0a97d9274c800a09bb3b784f675fa269a4536f9
 DIST netbeans-trunk-nightly-201510060002-src.zip 208673387 SHA256 dda7070cc82f15e7d8504a67a497be2405d3ed7e87525c332f1b71422c4a9f36 SHA512 94dd66c25fdb26b04bbedfc102e491893508ead55e66d3b61057a1544d5ffcfb898aacf197268213d139f214f033addb3e74630c3e5863cd5c417807988e1703 WHIRLPOOL 247f24bd2c8aa831b77319367fb4ca917b5300bc5916d5c0352100f1daf567a6a746fe4904f59fdb561490eeccb1442f1b01b7129c7e86830a207494345c7b31
@@ -28,8 +26,6 @@ DIST netbeans-trunk-nightly-201511010002-src.zip 208677648 SHA256 a23eb7aa0c1932
 DIST netbeans-trunk-nightly-201511030002-src.zip 208707811 SHA256 3d6beefb37d5b74cc273fbdbaf41bb9ed636b04276bb3ce72d289b55d74ed8e6 SHA512 496e8d8f4c04463f55ac01954dadcf8e80bdb6db81e2cefd66a5445c86c3c429950c4397ef781670a3f32b563812c792cf20ebc3542c33a6c9a87b38dcb26b84 WHIRLPOOL 2a119b5a7ac7b77dd7d93c61ef150e4eef67bbdd9e5ad41a851852493e189c87b7d9a889b74a215be61cfa1c3fddd90edf1089fedacbd8db54cff070a9100507
 EBUILD netbeans-profiler-8.0.2.ebuild 3402 SHA256 8021dea620d1bc26214ff0ec285f8061c24693dd28a62a97a48ac3223707e920 SHA512 2660390337a973256b1aac3a02b14e16782c230fa2714ae695213b0cabc0eb60621c6a1ae234f9e57259a19de22a87447f9a89ab846bd59bcedd2be313c35072 WHIRLPOOL 5d1053ded03143b2de05b64cfbe59b515cb786d60bfa65566be795567bfaf5feb88a2f8e7161a05da512fafd523f871778d5ddeb3c6b89fc95885096e379f65d
 EBUILD netbeans-profiler-8.1_rc2.ebuild 3427 SHA256 a142e156521746287b96e62a067e8a1fa3c6d1545a5528e2fd210e1b9c703906 SHA512 e2c864258c2dee2cf734ba2654c88c80c7a4f5a141a12370dae16c9a90609e0e84a0469ccab6925edb809e2bd192974372d5d4dcb69f3caeaf184a9c47fe0262 WHIRLPOOL 92fcf803213ad769fcf9df2bc8fc801423b222a727bf95bfabff28f38c8d1ef76c4a3193fae5f5a2b64d9a043e5bd5f42dd0cef165067ba94e8dc5fc9aec0312
-EBUILD netbeans-profiler-9999_p20151001.ebuild 3472 SHA256 1b18ebd1d0c854f9c64c65a1a28feaf75ed2a361ea47e30504efd1c1b31380fa SHA512 81ae8b10fcded109712ffbafb154be971dac86ce1085f54b94bf3cdd67e2b9af749fd0d4aa2810cf0cada6dfed42a704b92230251a3ace47068030ca6aea5dff WHIRLPOOL 37b00b190b836c33666ce47d6f36d8cf9b4f32e0e812fc4f3642f5d2eb154780019cac3228f88ecd83ed796c79d5628ce72a5f69a350241e7d5d7496ec6f0f5c
-EBUILD netbeans-profiler-9999_p20151002.ebuild 3472 SHA256 9720248bf90bbc4decb48481ec3e8c4ffa1c84b6b7feb728781a171540bcce0e SHA512 4e3a9f84c42dca79952c2ed8d6fa19e536d46fda7c8f3a6626ef764b31c5d8903831f9e3a3d665840ec8ee3c730cf5c613bb27000040518c6d74f92081274b30 WHIRLPOOL 27c33660b378c52a89adc216a468c740fa45fee8bab23e861b7dbf3b18c5400acad65dc16c6c22b94e8822dc7a62ab1996d84475ab723eb5db832805963683fd
 EBUILD netbeans-profiler-9999_p20151003.ebuild 3472 SHA256 2b610710e7f7262ea0e901b77046f63c73828fe76ca32d40f03fe795fb4c090a SHA512 c332d809aa77f1a232b2a9a0289fd25b0534ef741629fb8fe5d77a76139ad042085cc4deb7f30a6a1355b3ec664514144cf2bdb5ca477e9dad11da3b9c3a7903 WHIRLPOOL 2a5460186493fd25e5af63b921d94e94652179149d616ddc7ce5360138048dfb01a21caa276bf0f7a7111425ae605569b757bca698244dfc7c184f886dd0fa66
 EBUILD netbeans-profiler-9999_p20151004.ebuild 3472 SHA256 9761ece36a95b21ad99f67ae7a77e58d447c80dbb5fc517fc78d9cc109a32153 SHA512 13ebfe1133895504c33af3115a893e638e1d2b5edcb981e94c8887aa0332eb43241ab9ef6547f3ce850a5e22faf47f5d1373e39f8cccd676bce87f0cdbd2575b WHIRLPOOL 5280f24888861c43a85f31d61c3487d15315d5f1233e003b33432dbb6215109fc7b8a261cec1f70a358e2c27be8e3be9b4c37cb793e8c16c025826cf1ccffd1a
 EBUILD netbeans-profiler-9999_p20151006.ebuild 3472 SHA256 4d149415e3c2a078ff381f3c400342e683a72bc81eb2252e0c9f754dea486cbc SHA512 312f4bb8493d64073d1252ef7652b6cb925072f9ac289b302e58cc8767603729b558200fdc9407f64b26c565c41464ccf80452df52e4aed6293966d74347eb98 WHIRLPOOL e83f89fd649287ba5bf79db9b9975007fcefad16a90e121852c4ec9dd4a4636b2390a699defdf25a0f55c12c2ab3a658530766d4d8ea2c577940bb3e0dc75e39

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20151001.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20151001.ebuild
deleted file mode 100644
index 942d3e2..0000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20151001.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2015 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/2015-10-01_03-28-59/zip/netbeans-trunk-nightly-201510010328-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-profiler/netbeans-profiler-9999_p20151002.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20151002.ebuild
deleted file mode 100644
index 26b3a5b..0000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20151002.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2015 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/2015-10-02_00-02-28/zip/netbeans-trunk-nightly-201510020002-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/Manifest b/dev-java/netbeans-webcommon/Manifest
index 5531f36..4c46ca4 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -12,8 +12,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-8.1rc2-201510122201-src.zip 208690047 SHA256 728bfd0c1be5c20d6e7e32251984130e9f00f7d95bcc7e87b25484cd25c40531 SHA512 01636c48d05247ba2a0ab105fdf4736e895ad878e824ab0ffb82d26a258c50ad740092dd6924e27f0bc53fa41dbe4ad67c98252ce0ef301388feca57231d8e09 WHIRLPOOL dae4e5c5f0d97a64b1c905dd046c8584150eea26ec99aeafc5f152e82d5770619e6999854729dcf4dd538b372f1827a8c0a4169c6e199bd730e970db6ced323a
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
-DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
 DIST netbeans-trunk-nightly-201510030002-src.zip 208672397 SHA256 56d684334f97609098798fc2e9d2bb56073a61dcd7c91be398476163b39b7dda SHA512 18c9b136a3f2bdca433dcd2cf7d0cdba5a6428027e3bd884791278b55af4955058674eeba8c920739896d80b88fc5eb94b67695ac7b81e55878328eec49ae516 WHIRLPOOL 75af86ffcdb1318b46995d168b01d979e8f40f3351ec875dfa8732c7ace713bd20ee38559ea2f5d2558088573831d545956e4efd228eaf697d17a2b14f74c3f0
 DIST netbeans-trunk-nightly-201510040002-src.zip 208672385 SHA256 ebc1f4ac878d56d41dcaf987e4436f5fb4e1f02643c7832ca927c5e3ddbb6a16 SHA512 26c6882a12b5a00cfa54cdca758c81442391b960383d5486dd81b444558c882c003d55fd32d58e8d75866e77a729cafc2ff00a6926b4c05245e1be023a159603 WHIRLPOOL fe7c480835e4458340ab03d6dd1319a2e377370d2f12e0afa3b4080bc128c746480708382e22a3584e61a101c0a97d9274c800a09bb3b784f675fa269a4536f9
 DIST netbeans-trunk-nightly-201510060002-src.zip 208673387 SHA256 dda7070cc82f15e7d8504a67a497be2405d3ed7e87525c332f1b71422c4a9f36 SHA512 94dd66c25fdb26b04bbedfc102e491893508ead55e66d3b61057a1544d5ffcfb898aacf197268213d139f214f033addb3e74630c3e5863cd5c417807988e1703 WHIRLPOOL 247f24bd2c8aa831b77319367fb4ca917b5300bc5916d5c0352100f1daf567a6a746fe4904f59fdb561490eeccb1442f1b01b7129c7e86830a207494345c7b31
@@ -37,8 +35,6 @@ DIST netbeans-trunk-nightly-201511010002-src.zip 208677648 SHA256 a23eb7aa0c1932
 DIST netbeans-trunk-nightly-201511030002-src.zip 208707811 SHA256 3d6beefb37d5b74cc273fbdbaf41bb9ed636b04276bb3ce72d289b55d74ed8e6 SHA512 496e8d8f4c04463f55ac01954dadcf8e80bdb6db81e2cefd66a5445c86c3c429950c4397ef781670a3f32b563812c792cf20ebc3542c33a6c9a87b38dcb26b84 WHIRLPOOL 2a119b5a7ac7b77dd7d93c61ef150e4eef67bbdd9e5ad41a851852493e189c87b7d9a889b74a215be61cfa1c3fddd90edf1089fedacbd8db54cff070a9100507
 EBUILD netbeans-webcommon-8.0.2.ebuild 4723 SHA256 e2ba39cb6f22c990acf9a492eac5707f130382d56f9bc1e3636e82cbe4d61938 SHA512 61955d38f829b3ed54bc5cb9a71da07f05676a2bf7219fa8073aeee0f0e2d0e73f7aa6ec1636be39fb071d3d2b9de7ceb813a247a61961874f4cc78697d4e568 WHIRLPOOL 1a272650fc2394716a790b79cb85a9322929c7cc96ea4776cc639fb869c5b536140dbdc632b1a8aa9cb1fc8e740050125c2ebe9390de7a8f4207e88e24924206
 EBUILD netbeans-webcommon-8.1_rc2.ebuild 4946 SHA256 62c9421fd1f005d264d6c6f4eb6a0da4ba51fab3b6367b8128e543f24ef10242 SHA512 d38f9ca1f9a6671f7404a456544e2ea85f9261d6f011edcbee25c0ed829cfc751dd4a62a46db8081f23ad2bb82be1af2b0885d5863e6cd0f2be94073d2bc7547 WHIRLPOOL 6cc61860487ab3ed2b7db33ac73ce4df96dcbb739316f5b2cd0d0135be4ec9f5d4f3f8025dedf62a612b23dd7403d9fc9366848b8b8fe9311e8c2425099d1eab
-EBUILD netbeans-webcommon-9999_p20151001.ebuild 4991 SHA256 03578dcdaffc4652a45f2a97a08c8f283bb1e009f819b0f82d597077e74ba12e SHA512 03100ced6d732824efe800c39fc46c2d021bc1888f6c8b957130ce2adbf70b1abb45ab10f40c5329f3c097b85273177ed791a3740cd154b6d4681b4eacaed29a WHIRLPOOL 0696f5932e0b798bbd1c58c3e88994ed8c77cc32432228ddca59308c79bdc6908dfa3e2dc52a3b5e2a7a0aa028c8437848603f18459f2f66bcae2fcb312dc07a
-EBUILD netbeans-webcommon-9999_p20151002.ebuild 4991 SHA256 54fee490d088d97cfd8e125ed8357016a754a5b2683be61b85a54435156f41df SHA512 6231875af243909443999f7bda9c6fa199ed02258d8ae96406231c197b4facf3f4745c7c1dcec251b5c6117b5c209508becf8d6fb42d550a178e73c4b8562d71 WHIRLPOOL 0d1f347ad7ccb52246fc38d8a09b68067b98bf7c9c46ca73e7533dd499c5246914b0523b60f680bd518308617caeced87edd49157a4b255460d7ecefc35f9b68
 EBUILD netbeans-webcommon-9999_p20151003.ebuild 4991 SHA256 975a094c71ca5e9e41b44965ee854077072fe14299f151b8acdc3c0812662cc8 SHA512 2dd52d88f70c315ab5afbfc7520f7275d402889a897338c528d00df91860dd01f5c8f06da6ae960eb0d7fdca3b225f4639480dc82bc9b9ddc4ea0a45434c37a5 WHIRLPOOL 988399277abfb0e5f32a1ddd3ce3721e4f85d7b82dbbf17de7858d96abe1efd2dadf045577500b1384d17ae416af5b2bf54dd56a57e0f4555598e1625e82e89c
 EBUILD netbeans-webcommon-9999_p20151004.ebuild 4991 SHA256 8600dbb7f1834c3c3fc441c902156e2519b9bba328815f68e5c4ad2139184c16 SHA512 9e0c5af1539980c4fd18331a08988c5d6fe3de265b011ac2ce323ef5e3ddc2d638463516000a76e101d58bcc2fee2c5834c0ca01f24f632fe4dc00a7e98bf4ce WHIRLPOOL 72414ee1e3eb2cc6a6880621e4f8e7e2a06447ad27579b8fb9d2e36fb2642d83bbbce806bffe40d3b6cc1e362b7c36cc54da1892cb94c373b11ffeffa0ec2af8
 EBUILD netbeans-webcommon-9999_p20151006.ebuild 4991 SHA256 27ff47031ea90fcd65645ad2b36259945ee0c8a4247cde97d3f8413b55a7f775 SHA512 6827e721765e4ff1ae81d2f828ada4cb37fbe714a2793a98277a61a8d556d74123049639816db441b5eb94799f952d6ca0d8908bc53ff548573845e36fef6954 WHIRLPOOL 3695f7f37dbb75660007e335d9553414691412c9317b292409ae249593075f18594107b6c42943a4f6d19a31027b8c366ec204230abadaeb0224e836f2bb681c

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20151001.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20151001.ebuild
deleted file mode 100644
index b928474..0000000
--- a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20151001.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2015 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/2015-10-01_03-28-59/zip/netbeans-trunk-nightly-201510010328-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-webcommon/netbeans-webcommon-9999_p20151002.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20151002.ebuild
deleted file mode 100644
index de70fc4..0000000
--- a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20151002.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2015 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/2015-10-02_00-02-28/zip/netbeans-trunk-nightly-201510020002-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/Manifest b/dev-java/netbeans-websvccommon/Manifest
index c238530..6472d7e 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-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-8.1rc2-201510122201-src.zip 208690047 SHA256 728bfd0c1be5c20d6e7e32251984130e9f00f7d95bcc7e87b25484cd25c40531 SHA512 01636c48d05247ba2a0ab105fdf4736e895ad878e824ab0ffb82d26a258c50ad740092dd6924e27f0bc53fa41dbe4ad67c98252ce0ef301388feca57231d8e09 WHIRLPOOL dae4e5c5f0d97a64b1c905dd046c8584150eea26ec99aeafc5f152e82d5770619e6999854729dcf4dd538b372f1827a8c0a4169c6e199bd730e970db6ced323a
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
-DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
 DIST netbeans-trunk-nightly-201510030002-src.zip 208672397 SHA256 56d684334f97609098798fc2e9d2bb56073a61dcd7c91be398476163b39b7dda SHA512 18c9b136a3f2bdca433dcd2cf7d0cdba5a6428027e3bd884791278b55af4955058674eeba8c920739896d80b88fc5eb94b67695ac7b81e55878328eec49ae516 WHIRLPOOL 75af86ffcdb1318b46995d168b01d979e8f40f3351ec875dfa8732c7ace713bd20ee38559ea2f5d2558088573831d545956e4efd228eaf697d17a2b14f74c3f0
 DIST netbeans-trunk-nightly-201510040002-src.zip 208672385 SHA256 ebc1f4ac878d56d41dcaf987e4436f5fb4e1f02643c7832ca927c5e3ddbb6a16 SHA512 26c6882a12b5a00cfa54cdca758c81442391b960383d5486dd81b444558c882c003d55fd32d58e8d75866e77a729cafc2ff00a6926b4c05245e1be023a159603 WHIRLPOOL fe7c480835e4458340ab03d6dd1319a2e377370d2f12e0afa3b4080bc128c746480708382e22a3584e61a101c0a97d9274c800a09bb3b784f675fa269a4536f9
 DIST netbeans-trunk-nightly-201510060002-src.zip 208673387 SHA256 dda7070cc82f15e7d8504a67a497be2405d3ed7e87525c332f1b71422c4a9f36 SHA512 94dd66c25fdb26b04bbedfc102e491893508ead55e66d3b61057a1544d5ffcfb898aacf197268213d139f214f033addb3e74630c3e5863cd5c417807988e1703 WHIRLPOOL 247f24bd2c8aa831b77319367fb4ca917b5300bc5916d5c0352100f1daf567a6a746fe4904f59fdb561490eeccb1442f1b01b7129c7e86830a207494345c7b31
@@ -28,8 +26,6 @@ DIST netbeans-trunk-nightly-201511010002-src.zip 208677648 SHA256 a23eb7aa0c1932
 DIST netbeans-trunk-nightly-201511030002-src.zip 208707811 SHA256 3d6beefb37d5b74cc273fbdbaf41bb9ed636b04276bb3ce72d289b55d74ed8e6 SHA512 496e8d8f4c04463f55ac01954dadcf8e80bdb6db81e2cefd66a5445c86c3c429950c4397ef781670a3f32b563812c792cf20ebc3542c33a6c9a87b38dcb26b84 WHIRLPOOL 2a119b5a7ac7b77dd7d93c61ef150e4eef67bbdd9e5ad41a851852493e189c87b7d9a889b74a215be61cfa1c3fddd90edf1089fedacbd8db54cff070a9100507
 EBUILD netbeans-websvccommon-8.0.2.ebuild 2651 SHA256 a195b307847c466dbb5f46eb04240358ce3c92cadeecb8fda1562304de46820f SHA512 933626bd2073f58e3508180c042e237b9e61ba6f3c992cf37ea43978ac2fc972d2dcc3ef0b5c390b3867296e197ed2605c43452c98e36acf0982e7338b6d1eb7 WHIRLPOOL c3db8f0b50116d0129f50778e1961166e76601d8c165e20e73d75c91b02c8a095067e0f13e18178d849dd29adcedaeee7d3e0e62f99be592d7ce159fd6af632e
 EBUILD netbeans-websvccommon-8.1_rc2.ebuild 2676 SHA256 9c17f1d8da5dc2d0f744317b9e5e29069ae4a51c6cb08ae5ab3a76d4739f96dd SHA512 a02ca061aedf144a6f7a5dc86371125d7abed807c0e47393de18d4164309d4d5733d869c4ee9577924af1949b95418518e6e8dd1f4bec2938507d6f68ab202b8 WHIRLPOOL 7e07a5d125295dae0cc1d38e162b8225e46e7d668fd8255e74d05a0739bc8204ffd9f192c5a9e043ee1e856057441a2cb7424f2f9b512e659740e27c5ef532a7
-EBUILD netbeans-websvccommon-9999_p20151001.ebuild 2721 SHA256 d9ac82f799c5e4846187b6eafc244d07065c2dc90ed1d291a75878f13b389dc8 SHA512 c6306a45f10908f3d1858ac840ae9a8b6f68928a0a048213915772516c7a321061a48bf6dbea85e51cc03f91082aa6c381a339356df0d8325fe1d1ece56e5294 WHIRLPOOL 5f0921b9e5e07014ca30bfb5acb988d6c44517436fb8e16977a446eccd203605e7caaa79fe9484caffcebe512a4ecac1c261b238324a0c2404829cc48e94bb97
-EBUILD netbeans-websvccommon-9999_p20151002.ebuild 2721 SHA256 5fd1f31664e98cc5083e865ec1b21c5901970dd393b1cad78e854f6edc6bc523 SHA512 36b92cbd7cfb19bdbdbcfd102e83608000c32c241e32e30bebbbce639c0edc145c3d22c0a91682a0401fcae5def48f89dd58fab049b057cb144f5e050c14999e WHIRLPOOL df9eb78699ef7b80661600e6afb4a705b7673b74289468ebaf18880453bcbb1492f322b974670ac726695aa785eb9b3b5582d519a771f0cafedff1a4f42632ba
 EBUILD netbeans-websvccommon-9999_p20151003.ebuild 2721 SHA256 0d7cbb5ae2387d2059e1e1837f688b13ce8bb75e60143675ea32642e51d05793 SHA512 0b5a17ea097691113830a527e2da9e3482700f975e518b4eb2fcfffbba792b34078f0ef013f50881ec07d3ac5fc65b0679482d20d6c245b8bc1939b30bdf86ef WHIRLPOOL f15afab3d3dd0fd6bc6d4f66a92d3b01f32f3b237ab8445e0ecfa08c250be476461fb72941b1ca86256670a0ac3f5fc44a70e1326d452a7c88ee40fcad829a88
 EBUILD netbeans-websvccommon-9999_p20151004.ebuild 2721 SHA256 cbf659487f4a593cd7219f57d242a0a2674153ac40979c71d090f5cd643e108c SHA512 1b2ca0311a800fd6d3302d476199cb41b0199c124ee1b4d39bbe0252011e4a15e05c265af87f62f9f7f1096c54fd6fcf804feb8c3f643c3af8caff6ff651151d WHIRLPOOL 543946ed8151df556e3acf41c21682c9fa220a5961b3afe771e500130d3a0bfa7b44abb4149e9fdd5b789214255c4e6d83711d6c40ef0f425c30472a518fbe71
 EBUILD netbeans-websvccommon-9999_p20151006.ebuild 2721 SHA256 9e650de148f28cf3af6543f642d38f044d0c68ff3a78318bbda09a1c407c49d5 SHA512 5beeae97c6dc0f503eff04ad6dac26f5b2a87cab5b9662cf2e1a4a8dd1748e0ab0bc6b68c02838318282a8f85db6dd15c2e694bac60c60ec0f0c13bbafc7572c WHIRLPOOL 1a874c4cc4e5caaf35052c48c0618882cac40f5ef0c6ea472abe880f6f7e04a0d426d4397d54365b9d070419448dff593bcb2dd494ce0aff08fac080a9ae6fc4

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151001.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151001.ebuild
deleted file mode 100644
index 8bd81c0..0000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151001.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2015 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/2015-10-01_03-28-59/zip/netbeans-trunk-nightly-201510010328-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-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151002.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151002.ebuild
deleted file mode 100644
index 70ffc1f..0000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151002.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2015 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/2015-10-02_00-02-28/zip/netbeans-trunk-nightly-201510020002-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/Manifest b/dev-util/netbeans/Manifest
index 38725d2..6cdc5c8 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -6,8 +6,6 @@ DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3
 DIST netbeans-l10n-8.0.1-20141110.tar.bz2 12065358 SHA256 542d325cbc6e0e617f6076e964e37803ec322b6d0ee4724a6d2127f2f480fb24 SHA512 28242dcbe7bcbc6a9abce15dfe6fd6140a275a417d96ff28228315bdc0ce8110ede899a1815e2fdf9115b48221d50cd3ff5b71a15d36316d04d81f66e9c0cac4 WHIRLPOOL 0318caea3463d3f7bb8876774b1cc9467dadd9bc36497a9304ed12900e2fabdc4dcdfec0b9eaee27bb36c39e9caff3743c5a42ad4c3a432205a716832688c4d6
 DIST netbeans-l10n-8.1-20151014.tar.bz2 11942405 SHA256 de4f3ce7492e8d7ba2708f944549083efb37673e59287db188e4d9bc250e5ca3 SHA512 1a34e7618750b0ccf837804a5bfd0f76bb3fbb27e69bdc7b511e472e0250682427796e9253d53b06e7d74ae77e01966c86cd480f92b5eb45f0bf8ff2bc34ab0e WHIRLPOOL 81cc0f8c2c1a0d824d9dc395ecdb9d795eb2b3cbcc8f2e6f68690a6597d77ec9038bb49b024941e53b4212b020b305ce10e8a27c2f106826e8b46b3087889c1b
 DIST netbeans-l10n-9999-20131010.tar.bz2 12440242 SHA256 64c48605820ec1f35e38c34b48cc16cd40c053d085d50819d4b4e9a80453dfa9 SHA512 7d4d61fa61710186fefd90721598ec635db7c6249ce6fc484fd5813636220f163b60230349c984c398c87e083d2d629c531fe5b4cea3752ebbcaa9823b701a02 WHIRLPOOL 10506e3a3004d6c0ab17b05507f72db2c25d2713c3233a7f5478da27d3b1261b5fb6d5f71cbf369858668ca2d1219dad1900c6c42d3f250adcc935e846e56b09
-DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
-DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
 DIST netbeans-trunk-nightly-201510030002-src.zip 208672397 SHA256 56d684334f97609098798fc2e9d2bb56073a61dcd7c91be398476163b39b7dda SHA512 18c9b136a3f2bdca433dcd2cf7d0cdba5a6428027e3bd884791278b55af4955058674eeba8c920739896d80b88fc5eb94b67695ac7b81e55878328eec49ae516 WHIRLPOOL 75af86ffcdb1318b46995d168b01d979e8f40f3351ec875dfa8732c7ace713bd20ee38559ea2f5d2558088573831d545956e4efd228eaf697d17a2b14f74c3f0
 DIST netbeans-trunk-nightly-201510040002-src.zip 208672385 SHA256 ebc1f4ac878d56d41dcaf987e4436f5fb4e1f02643c7832ca927c5e3ddbb6a16 SHA512 26c6882a12b5a00cfa54cdca758c81442391b960383d5486dd81b444558c882c003d55fd32d58e8d75866e77a729cafc2ff00a6926b4c05245e1be023a159603 WHIRLPOOL fe7c480835e4458340ab03d6dd1319a2e377370d2f12e0afa3b4080bc128c746480708382e22a3584e61a101c0a97d9274c800a09bb3b784f675fa269a4536f9
 DIST netbeans-trunk-nightly-201510060002-src.zip 208673387 SHA256 dda7070cc82f15e7d8504a67a497be2405d3ed7e87525c332f1b71422c4a9f36 SHA512 94dd66c25fdb26b04bbedfc102e491893508ead55e66d3b61057a1544d5ffcfb898aacf197268213d139f214f033addb3e74630c3e5863cd5c417807988e1703 WHIRLPOOL 247f24bd2c8aa831b77319367fb4ca917b5300bc5916d5c0352100f1daf567a6a746fe4904f59fdb561490eeccb1442f1b01b7129c7e86830a207494345c7b31
@@ -31,8 +29,6 @@ DIST netbeans-trunk-nightly-201511010002-src.zip 208677648 SHA256 a23eb7aa0c1932
 DIST netbeans-trunk-nightly-201511030002-src.zip 208707811 SHA256 3d6beefb37d5b74cc273fbdbaf41bb9ed636b04276bb3ce72d289b55d74ed8e6 SHA512 496e8d8f4c04463f55ac01954dadcf8e80bdb6db81e2cefd66a5445c86c3c429950c4397ef781670a3f32b563812c792cf20ebc3542c33a6c9a87b38dcb26b84 WHIRLPOOL 2a119b5a7ac7b77dd7d93c61ef150e4eef67bbdd9e5ad41a851852493e189c87b7d9a889b74a215be61cfa1c3fddd90edf1089fedacbd8db54cff070a9100507
 EBUILD netbeans-8.0.2.ebuild 7167 SHA256 80e31382a0ceb680c2a055dc5c78c1dce8edf32c50bbae6a1c14a2c568492519 SHA512 0ab466ca247ec953896ef0ab3b01b43ffea3a9f37e9bcdacecfc0476226d45cef35e4ddf27f2b85628d9512ed304e6cc6cfe963a5e547217d08cad400eefc4b9 WHIRLPOOL d09668e669f4f8d7987ab02cf26104fc6e54ba29b8b497fe0013cc8816a2d7560c99e6e1b02db77ead872d5240b84c09e3fabbc3465587d1d1ca7d6fcae114c1
 EBUILD netbeans-8.1_rc2.ebuild 6892 SHA256 aea23cb4a7170da766bbc225c6b58e671a5ab08e095044ebdf36b195d86610fa SHA512 77a9c3d1c82648a0a5b9b335f577132013724ac37e29f99bb732653321e861f5628c9a8689d4f9196f3ebae1cc4cad569dc3b1a7f4c7a127f363ca82099439f7 WHIRLPOOL 023da0938e5f8b74062bbcabb1b0e659d093f5860f8e82322339546299a154d7b57c78f1bb4f28403a6a5ca45d0bf1f1dcf1fa2669423cba465a68ab6c08008c
-EBUILD netbeans-9999_p20151001.ebuild 7210 SHA256 def45859122eef44a348c1c45f165a664bf7490d2b86f0a3eedb856f59aae4d2 SHA512 5bf3d55dd64c75d567bbce039c729d924964f3ea8daf2b39bbd370f2c1f830bf8ce571281caa22654a43a39dc2f909736bece02b0c58ad020d3fee7d650fdd80 WHIRLPOOL 4c134a94ecb6dd5a35944ff0108135f4e0795bbb792bb6617b29db3a3348a41c001e28b2321bd0b69207e10e69942e18826213fce7f50cd0d526ae8cdf1ba8fa
-EBUILD netbeans-9999_p20151002.ebuild 7210 SHA256 c35dc91ef0201c2f45dbc2478914a7e4c89a7008fbee4a64d21595c26546266d SHA512 7f00d3e89966b3e713f9a888f5de7d5a1312e56079e18d5e5a9cf6eaf31ec52455f3d3fe0075e0df719f1419aeba0d9d39d906854dda5c22c0f4319206cce55a WHIRLPOOL 3c69bd92e9031c4e1fd32ce6e65538693a3493ca3c43571c6b3d8ca8519337409bdab4388054f30c15def817b7b02375b6b3fa095c9f943d81b54e2b9f7a6a52
 EBUILD netbeans-9999_p20151003.ebuild 7210 SHA256 73b26316fcaef5fc94acc2765f090985a2b67ae2518ad939cc3e420d5c3c775f SHA512 2d47a4742a550d1294374d9e4aa0eaa503f678af178269a56ed440f068fa396b0a6c87cf20a3d76d43565263ec93e15c950f62c0c3193643d0a3fc965e359fce WHIRLPOOL 14abe78c8bf20ff9dcb8a34a1a5daf901f3037ea37f67ebb93ed88aff9ff7a204e58563c0790cc550d61a02a0c31d646c2062500fdd21e943c70ada293437454
 EBUILD netbeans-9999_p20151004.ebuild 7210 SHA256 8267ab4ba27f0a685fa8c955450bf7aa3a1160bf360dc0c02b3164920bc63399 SHA512 de94d9c9f4e7f852b14f41c01dd195fd679857d261c7711bbaf2d3bc15f1ac83a741b456fe49e2336f67098d5265102ea6225db009d37285d50021ec0e384725 WHIRLPOOL c0f22c954b7993a12292b611c1e9cf5301f62262e39b06b8c97f1e415093a4593319af5815007b1c29c8fc19d157ed70382fb76832a8d1012086328be36f8e76
 EBUILD netbeans-9999_p20151006.ebuild 7210 SHA256 392cfe85ff601e3da05355cd7d2a13ec87d022879ca820790a3a0856cf2aadf7 SHA512 fe6ab57cd477cb8633b15fe161408dcf25841770344ff1a158e4e190cc4eaac1bd132cd7c814d1eb5926847a874d3d9b3b6953654f581536cab86ba7995db453 WHIRLPOOL f90d40211a8e6728626ea6ca32fbfd1665a5fe7207036b4c161dd3b4ded87d755a41edc89136349d0487c425af760d61e317c5bfa8e1e6e57981dac02bf3a09d

diff --git a/dev-util/netbeans/netbeans-9999_p20151001.ebuild b/dev-util/netbeans/netbeans-9999_p20151001.ebuild
deleted file mode 100644
index 6a27f49..0000000
--- a/dev-util/netbeans/netbeans-9999_p20151001.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2015 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/2015-10-01_03-28-59/zip/netbeans-trunk-nightly-201510010328-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
-}

diff --git a/dev-util/netbeans/netbeans-9999_p20151002.ebuild b/dev-util/netbeans/netbeans-9999_p20151002.ebuild
deleted file mode 100644
index f1ce469..0000000
--- a/dev-util/netbeans/netbeans-9999_p20151002.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2015 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/2015-10-02_00-02-28/zip/netbeans-trunk-nightly-201510020002-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] only message in thread

only message in thread, other threads:[~2015-11-05  9:20 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-05  9:20 [gentoo-commits] dev/fordfrog:master commit in: dev-util/netbeans/, dev-java/netbeans-ide/, dev-java/netbeans-php/, Miroslav Šulc

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