[gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-java/, dev-java/netbeans-groovy/, dev-java/netbeans-javafx/, ...

[Miroslav Šulc]

commit:     b2f33e6bd9e83187be8f5d6967114687319cec72
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 26 06:19:24 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Aug 26 06:19:24 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=b2f33e6b

netbeans: removed obsolete ebuilds

Package-Manager: portage-2.3.0

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index b8d269b..df69ea1 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
 DIST netbeans-trunk-nightly-201607190002-src.zip 216613749 SHA256 412763dc00b1c15d23dd85c94de76503155ad6f402ddb2fb6fc40bd162e72de9 SHA512 37efb5947aeeecf1567fed864a28a907f261a7c251ad4de882660980c76248560da9f0be91dc6763767ed8aea7f57a68c1a403d429fbe4c1af5e3f27c0f85d45 WHIRLPOOL 27edad2d71b76784b0fba98bc15b4649616e1462edc174dc850bbe1782d341efd704115d1af5c8cfc56faa14d37d294dc1ce831118a4bb9e74e48add3a341062
 DIST netbeans-trunk-nightly-201607200002-src.zip 216623678 SHA256 08e39cc20bb2eff32d9298541073e9dfebdabfd0878d00f88bb6f896632783a5 SHA512 f3796b3548b714b4207cff52c0e5516dec1e23f176dadb13ee5d4dfe44014bd0692f1f8019569e68e50cdf33905cd0d3623bd01f12a69cf1c7dedf452f289e23 WHIRLPOOL fbbeb6bb0331e2c60fb546394dba8c8e0d2a54e9c807b6c9b30f256f68e8ce9039c558800821d5f38bc8d2428d1f3732c4160d53fc075f1ecc57113776491cf8
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201608240002-src.zip 217199132 SHA256 75e77e61eb9684
 DIST netbeans-trunk-nightly-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
 EBUILD netbeans-apisupport-8.0.2.ebuild 3314 SHA256 b68fe791f275fe4fcc8b00888688949b8927cb39db2cf9ad7860017c6d20adee SHA512 35c4bbcd34ec0eaef8a2de86c13333d2bf092db61af48558c3e173bb17dbf8fcd15001307bd7c498f4ccdbaa4277e1ee42ff0909af6170039165b547f646c383 WHIRLPOOL 206fe8d5f64e76827d3eb958a629ba087e8a16c2797752f5d9e62dff4166653677587a81be19e0a2c6adcf49292255d532e1f542c02550b1cf6ffd51467bde3c
 EBUILD netbeans-apisupport-8.1.ebuild 3338 SHA256 d249a09cd1a527bfc4f0dc87b1768aad9f05fc7fe7079fad0094c27d416d030c SHA512 47e5db58581625b23157ef7a7b6e340fce1327db85e015369ac32791178a0836af3348397ac6ff4439ab246170d3318c2062994c81019ff361084f00d432c9c8 WHIRLPOOL 8e379c9219b7730a15c10216bed00c3ec104f84b252d32da629f066095897398a4d8818e07cda5afdf94b115b97ead8de6a9529f38c81c1c41144067f119e54e
-EBUILD netbeans-apisupport-9999_p20160717.ebuild 3384 SHA256 4174464d10048e8856aafad202683a13224a5bbbf752f2b7bb1344c5c11489a5 SHA512 77a0804b986f3197dcbdfc454cae5e325d94660a15fc99803085c7c28e0dea516dae60a4552ff2aaa5f4fd265f56ef3b9474e4c45dbc2b0521f883511687cfae WHIRLPOOL 1a1ed092cca82d649d030f798acfa23fcfec54518403fb6586d6b77c35f280aa2ad1ba3f11c51b4797c747cd8967b07444a6c993e752580fc1ff9d69c6947356
 EBUILD netbeans-apisupport-9999_p20160718.ebuild 3384 SHA256 c214fafe112cb666e1cd676999dc8d8f58d3032d75e8a7150128511f31a6bbec SHA512 87472e62bae4b650cffe3f692a4883362261bc94efc763a5ec3ca01285b501f400879d3825a10b99b79a1cb3328ac9eafcce72ea91628451569145680f6aee0a WHIRLPOOL f4a9fe9c524a7739fb84c9c969d4680059d392f90ee35238795c305d5ce84ad1f17773f2f08327859aec82cdc8958e676878ec581d03666930b36bc9caa578a8
 EBUILD netbeans-apisupport-9999_p20160719.ebuild 3384 SHA256 7a4e16616c0d15066291690bcbb58f5fae2c4bddfc5eed4c249df4c5a31acb3d SHA512 82f189e5df6b5b6752b8a5cbc5cbfba05cf5cfc84d18cd1c7b59322493dfed3c3e4fb0ef92bc8fd294cf15922e4157017c3f0433705557762fe285a81081e2b7 WHIRLPOOL 1b67f6772326ed9b9de4f14a2f4492b28cb82501535f647a749e72057585887c86d626f6e3792bb290f3048346489340f6ec48872bec556ead1ed8ceabc60f4d
 EBUILD netbeans-apisupport-9999_p20160720.ebuild 3384 SHA256 cbde05fa60ebf92c09df5dfdc0a6a7d8d8f6ed85c4e648c3745b5167c046e942 SHA512 aec8c138a8865468e7ad56925cab3fe141ddfa089caa18d6f5e0f88ce85eb90abd45958ad80c883321236957f14ec76125b9dc11ca40070447733deafdf78752 WHIRLPOOL 2978a7315da6fdf41713c88b9624e8ede985fff311510801c8a30480744e4eb415460485479797f8a5217e70f8433a5e96c9d2e9d28284096c0d9e952e6c2978

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

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index e26e265..2f6e32e 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -16,7 +16,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
 DIST netbeans-trunk-nightly-201607190002-src.zip 216613749 SHA256 412763dc00b1c15d23dd85c94de76503155ad6f402ddb2fb6fc40bd162e72de9 SHA512 37efb5947aeeecf1567fed864a28a907f261a7c251ad4de882660980c76248560da9f0be91dc6763767ed8aea7f57a68c1a403d429fbe4c1af5e3f27c0f85d45 WHIRLPOOL 27edad2d71b76784b0fba98bc15b4649616e1462edc174dc850bbe1782d341efd704115d1af5c8cfc56faa14d37d294dc1ce831118a4bb9e74e48add3a341062
 DIST netbeans-trunk-nightly-201607200002-src.zip 216623678 SHA256 08e39cc20bb2eff32d9298541073e9dfebdabfd0878d00f88bb6f896632783a5 SHA512 f3796b3548b714b4207cff52c0e5516dec1e23f176dadb13ee5d4dfe44014bd0692f1f8019569e68e50cdf33905cd0d3623bd01f12a69cf1c7dedf452f289e23 WHIRLPOOL fbbeb6bb0331e2c60fb546394dba8c8e0d2a54e9c807b6c9b30f256f68e8ce9039c558800821d5f38bc8d2428d1f3732c4160d53fc075f1ecc57113776491cf8
@@ -45,7 +44,6 @@ DIST netbeans-trunk-nightly-201608240002-src.zip 217199132 SHA256 75e77e61eb9684
 DIST netbeans-trunk-nightly-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
 EBUILD netbeans-cnd-8.0.2.ebuild 4510 SHA256 0a9a4e58e28f395b5bcb017016b6ddb1b77afe393d0e5bd81cc05e3a32076c71 SHA512 2b1fedfe292fa140920fd11829e77127f9535e08b8307886accfa37e6d11195a1204e6b71b2640937da0711c3ce0bbf80c0eaa3c248a64fd61b6a3d99d5de14e WHIRLPOOL 10b1518360ade5d6f1f27c79a10f630b94a2ec5062e18df11f9828d4b374e6cbdea0b9f770e01c117ca90fa194dff9bd3be6a468075c2d35167fb78a7bb32794
 EBUILD netbeans-cnd-8.1.ebuild 4744 SHA256 e008e92761489558e039a07d4858b5a9745aa38c38c57668cba8b5f6a28dbd9b SHA512 724af3f292851fa1a04ccc95fe0a4f9d0fab5503ce31d2ff11be73779d67bd0f38835b334684f628f8eea2dde44543e6b872611b2bd6c01191ccfe26e69f4ec2 WHIRLPOOL 59ddd65a105dafeb8b783f457ec7a8c67a5a3aceb78ca60ac7c4f45f330b28b429ba6236a643ca0023189a9ebdb1ca0182ec0546943ec2494693859aa8f95515
-EBUILD netbeans-cnd-9999_p20160717.ebuild 4790 SHA256 0d81342f64c5b124fecfe586c95eb8a5cbc4c78d502cfe02b47115a4bd07173a SHA512 8b0461f10a7b547f07c2a4e7d9325f3612e2e4462128c20dc141fb42a4930d1c7c769646e1927cf40952eb1bfb763bbd6d9de8d1340247dd235c61301893ef39 WHIRLPOOL 717a3a8f269ece85b7a94769ff56fb585db747d5ee644aec5b13ccde360f172aaaad80cfa745c1bb51854e09324791af465f38b1fc3016daa758eefb71ce51af
 EBUILD netbeans-cnd-9999_p20160718.ebuild 4790 SHA256 e81149c3c4d0cbb98867b65ce3606b974b9729774dd546253605775018a52d9d SHA512 49120fb2b215cb057a4c4b859192d1af140b2b9958b4247d60845c07a8d75cf354e9dc7a6f9af2c2861f7ad84f5b50a6bcada11cb4e615385ae7b4bb670a20ae WHIRLPOOL 3578671e0a3aaf2a9fc6edf552d54fa1f5dbb83390163d99e418f9c41f612de5fe73d74dc43ee4784c14477f999d1a5742efc3de982d3fc48ee618deed38b52d
 EBUILD netbeans-cnd-9999_p20160719.ebuild 4790 SHA256 75aa358c41858d73b577bc8070465c70be02daab27019750e4dc2c3b38131c7a SHA512 82f07278bab0967806a83f62c7acd49d38853fdb1ecf35a75a8b275767855cb5e0b68b3efef593d108e97c7f36fe767422eb1e5dd9c274674270d6a8c6a338f7 WHIRLPOOL 15e24943a09967af801bdc1b8023cb2648094605a3354724a86b3174c0214644cf703113096c893adaa156e6814b2f341090b6e8df1cfc9a797ad919f418d0d7
 EBUILD netbeans-cnd-9999_p20160720.ebuild 4790 SHA256 817af01d4b078972fe206b1bf26eed1ae9db7572b209d1f3246061ff2d0b7b70 SHA512 742956e96afea8f440f2acde4dfcf4009de4119b84012f42356b0bda01ec3a21f1515c7d425c7c649ac431db4ff2a5da1ceb1ebba85766a03c348d0193af7c24 WHIRLPOOL 67afc2fe695fd02743075afa4c6b248f4a3f1a5d881442600cd1f114adac5c9f7fd97b4bf2e295acabe431e217e22253cd8412d3fb8792b94d74b83c06030655

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

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 3ccbed6..4e3fcfd 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
 DIST netbeans-trunk-nightly-201607190002-src.zip 216613749 SHA256 412763dc00b1c15d23dd85c94de76503155ad6f402ddb2fb6fc40bd162e72de9 SHA512 37efb5947aeeecf1567fed864a28a907f261a7c251ad4de882660980c76248560da9f0be91dc6763767ed8aea7f57a68c1a403d429fbe4c1af5e3f27c0f85d45 WHIRLPOOL 27edad2d71b76784b0fba98bc15b4649616e1462edc174dc850bbe1782d341efd704115d1af5c8cfc56faa14d37d294dc1ce831118a4bb9e74e48add3a341062
 DIST netbeans-trunk-nightly-201607200002-src.zip 216623678 SHA256 08e39cc20bb2eff32d9298541073e9dfebdabfd0878d00f88bb6f896632783a5 SHA512 f3796b3548b714b4207cff52c0e5516dec1e23f176dadb13ee5d4dfe44014bd0692f1f8019569e68e50cdf33905cd0d3623bd01f12a69cf1c7dedf452f289e23 WHIRLPOOL fbbeb6bb0331e2c60fb546394dba8c8e0d2a54e9c807b6c9b30f256f68e8ce9039c558800821d5f38bc8d2428d1f3732c4160d53fc075f1ecc57113776491cf8
@@ -35,7 +34,6 @@ DIST netbeans-trunk-nightly-201608240002-src.zip 217199132 SHA256 75e77e61eb9684
 DIST netbeans-trunk-nightly-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
 EBUILD netbeans-dlight-8.0.2.ebuild 2898 SHA256 08402481b573b90396431be03bda45904b2dd29f0086e09a111fe362e310c3f7 SHA512 3f6d6c9ea0043382562fbe47ad16e3273032407a74cb44ec7ff26736f96483835af4be8674361e910912a550b9fe592cc5a28c2b93b6b993076553195c35eac5 WHIRLPOOL 9d8706ccbc0d97b0f5d64ebf22c36316b08d8fbccd57408119ca5f5faef08c7f82677bf67488ff611eabeaa730e4c9a730c50966d94d738cfe79330ac147863d
 EBUILD netbeans-dlight-8.1.ebuild 2922 SHA256 f003a099e3f82f5ab53dcc56d86c00a662c98f47480feacac2a77ffea90ccd0f SHA512 94706ac4d8570deb8860236300cfeddfb2c3cbfd385ecb438a039991deeb018f292f6dbb2267d7c701b7f1b5b88d200f2c25696fb3204fcf205c15155b26d1fc WHIRLPOOL 1e44f40c8e2c03b7aa7385ef20a3247ea15a4d4705ce4b5f860bffe236eb578ab3d912f2cc2457e5906158ae747edc3b6b92463336c69af9cd58eca3fccb223d
-EBUILD netbeans-dlight-9999_p20160717.ebuild 2968 SHA256 a9585c80567052a2dcd624548c5205f9c821967a92aa4faa8ef4b0b94cabfe22 SHA512 87bb7356eae2c64e5ca35381da57d2c37ad84df2a3cf05df59559cce0a4af58a99e65b1635c91f10661b9ced5df25d7d039d6daa5350bd302cf7a1fdd0c33190 WHIRLPOOL 8b53e3008878d567464d904b35221405cd878d71000e60c87510fde522056ad59fc10bf75e48113cba71f0da8858d973e97c6066f9c4e4aaa962212007b31558
 EBUILD netbeans-dlight-9999_p20160718.ebuild 2968 SHA256 29ea8d0f4d7734f8eea1baee1f05614b67095abcc4fe57f08fadefe103e303f7 SHA512 a1f33faa521f7cabc7c496bab931e60d89c5e31193b3444f3421803443f44df4235d7f99c98eabdc4a38d479c99e74fcdd605e8ae9b4f4f6a356775d2ca8da1d WHIRLPOOL 54ae990fc10897fd3570759747b2d4f11c053ae22c55285871b933905390004355a6256ba1d2513c77c976ffed93e9f44d63b1debc0919f1c3b3a81d0eb835dd
 EBUILD netbeans-dlight-9999_p20160719.ebuild 2968 SHA256 ac486e7793151af738fa02d3e1a45ba5e0bb287de3deb74cba5de20ec6eb90f0 SHA512 b7ad20c19a5cda4e9c9f19963adf849964579958d1c9a052f293d22e7518b74f04ca2e5a8bd5a80090c7f53d395510275aa049d96d1f0a290f8a100d9213b5ce WHIRLPOOL 06104c6bd0b66934a80a07a44cb5e400861232c8cc9408b3e17a849254b80a069cc245e83e989310ec04db9565fe9f553d12379e425eb4dc830b106f7f5dfcf2
 EBUILD netbeans-dlight-9999_p20160720.ebuild 2968 SHA256 6444ab091eb7dbff9e4bbb373fab829c0647fd10040dc8b7e4b09642001b45fe SHA512 1b5dab51603bb5f7a7ba2c6787abe16b883a58c59e6958cea360bfb3a01dc18aa29563b77260304fe10dd1772c4539e7d07deca9f7485ce09d56d32044abc360 WHIRLPOOL 291d1fd566aeddffa995c7f8b496083422bc77f51a0988b3b054c32960d20a42ec04404c24f7e01feece8eb468639a6cff61d188847df5d57c0ab2869436d813

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

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index f7c015b..9f65b73 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -35,7 +35,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
 DIST netbeans-trunk-nightly-201607190002-src.zip 216613749 SHA256 412763dc00b1c15d23dd85c94de76503155ad6f402ddb2fb6fc40bd162e72de9 SHA512 37efb5947aeeecf1567fed864a28a907f261a7c251ad4de882660980c76248560da9f0be91dc6763767ed8aea7f57a68c1a403d429fbe4c1af5e3f27c0f85d45 WHIRLPOOL 27edad2d71b76784b0fba98bc15b4649616e1462edc174dc850bbe1782d341efd704115d1af5c8cfc56faa14d37d294dc1ce831118a4bb9e74e48add3a341062
 DIST netbeans-trunk-nightly-201607200002-src.zip 216623678 SHA256 08e39cc20bb2eff32d9298541073e9dfebdabfd0878d00f88bb6f896632783a5 SHA512 f3796b3548b714b4207cff52c0e5516dec1e23f176dadb13ee5d4dfe44014bd0692f1f8019569e68e50cdf33905cd0d3623bd01f12a69cf1c7dedf452f289e23 WHIRLPOOL fbbeb6bb0331e2c60fb546394dba8c8e0d2a54e9c807b6c9b30f256f68e8ce9039c558800821d5f38bc8d2428d1f3732c4160d53fc075f1ecc57113776491cf8
@@ -64,7 +63,6 @@ DIST netbeans-trunk-nightly-201608240002-src.zip 217199132 SHA256 75e77e61eb9684
 DIST netbeans-trunk-nightly-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
 EBUILD netbeans-enterprise-8.0.2-r1.ebuild 15075 SHA256 41d376117ad1d8d59c8194debfd29dc42f5fd4de70aee12a2134ec143a604dda SHA512 4cd9de88e9a401cc0be88e3e2605abc411c47307818376b2bcc00f9ae570b21324f2bf00fd83e819bfa076da0fb07811fa1f0f9362a6cd0ee05b63221a199000 WHIRLPOOL 73f4518c14430fe7aa3614ebf1b11a06ba0e9bce7479af2770db3a114f149d575a16a655218f757ed416b5149228ac56dac700f5a8d5e034cc838bfa4092e636
 EBUILD netbeans-enterprise-8.1-r1.ebuild 15888 SHA256 d4c04ccfee01a46819020cb7cf8fd8297618f3c0431ae2d9dd7eec8131f988ab SHA512 6c7c39c378cb79d3f382cb80d07710a8c5233aaf0df8fb58889ee6aa6bde73624efa6aa49b43f84105685094a7aff89e4b6367ffd1fd113da27b42d50d07e983 WHIRLPOOL e678e2a6957e428c1b6e51469c0e7cc6a08da2c797f1575b6bb660a7f3281c00f071179de459e27c983304915b005baaf94ad4fae0a4c08162f218bf53b7d821
-EBUILD netbeans-enterprise-9999_p20160717.ebuild 15825 SHA256 6f265fe58c8252107ce4c86f337fd1903c5de552c4ca3a9c54de665a84ebafc6 SHA512 8aaaca1a4be98b54537088d6f7d8fd9dc985e1a85b6ce974af5557aa35a02576219d89cd923b92660b1dee84f956a261da0f4d3e85d11362952d83a0e6b10ce8 WHIRLPOOL 9c0d0742d2d54ba348dea2ef47b902d11831ed6ec387f3c6b2992c790bea3de4f303493b92297bc63299ca3ffebbe0096fe548d92e4ba2ccc97911c6cbd20680
 EBUILD netbeans-enterprise-9999_p20160718.ebuild 15825 SHA256 1a10b9ba8c620bbce7f5a95006c34e152add7c03f7cbc7dd9c116e64d0e10545 SHA512 1864b9431d785257d613d04ce76296abe59c4dc3329d5d28e79e8c1ff53e4a9fddfe07b4baa63b557d2936ed11978583a6dbea566a46f997409d36044ed45c82 WHIRLPOOL 888c37f5da6042b533e95f3aaab1a1fe7d77c0770c7041ab6928e7ed0a904bc0799088ba09c54d4800e76c1a7e2d1726b21c6823b3a6e3b1e03430caa023c103
 EBUILD netbeans-enterprise-9999_p20160719.ebuild 15825 SHA256 560886c041c1c6968aea83fff543ef0b7837e9e117fcecf16df2bdb25afd6465 SHA512 1ea56ee2ea133aa65e5ee4653ee5899bc8e3396fbd758531f02a29b8ae2e9734dbc6514345864009e561c5eb374a46278c65f6c563305d2abf2c42c9d56aeb10 WHIRLPOOL a8c148eb5ed008ba51c647db2f0a727f950405a52413fcb65747657d91c02da14b209adba325613ec0a8d3b7a078bf38eb531009d287f9b74f9189813dec1336
 EBUILD netbeans-enterprise-9999_p20160720.ebuild 15825 SHA256 ecff0454745d17ec38c51f0c4c38ad41b73a57781f67d459842544ef5a4ec8a4 SHA512 eb31ec92469b5d29f6189e37cb91c668c9fc808af9c8f72dfaab765ae760d2877ba0467df7e59c110da184453dfe327d7706e84b79493253887b87325865e754 WHIRLPOOL 2f9c8033eb88445f70a06cd7efebb7aa3d2ee31b41906d09701ef8e7e3326174800c2ec20e221320013fa5c502fc5e13c229764f48636fe99b64f8e55c7a31ae

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160717.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160717.ebuild
deleted file mode 100644
index 397e0e0..0000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160717.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Enterprise cluster"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-17_00-02-33/zip/netbeans-trunk-nightly-201607170002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar
-	http://hg.netbeans.org/binaries/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar
-	http://hg.netbeans.org/binaries/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar
-	http://hg.netbeans.org/binaries/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar
-	http://hg.netbeans.org/binaries/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar
-	http://hg.netbeans.org/binaries/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar
-	http://hg.netbeans.org/binaries/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar
-	http://hg.netbeans.org/binaries/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar
-	http://hg.netbeans.org/binaries/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar
-	http://hg.netbeans.org/binaries/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar
-	http://hg.netbeans.org/binaries/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar
-	http://hg.netbeans.org/binaries/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar
-	http://hg.netbeans.org/binaries/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar
-	http://hg.netbeans.org/binaries/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar
-	http://hg.netbeans.org/binaries/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar
-	http://hg.netbeans.org/binaries/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar
-	http://hg.netbeans.org/binaries/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip
-	http://hg.netbeans.org/binaries/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar
-	http://hg.netbeans.org/binaries/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip
-	http://hg.netbeans.org/binaries/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip
-	http://hg.netbeans.org/binaries/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip
-	http://hg.netbeans.org/binaries/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar
-	http://hg.netbeans.org/binaries/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar
-	http://hg.netbeans.org/binaries/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip
-	http://hg.netbeans.org/binaries/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip
-	http://hg.netbeans.org/binaries/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar
-	http://hg.netbeans.org/binaries/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar
-	http://hg.netbeans.org/binaries/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip
-	http://hg.netbeans.org/binaries/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip
-	http://hg.netbeans.org/binaries/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip
-	http://hg.netbeans.org/binaries/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-profiler-${PV}
-	~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-webcommon-${PV}
-	~dev-java/netbeans-websvccommon-${PV}
-	dev-java/commons-codec:0
-	dev-java/commons-fileupload:0
-	dev-java/commons-logging:0
-	dev-java/glassfish-deployment-api:1.2
-	dev-java/jsr181:0"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0
-	>=dev-java/junit-4.4:4
-	dev-java/tomcat-servlet-api:2.3"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}
-	>=dev-java/antlr-2.7.7-r7:0
-	dev-java/bsf:2.3
-	dev-java/cglib:3
-	dev-java/commons-beanutils:1.7
-	dev-java/commons-collections:0
-	dev-java/commons-digester:0
-	dev-java/commons-io:1
-	dev-java/commons-validator:0
-	dev-java/glassfish-persistence:0
-	dev-java/guava:14
-	dev-java/jakarta-oro:2.0
-	dev-java/osgi-core-api:0
-	dev-java/validation-api:1.0"
-#	dev-java/commons-chain:1.1 in overlay
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.enterprise -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar libs.amazon/external/aws-java-sdk-1.2.1.jar || die
-	ln -s "${DISTDIR}"/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar libs.elimpl/external/el-impl.jar || die
-	ln -s "${DISTDIR}"/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar web.jspparser/external/glassfish-jspparser-4.0.jar || die
-	ln -s "${DISTDIR}"/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar libs.glassfish_logging/external/glassfish-logging-2.0.jar || die
-	ln -s "${DISTDIR}"/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar libs.amazon/external/httpclient-4.1.1.jar || die
-	ln -s "${DISTDIR}"/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar libs.amazon/external/httpcore-4.1.jar || die
-	ln -s "${DISTDIR}"/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar javaee.api/external/javaee-api-6.0.jar || die
-	ln -s "${DISTDIR}"/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar javaee7.api/external/javaee-api-7.0.jar || die
-	ln -s "${DISTDIR}"/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar javaee.api/external/javaee-web-api-6.0.jar || die
-	ln -s "${DISTDIR}"/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar javaee7.api/external/javaee-web-api-7.0.jar || die
-	ln -s "${DISTDIR}"/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar j2ee.platform/external/javaee-doc-api.jar || die
-	ln -s "${DISTDIR}"/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar javaee.api/external/javax.annotation.jar || die
-	ln -s "${DISTDIR}"/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar javaee7.api/external/javax.annotation-api.jar || die
-	ln -s "${DISTDIR}"/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar javaee7.api/external/javax.xml.soap-api.jar || die
-	ln -s "${DISTDIR}"/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar javaee.api/external/jaxb-api-osgi.jar || die
-	ln -s "${DISTDIR}"/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar javaee7.api/external/jaxb-api-osgi.jar || die
-	ln -s "${DISTDIR}"/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip websvc.restlib/external/jaxrs-ri-2.5.1.zip || die
-	ln -s "${DISTDIR}"/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar javaee7.api/external/jaxws-api.jar || die
-	ln -s "${DISTDIR}"/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip web.jsf12/external/jsf-1.2.zip || die
-	ln -s "${DISTDIR}"/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip web.jsf20/external/jsf-2.2.zip || die
-	ln -s "${DISTDIR}"/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip web.jsf.editor/external/jsf-api-docs.zip || die
-	ln -s "${DISTDIR}"/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar libs.jstl/external/jstl-api.jar || die
-	ln -s "${DISTDIR}"/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar libs.jstl/external/jstl-impl.jar || die
-	ln -s "${DISTDIR}"/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip websvc.metro.lib/external/metro-1.4-doc.zip || die
-	ln -s "${DISTDIR}"/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip websvc.metro.lib/external/metro-2.0.zip || die
-	ln -s "${DISTDIR}"/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar web.primefaces/external/primefaces-5.0.jar || die
-	ln -s "${DISTDIR}"/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar servletjspapi/external/servlet3.1-jsp2.3-api.jar || die
-	ln -s "${DISTDIR}"/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip web.struts/external/struts-1.3.10-javadoc.zip || die
-	ln -s "${DISTDIR}"/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip web.struts/external/struts-1.3.10-lib.zip || die
-	ln -s "${DISTDIR}"/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip web.core.syntax/external/syntaxref20.zip || die
-	ln -s "${DISTDIR}"/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar javaee.api/external/webservices-api-osgi.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into j2eeapis/external glassfish-deployment-api-1.2 glassfish-deployment-api.jar jsr88javax.jar
-	java-pkg_jar-from --into libs.amazon/external commons-codec commons-codec.jar commons-codec-1.3.jar
-	java-pkg_jar-from --into libs.amazon/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
-	java-pkg_jar-from --into libs.commons_fileupload/external commons-fileupload commons-fileupload.jar commons-fileupload-1.3.jar
-	java-pkg_jar-from --into javaee7.api/external jsr181 jsr181.jar jsr181-api.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
-	java-pkg_jar-from --build-only --into web.monitor/external tomcat-servlet-api-2.3 servlet.jar servlet-2.3.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-profiler-${SLOT} profiler || die
-	cat /usr/share/netbeans-profiler-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.profiler.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-webcommon-${SLOT} webcommon || die
-	cat /usr/share/netbeans-webcommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.webcommon.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/enterprise >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/enterprise$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext
-	pushd "${instdir}" >/dev/null || die
-	rm commons-fileupload-1.3.jar && java-pkg_jar-from --into "${instdir}" commons-fileupload commons-fileupload.jar commons-fileupload-1.3.jar
-	rm jsr88javax.jar && java-pkg_jar-from --into "${instdir}" glassfish-deployment-api-1.2 glassfish-deployment-api.jar jsr88javax.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/aws-sdk
-	pushd "${instdir}" >/dev/null || die
-	rm commons-codec-1.3.jar && java-pkg_jar-from --into "${instdir}" commons-codec commons-codec.jar commons-codec-1.3.jar
-	rm commons-logging-1.1.1.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar commons-logging-1.1.1.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/javaee7-endorsed
-	pushd "${instdir}" >/dev/null || die
-	rm jsr181-api.jar && java-pkg_jar-from --into "${instdir}" jsr181 jsr181.jar jsr181-api.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jersey2/ext
-	pushd "${instdir}" >/dev/null || die
-	rm cglib-2.2.0-b21.jar && java-pkg_jar-from --into "${instdir}" cglib-3 cglib.jar cglib-2.2.0-b21.jar
-	rm guava-14.0.1.jar && java-pkg_jar-from --into "${instdir}" guava-14 guava.jar guava-14.0.1.jar
-	rm org.osgi.core-4.2.0.jar && java-pkg_jar-from --into "${instdir}" osgi-core-api osgi-core-api.jar org.osgi.core-4.2.0.jar
-	rm persistence-api-1.0.jar && java-pkg_jar-from --into "${instdir}" glassfish-persistence glassfish-persistence.jar persistence-api-1.0.jar
-	rm validation-api-1.1.0.Final.jar && java-pkg_jar-from --into "${instdir}" validation-api-1.0 validation-api.jar validation-api-1.1.0.Final.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jsf-1_2
-	pushd "${instdir}" >/dev/null || die
-	rm commons-beanutils.jar && java-pkg_jar-from --into "${instdir}" commons-beanutils-1.7 commons-beanutils.jar
-	rm commons-collections.jar && java-pkg_jar-from --into "${instdir}" commons-collections commons-collections.jar
-	rm commons-digester.jar && java-pkg_jar-from --into "${instdir}" commons-digester commons-digester.jar
-	rm commons-logging.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/struts
-	pushd "${instdir}" >/dev/null || die
-	rm antlr-2.7.2.jar && java-pkg_jar-from --into "${instdir}" antlr antlr.jar antlr-2.7.2.jar
-	rm bsf-2.3.0.jar && java-pkg_jar-from --into "${instdir}" bsf-2.3 bsf.jar bsf-2.3.0.jar
-	rm commons-beanutils-1.8.0.jar && java-pkg_jar-from --into "${instdir}" commons-beanutils-1.7 commons-beanutils.jar commons-beanutils-1.8.0.jar
-	rm commons-digester-1.8.jar && java-pkg_jar-from --into "${instdir}" commons-digester commons-digester.jar commons-digester-1.8.jar
-	rm commons-fileupload-1.1.1.jar && java-pkg_jar-from --into "${instdir}" commons-fileupload commons-fileupload.jar commons-fileupload-1.1.1.jar
-	rm commons-io-1.1.jar && java-pkg_jar-from --into "${instdir}" commons-io-1 commons-io.jar commons-io-1.1.jar
-	rm commons-logging-1.0.4.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar commons-logging-1.0.4.jar
-	rm commons-validator-1.3.1.jar && java-pkg_jar-from --into "${instdir}" commons-validator commons-validator.jar commons-validator-1.3.1.jar
-	rm oro-2.0.8.jar && java-pkg_jar-from --into "${instdir}" jakarta-oro-2.0 jakarta-oro.jar oro-2.0.8.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/enterprise
-}

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 3f607b8..e67f916 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
 DIST netbeans-trunk-nightly-201607190002-src.zip 216613749 SHA256 412763dc00b1c15d23dd85c94de76503155ad6f402ddb2fb6fc40bd162e72de9 SHA512 37efb5947aeeecf1567fed864a28a907f261a7c251ad4de882660980c76248560da9f0be91dc6763767ed8aea7f57a68c1a403d429fbe4c1af5e3f27c0f85d45 WHIRLPOOL 27edad2d71b76784b0fba98bc15b4649616e1462edc174dc850bbe1782d341efd704115d1af5c8cfc56faa14d37d294dc1ce831118a4bb9e74e48add3a341062
 DIST netbeans-trunk-nightly-201607200002-src.zip 216623678 SHA256 08e39cc20bb2eff32d9298541073e9dfebdabfd0878d00f88bb6f896632783a5 SHA512 f3796b3548b714b4207cff52c0e5516dec1e23f176dadb13ee5d4dfe44014bd0692f1f8019569e68e50cdf33905cd0d3623bd01f12a69cf1c7dedf452f289e23 WHIRLPOOL fbbeb6bb0331e2c60fb546394dba8c8e0d2a54e9c807b6c9b30f256f68e8ce9039c558800821d5f38bc8d2428d1f3732c4160d53fc075f1ecc57113776491cf8
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201608240002-src.zip 217199132 SHA256 75e77e61eb9684
 DIST netbeans-trunk-nightly-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
 EBUILD netbeans-ergonomics-8.0.2.ebuild 2843 SHA256 f9262f6ee7f2aed1fab9bf4cf756f565272e9894afa50b349735e39961e7acc3 SHA512 f158c27640541f7aef31da050e0811c07a251ae4797cc663b95a074a47eaf9d6bb7a9aa11ba38ea55e75c185f7dba74629ba6716a819e8ad68eb3db9ada71451 WHIRLPOOL 4fe9634fb673fb05dbba25996efc3a212ef3bb23ab6e7c732cb75de076feb930735e3901806fd9c801abc7ee8aa8eb800718065325d415371255a886474061d4
 EBUILD netbeans-ergonomics-8.1.ebuild 2867 SHA256 6d2c0b7221d47b64c77b243c8c5232c6d8c24d3199eae5799adafeac609b2e2a SHA512 6302c8c13d43ec51048e8b0439916746a01bb67f14e7cd21be95b4179df6106dcff1d3973b9191f7a36cf6f29d53b1d2308864f5f64d9f87f980ea264b1a97c0 WHIRLPOOL 63ceaad04323d9085dfb90d1e5075ad13f6e14e8991b13aafaf3fc174440152054f32498ac8d03f57917744887db3bc1efdfc30b473b8d1a33b514ec4960ea6f
-EBUILD netbeans-ergonomics-9999_p20160717.ebuild 2913 SHA256 ae66c3fbb8da6a7dcaeeb397b54aae6a4b8abb8f5fde2ae34812b8551e2a28cd SHA512 4ba19510bcbe55baa0464d79b0ed3f52b6561c1d186eaab51f4ebf3291d3f5485684e14ad580a9e2fe931bf38c3cd9a5fd23d88d5b7cb03387a71cf146be2ca8 WHIRLPOOL 2c6c24750c6b8661c876b683809af4075739738c3104be7287ec6d1f738da0aba23d74b0d49641f42308d702a23ce6535d6e5183ee3f58e2bfe5804fb7808b4f
 EBUILD netbeans-ergonomics-9999_p20160718.ebuild 2913 SHA256 32f0ca7b8419bee9bfab9717309fcf88a656a66d62c3059d3c167aa99fabcd1e SHA512 91af39c0e9418ad4e2eaceb88529e7b3e1dce7bccf825a6e7f2c32b158698ed95bccc38d4c100f8c647798dd1e9d94ae18ff6a82a233dfa707a905d5e40d255c WHIRLPOOL dfacad331cbf414d39be119594d3e9f31d8578d8df2e3b83b2d4fd7964f3bf0ed6df1f358cefe5ec988d0a16b64a3654acb14fa5ce8b8ef06bddad27a7117fc1
 EBUILD netbeans-ergonomics-9999_p20160719.ebuild 2913 SHA256 9cb732fefd5483356ead9c2fd14b685c64bcbda5ad2f83683db4f31f2e0f820f SHA512 bb3baa9a4515450e0c146360e8fb252d0064cf5064960e4aa52531b0b010afec4e1b6642fc50c6a81ed7e80a82ce70ead4b63357b92bfee30e4a1e25d8dcc0e9 WHIRLPOOL 8eb0e59f3b238c05d2e3de1961d0ff192b85948e5e37c2667bfeff0ecb87d407dac43033e2a359348d859fa23729e6cc039741708dd3922d22a67e9ecbee6223
 EBUILD netbeans-ergonomics-9999_p20160720.ebuild 2913 SHA256 5eea037b15c4b0c5ae710c13e2174d46336fb00eae9a8c19ceb9a26a8ea29d5b SHA512 a04ab8004de87ab65b616f5fe2ed22913e48b299eb5c3f3c1e2e1690c349e00037b53fbab4a7a2a1490eab141b1ed2aa55f1b97b559250f7c1c930dccb113e07 WHIRLPOOL 3608b01b47a42a54026aa2f824a54b16f89c9051a2d309676f60dd7ee42bb6d4e55d6967a1a25cfb7aaf0b7a0519627146b68c5d978ab482c2af471038bc6545

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

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index 906c4b2..858d399 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -7,7 +7,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
 DIST netbeans-trunk-nightly-201607190002-src.zip 216613749 SHA256 412763dc00b1c15d23dd85c94de76503155ad6f402ddb2fb6fc40bd162e72de9 SHA512 37efb5947aeeecf1567fed864a28a907f261a7c251ad4de882660980c76248560da9f0be91dc6763767ed8aea7f57a68c1a403d429fbe4c1af5e3f27c0f85d45 WHIRLPOOL 27edad2d71b76784b0fba98bc15b4649616e1462edc174dc850bbe1782d341efd704115d1af5c8cfc56faa14d37d294dc1ce831118a4bb9e74e48add3a341062
 DIST netbeans-trunk-nightly-201607200002-src.zip 216623678 SHA256 08e39cc20bb2eff32d9298541073e9dfebdabfd0878d00f88bb6f896632783a5 SHA512 f3796b3548b714b4207cff52c0e5516dec1e23f176dadb13ee5d4dfe44014bd0692f1f8019569e68e50cdf33905cd0d3623bd01f12a69cf1c7dedf452f289e23 WHIRLPOOL fbbeb6bb0331e2c60fb546394dba8c8e0d2a54e9c807b6c9b30f256f68e8ce9039c558800821d5f38bc8d2428d1f3732c4160d53fc075f1ecc57113776491cf8
@@ -36,7 +35,6 @@ DIST netbeans-trunk-nightly-201608240002-src.zip 217199132 SHA256 75e77e61eb9684
 DIST netbeans-trunk-nightly-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
 EBUILD netbeans-extide-8.0.2.ebuild 3307 SHA256 084e952eae1708b0fab785fd34313985e864dbc74a8531a0d5cdcf906e88f85a SHA512 ade8dc37aa932d7ec20966199e521311716061c23df08d02635f78efd2776f1d7bf040b0f9c9488b947bbbdfb3e33fa764723e3dfffa2214892bc6d685428f6f WHIRLPOOL ad2c26b005675ebca7d902ff1e6caa28552f3fda6795e327cc3584cf109f0ad6efad6516e15af5e70d689be236298b0948003e09a3da4991b3e29a1c85607b2f
 EBUILD netbeans-extide-8.1.ebuild 3331 SHA256 7d81adb3cba102e13678052bfe288e8417753ebceb69f69ce528ede3fedcef04 SHA512 ae445552036799069f31b40c145879ac55cf0964e168f328ac84f2d434171de8c4848e3416ad7425563e8565c09f798c9520bb3cb7511348f5d6a7522b878e40 WHIRLPOOL 44142233d4d3047ebb5c152992b484e5fef1fddd04cf274cc370f00beece5a75a986e5fadedd4bc18a01559c4f6cb58289cefbfc24d8d098d70056707e8b8f57
-EBUILD netbeans-extide-9999_p20160717.ebuild 3377 SHA256 ab26b07b05a58b23549b5087c7894145d409a3d7e77776fb402d3edf1a7c2210 SHA512 610627b5f47b2da7fbf073c0073156d038db0c62697e2cb385cacce0563f9f872b91fa56bbc1ec7bf9a439e3fc0ffa7db3a524e335ad8732aa97554174e13071 WHIRLPOOL 05b1cc8602f17e3becdff52d2afcacd2b3156b9fe1294012b671b51d566467c2970a93c33bca0f793a52d04e12526ca4be56832e318321f47a3f8c5277622017
 EBUILD netbeans-extide-9999_p20160718.ebuild 3377 SHA256 ffc49c7dd3ac8fdeacdc662e39255435e6ae8c565d9f6ad2f5ef23f823eafc8e SHA512 a1a58d086327277daf40593dbbaf78753d3eb20148c729647bc1262047e007790e2908a66399f0dd696519b19b3528178628bb5a628e7519d49e644309a18e17 WHIRLPOOL aba437852a1bbd5330502807173be09c30ae011e49075b3b56caf8dc30a449272c699baa8c0d35fe057b519d3f642b471bc20ace76db66ef14d6987b4ce5bd1e
 EBUILD netbeans-extide-9999_p20160719.ebuild 3377 SHA256 ad1335c8865b44e9b1b9e3d11cd7fd6683fcc3d0daf737296d2ccc52e4f5ddc3 SHA512 3832ad37b91456f28b5db727cfb9e6973522dc418cf2dcb94ee3e1af6a40dff7418e7b2554da0411723c76c338e97e8d469056a49363b309c36e918b1e75a724 WHIRLPOOL 24c886bd85ac541640da0fae1bf7b1c8b5cb5b1e08f6c98f62b31b8ba78f41608cac0bd18e9f8e268f04beba505338a6f3cd7bd11cbafcd34022ff5b5c084343
 EBUILD netbeans-extide-9999_p20160720.ebuild 3377 SHA256 b062748a0a1228518cccda42fba068adcffb90a36ebf7adea8adf1102e75c79d SHA512 c3587fadb74b07b1d489b7cbdb75e7cbd303f1c7cbf22e18e798ab1b7625253087c201c15b9f93b3b06485ad7c063edecec29145b3d2f9c751cbe6f9dbd0e4af WHIRLPOOL 3227f0e6b96a618c7dac79c4829a730eae794471f7e0b690a0b473099cbbb2ffdb5a94ea4c0322130cdb2282b7e8e30822d8f12930f719f411f1849f55b01921

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

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 4de49fb..5081bf8 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -5,7 +5,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
 DIST netbeans-trunk-nightly-201607190002-src.zip 216613749 SHA256 412763dc00b1c15d23dd85c94de76503155ad6f402ddb2fb6fc40bd162e72de9 SHA512 37efb5947aeeecf1567fed864a28a907f261a7c251ad4de882660980c76248560da9f0be91dc6763767ed8aea7f57a68c1a403d429fbe4c1af5e3f27c0f85d45 WHIRLPOOL 27edad2d71b76784b0fba98bc15b4649616e1462edc174dc850bbe1782d341efd704115d1af5c8cfc56faa14d37d294dc1ce831118a4bb9e74e48add3a341062
 DIST netbeans-trunk-nightly-201607200002-src.zip 216623678 SHA256 08e39cc20bb2eff32d9298541073e9dfebdabfd0878d00f88bb6f896632783a5 SHA512 f3796b3548b714b4207cff52c0e5516dec1e23f176dadb13ee5d4dfe44014bd0692f1f8019569e68e50cdf33905cd0d3623bd01f12a69cf1c7dedf452f289e23 WHIRLPOOL fbbeb6bb0331e2c60fb546394dba8c8e0d2a54e9c807b6c9b30f256f68e8ce9039c558800821d5f38bc8d2428d1f3732c4160d53fc075f1ecc57113776491cf8
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201608240002-src.zip 217199132 SHA256 75e77e61eb9684
 DIST netbeans-trunk-nightly-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
 EBUILD netbeans-groovy-8.0.2.ebuild 3346 SHA256 907e6cd11c222f15c826494b44929483803f0e4249de0d54db51e6855b574148 SHA512 8bb37121e7e32621959318d109b1d982e2c705a9deb7171f5fef1dcaed55fc5718b0bc9e6bbb2592cdaa5e96d874bb6e6bfa96d06fe09f14d5250c1485eb1da5 WHIRLPOOL d5e09fa1e975835f05c6132c091fee4ae9fc9dd671af9f5f88a9195d5cd4a93804f96687ed3f2bd741117fa65773f2c464b3cfd6697425039cc51a940efa2a31
 EBUILD netbeans-groovy-8.1.ebuild 3370 SHA256 ca32569d438060704e4d5d5e46be2ebf20bffdb0ae2471d8718ada8676f32082 SHA512 40555d2ffa0ddab1e55ca514eddbd98c6e721caa230cd174050fb56f144def46f389b0ac018068c9f509936c83235b2d3423cae8676db7c96e8782b0da73e4ad WHIRLPOOL 7b2b021581db21aa8ff90ea188ddeea0974ec84fdb064cf367a56a6fa53487affe89edb1880a83934a2cf0c586060a9192838687ffebf33b55e79d9ddc7ac986
-EBUILD netbeans-groovy-9999_p20160717.ebuild 3416 SHA256 7b05aa2637a21e64889dabeac2149951db5779a4efe21df2b06d21ba84c514d2 SHA512 dba6e3b94b813c476cfd2976a840207d8472c78a70d8c9f6cf677e8d3c9d9f30b687a04d84239bbe61b05ce76b4cb2cdf12d0fdf6c6ae0f7d3e83e37786b15de WHIRLPOOL c81b0b1ddf9bf155003d0151d1a8ec63b7423694238e0a848c3d0016e1ee5dd44a2dc9f82a3eb74d39ac59ce5b8631254464b98e4b9e4b3e8f180297534e1446
 EBUILD netbeans-groovy-9999_p20160718.ebuild 3416 SHA256 9daed92e913019b7499bd9efdd6b2a4ae49baaa4b17ff41a6a7102832aadd438 SHA512 7487949ae8209a0471418ab2bbeeb25d7385ef03ebe86842483ba7dd387a5811d96c1085a8e5f598d70ada57277b37b7b76d9e2a2b5f13fe1b551c04be780220 WHIRLPOOL 5bd6715eeaa05ef4db0bee0f46c9ab8f0b02e70721af572fa234bacc23182d33d586246b25abae1b002ced01fdc9079847b5cc296b1c594283754ba691e74dc9
 EBUILD netbeans-groovy-9999_p20160719.ebuild 3416 SHA256 9fdbfc1257fb7a88a0d4a6c6534c283e2c2ef74d87efc7f8d1ccca3e7ee7bed1 SHA512 44e4d4b11680dc058e2a47aa973e78f95cbdab0c1880c5f6e1385b748918883c332c0e742e4675d78c1136a1b5c9455e65ca5d3170ee89f06d2acff66e5b9dab WHIRLPOOL d7e87a51a80d3879013a025ab6768e885eae6836a266be15aad54eafb6a0ff97814db5db98b5579f28bf1e46c2245b6f2410a7dcccc4317e5065ba183355ef96
 EBUILD netbeans-groovy-9999_p20160720.ebuild 3416 SHA256 dd59827c8836288e852259b6d0a55c73f1d7077f42de330fb76da8144fc2d5a8 SHA512 c743a97d6491e204318caf9f83e24386fcd2f60eea0adbbaf56d58335a16ba1325357e220dfa5f1e1dd07f14c56639feaac515b33acd5f0c1e9534c34bfa37d0 WHIRLPOOL 046ce82ead2ae38af4ff632e2650441c38d042c070bccf71aa3a51c254d95443eab1cf44ee9b51333069e12d4afd00bc4679c1a94c99f981309b6c7c9a44cee7

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

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 9bd7cd2..437731e 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -8,7 +8,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
 DIST netbeans-trunk-nightly-201607190002-src.zip 216613749 SHA256 412763dc00b1c15d23dd85c94de76503155ad6f402ddb2fb6fc40bd162e72de9 SHA512 37efb5947aeeecf1567fed864a28a907f261a7c251ad4de882660980c76248560da9f0be91dc6763767ed8aea7f57a68c1a403d429fbe4c1af5e3f27c0f85d45 WHIRLPOOL 27edad2d71b76784b0fba98bc15b4649616e1462edc174dc850bbe1782d341efd704115d1af5c8cfc56faa14d37d294dc1ce831118a4bb9e74e48add3a341062
 DIST netbeans-trunk-nightly-201607200002-src.zip 216623678 SHA256 08e39cc20bb2eff32d9298541073e9dfebdabfd0878d00f88bb6f896632783a5 SHA512 f3796b3548b714b4207cff52c0e5516dec1e23f176dadb13ee5d4dfe44014bd0692f1f8019569e68e50cdf33905cd0d3623bd01f12a69cf1c7dedf452f289e23 WHIRLPOOL fbbeb6bb0331e2c60fb546394dba8c8e0d2a54e9c807b6c9b30f256f68e8ce9039c558800821d5f38bc8d2428d1f3732c4160d53fc075f1ecc57113776491cf8
@@ -37,7 +36,6 @@ DIST netbeans-trunk-nightly-201608240002-src.zip 217199132 SHA256 75e77e61eb9684
 DIST netbeans-trunk-nightly-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
 EBUILD netbeans-harness-8.0.2.ebuild 4055 SHA256 2674d562adc57648c82cac9f714f74f9d29dd7b7ff7fa7f0ef37c43ef0975489 SHA512 7d72bed5b955b2365a4c11fcd97a2d6f2372ab939fb9a03b3ff7915053f24d695373c1aa154f6e6916d37ef3ace7b38864d575419460382760500576dae52e49 WHIRLPOOL 72f54a6cb83f282a75f0abb073109414a7b8bcd4e9263466281e68ff34148a7343ed3bd78ebdc8afd109b6b9f5b9f15bfd0e250f418fcaa4986a7c886b57b9f6
 EBUILD netbeans-harness-8.1.ebuild 4079 SHA256 116b90d6e6fd1b1ad8ce99c81104262a416a485b3a3110beed70e9381333cec2 SHA512 77ca4bbaf078adf6e13c0fea0a8e673262aaed60dd799ec161584589fb4c791d9bd758c87f4272297d863d3992b54a66b77b7bf05135cada530d111e1c428e68 WHIRLPOOL d385cd6292f31a5817a2c096f960330186a68242b51ed26e4272f33a690a98175e0b622a5d5309e1e6a72ff824662964785b7d235cf3a73ba4d715cd19e89dbb
-EBUILD netbeans-harness-9999_p20160717.ebuild 4126 SHA256 bf0875a3b8dc58b69add80c569c93d9a68864f258cf54ff2b0680b5871fb1e38 SHA512 1546e99ed7f9e5d4a1af1d921b6f63664ea35c7c61baffc598ba0c851429f5d61776b055acc89c018de262ad0f703ad5d12d2a052e65e8c2b3b64d55907bb681 WHIRLPOOL 0188144a6491042dcc31a57ad31e5547f4adab74ef032c1922405384b32b536b5fd0c54ca6b3171824e7c5f8b312c4cde63e120fc519a7aaca76925a63fd7639
 EBUILD netbeans-harness-9999_p20160718.ebuild 4126 SHA256 8400b79625bf5c8e64d1823c2ae120929e6062bff1071a14b7eeffb5463f0932 SHA512 be2d7ebb929506c00c6e100bf927dfdbbc51418fde77b34cb17a06fa73daba788ee8ee1cde72727241e5aa1f44856230bc16ec161e1169cd351b7187ac6e8015 WHIRLPOOL 3a9a4f947e1712f0bb6fd3a125bc2c05eda7628073902ad3c17499eec0a3b659e38ac94bf47ffee0e3db71dca003ae167d7352444050cb855d98b7856dde4cc0
 EBUILD netbeans-harness-9999_p20160719.ebuild 4126 SHA256 11ccc50937fbd8b4ed084e6064dcf2d82727a948a62caf97f0317f0364203865 SHA512 5469dab736a0e23e4b36857ca14d4c57af0c3a6b604a1af3e0656c6e6179d68f4ff39ecd1f52961763a3078f862ffa1215a81a7c31e4de92dc005f32292da6a0 WHIRLPOOL a845885b3943e65c2f82aadeefbbf22fc564220f2e138a652f502a765dc0467093995a3fdcd7d220cc935d0734770a3ddb5eda998630783844f93f391411f8a3
 EBUILD netbeans-harness-9999_p20160720.ebuild 4126 SHA256 61dd9a7ebd9e1b46a9f81b81198987e569bafd49e3503943b079bf1b688b9974 SHA512 8eb54ca9d00789af0fabadb66435c8fd442f511bedd333afd61adbab40ff219d2eaba398ed8837bc7f8d0f21ccabefde73e0c0df93014aeac883fa75502dcd7d WHIRLPOOL 5a09b1c6406dde7fb7c8d20534d2af0e2bc9d9c78f2474e8b955fd5e036cdeb55a8ec106f8746ba3ec5e3b8b7bf7363e3837aafa2e0e56701b64d81832de564f

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160717.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160717.ebuild
deleted file mode 100644
index 766b5f6..0000000
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20160717.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Harness"
-HOMEPAGE="http://netbeans.org/features/platform/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-17_00-02-33/zip/netbeans-trunk-nightly-201607170002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
-	http://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar
-	http://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip
-	http://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip
-	http://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-platform-${PV}
-	dev-java/javahelp:0"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	>=dev-java/junit-4.4:4"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.harness -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar apisupport.harness/external/bindex-2.2.jar || die
-	ln -s "${DISTDIR}"/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar apisupport.harness/external/jnlp-servlet.jar || die
-	ln -s "${DISTDIR}"/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar jemmy/external/jemmy-2.3.1.1.jar || die
-	ln -s "${DISTDIR}"/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip jemmy/external/jemmy-2.3.1.1-doc.zip || die
-	ln -s "${DISTDIR}"/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip jemmy/external/jemmy-2.3.1.1-src.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into apisupport.harness/external javahelp jsearch.jar jsearch-2.0_05.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/harness >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/harness$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	fperms 755 launchers/app.sh
-	find "${D}" -name "*.exe" -type f -delete
-
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/antlib
-	pushd "${instdir}" >/dev/null || die
-	rm jsearch-2.0_05.jar && java-pkg_jar-from --into "${instdir}" javahelp jsearch.jar jsearch-2.0_05.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/harness
-}

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 3dd4611..eea51a1 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -142,7 +142,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
 DIST netbeans-trunk-nightly-201607190002-src.zip 216613749 SHA256 412763dc00b1c15d23dd85c94de76503155ad6f402ddb2fb6fc40bd162e72de9 SHA512 37efb5947aeeecf1567fed864a28a907f261a7c251ad4de882660980c76248560da9f0be91dc6763767ed8aea7f57a68c1a403d429fbe4c1af5e3f27c0f85d45 WHIRLPOOL 27edad2d71b76784b0fba98bc15b4649616e1462edc174dc850bbe1782d341efd704115d1af5c8cfc56faa14d37d294dc1ce831118a4bb9e74e48add3a341062
 DIST netbeans-trunk-nightly-201607200002-src.zip 216623678 SHA256 08e39cc20bb2eff32d9298541073e9dfebdabfd0878d00f88bb6f896632783a5 SHA512 f3796b3548b714b4207cff52c0e5516dec1e23f176dadb13ee5d4dfe44014bd0692f1f8019569e68e50cdf33905cd0d3623bd01f12a69cf1c7dedf452f289e23 WHIRLPOOL fbbeb6bb0331e2c60fb546394dba8c8e0d2a54e9c807b6c9b30f256f68e8ce9039c558800821d5f38bc8d2428d1f3732c4160d53fc075f1ecc57113776491cf8
@@ -171,7 +170,6 @@ DIST netbeans-trunk-nightly-201608240002-src.zip 217199132 SHA256 75e77e61eb9684
 DIST netbeans-trunk-nightly-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
 EBUILD netbeans-ide-8.0.2-r2.ebuild 29330 SHA256 4822cbe26fc19685164c35d69e75bc20578ca8a5ce3394fe97bde6acc721fd2d SHA512 552f35cb1aa5429beb70c72a0cd2a3aa3a006f5870ec4084e88632a39e2ccdc05d0b2b15a87f26c72cdffb3c9a6fa0a124a8d501edeef9aa9580396922071e8d WHIRLPOOL 4c9bce3ca21d5ae61ef9392b9282c2dff9de7f82f2e83d2944a2906ca2180ef0ffab59489bdbb6afc7ba88d5143d77b47a0cf6b219a5a4d385b68afcacd3fe6d
 EBUILD netbeans-ide-8.1-r2.ebuild 30301 SHA256 892f20531352d85b5b72b1c85352eefa444917b515b0b564f04c4f91d1e654f9 SHA512 50af4873fd3ea7755b0d33b086be7e07766b6c009a46ec3954a67a1da9930378bcf9da6d18b7e60078b31af4b36ccf060f22378a8ef26b3829ccf30a529dd023 WHIRLPOOL 1024af16e7cae7f4728dd37f88031be33253b7c62548a095d3e827abeccb6c183d34ce312bd1a0f808f0d107aff217e4b81b7a17eecc6842e1d914d7061df2c9
-EBUILD netbeans-ide-9999_p20160717.ebuild 29867 SHA256 b8427180790446c73c44eeed52e0dd98ffceb675af44dd22585af7dc5b3a5aef SHA512 5ad67cf2c97070e7180cee5fbf80066de0afafd41b495ce89660dffddd22db6af1e28f8835f16fffe194ede13305689ebe2d53ebc588be8352316484ed99f0e4 WHIRLPOOL 4fa7d59bd7bbace808896dd21db6e7ebdc0284d6df7e9ded76cde17bc01c4b98fd07ad24628e4cc51dcfc46b889e1b04e1ce7a20532310ea83f26f5e46d9e1ca
 EBUILD netbeans-ide-9999_p20160718.ebuild 29867 SHA256 13efa12ef84fd94cc662d80182f32bf510ba572421416137090ee1443d1cca33 SHA512 eef604c63f2ad53d36ecd1f123714cca30f6790ee386c43c6e4ffda8bd184ee6288e75eca4aa3644ec2b31b9706ae3035c421d384a35c9e65083242d6265fc99 WHIRLPOOL c828d4a89504789328b3bffc93a5c4237d709db7a09cc5bd78ace311fd20eedcd26853bac3d01a4405d8e3bfcdc6ade4aeeed7ab70a5e3f440d58a5bd86ea6b4
 EBUILD netbeans-ide-9999_p20160719.ebuild 29867 SHA256 f90b8f22c281695cec6443712a6d83906127c544934bee87941d1a4515ebf8e0 SHA512 ccfa574fc5c69f11d1f811a03e8ef2da175649ac7196d4bea837b3c061b95f83c48a8ad4277c7a61c85c774831945ae75b45cb736a9ca3c3f777aebd94addb4b WHIRLPOOL 275937f9a4a1a31b995d49b5703ac43582cb8088e348e269cc73783923e5a5313e30891d5ad028add43529be170ae4f0a8ea2b4370f7b4580dff89c9af946f4d
 EBUILD netbeans-ide-9999_p20160720.ebuild 29867 SHA256 6ad09e0ecb1106691f533a6afbd3933154ae477974a046c1e26963127d4137a1 SHA512 b990922493ad6bf2f95b4c5b8c0cabdeebcae90e3ed352c0f9cdae436720176136e89315ca628ee0c575b7eefcf7d8e8cf57c0fed16a5e9077b9d0df7d7be32b WHIRLPOOL 313745c1e95abd332b8a0a605edeb35dd99b22989cf86fca12c9d0827a53fd90c04b243f25a659579d2750ab95a5b94e08ad6638882ef3373399a522c9cacafb

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

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 478d1df..c614223 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -37,7 +37,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
 DIST netbeans-trunk-nightly-201607190002-src.zip 216613749 SHA256 412763dc00b1c15d23dd85c94de76503155ad6f402ddb2fb6fc40bd162e72de9 SHA512 37efb5947aeeecf1567fed864a28a907f261a7c251ad4de882660980c76248560da9f0be91dc6763767ed8aea7f57a68c1a403d429fbe4c1af5e3f27c0f85d45 WHIRLPOOL 27edad2d71b76784b0fba98bc15b4649616e1462edc174dc850bbe1782d341efd704115d1af5c8cfc56faa14d37d294dc1ce831118a4bb9e74e48add3a341062
 DIST netbeans-trunk-nightly-201607200002-src.zip 216623678 SHA256 08e39cc20bb2eff32d9298541073e9dfebdabfd0878d00f88bb6f896632783a5 SHA512 f3796b3548b714b4207cff52c0e5516dec1e23f176dadb13ee5d4dfe44014bd0692f1f8019569e68e50cdf33905cd0d3623bd01f12a69cf1c7dedf452f289e23 WHIRLPOOL fbbeb6bb0331e2c60fb546394dba8c8e0d2a54e9c807b6c9b30f256f68e8ce9039c558800821d5f38bc8d2428d1f3732c4160d53fc075f1ecc57113776491cf8
@@ -66,7 +65,6 @@ DIST netbeans-trunk-nightly-201608240002-src.zip 217199132 SHA256 75e77e61eb9684
 DIST netbeans-trunk-nightly-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
 EBUILD netbeans-java-8.0.2-r4.ebuild 13298 SHA256 d4172dfdec5afecb1cd099e18a21aa872c7822bff40b192b5f4ec4d35e6e0ef8 SHA512 48ae6f7141117fbf58123ded750d76f2e7311211a6be3b62bd491349817460da11f781ec5694da91584315547c32008f568fac3bfb406dbdb5ed7fd825ff694e WHIRLPOOL 73fb68aec003707c14b2b390c2de80f24e1e5413cf7e16cf7e661af47c908e2d559214580379e45e21d316767987ac906b5a119a61ae39f03c3d01dafad49b7c
 EBUILD netbeans-java-8.1-r2.ebuild 14814 SHA256 1f49212c90fcaa9a6483f19bb60c963520f20aa08c2a509aa19cc7fda12e4564 SHA512 2d6b225f5d32f0ce1801124808b0cc2101f16a703540877c4818be06694742cfa262c3a2e7018761254f9244a7992eb7fe9bc15cdb20f6f4cb83958789c0ef42 WHIRLPOOL 8557163a46ea91a47efec3c272b8a8a0f2acbf9eaa8f6c280d0ddaac6dd8b2185f06716ab12ebf76fb87fe6c05ab1a14bfd281875ebef586f1304d2162e5f2dc
-EBUILD netbeans-java-9999_p20160717.ebuild 15656 SHA256 ecf2234a5d3f6dad96eb51de1785af556dc2f7111104564dc175344afac0d4f0 SHA512 279741717d2c2f265315be722cdbf0ff773f0d576e444854ee7149ebd922145beb89181bc12782f8a46f9674b8ace5de7b33ba0dc5b16a47e181425a123e4d8e WHIRLPOOL 9f37b0156619c16b5e0d467a22dc3ada6a162fc4e5831f51ee3b998578829a31a8db5637169d85d79af29fd74edfd33c6fdf1182153acf86ca511a638d276a53
 EBUILD netbeans-java-9999_p20160718.ebuild 15656 SHA256 2a657854974f3af8949dffe4ce8625047483d8d7638e3aa21dfeb3f45a63a176 SHA512 8397e1561a591368974d1a9475a0cc641b3429c7bed700c151f0ce844ce0f796fa68231e486932ebc82076e9d4f9f96770f5faed251d32b69cc5a62e1f693c18 WHIRLPOOL 757fdd91854e97ea1b8c3a23066324685d2109401288b504a95afa78590bd0780c41530f770dfd722a74d022ffe8baf4f77747f0bf00416767e36c8da30631f8
 EBUILD netbeans-java-9999_p20160719.ebuild 15656 SHA256 06738fd2004b48ba9e7e32e16b82b3fe6bac2d940f73e99afc7dfe3f3a3b8970 SHA512 8b94f0aa904d2e7df52d83261abfcee82424b61ee090ebc25084ff818623460840f11e551a5bca706587cb3f427ca3e6f847d8333bcc76cd0ad9b4b523c9245f WHIRLPOOL 0c8e5df74c41ab2b1d6244dc31d8d39c6bf328ee9707127f9a8c48d71bef7ceb744ee693b6e7ea2a9753e024f301b25d76f0dfccb9e39991b9632592a9723e8f
 EBUILD netbeans-java-9999_p20160720.ebuild 15656 SHA256 66533c1b722ef1d87f04ca05b6d75bca31dcd6c66295182d477ee9dd0868effe SHA512 5b40e60b456b130344a84f0f9f702a2927a1c3958fd9ad0817d9509b379a6d048a0b8b51013119b5a43ff1d27ba38a500a3b98e55b711ad2f8aaf2e41d380c62 WHIRLPOOL 2694bec79c454ed78f8c5e43cfd6ff7972f68010f0e20a76f12dd450ce93e9612a0ade12b977eed18bd419ccb7c570f5d03303f95f8a48109d4fe08336de5a6b

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

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index b7dc16c..52ef44f 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
 DIST netbeans-trunk-nightly-201607190002-src.zip 216613749 SHA256 412763dc00b1c15d23dd85c94de76503155ad6f402ddb2fb6fc40bd162e72de9 SHA512 37efb5947aeeecf1567fed864a28a907f261a7c251ad4de882660980c76248560da9f0be91dc6763767ed8aea7f57a68c1a403d429fbe4c1af5e3f27c0f85d45 WHIRLPOOL 27edad2d71b76784b0fba98bc15b4649616e1462edc174dc850bbe1782d341efd704115d1af5c8cfc56faa14d37d294dc1ce831118a4bb9e74e48add3a341062
 DIST netbeans-trunk-nightly-201607200002-src.zip 216623678 SHA256 08e39cc20bb2eff32d9298541073e9dfebdabfd0878d00f88bb6f896632783a5 SHA512 f3796b3548b714b4207cff52c0e5516dec1e23f176dadb13ee5d4dfe44014bd0692f1f8019569e68e50cdf33905cd0d3623bd01f12a69cf1c7dedf452f289e23 WHIRLPOOL fbbeb6bb0331e2c60fb546394dba8c8e0d2a54e9c807b6c9b30f256f68e8ce9039c558800821d5f38bc8d2428d1f3732c4160d53fc075f1ecc57113776491cf8
@@ -35,7 +34,6 @@ DIST netbeans-trunk-nightly-201608240002-src.zip 217199132 SHA256 75e77e61eb9684
 DIST netbeans-trunk-nightly-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
 EBUILD netbeans-javacard-8.0.2.ebuild 4906 SHA256 944fee40d693c2c287e748f70ba565f3cd84bb7c19110f8be716134ec20694a7 SHA512 1f66cd2756effbfde7d43f9da7d8d93cb6252c58a02ee3d821f6faeaf63bf3c63e28f80c6eb44689e3aa954452a2f3893c65e75de84158dff1da0d94cafea14a WHIRLPOOL 88197e03008b8acb1ce62f72783bb096d9a3fc2a289b83367841a8adbee2bf822031f9bd6051831515ee44b1d5d2a109c5646f98ca723506f27c874301fb4189
 EBUILD netbeans-javacard-8.1.ebuild 4930 SHA256 5342d0d3f4207da3d36eb19f0fa78015f33b4a6e6435fcf43b7f568afabb9d02 SHA512 5275ae0fd617e26cd8580f6256a766bdd9cc0299f5a488be5a97744ec6abddf262e5fb1db358b9ac00203bbedfe7ac152828b174856d9cf6fa06e1e2128e219b WHIRLPOOL 427bfed5b61a421340acf7ec0cfb5e88a8b4a68cb546b9d0546b7c69ab0e29700d03e2bf58641bde63a2a43579b0521c028cf57dbf25af280fb0732565a30617
-EBUILD netbeans-javacard-9999_p20160717.ebuild 4971 SHA256 191d88d9b85ca0901a0122d608195620b4deb3f2505fce77b0e0e78944fbbc66 SHA512 4a1477363cb176cd2d9e9d2122a8c852ab1d8dad7ddad4d3a891a08c2c769cb2872d1b00721661e0a4fc92cb1907e579c8baea9fa59b111f2c0b9d4d72f3796a WHIRLPOOL 9f35a26ddfae9cf9a717c90108140039f470c17d94c88f6a1cb1a4d751535a0972c20843f264f408949be40b56d6a207b8b4535b2aaa55712135460cae40ba98
 EBUILD netbeans-javacard-9999_p20160718.ebuild 4971 SHA256 98f13fba044070d0dcca1f8156a4a005c6c72f0fd5f93ad07bcd32d038823a05 SHA512 d5478fb13198dfca9706d3d61aeb623a3b5e7098e6b60b3dc5cb8b382ddc11ef300513cb234d8344313bb571ab883261651ca7a3c842b9576c4cff68c793f325 WHIRLPOOL 5ae970b3df09cda9782db6a9544e736a859811e2bc5814a8534ca2250a0ee00964c35b56f283a9daec6d551dd4ccf8879665ef0a5013bab1247222626880b169
 EBUILD netbeans-javacard-9999_p20160719.ebuild 4971 SHA256 a71983b85bfcd03706e7aced1ac53e39b2123dc5472857742a7a30aff2e944cc SHA512 f978cb1bdd84e43dd6d4f5fd3f777caa5fd36f6f232b29347659f7d080e335eb206ead6bd17bbb7712f4563164ddb3dd3ac101a1074959e71be767ff0d3559ed WHIRLPOOL bf59cb7ed378616f421905cb7ac49712edc9e2715383ccdb67ea1c390daf6e9b4881e2196114b5e231e152910cd51cf30e88aab8207a10073be99a6c6ce68005
 EBUILD netbeans-javacard-9999_p20160720.ebuild 4971 SHA256 efd983e371adfddd07839d9c5a16a38caa9fb600c9ab57686ce9253cb4b72496 SHA512 ff3b0e3cb9a155f5a789c189322f533a650a8596b938203e86e6abc1dc38072ba4a6abbb21128ea11b9e85feed0f60954e88a1f53ebe1bfdc60ef031bc44e53b WHIRLPOOL 68bcb8935ce661b6d5b1329f458467e0804291d73cc8216c880b924535f7f07ed01a5cd52ae480db5304422fdbee13c2bf0f0c9d5002653f713713a5f471c6bb

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160717.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160717.ebuild
deleted file mode 100644
index 5138854..0000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160717.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans JavaCard Cluster"
-HOMEPAGE="http://netbeans.org/projects/javacard"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-17_00-02-33/zip/netbeans-trunk-nightly-201607170002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar
-	http://hg.netbeans.org/binaries/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar
-	http://hg.netbeans.org/binaries/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}
-	dev-java/ant-contrib:0
-	dev-java/asm:3
-	dev-java/bcel:0
-	dev-java/commons-cli:1
-	dev-java/commons-codec:0
-	dev-java/commons-httpclient:3
-	dev-java/commons-logging:0"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.javacard -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar javacard.ri.platform/external/anttasks.jar || die
-	ln -s "${DISTDIR}"/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar javacard.apdu.io/external/apduio.jar || die
-	ln -s "${DISTDIR}"/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip javacard.ri.bundle/external/javacard_ri.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/javacard >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/javacard$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	rm -fr "${D}"/${INSTALL_DIR}/bin || die
-
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/JCDK3.0.2_ConnectedEdition/lib
-	pushd "${instdir}" >/dev/null || die
-	rm ant-contrib-1.0b3.jar && java-pkg_jar-from --into "${instdir}" ant-contrib ant-contrib.jar ant-contrib-1.0b3.jar
-	rm asm-all-3.1.jar && java-pkg_jar-from --into "${instdir}" asm-3 asm.jar asm-all-3.1.jar
-	rm bcel-5.2.jar && java-pkg_jar-from --into "${instdir}" bcel bcel.jar bcel-5.2.jar
-	rm commons-cli-1.0.jar && java-pkg_jar-from --into "${instdir}" commons-cli-1 commons-cli.jar commons-cli-1.0.jar
-	rm commons-codec-1.3.jar && java-pkg_jar-from --into "${instdir}" commons-codec commons-codec.jar commons-codec-1.3.jar
-	rm commons-httpclient-3.0.jar && java-pkg_jar-from --into "${instdir}" commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.0.jar
-	rm commons-logging-1.1.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar commons-logging-1.1.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/javacard
-}

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index 8c3f6e1..472dca3 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -5,7 +5,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
 DIST netbeans-trunk-nightly-201607190002-src.zip 216613749 SHA256 412763dc00b1c15d23dd85c94de76503155ad6f402ddb2fb6fc40bd162e72de9 SHA512 37efb5947aeeecf1567fed864a28a907f261a7c251ad4de882660980c76248560da9f0be91dc6763767ed8aea7f57a68c1a403d429fbe4c1af5e3f27c0f85d45 WHIRLPOOL 27edad2d71b76784b0fba98bc15b4649616e1462edc174dc850bbe1782d341efd704115d1af5c8cfc56faa14d37d294dc1ce831118a4bb9e74e48add3a341062
 DIST netbeans-trunk-nightly-201607200002-src.zip 216623678 SHA256 08e39cc20bb2eff32d9298541073e9dfebdabfd0878d00f88bb6f896632783a5 SHA512 f3796b3548b714b4207cff52c0e5516dec1e23f176dadb13ee5d4dfe44014bd0692f1f8019569e68e50cdf33905cd0d3623bd01f12a69cf1c7dedf452f289e23 WHIRLPOOL fbbeb6bb0331e2c60fb546394dba8c8e0d2a54e9c807b6c9b30f256f68e8ce9039c558800821d5f38bc8d2428d1f3732c4160d53fc075f1ecc57113776491cf8
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201608240002-src.zip 217199132 SHA256 75e77e61eb9684
 DIST netbeans-trunk-nightly-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
 EBUILD netbeans-javadoc-8.0.2.ebuild 5993 SHA256 baf9da38d87b86eb8ed10ef46017361f36ca8583dd90885c9d1667a51851bc52 SHA512 892bc25b30dc26e3ee7c8be9aaf8542c00a7fa1d1d8f883d82bebb816edfa93e1ee9abeac1b0c47ecc8b4169bcaded56c5c71f18151fdc22fe241fcee0fd4521 WHIRLPOOL 2012f28f3ba5074b4d262b20e9a1c8ddf590ce444339ec1a404c890867c1271e38f9f9e09717d0648fae061553f5c8da3d97a70c35c8e853fe4894fb6fd4ec96
 EBUILD netbeans-javadoc-8.1.ebuild 6247 SHA256 5f0ab01cbea85353ac471a46e341750785f4889732c9da111d77b87bbd1bcc2d SHA512 4a4636f4f58a9baba9d9f5bac4ee7d4f57c0e07d6790902d34974383660f2926c4c4b16a27bacc2a3a7a0a6d5b7699caae90bb2ac513ac8e0535e46d11ec345e WHIRLPOOL 9cbac0234b9f1a8122df116512d5154b7e85561fd9541e0a77dc5c2b5863cf3238400ac17d05499e950705309faa97caace6da00c912ea07d6a74b0076f683ed
-EBUILD netbeans-javadoc-9999_p20160717.ebuild 6293 SHA256 3135b0769bc56bb6754e5911e8d94bee8eb5b827f6356433638dcb1f07ddadf9 SHA512 e7d5cc0b7c96a060b8f9728694331cca4699023ffd0db7bdf206e45f58b1f405ac340c0815ae5e51e1a7d86008893428526222c21721415e0ca7579eb9e2e06c WHIRLPOOL dd81408e028eec410e4b1f1e155d06be29ff7639cbe5821c9b97c482468fa9c0c4ae742fc4b87200434c82970bb2e7edc991abb6c87c4acf0d52500b34d49645
 EBUILD netbeans-javadoc-9999_p20160718.ebuild 6293 SHA256 62b444faa8f5eb04280cacf1e0e753b03e6bda938787a3203ceb01f390836d0d SHA512 39cc041b1126262738bb1c1c1e74ae3d877d747035123c138cbf445268d6a70e906f9e4aa5af951e75d26b234ac4edca2ebcaf2df9df1e95b23d6b374de6d665 WHIRLPOOL 5f7a82bf0f94c1938789a553f446586825bc575dd284a6b4bf23739c1eb721eec423cda5f5b2e9798cb34aa227d6738c27693f832a14e03548c6d83476fc868f
 EBUILD netbeans-javadoc-9999_p20160719.ebuild 6293 SHA256 1e94315d1ce62f78fd3b6871493af345bed5f8cc31ad33e7146a51bc89788bb6 SHA512 1908124c25565223946b903e27aada0f7783f55eb7e6ad59d161736d4ca32bc6643741772c5892a0e343c696f4b11d6391e4c9216f372a11c520b3dcd04b811a WHIRLPOOL 85ac8c7b1839a1dcaa1755899e475bd070ab4e2227a2a48ad38d270fcbc5fc1e7afe0ea8a858b0f0198d62d1cfe04be74102e0f05392542e0756113ecbd40afd
 EBUILD netbeans-javadoc-9999_p20160720.ebuild 6293 SHA256 22de0b21407c5d510ed71843aa8a3186999e178eb5792cf304042b341bdfee04 SHA512 38c48ff82002f342c18577ec0a46ad92d3fce7e6c48a554aa74d2d3ce7a88b70b8daac53b5b32e5c5add5d053bc808210fde615f1a682a1a272209f04e6fecf5 WHIRLPOOL f21467521066dc1610d30f0f1b6650f7575057bc59d664253ee4bdb96a5d748f532ffb87025dda6002868d575406cc9b5650ebfafba2f9c9632dc83299bd3c9e

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160717.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160717.ebuild
deleted file mode 100644
index cef5288..0000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160717.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans JavaDocs"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-17_00-02-33/zip/netbeans-trunk-nightly-201607170002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-# oracle-jdk-bin is needed because of javafx which is not currently packaged separately
-DEPEND="dev-java/oracle-jdk-bin:1.8[javafx]
-	app-arch/unzip
-	dev-java/javahelp:0
-	dev-java/junit:4
-	~dev-java/netbeans-apisupport-${PV}
-	~dev-java/netbeans-cnd-${PV}
-	~dev-java/netbeans-dlight-${PV}
-	~dev-java/netbeans-enterprise-${PV}
-	~dev-java/netbeans-ergonomics-${PV}
-	~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-groovy-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-javacard-${PV}
-	~dev-java/netbeans-mobility-${PV}
-	~dev-java/netbeans-nb-${PV}
-	~dev-java/netbeans-php-${PV}
-	~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-profiler-${PV}
-	~dev-java/netbeans-websvccommon-${PV}"
-RDEPEND=""
-
-JAVA_PKG_BSFIX="off"
-JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.8"
-JAVA_PKG_WANT_SOURCE="1.7"
-JAVA_PKG_WANT_TARGET="1.7"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip o.apache.tools.ant.module/external/ant-libs-1.9.7.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-apisupport-${SLOT} apisupport || die
-	cat /usr/share/netbeans-apisupport-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.apisupport.built
-
-	ln -s /usr/share/netbeans-cnd-${SLOT} cnd || die
-	cat /usr/share/netbeans-cnd-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.cnd.built
-
-	ln -s /usr/share/netbeans-dlight-${SLOT} dlight || die
-	cat /usr/share/netbeans-dlight-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.dlight.built
-
-	ln -s /usr/share/netbeans-enterprise-${SLOT} enterprise || die
-	cat /usr/share/netbeans-enterprise-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.enterprise.built
-
-	ln -s /usr/share/netbeans-ergonomics-${SLOT} ergonomics || die
-	cat /usr/share/netbeans-ergonomics-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ergonomics.built
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-groovy-${SLOT} groovy || die
-	cat /usr/share/netbeans-groovy-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.groovy.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-javacard-${SLOT} javacard || die
-	cat /usr/share/netbeans-javacard-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.javacard.built
-
-	ln -s /usr/share/netbeans-mobility-${SLOT} mobility || die
-	cat /usr/share/netbeans-mobility-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.mobility.built
-
-	ln -s /usr/share/netbeans-nb-${SLOT}/nb nb || die
-	cat /usr/share/netbeans-nb-${SLOT}/nb/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.nb.built
-
-	ln -s /usr/share/netbeans-php-${SLOT} php || die
-	cat /usr/share/netbeans-php-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.php.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-profiler-${SLOT} profiler || die
-	cat /usr/share/netbeans-profiler-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.profiler.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	eant -Dpermit.jdk8.builds=true -f nbbuild/build.xml bootstrap || die
-	ANT_OPTS="-Xmx1536m" eant -Dpermit.jdk8.builds=true -f nbbuild/javadoctools/build.xml build-javadoc
-}
-
-src_install() {
-	rm nbbuild/build/javadoc/*.zip
-	java-pkg_dojavadoc nbbuild/build/javadoc
-}

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index c971942..e352ec3 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -11,7 +11,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
 DIST netbeans-trunk-nightly-201607190002-src.zip 216613749 SHA256 412763dc00b1c15d23dd85c94de76503155ad6f402ddb2fb6fc40bd162e72de9 SHA512 37efb5947aeeecf1567fed864a28a907f261a7c251ad4de882660980c76248560da9f0be91dc6763767ed8aea7f57a68c1a403d429fbe4c1af5e3f27c0f85d45 WHIRLPOOL 27edad2d71b76784b0fba98bc15b4649616e1462edc174dc850bbe1782d341efd704115d1af5c8cfc56faa14d37d294dc1ce831118a4bb9e74e48add3a341062
 DIST netbeans-trunk-nightly-201607200002-src.zip 216623678 SHA256 08e39cc20bb2eff32d9298541073e9dfebdabfd0878d00f88bb6f896632783a5 SHA512 f3796b3548b714b4207cff52c0e5516dec1e23f176dadb13ee5d4dfe44014bd0692f1f8019569e68e50cdf33905cd0d3623bd01f12a69cf1c7dedf452f289e23 WHIRLPOOL fbbeb6bb0331e2c60fb546394dba8c8e0d2a54e9c807b6c9b30f256f68e8ce9039c558800821d5f38bc8d2428d1f3732c4160d53fc075f1ecc57113776491cf8
@@ -40,7 +39,6 @@ DIST netbeans-trunk-nightly-201608240002-src.zip 217199132 SHA256 75e77e61eb9684
 DIST netbeans-trunk-nightly-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
 EBUILD netbeans-javafx-8.0.2.ebuild 4647 SHA256 15e5e0b1c4729852dd55e5bfb2dcb520ba7c959bd9927d315c0abcb3f94e4ecc SHA512 520c60264fee67b0ccfd50ced0cc8586d5653d5186fa75c6b7cd8b400aae834de446b7e6145ad38df7e68207391fb360ef4834140e096d48add568fed387ac98 WHIRLPOOL 416a56ceb2ba85e3923ada0c8ef485cdd6fa16b3423b8fd0de523fa54dd082cbaedee5da4f1a92b50e440195f9256376f50e99a850d70ccdcb8c0ff370007f7c
 EBUILD netbeans-javafx-8.1.ebuild 4671 SHA256 2a12bebaca0ddbb03b84c33de7f5933f76a8381db3c40013fc4014687ded6cd4 SHA512 ff410f96e808c414e3e9485461866239080098e46e843ee771a78a0afffddc1c776697dccb276daf7f87dadf915a212bfe9c2a07b3a8a9057cb3ea19b77163fb WHIRLPOOL 51729142255a16d4cd949d4bf5f3b681d36bc83f30dad39aad9d1dd56f7dcec0dae4377817350e7947d518129a74eec7f227c3cb1600ac168ea90d056b87d195
-EBUILD netbeans-javafx-9999_p20160717.ebuild 4717 SHA256 0f65fdce06426559412a854623ed39a08eade81bbe1676142ee5a9cbc46f4e10 SHA512 77765eaf48ca28cc181be0ab4fbc6f617e94f1be57e2c862d35a0ab996adeaf71775156e1744567e1831765fb3febaf91bc4461bf183f40d4cb4357889159f15 WHIRLPOOL 6db931aed455dac3954d7aebe46bcbe0cbd824fd87966ec41306160be43b0817643b27ed12d5faa8faece507da6a00092830bbf74cc0fb059be404ae6b611140
 EBUILD netbeans-javafx-9999_p20160718.ebuild 4717 SHA256 54454f6035322095ba1b566c894eed7a6d354b88021eddcff15a7bb981cf534a SHA512 a3a40de8ca145664db25fc2a589a382cb2ce3fc610f5199d766d786b86fcc3436b0c91d9c281fe809288645df99df8ca2029873f8d5ee305f8d555228622df6b WHIRLPOOL f14bab15b00c5ed84c80e6a63c651030323598eb995b88b1cbb17847ad89d69af272681cd7645c3b275f58ea33428baad1d1eb356d57ba6247bd2b14105bbefa
 EBUILD netbeans-javafx-9999_p20160719.ebuild 4717 SHA256 4a163419ead035e24ef3870e0cf95cc73fae79622f6b201261b2d0fe2d3e98f7 SHA512 22abc09b34bb4eaa3c8c9343c213472e6eefda3f06057aabdd51e6af09659e62ae6f6436804e0fb87a9baf8ed5bfb59f2537d63fd17680a51b2563a44d568054 WHIRLPOOL fa4e4145fb4c43284e5f781ec1bcf0c5426ff7cb55e49934d2f36f84adfa82840c782236d49bb52f6ed06281a79c513eaacb6e3d990a0b226954b720b0d27973
 EBUILD netbeans-javafx-9999_p20160720.ebuild 4717 SHA256 222573eb9fe710e6d64f3d7a29eb0b35b41ee1c70ef59cd1bf8b34d161f34cb9 SHA512 3b9baa05c1b7551dd150cca012447a426c02cef12a9387672e37ab8e6c2e0315f795b36abc53706ae97e68e9692415f6d43cb84204e01c3465e6b9d28888804a WHIRLPOOL 20fcd66d79382ae03d174133524ff582eb896872f44ddd0da42e26cc38d4a0e0e43f7ad90027c1aa5ba8c36fd7936a4c96ee59ab51067d0b28cb9d9341e95048

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160717.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160717.ebuild
deleted file mode 100644
index 6459a26..0000000
--- a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160717.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans JavaFX Cluster"
-HOMEPAGE="http://netbeans.org/projects/javafx"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-17_00-02-33/zip/netbeans-trunk-nightly-201607170002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
-	http://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar
-	http://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip
-	http://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip
-	http://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar
-	http://hg.netbeans.org/binaries/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0
-	dev-java/junit:4"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.javafx -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar apisupport.harness/external/bindex-2.2.jar || die
-	ln -s "${DISTDIR}"/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar apisupport.harness/external/jnlp-servlet.jar || die
-	ln -s "${DISTDIR}"/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar jemmy/external/jemmy-2.3.1.1.jar || die
-	ln -s "${DISTDIR}"/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip jemmy/external/jemmy-2.3.1.1-doc.zip || die
-	ln -s "${DISTDIR}"/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip jemmy/external/jemmy-2.3.1.1-src.zip || die
-	ln -s "${DISTDIR}"/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into apisupport.harness/external javahelp jsearch.jar jsearch-2.0_05.jar
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/javafx >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/javafx$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/javafx
-}

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index a0dddf3..7b4267b 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
 DIST netbeans-trunk-nightly-201607190002-src.zip 216613749 SHA256 412763dc00b1c15d23dd85c94de76503155ad6f402ddb2fb6fc40bd162e72de9 SHA512 37efb5947aeeecf1567fed864a28a907f261a7c251ad4de882660980c76248560da9f0be91dc6763767ed8aea7f57a68c1a403d429fbe4c1af5e3f27c0f85d45 WHIRLPOOL 27edad2d71b76784b0fba98bc15b4649616e1462edc174dc850bbe1782d341efd704115d1af5c8cfc56faa14d37d294dc1ce831118a4bb9e74e48add3a341062
 DIST netbeans-trunk-nightly-201607200002-src.zip 216623678 SHA256 08e39cc20bb2eff32d9298541073e9dfebdabfd0878d00f88bb6f896632783a5 SHA512 f3796b3548b714b4207cff52c0e5516dec1e23f176dadb13ee5d4dfe44014bd0692f1f8019569e68e50cdf33905cd0d3623bd01f12a69cf1c7dedf452f289e23 WHIRLPOOL fbbeb6bb0331e2c60fb546394dba8c8e0d2a54e9c807b6c9b30f256f68e8ce9039c558800821d5f38bc8d2428d1f3732c4160d53fc075f1ecc57113776491cf8
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201608240002-src.zip 217199132 SHA256 75e77e61eb9684
 DIST netbeans-trunk-nightly-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
 EBUILD netbeans-mobility-8.0.2.ebuild 4342 SHA256 e9b4ff8fe38904346bc21a82219696e97322bf9df4e9d4cad2259b6f08bbe7f9 SHA512 338711fe61c469cee80e499ddf8c3ad70a3a38e6658311afcd1d24edd1a99b87566fafcbd392bb958b589796e0913d2574b07570870c8d3382a91a324227082f WHIRLPOOL 855b2817c36bea67c8fb368a0740be18b71dbebb2b98a154552f002a56eaff34f54eee2698379d7200a6042c1de699df23e7717b5b6c532776852d8757b74cb0
 EBUILD netbeans-mobility-8.1.ebuild 4366 SHA256 fe10d103a284b8f82b67179ea52d51d57b43cfc4a4084b97e3f9650526621497 SHA512 36bdf0948b41bfe4f9c66fe093030d5f27b90f5a89be94dfbd176e3887b249d5aa3eb9b0924df142291f0d693f274eef840ed3a7f658106847327befd0374710 WHIRLPOOL f9dd44e6401367b2df73c5f1428bff53547ac012068297667666d0241c29310aed4413a368e5350a996af37ad026e875325467b1a165cba6953d99a5da3a0d76
-EBUILD netbeans-mobility-9999_p20160717.ebuild 4412 SHA256 9875dd3e26d88b3c7bc43c09dc28e2b9b86a29fb19501f57cdbb33e659e6045b SHA512 654bf97176ccc3e20c14dd3948227fce0f8b9c0ce4840ebe9ae8d64670848c6255ac467591cdb591bb91ac0c47f597ff11c88c93b73c9bc34a58260b2fcebe74 WHIRLPOOL 6c9d22fb45601071e5dca0636f26dcaae0464b689c32869c934e270a58f9a057cf247ba9bbe8ff0b6fdcc66df9298c8c79b395772fccb21f3b763d49023feb87
 EBUILD netbeans-mobility-9999_p20160718.ebuild 4412 SHA256 64a35f93019b49179ac7cda280bd9d86ddc2302bd37ed5b43078edf21b950f0e SHA512 6883c112f3840ee518756be54e3713e48f0500f07ac1d3a0be426a993c4fa57234838c7cbcc9f19802e9b79604066ac5303bb897071ab13df0016f3abc7b5905 WHIRLPOOL 45c329a470d8e446a3f64dc241d30f7d2b43775bc8b1357bbed527fa667827ef5adaeb92202457183e500f0fe720ba181dd1aeeafa44085316744b9127f8061e
 EBUILD netbeans-mobility-9999_p20160719.ebuild 4412 SHA256 108141c07609008d0bfd35f55524386aef7312d084a4c27ea3d288a4b0241c6a SHA512 c909b8627d45e007dd713f7dba749b686e2bd51c145cadb21ab2f10d0249d222d18ad70471901ffcf77d07a38b2ede26b69f6814511933c4f7c9952e642f0a22 WHIRLPOOL 1a5b3c84817149c39ba4a1391d81ccc20e2009b1d5ddc707ff44116e89225dc06c58f818dcff69692ad41ea7026ff8e3f42bcfb143507514029d93a8e584d0ec
 EBUILD netbeans-mobility-9999_p20160720.ebuild 4412 SHA256 cfa210e4b8cde0cdf39866021464b70763c1bc7e8f37dde023cbe567552a0a16 SHA512 136b7d36cc6f5acb5e6dad46d7c28da9f2659321e7ad99e766ccfaf6365c3ebfe7e6af21d4f8ff84e0a3901f50b33c64e8ffa5faab0403f8a22edf9c253c36e4 WHIRLPOOL c334199b79be66c728d2995f4f3857128b17df70e34d3a94ac1a58b81f5ad5df8aa578b56cf15216a6fc1a7f02ad667782ba8b7dee462195c681f00ac3a7a6c4

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160717.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160717.ebuild
deleted file mode 100644
index ca13265..0000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160717.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Mobility Cluster"
-HOMEPAGE="http://netbeans.org/features/platform/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-17_00-02-33/zip/netbeans-trunk-nightly-201607170002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-apisupport-${PV}
-	~dev-java/netbeans-enterprise-${PV}
-	~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-websvccommon-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.mobility -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f | grep -vE "mobility.databindingme/lib/netbeans_databindingme.*\.jar" \
-		| grep -v "vmd.components.midp/netbeans_midp_components_basic/dist/netbeans_midp_components_basic.jar" \
-		| grep -v "vmd.components.midp.pda/netbeans_midp_components_pda/dist/netbeans_midp_components_pda.jar" \
-		| grep -v "vmd.components.midp.wma/netbeans_midp_components_wma/dist/netbeans_midp_components_wma.jar" \
-		| grep -v "vmd.components.svg/nb_svg_midp_components/dist/nb_svg_midp_components.jar" | xargs rm
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-apisupport-${SLOT} apisupport || die
-	cat /usr/share/netbeans-apisupport-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.apisupport.built
-
-	ln -s /usr/share/netbeans-enterprise-${SLOT} enterprise || die
-	cat /usr/share/netbeans-enterprise-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.enterprise.built
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/mobility >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/mobility$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	rm -rf "${D}"/${INSTALL_DIR}/modules/lib || die
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/mobility
-}

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 689481e..535805b 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
 DIST netbeans-trunk-nightly-201607190002-src.zip 216613749 SHA256 412763dc00b1c15d23dd85c94de76503155ad6f402ddb2fb6fc40bd162e72de9 SHA512 37efb5947aeeecf1567fed864a28a907f261a7c251ad4de882660980c76248560da9f0be91dc6763767ed8aea7f57a68c1a403d429fbe4c1af5e3f27c0f85d45 WHIRLPOOL 27edad2d71b76784b0fba98bc15b4649616e1462edc174dc850bbe1782d341efd704115d1af5c8cfc56faa14d37d294dc1ce831118a4bb9e74e48add3a341062
 DIST netbeans-trunk-nightly-201607200002-src.zip 216623678 SHA256 08e39cc20bb2eff32d9298541073e9dfebdabfd0878d00f88bb6f896632783a5 SHA512 f3796b3548b714b4207cff52c0e5516dec1e23f176dadb13ee5d4dfe44014bd0692f1f8019569e68e50cdf33905cd0d3623bd01f12a69cf1c7dedf452f289e23 WHIRLPOOL fbbeb6bb0331e2c60fb546394dba8c8e0d2a54e9c807b6c9b30f256f68e8ce9039c558800821d5f38bc8d2428d1f3732c4160d53fc075f1ecc57113776491cf8
@@ -35,7 +34,6 @@ DIST netbeans-trunk-nightly-201608240002-src.zip 217199132 SHA256 75e77e61eb9684
 DIST netbeans-trunk-nightly-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
 EBUILD netbeans-nb-8.0.2.ebuild 4927 SHA256 7531e50c4d76608bf925efdba4f54f522de3a8ceeef4d48807fb4ee48bfabdf6 SHA512 925734f331cf228066c5c9e614f48b756af31cac8b559cfe756347b6a2cb0ce362c7c41489a25084f2ed3f2e415baefd148a54f39fc00269fb14179efe056cb9 WHIRLPOOL e3224c5f22bb8e4792a5f98bbe819e071ff18c99533ce05a3fc1c5898ddcca1e3ce34487ba78159bb4d60155acdf15ae4fe81189ff2d5b1bc77ffd9ee4e20aca
 EBUILD netbeans-nb-8.1.ebuild 4065 SHA256 c1bfd704ecaa1fd62b149114b7391b4633a90a8a1d87645b833731920aa6efbb SHA512 56bda99c3d05522d5becb032177e4b4411d862d18a069e2d4343ddc8b08d05ed6c3199588e28aece7e583ccc9f95517621780a246bdd65c7d3edf072a61ef1cb WHIRLPOOL b9a43e6b4ada929bcf2aaed0bffe9cdfe0b9dbbf001e8ee4f2ab3cf8a08e27d318ea435d0580c80fd23cf921d261ca9b54d54a2b2e7a53173f955bde03aa0a12
-EBUILD netbeans-nb-9999_p20160717.ebuild 4111 SHA256 44a0d82084a38bbbe204144c277963858eb54bd3e3e6dc9fba7eb127053dde99 SHA512 ab2d69dcb56a54c8332d960adb89cd78c6432c698f8265438e3536e4d14257fc274e37ee371213872281edd8980484d9c5de3480fad2b318bda1de5b56ebc2cf WHIRLPOOL 1b6b8e942d071a90c22c5359521e1ee7a5f5accaeeb7ea514f75df66b3a9aa95c42ac6da65aa6a7f8e67b8eff91997a12c000ad9900c7c7190619e0ae6d83499
 EBUILD netbeans-nb-9999_p20160718.ebuild 4111 SHA256 27361fbce4072d55f9911f533707a504c51e41bf3896302fe629e85aac550f55 SHA512 ec25644ca7bbdae22ad5603aad0b344c03fece8593e7096c3b5731006e8894593237bb9481b9046e308c6c5f9d5ae35514424399d0b24201b84881c8d06556e3 WHIRLPOOL 1eaacd853ce131ae88ef2dfe92c6525fea9a9d9c02a473dfd8b1edfae8846ceb1955d9ebe3586ca66ac2798cedf09344f731281ea7934dec48ad5cea7ca3cdc2
 EBUILD netbeans-nb-9999_p20160719.ebuild 4111 SHA256 73a3e1616efcfad39c542a5c76bbca35537f749bba9079be9d3aa401cbf406ef SHA512 ebe6ce4fd28207619cc872deea9cd4ad1e18005de9aba150af8c9ee9a86ecd06a4eef4db20004d6f873c32fe7be94cf31fc227a4a55e6eebe986e6d195799472 WHIRLPOOL eb0a5c10dc2b039988d20ca2e1e1feaaa8a6a211f9f1a740298cb337e6522070bbbecaa34fe00f7bda2874da747f9f54666e14feab1d568159bcf63fcc35336a
 EBUILD netbeans-nb-9999_p20160720.ebuild 4111 SHA256 191e189d9ff8f88f89b1f6ec21ee7772539a5a0f58143d43e26556fd8966ab53 SHA512 0c7330d65166d0b5ce740d1741df627337ee4abea32fa1127ad95d857d5600daa4c9c05782e2833c912f9856dba894d3a04917c19ab89a987406fd1d569d2553 WHIRLPOOL a6f227be1c6187040b32529067e3c95b40342f1a4e0faed89708f6751726e9b9fc6c4fa7342b8887bd99b757933c13b9df01df96e8c7892ae0d9654436b576a7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160717.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160717.ebuild
deleted file mode 100644
index 9c3ceb5..0000000
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20160717.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans IDE Branding"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-17_00-02-33/zip/netbeans-trunk-nightly-201607170002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster create-netbeans-import finish-build"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.nb -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans >/dev/null || die
-
-	insinto ${INSTALL_DIR}/nb
-
-	grep -E "/nb$" moduleCluster.properties > "${D}"/${INSTALL_DIR}/nb/moduleCluster.properties || die
-
-	insinto ${INSTALL_DIR}
-	doins -r nb
-	dodoc *.txt
-	dohtml *.html *.css
-
-	insinto ${INSTALL_DIR}/bin
-	doins bin/netbeans
-	dosym ${INSTALL_DIR}/bin/netbeans /usr/bin/netbeans-${SLOT}
-	fperms 755 ${INSTALL_DIR}/bin/netbeans
-
-	insinto /etc/netbeans-${SLOT}
-	doins etc/*
-	dosym /etc/netbeans-${SLOT} ${INSTALL_DIR}/etc
-
-	# fix paths per bug# 163483
-	if [[ -e "${D}"/${INSTALL_DIR}/bin/netbeans ]]; then
-		sed -i -e "s:\"\$progdir\"/../etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans
-		sed -i -e "s:\"\${userdir}\"/etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans
-	fi
-
-	dodir /usr/share/icons/hicolor/32x32/apps
-	dosym ${INSTALL_DIR}/nb/netbeans.png /usr/share/icons/hicolor/32x32/apps/netbeans-${SLOT}.png
-	dodir /usr/share/icons/hicolor/128x128/apps
-	cp "${DISTDIR}"/netbeans-7.0.png "${D}"/usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png || die
-	dosym /usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png /usr/share/pixmaps/netbeans-${SLOT}.png
-
-	popd >/dev/null || die
-
-	make_desktop_entry netbeans-${SLOT} "Netbeans ${PV}" netbeans-${SLOT} Development
-
-	mkdir -p  "${D}"/${INSTALL_DIR}/nb/config || die
-	echo "NBGNT" > "${D}"/${INSTALL_DIR}/nb/config/productid || die
-}

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index 162b80d..65e8b15 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -8,7 +8,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
 DIST netbeans-trunk-nightly-201607190002-src.zip 216613749 SHA256 412763dc00b1c15d23dd85c94de76503155ad6f402ddb2fb6fc40bd162e72de9 SHA512 37efb5947aeeecf1567fed864a28a907f261a7c251ad4de882660980c76248560da9f0be91dc6763767ed8aea7f57a68c1a403d429fbe4c1af5e3f27c0f85d45 WHIRLPOOL 27edad2d71b76784b0fba98bc15b4649616e1462edc174dc850bbe1782d341efd704115d1af5c8cfc56faa14d37d294dc1ce831118a4bb9e74e48add3a341062
 DIST netbeans-trunk-nightly-201607200002-src.zip 216623678 SHA256 08e39cc20bb2eff32d9298541073e9dfebdabfd0878d00f88bb6f896632783a5 SHA512 f3796b3548b714b4207cff52c0e5516dec1e23f176dadb13ee5d4dfe44014bd0692f1f8019569e68e50cdf33905cd0d3623bd01f12a69cf1c7dedf452f289e23 WHIRLPOOL fbbeb6bb0331e2c60fb546394dba8c8e0d2a54e9c807b6c9b30f256f68e8ce9039c558800821d5f38bc8d2428d1f3732c4160d53fc075f1ecc57113776491cf8
@@ -37,7 +36,6 @@ DIST netbeans-trunk-nightly-201608240002-src.zip 217199132 SHA256 75e77e61eb9684
 DIST netbeans-trunk-nightly-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
 EBUILD netbeans-php-8.0.2.ebuild 4347 SHA256 585b2488d748f3d0f87c17c951870e167aac7bf10847428add786e4a8a446583 SHA512 1431305d4f340cb0a2c7c896c54d45f6f02ef82a4201f82053278b98511a5a4a68210317530e9cdf5cf1f495996d3a3f9c4b2c3c479aa407abd375072ab3182f WHIRLPOOL af8476f2ff2d119f2657e6be03cfea1160f86e41bd791f40609f1bc8a8aada46ba1081e4f2417b0fddde931fa4e43d20956c0fe1d4fdf3617b78d01afd23f9b4
 EBUILD netbeans-php-8.1.ebuild 4371 SHA256 a9e7565a8cbcc5dfca4d9449f43b959911c47ad8da59648e383ecce55c4b0064 SHA512 67d43532ea43abf007adce73e7da2345d9cc42229189ba90d254d7764e19e3fd3c86b990ea2fe08cf52e49422def481046fe6e0e447fdc1de1680ac59f51d9d3 WHIRLPOOL 433275570fd81db477180e58909ebd50b83cde03bd5df807cc9ee213e2f3a44f65f3ec4877851aa6322e7752969aa72313ee7b35b8ee07446e8c22be4321d536
-EBUILD netbeans-php-9999_p20160717.ebuild 4418 SHA256 8d2a0c51ebefe4b3f582e31021b799613dfde87cff55553ea1807b8332da03bc SHA512 4d37b7f8ac213b9a0a23b39a2551f22e82afe7b0ee76e19f0a5154e749b56ff282b0c2f80af68dbf9c5fa79dd4de1f3877a7f52b2628ad4a736d696185049b0b WHIRLPOOL 7207355781d8769e1ef6e333e34fe814974556aae771e0a8cc1a0eff8dbc600e4a580ab31b844a40b6cbccb7e01127d3c0713bbdf4da72c6512f8beccea6a5e5
 EBUILD netbeans-php-9999_p20160718.ebuild 4418 SHA256 32e3421519f34969dfdd91bc8d2d337d7ddb3c1335da16615f7a4433a2bdaa80 SHA512 128662633c52dfff7193102504890e47e195d6caab1101a94420baedaf821e7d72898216a93856a6b46e2aa758caa704753483e173960eea25dd3f21f24158bb WHIRLPOOL 921d7fcffa0e9f3f806c4b02631fc390fe7a497667327415796d60df88efb1931016bec0fbb8d7243cb14e413240354aa10d18de07d0f0d0324b38b2708c0bdb
 EBUILD netbeans-php-9999_p20160719.ebuild 4418 SHA256 f2651e5970f528722ce2be216c40056ae9864fe070c4b427d7321791d3475a6c SHA512 b42a126bff1df5e1c79f90c7a45dfb8b6883990eeb542a0d671bc7a95fa5fdd7f00e7ff8e2f72d3b2f4656f6ad2f553c3d7747ff56532af68011aa42ec6bf4d2 WHIRLPOOL df89edf803a5287410b9701047fa5d85dfefef47c3ef6085ecad5d17a0e09aaaf6dfe749a2f2bf7b09f0ddf6cd45b3def02d95ff532e6b08693c33d9c662f872
 EBUILD netbeans-php-9999_p20160720.ebuild 4418 SHA256 22f7de42ee0fbfe933bc2f6a004a2d29d472e09630f253d96e42ad03c86c4414 SHA512 53877c459b214f930c5f98b3cfd06235e772a854d3046ae2771f58fd72acd0611131d3c7ff9fd6421084213322fa6bb2ede004441ddc5c05f0d192f009842e3d WHIRLPOOL 3a4724402415ee4dd365b17e457b11a988577fa21b27209b7dd2d539992b14ca83dcf95b79d1381aeee08bb8d036cc131be28465fe99b94a5f0333712c52e190

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

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index ffe46c4..7f5ecb6 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -29,7 +29,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
 DIST netbeans-trunk-nightly-201607190002-src.zip 216613749 SHA256 412763dc00b1c15d23dd85c94de76503155ad6f402ddb2fb6fc40bd162e72de9 SHA512 37efb5947aeeecf1567fed864a28a907f261a7c251ad4de882660980c76248560da9f0be91dc6763767ed8aea7f57a68c1a403d429fbe4c1af5e3f27c0f85d45 WHIRLPOOL 27edad2d71b76784b0fba98bc15b4649616e1462edc174dc850bbe1782d341efd704115d1af5c8cfc56faa14d37d294dc1ce831118a4bb9e74e48add3a341062
 DIST netbeans-trunk-nightly-201607200002-src.zip 216623678 SHA256 08e39cc20bb2eff32d9298541073e9dfebdabfd0878d00f88bb6f896632783a5 SHA512 f3796b3548b714b4207cff52c0e5516dec1e23f176dadb13ee5d4dfe44014bd0692f1f8019569e68e50cdf33905cd0d3623bd01f12a69cf1c7dedf452f289e23 WHIRLPOOL fbbeb6bb0331e2c60fb546394dba8c8e0d2a54e9c807b6c9b30f256f68e8ce9039c558800821d5f38bc8d2428d1f3732c4160d53fc075f1ecc57113776491cf8
@@ -58,7 +57,6 @@ DIST netbeans-trunk-nightly-201608240002-src.zip 217199132 SHA256 75e77e61eb9684
 DIST netbeans-trunk-nightly-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
 EBUILD netbeans-platform-8.0.2.ebuild 5406 SHA256 98e9861da45ead0d2d975a0527315df5282870b2d7e71a089724d91c18852e81 SHA512 cadbe66132d3ad81f6d149e20731b558c11c529e2ec15b1fe47ff97d99a3f4b4612fa5c98c435c4ff979eaefab6702721db009a03162202c96b4b411cf9f872a WHIRLPOOL 9552948e8bbad308f4379eaae69d8c214da9fbfab87d75226949b69ddca3e68c2d36c4d05738196073e5b959ab0b764064c9186d421198937122aa4bdc4988dc
 EBUILD netbeans-platform-8.1.ebuild 9320 SHA256 4a03fc6a399aaab949edb3df7c629da5bc7ce6288d44dbc848097352c2b4ae3a SHA512 7015cb042dd4e371cdcad49838eb2e4109d1ec505ac618f3a6f98d4dce328ab34be90a3cb0820896bd75337a180a1bd9c91c842a143fdffdf033696d5f496402 WHIRLPOOL 8c5311df396a374bf9d8c994b37c5c9fe6aa3c82a9e9e0824a5caefb0006fd9b44f4fdddd387ee12da48592929d5c4dd7e7fb2d866c9ddaf76acf5b3adbe310e
-EBUILD netbeans-platform-9999_p20160717.ebuild 9520 SHA256 27288bd56f3cebc554e4b8790e3bd5607e8bb32771365bdba788df7dcdc65330 SHA512 e7ab57eac6b422f986c9f32d7f7d68ebb3eecf642c6e30b4110269972791bcbd0ecb27c30b72a960b13da39e0ede6a5a7255e51c731464d6bbddfb61b7ec8b3d WHIRLPOOL a1d1c7cfb60d2e114b227bab18a35f01e0b555b5c879444136935c34de829e512045e9ea813f34084515615fc11df536940a630190e26c8a8b9cc73f6676efd9
 EBUILD netbeans-platform-9999_p20160718.ebuild 9520 SHA256 88c120ae45fd0a1cfe2ebda9ddeafc6908f5cc7d876993fcd19b7a55b1ab5cc5 SHA512 635d836c864c6fd13626c2304562cd0ac2276bf8d4ccb88b8b3719cacf5f9ca8504ac090b48696616b0f3e3f4f5ad76af4844d996192aada6532c83003652b64 WHIRLPOOL 16f68d3443b7fcc76421bf359728902f638139a02197debd8cb59332ce9cc84021fb19160b0e19aa966c991f6d1d547b238215e56fcd7dd0a29f06b6383f339d
 EBUILD netbeans-platform-9999_p20160719.ebuild 9520 SHA256 18b0dcae2c73d3051d12b44595dc43743cdf907afa4192a9cd60046a40b9c9b2 SHA512 5558fe1df0af1e07d1f47077f37554ca90ac447cef05e79252428979a47770a14ba54ab2d4bac454b941f64f05feb7fb6c93a529d2f9d8718287839cd99e56f8 WHIRLPOOL 4a7cd25bde3e6cf546a4fd94e088594baba7e6aedbb0e7fe097c15e35faf48dd0e0c8fbf59a88f8db1a1eb04bcce437b16ef3d82b759ba028705243f9904de52
 EBUILD netbeans-platform-9999_p20160720.ebuild 9520 SHA256 ef3e5838a78f6911a7020f5ff45375429b61177547eaa783a44a14126e43724d SHA512 634a0d7e7d0ba78bab07c676efda1569c3a76d310f67b1653092c4707835b4552bb8144387cde63d0188fd0d86d0a08ef9ec12d4ceb2edb48e96405ff08287e7 WHIRLPOOL 007cf27cd4c2f49835af4e73a75c4207af624496114d4fc06f0a10c920bc64da19166e6a74629702801879efa34baf8df3eb89719534b70c0d89099bc7de5c9c

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

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 1e5178e..47f3d14 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
 DIST netbeans-trunk-nightly-201607190002-src.zip 216613749 SHA256 412763dc00b1c15d23dd85c94de76503155ad6f402ddb2fb6fc40bd162e72de9 SHA512 37efb5947aeeecf1567fed864a28a907f261a7c251ad4de882660980c76248560da9f0be91dc6763767ed8aea7f57a68c1a403d429fbe4c1af5e3f27c0f85d45 WHIRLPOOL 27edad2d71b76784b0fba98bc15b4649616e1462edc174dc850bbe1782d341efd704115d1af5c8cfc56faa14d37d294dc1ce831118a4bb9e74e48add3a341062
 DIST netbeans-trunk-nightly-201607200002-src.zip 216623678 SHA256 08e39cc20bb2eff32d9298541073e9dfebdabfd0878d00f88bb6f896632783a5 SHA512 f3796b3548b714b4207cff52c0e5516dec1e23f176dadb13ee5d4dfe44014bd0692f1f8019569e68e50cdf33905cd0d3623bd01f12a69cf1c7dedf452f289e23 WHIRLPOOL fbbeb6bb0331e2c60fb546394dba8c8e0d2a54e9c807b6c9b30f256f68e8ce9039c558800821d5f38bc8d2428d1f3732c4160d53fc075f1ecc57113776491cf8
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201608240002-src.zip 217199132 SHA256 75e77e61eb9684
 DIST netbeans-trunk-nightly-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
 EBUILD netbeans-profiler-8.0.2.ebuild 3402 SHA256 8021dea620d1bc26214ff0ec285f8061c24693dd28a62a97a48ac3223707e920 SHA512 2660390337a973256b1aac3a02b14e16782c230fa2714ae695213b0cabc0eb60621c6a1ae234f9e57259a19de22a87447f9a89ab846bd59bcedd2be313c35072 WHIRLPOOL 5d1053ded03143b2de05b64cfbe59b515cb786d60bfa65566be795567bfaf5feb88a2f8e7161a05da512fafd523f871778d5ddeb3c6b89fc95885096e379f65d
 EBUILD netbeans-profiler-8.1.ebuild 3426 SHA256 81f8b3b135f021a2dbe7b5ccb53fc7fcf79908ab83ef14ca0e912732b7fb4b53 SHA512 210bc0c5214aa8f79f559cccf69f1ed885dd2d14dc55cd17bd89c8a7f04f1a76de5b414426337b2ba6e99576850f0753f13e41e0f424b3f0adc58001dffc217a WHIRLPOOL 293d12a03294532dc9ce10503b030282cb636f08af6300ea796885eb6a3fe36c9d37c2a07138d03e9c4d45b31352ce160901a96f659f26d50a0fe5caee3bf0fa
-EBUILD netbeans-profiler-9999_p20160717.ebuild 3472 SHA256 ca94edf54cb5dcc24aa4736c13c9d31eeb64b27014cc84e5369b45fe329113be SHA512 88f7013c3e3181a998be8bc5bf1a77af2f392d6efa4b5b65c47a167b241255eec57b159fbf355e6570c01c2aceb56bb1e6e92f3689a6031e4915194b4a7c3a91 WHIRLPOOL 35095660c2403e167bf207bb8d277c2a1ca31ca36b18ac442dac9565576962ae5b89c687661d409132d336737810fb08f420166fed4008be0bf62d35f991a626
 EBUILD netbeans-profiler-9999_p20160718.ebuild 3472 SHA256 72318a0ec7774e39ca877fd154c64dbd09eb7db5967d21a0a7d124169541eae3 SHA512 acb5ea7e404f23030f5a09e52beee7f397b9182b04071e78020f91d034ef8c4c8a30b64cd168a3732401c6f4d4879991e8e26a8a89304ce3af30097e4d51653c WHIRLPOOL 2da7ee55f5b50d11363cd0294e74e2adf00e084190b784d080d95d0adf14c139cddc58d7e7bc3c974f105c4af3a3effa9a8e3451c31c52252218a3942dc7155f
 EBUILD netbeans-profiler-9999_p20160719.ebuild 3472 SHA256 c02ee61d3eb4910ba1ed825913bc7b99d9b049a183b960cf7db52713d10ef398 SHA512 5a75167fe2db54467d06b7da3c9954c670cb12d7310d68c5a6fc3318f1a0528374466399fcf43899ffdc52e30fad6e68e1db2dafce012419669c88a6d6fc1bed WHIRLPOOL a6b9744a5a2825dd2a3349af3a4d5d529aea8a728faa8b8138298546ac95803dbe2185b8ea47cfbc2353f69ede544c9de34f5af5d5aa34acb9c4a7e7a8097af0
 EBUILD netbeans-profiler-9999_p20160720.ebuild 3472 SHA256 480f46ebacfb513a42cadca73b37fc3bed4f90e9126b69fe686403ca75ca1612 SHA512 0d1558a1048f5a5ad7e020c62bcc0e415ac09483c0a88c69e42a8b78ecc31e3422c59d539680f2eb0c13d4b5124f0ae30eca471985dfb6a8d1f05d64eb1c252d WHIRLPOOL 98305cee23dc82c43a1c41fdd84f5037ef3207a8fce205e3454901a349ef3d12664b9ff607d4c18028c6abe77862bd9c9e99fe34e8765df112368ebbefcb48e9

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

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index d45432c..3114f91 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -23,7 +23,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
 DIST netbeans-trunk-nightly-201607190002-src.zip 216613749 SHA256 412763dc00b1c15d23dd85c94de76503155ad6f402ddb2fb6fc40bd162e72de9 SHA512 37efb5947aeeecf1567fed864a28a907f261a7c251ad4de882660980c76248560da9f0be91dc6763767ed8aea7f57a68c1a403d429fbe4c1af5e3f27c0f85d45 WHIRLPOOL 27edad2d71b76784b0fba98bc15b4649616e1462edc174dc850bbe1782d341efd704115d1af5c8cfc56faa14d37d294dc1ce831118a4bb9e74e48add3a341062
 DIST netbeans-trunk-nightly-201607200002-src.zip 216623678 SHA256 08e39cc20bb2eff32d9298541073e9dfebdabfd0878d00f88bb6f896632783a5 SHA512 f3796b3548b714b4207cff52c0e5516dec1e23f176dadb13ee5d4dfe44014bd0692f1f8019569e68e50cdf33905cd0d3623bd01f12a69cf1c7dedf452f289e23 WHIRLPOOL fbbeb6bb0331e2c60fb546394dba8c8e0d2a54e9c807b6c9b30f256f68e8ce9039c558800821d5f38bc8d2428d1f3732c4160d53fc075f1ecc57113776491cf8
@@ -52,7 +51,6 @@ DIST netbeans-trunk-nightly-201608240002-src.zip 217199132 SHA256 75e77e61eb9684
 DIST netbeans-trunk-nightly-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
 EBUILD netbeans-webcommon-8.0.2.ebuild 4723 SHA256 e2ba39cb6f22c990acf9a492eac5707f130382d56f9bc1e3636e82cbe4d61938 SHA512 61955d38f829b3ed54bc5cb9a71da07f05676a2bf7219fa8073aeee0f0e2d0e73f7aa6ec1636be39fb071d3d2b9de7ceb813a247a61961874f4cc78697d4e568 WHIRLPOOL 1a272650fc2394716a790b79cb85a9322929c7cc96ea4776cc639fb869c5b536140dbdc632b1a8aa9cb1fc8e740050125c2ebe9390de7a8f4207e88e24924206
 EBUILD netbeans-webcommon-8.1.ebuild 4945 SHA256 55c57b638481134d659763154a7820467a9866707112cba0e60dbd9ba8cd2840 SHA512 a98987535f60b533bf0df701f83693a58584dfa9a10d5c8646186165d884fb7e8a3348ec77cbf25d1a8cc8cfd947bf54cdb30d251ae1a3fffb74947070d76579 WHIRLPOOL 36fe1b7b9b34a02fcda227aaeebed8a33562e6fe4a014c78e9a464d709bf5120322a35bd54a0ffa15c4dd4f3ae605cf6fc2d35c5652f7162ae646c61ad69210a
-EBUILD netbeans-webcommon-9999_p20160717.ebuild 6242 SHA256 ee7200046af66189d8efd1eaa7b3aaa858dc481fc84d14821f33719b6c2a5c24 SHA512 06db68d025dd8a5fcf3a4779154893a3d174d282d157f7b5edd6802a28c405c2890814b39b7b18061093b40675ded4ddf6cad35610ed116b3719228cfe879aea WHIRLPOOL 251b4db4fcbd939a0f5a017333e33a5635cfc7baf46a0eccbfd8f3071a53aaac4497d04286f213375b8daa0a8daed375c21d86dda477c84f2065453cefefd530
 EBUILD netbeans-webcommon-9999_p20160718.ebuild 6242 SHA256 29ef334501203f367873de14ff1f88326f5cae0311f6f44d61a7569f670a4650 SHA512 9cac5c9ff7e8e1afc69e4ff73891e5dd9a9c8858a50a35f45226f03e024c3ec73818977dc54a672c21b41b1c7b097700c5e7046504276b40740f0543399a3127 WHIRLPOOL 6645c07da4d3c9496f44f5843374d81b3747f5491faa424b01c23e344ab30ae888958bcfae41222dfe4ee555a9e434c6535c0fa0009a8faf40b6d38fd6814269
 EBUILD netbeans-webcommon-9999_p20160719.ebuild 6242 SHA256 51b9e60cf60236e28558683374493c26b397ebf14035294466433a7f701a8b2d SHA512 21d4386331b70a1fa40eeb937dca104f1df0d0e07157ce89000065360fe1f288ce35dfd986260e64c0c239c960bef8495badc8f21d0441f1869f659e8c32124c WHIRLPOOL d721d1e487569b0040ff47d6a5a869e691fef486bdf3fe97ed5bbc94dde66b26efeb66850e8a0fce9c157a54f301532e1b294c69d310251fa316802f8879fe49
 EBUILD netbeans-webcommon-9999_p20160720.ebuild 6242 SHA256 a0b41d32e6530fa4704f3c98f10d52a95aab58b752b6813b1f34ad49d6684044 SHA512 6127b3fddbdfc9251fc4ab5ce2323adf9ce776101779944e57b47bf808f7e41a356371787ea3c25e875f4ad9152878c41aa4ccec7af675119e2832f109f653ce WHIRLPOOL 635f82637ba1020b8e51ab2c65d58df3c207e49b6231d97ae02b43b6e9d348df2baf941d26d597778f97af3c186df452640e6a7aade64aec17474de0f0d223d8

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

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index c95ccf8..adaf57e 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
 DIST netbeans-trunk-nightly-201607190002-src.zip 216613749 SHA256 412763dc00b1c15d23dd85c94de76503155ad6f402ddb2fb6fc40bd162e72de9 SHA512 37efb5947aeeecf1567fed864a28a907f261a7c251ad4de882660980c76248560da9f0be91dc6763767ed8aea7f57a68c1a403d429fbe4c1af5e3f27c0f85d45 WHIRLPOOL 27edad2d71b76784b0fba98bc15b4649616e1462edc174dc850bbe1782d341efd704115d1af5c8cfc56faa14d37d294dc1ce831118a4bb9e74e48add3a341062
 DIST netbeans-trunk-nightly-201607200002-src.zip 216623678 SHA256 08e39cc20bb2eff32d9298541073e9dfebdabfd0878d00f88bb6f896632783a5 SHA512 f3796b3548b714b4207cff52c0e5516dec1e23f176dadb13ee5d4dfe44014bd0692f1f8019569e68e50cdf33905cd0d3623bd01f12a69cf1c7dedf452f289e23 WHIRLPOOL fbbeb6bb0331e2c60fb546394dba8c8e0d2a54e9c807b6c9b30f256f68e8ce9039c558800821d5f38bc8d2428d1f3732c4160d53fc075f1ecc57113776491cf8
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201608240002-src.zip 217199132 SHA256 75e77e61eb9684
 DIST netbeans-trunk-nightly-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
 EBUILD netbeans-websvccommon-8.0.2.ebuild 2651 SHA256 a195b307847c466dbb5f46eb04240358ce3c92cadeecb8fda1562304de46820f SHA512 933626bd2073f58e3508180c042e237b9e61ba6f3c992cf37ea43978ac2fc972d2dcc3ef0b5c390b3867296e197ed2605c43452c98e36acf0982e7338b6d1eb7 WHIRLPOOL c3db8f0b50116d0129f50778e1961166e76601d8c165e20e73d75c91b02c8a095067e0f13e18178d849dd29adcedaeee7d3e0e62f99be592d7ce159fd6af632e
 EBUILD netbeans-websvccommon-8.1.ebuild 2675 SHA256 c9ff3d598c5f76c2b69dd5488a80c63025acc3cd0cc99321a0e84a493502df36 SHA512 89daec44b860aa8011d9e5533230f89dad7bcc50a119664122d2718db3e53501d1319ae4b27eac1d71596671e9a7c21315a641346e6cbab22edb3c7232bf5ce3 WHIRLPOOL 521521094b396c98687e2054742e4c019023045f19b01a6cc3a5f826f4cabe9448254db8b834448f3b33368c76dd667942554e1bae459c55de2c571bb5cfb4f5
-EBUILD netbeans-websvccommon-9999_p20160717.ebuild 2721 SHA256 1a6d30ed67c610f79628c86c79bb73657dd57949bbb12201a01442a2deff867f SHA512 8aa2594ac7ff48e41c21cc884e4b2eb751cf915e5f7aa08a1cfaa5859649efccd2418e85a3e1f428b94b72a3d218144094bf8226aec4d54fd91fd002d246ec81 WHIRLPOOL b5372ebbb32502083aacd1c5fbe7512c2722ca7ed12f39ec9cad62f95a4aa86ba6f0478d6a151377596716a7b15f03558fd36d72b89573af3e93b975a562decf
 EBUILD netbeans-websvccommon-9999_p20160718.ebuild 2721 SHA256 8bf6f2b49e2dcd05969d9f616ff18f8c926ad705e8b9e72de65d229122e847fe SHA512 944033374ebd5203c7bb96495bd16e869e53089db6380e25f9a358c25315cf6bf7e4e7c4060ca4c45c42bd1a99f4d91f1be041405025d5b8689ec22fe77f840b WHIRLPOOL ec6f3d388d07930a81500da52dc135059eb6cdd698cb24ee63bc4d7d52801302dc13426f22662737d387883f6d06e95b831cdb1c723096db9968d2ae65d1264b
 EBUILD netbeans-websvccommon-9999_p20160719.ebuild 2721 SHA256 20b2ca9b244271635f2dfbd6bc795cd59d16ae5184c47756ff09eb2259ef85d9 SHA512 6f57cf7eb5b53f1c20b338e7cdccbcc2cb6c4c97f550900c1997792f6c65c04596651cf9d039321b1e63e48b18dbea069046f020e5c0e5b23a0f57beedf9d8bc WHIRLPOOL cc8b6300f397a7e9040be07682b29e022df39ad5d1f3000ff76784821df782b80d700da03e50b172f517371fd47b7a523836483a1d2c5a00764e02b871948ae3
 EBUILD netbeans-websvccommon-9999_p20160720.ebuild 2721 SHA256 8d21dc980ae62bdb156b500e0c36371210dc5bd9d7e54a2f19e5ee69a79847f9 SHA512 1c9caa402be2bc95bc2e146b1cb6e813daa659e54e95d761437e0ded9d7cc078aaecf2165b817096ecec807b77aa739452b8ff9c99efe9c139b72b637902823e WHIRLPOOL 823964ca169f52cf428b69a7d547bf905da689ced4aa6edc8d8d81a83310f1369f2fac6791d7b453eea4084c13ddf9a9476ba440dfe8d40ad2bae10dea883046

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

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 6b3d55f..f189c8e 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99e
 DIST netbeans-l10n-8.0.1-20141110.tar.bz2 12065358 SHA256 542d325cbc6e0e617f6076e964e37803ec322b6d0ee4724a6d2127f2f480fb24 SHA512 28242dcbe7bcbc6a9abce15dfe6fd6140a275a417d96ff28228315bdc0ce8110ede899a1815e2fdf9115b48221d50cd3ff5b71a15d36316d04d81f66e9c0cac4 WHIRLPOOL 0318caea3463d3f7bb8876774b1cc9467dadd9bc36497a9304ed12900e2fabdc4dcdfec0b9eaee27bb36c39e9caff3743c5a42ad4c3a432205a716832688c4d6
 DIST netbeans-l10n-8.1-20151105.tar.bz2 11945028 SHA256 33e86aa7315021d28fdb64790233327d7599c98bcf3ab9d936b6fe924884325a SHA512 eb3163eaa8add417a0e8ac3ed4923a6e4992a80eaac00a01eed24e0e1ceb8a5cbd308659bcf0e5e1192ac8e84a79ea36744ad6b2589d60891b03b37102e9435d WHIRLPOOL f214a865bfd8c54341fb9d538da6db4d9b24906b0d94b3ee6cbf4a525e8842d28e852febb2f34c4c31f989d1b6baf750480bc2f04d94bcd7a8bdb8c9553ef590
 DIST netbeans-l10n-9999-20131010.tar.bz2 12440242 SHA256 64c48605820ec1f35e38c34b48cc16cd40c053d085d50819d4b4e9a80453dfa9 SHA512 7d4d61fa61710186fefd90721598ec635db7c6249ce6fc484fd5813636220f163b60230349c984c398c87e083d2d629c531fe5b4cea3752ebbcaa9823b701a02 WHIRLPOOL 10506e3a3004d6c0ab17b05507f72db2c25d2713c3233a7f5478da27d3b1261b5fb6d5f71cbf369858668ca2d1219dad1900c6c42d3f250adcc935e846e56b09
-DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
 DIST netbeans-trunk-nightly-201607190002-src.zip 216613749 SHA256 412763dc00b1c15d23dd85c94de76503155ad6f402ddb2fb6fc40bd162e72de9 SHA512 37efb5947aeeecf1567fed864a28a907f261a7c251ad4de882660980c76248560da9f0be91dc6763767ed8aea7f57a68c1a403d429fbe4c1af5e3f27c0f85d45 WHIRLPOOL 27edad2d71b76784b0fba98bc15b4649616e1462edc174dc850bbe1782d341efd704115d1af5c8cfc56faa14d37d294dc1ce831118a4bb9e74e48add3a341062
 DIST netbeans-trunk-nightly-201607200002-src.zip 216623678 SHA256 08e39cc20bb2eff32d9298541073e9dfebdabfd0878d00f88bb6f896632783a5 SHA512 f3796b3548b714b4207cff52c0e5516dec1e23f176dadb13ee5d4dfe44014bd0692f1f8019569e68e50cdf33905cd0d3623bd01f12a69cf1c7dedf452f289e23 WHIRLPOOL fbbeb6bb0331e2c60fb546394dba8c8e0d2a54e9c807b6c9b30f256f68e8ce9039c558800821d5f38bc8d2428d1f3732c4160d53fc075f1ecc57113776491cf8
@@ -35,7 +34,6 @@ DIST netbeans-trunk-nightly-201608240002-src.zip 217199132 SHA256 75e77e61eb9684
 DIST netbeans-trunk-nightly-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
 EBUILD netbeans-8.0.2.ebuild 7167 SHA256 80e31382a0ceb680c2a055dc5c78c1dce8edf32c50bbae6a1c14a2c568492519 SHA512 0ab466ca247ec953896ef0ab3b01b43ffea3a9f37e9bcdacecfc0476226d45cef35e4ddf27f2b85628d9512ed304e6cc6cfe963a5e547217d08cad400eefc4b9 WHIRLPOOL d09668e669f4f8d7987ab02cf26104fc6e54ba29b8b497fe0013cc8816a2d7560c99e6e1b02db77ead872d5240b84c09e3fabbc3465587d1d1ca7d6fcae114c1
 EBUILD netbeans-8.1.ebuild 6891 SHA256 22a19f05bdcea85475c0451df867367b69363bfbc6280f78b087248d9f8e9513 SHA512 812b6cdae3e5feaf37db5ca8b5efa1b374d5492f11cfa1df2adbd3617986cdca6a79d2d4dffd024c8c48492fc8a21704190242f5741c5699b12070620cea2c87 WHIRLPOOL baf5f750574c01effa0d02c72194139fb2757be932054f4900ceb0534607064af10f2b5b38063ff2cca34e75ab5be23d00c7e5d90d1c724339666d20f1bb10d3
-EBUILD netbeans-9999_p20160717.ebuild 6939 SHA256 d5fd90c55429197f77bedf0badf303301cf5f03d9add4aab004b400a0c7cfb4d SHA512 d227f40bbc923f37d593ba7845027b4c3d1f1faf4dfc57b788d7ec9a0cf9535b49ed4dbecfcc05faf415828f7ad26165ee4fdb2b3b67829187e8532815666993 WHIRLPOOL 03ed806129b4f038798a2afd4242a3e0d1a6cd28f79b18ac0de8500f523a02598746b1b703829a3c1509451edd5cacd21d1ab4e4c2a20e5d50ef489e4e12a5eb
 EBUILD netbeans-9999_p20160718.ebuild 6939 SHA256 a10ebfc28899d769c6d6a3837f9c48b193a553e1dafe530eb1019bb3d25e48f7 SHA512 56ce24913ba114c730acbad124fc37ca729c812affde20500397276edbee0ebc0124f57115ded653dc51e81cd5a706dfd470d9c2c5406f5cc4f5f1b341bd6a54 WHIRLPOOL 63f15c10b004a59eb538d086be71d53610905e41ee9b6620cff814d361e3eb22335ca7f6e95740c7ca6742676e33a6d3de294e82c0a573c3e2a810026334c028
 EBUILD netbeans-9999_p20160719.ebuild 6939 SHA256 f220fa90e2c05001b4692c1a5d97a0ee9aa268aba9e9f3a8284fa7a6a384c8d4 SHA512 f7b5f237231ee0b9267dac841349f767c61a3b9fa783a6273056a45cfc6c9f8f002a799a729ac85101f631fa6ac3b4e0bbfdbdc0b0914b60af7945f3b5d5245a WHIRLPOOL 827a8190f3b49c8f9f7714ac76596c46ca93cd0f41360a68825fc83b251d313caf5bad5b9f1595136f42e2ece14b79053b448f9f87b0dd8ebb7fc242dc023835
 EBUILD netbeans-9999_p20160720.ebuild 6939 SHA256 798afa2ad73f1e2146c097d4f8e4392131d22e928aa6de0fa03097ef080c1df0 SHA512 9cd879c98f960087e7c9d095a5024f856aaf6906f7f34178f3db8f2b18cf728158f442bbda3b758e2a727d0b4f51788c4eff4e9cb95d0188ae79c158100edc81 WHIRLPOOL c7c6271433c0ab8fc9dc75eb1a0cd6fec247463a0cb06c2d987c75c9d307e89a8ac942a40da3c8a6c500dee78ce18874b5bb0d9d2335e18d4d35112a8c5f02ac

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