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

[Miroslav Šulc]

commit:     827fc0d06a428234de9a23ba744f44e11082e9cc
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  1 06:02:08 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Sep  1 06:02:08 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=827fc0d0

netbeans: removed obsolete ebuilds

Package-Manager: portage-2.3.0

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 9789a67..6ed8bdc 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-201607210002-src.zip 216644136 SHA256 702bd0842f5b2a4cc0f0ca6b668319f9c375ea6e851f0eb05fbe7d2f3ceac74b SHA512 adf04ea3a875e3247631240b02c7b0592097c47aeed350ffd6b043094a07e4b8ad172ec2ddf63c5ae003bcea26178445782b7941f71ee5fc73f72d0a8d99f0ce WHIRLPOOL 6cbaa4fb5f43b66f9b499d5cfd94374e9fd1f5063c231e2a3f098d9519bd08fd7659b63a8ada9fe9952ed7025301abe4f820158f322e888fdbdb889e6b7ea31d
 DIST netbeans-trunk-nightly-201607220002-src.zip 216981902 SHA256 ca38275cd067b732c1b90054b9af9834957052a6e4012f52a2e89e06f2e19b3b SHA512 f8844781d0ed8fa4f4efa04f64092bec92b48908782683b0d1a2a6b9f44bd1cb52e7ec20ccd54ee7f3b7bf9e10fac1bc232dc6c9954ddb3c1324c6600cb8d457 WHIRLPOOL e493121f9b48364e741ef63935a7e3c17dc59dac721df890d3e5c10a1a7965c9d9978e46268e34b5cfd50aca3d47b66a94d3e79b5dac648093aeba13ffd616ec
 DIST netbeans-trunk-nightly-201607230002-src.zip 217014076 SHA256 b297107296d96cdacd6422fabe0aa3b6f6ccaa516c0eabdf70c034f617e8197a SHA512 09f6695558c1594288e26bd002d1038267c9bcb3706314ddc163fe5d869fd3bc4f747e4a6e00c8590e7606b32c8d04bd0b2b2d32efc765cda72289232eeec7bd WHIRLPOOL 435812a5cfbcdaa3b528aee2c43eb11a48c5241b9689a0135809b8ea87942ed31c16af78acd30bb8c58bd9f4e3c3ad8ab81639df0055ff74eb9411973ca8d942
 DIST netbeans-trunk-nightly-201607250002-src.zip 217019515 SHA256 4f7317d2fa0693c653216be2607fb8e9d2c90f6f22e650ba38971767cdea57aa SHA512 ca97c3cf0bb7bb7031e82445accaed1f09d971b81de6a8e11824c2232968c4acb92077af57d5a91c8dca029ce39f18b3e676a1fdf21ef7190a2a8577652f4181 WHIRLPOOL 64a2af5584458e9a415d83685f99387ad7c2422d21750d4c6234fa5922def0374517081a633837bb45231073fcd0ba366748bf6861d64d987952f4c786529cca
@@ -30,7 +29,6 @@ DIST netbeans-trunk-nightly-201608260002-src.zip 217205973 SHA256 6b68e52a251d6f
 DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc7b49dde50f98461edfc143b64c3ed8ba85f220ae149858b5d7 SHA512 8a036de09a281bbb3ce5473056a074c848ce49fd9165c831f0e3da8f64ea95f39b784bd4ccd4e5b8f9d1c3886a21d1c300d18efb0e78603da729c123246bb81f WHIRLPOOL 81c12e1cc239d723559af6173636d2eb3fd32b05abffcfdac89fd5c9a9c0c2215ad89b4eeef2bc0f04441cdb04a7619b9aafa28ed6e20b314ce9b1679d9ceb2f
 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_p20160721.ebuild 3384 SHA256 057923a58842b7e254ae95ff1bdd1acfca41be5287a36c981b94b2a3aa5309cc SHA512 0a438e05bab454ffd5bf8d7223287641c30de2f49167631a6d53614c5aa11105f68cedd4767bd4f6a07268746ec5380039c4de710314b1b42ddfe11ea98f4b4d WHIRLPOOL 1a29e5df72d57bb253dc10c219a5da972360506c664104e81507246fb8b2d96c0d90c4353747689a8bb9ad19fc72a88b19d8fb0322020f34bfdbcff568a241fc
 EBUILD netbeans-apisupport-9999_p20160722.ebuild 3384 SHA256 2b75ea2621ce92e04f7867ee9f0af8a09a3840f0fd194f77b0449d35bfe67984 SHA512 f6e39e77f724b0ee5528de31e60245bd5f83d620bae0d6d09a3d9a59c013318c21a1ddf98c4d7b5ad04b4930f8e5e420f954c8f936423c7a15f38ac119de0931 WHIRLPOOL 48691cdc853316d3e5c5df9e376bcb0e2a9f91683ca39ef66698b2755f469d97e6847beaf60b03cd8ce91e29cee148b86aadc7afcfe851e4b15644c6280a469e
 EBUILD netbeans-apisupport-9999_p20160723.ebuild 3384 SHA256 84401dc7cdbbf634946cdc54bb6a0064fb01e85f684aa802057d567012750a00 SHA512 2b9de45b2c6fc44cdc5d90db3df0216bcb625e6071cf14a7c3d5190d3856115bf58d6c930e28939f939170adf96bd17e94de659bb1e6c6cab106cf6fa3a96919 WHIRLPOOL eb22365b5d0a2ad8048f97a6aa4677988fae72862395e393be8c7283747e1af7376500b38c825dd96ea82897bf85e944c372ad797f4f82e7d019325f12593c7c
 EBUILD netbeans-apisupport-9999_p20160725.ebuild 3384 SHA256 1d86a358db627c1f19928420f98665d60acb427fe03befbe38826648a3bb01f0 SHA512 e5f8d5475939387ca1516b995aa452f9ed9716e6ebbc74b14fe256c2c4d7b5a9b7dfceaef8c77782d8fc6e6b47e3bf7092b36a84fb0603046c460d56de97a544 WHIRLPOOL 2a8b706a71e5868f0babf3bf29e25f9334d78b40c17b81cfac50ea7ebaf349c12dde8789da174c7f38c166976e8c04663937f726eee714a976994d6931b76ecb

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160721.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160721.ebuild
deleted file mode 100644
index 70f080b..0000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160721.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-21_00-02-33/zip/netbeans-trunk-nightly-201607210002-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 f210d16..f6f2025 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -15,7 +15,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-201607210002-src.zip 216644136 SHA256 702bd0842f5b2a4cc0f0ca6b668319f9c375ea6e851f0eb05fbe7d2f3ceac74b SHA512 adf04ea3a875e3247631240b02c7b0592097c47aeed350ffd6b043094a07e4b8ad172ec2ddf63c5ae003bcea26178445782b7941f71ee5fc73f72d0a8d99f0ce WHIRLPOOL 6cbaa4fb5f43b66f9b499d5cfd94374e9fd1f5063c231e2a3f098d9519bd08fd7659b63a8ada9fe9952ed7025301abe4f820158f322e888fdbdb889e6b7ea31d
 DIST netbeans-trunk-nightly-201607220002-src.zip 216981902 SHA256 ca38275cd067b732c1b90054b9af9834957052a6e4012f52a2e89e06f2e19b3b SHA512 f8844781d0ed8fa4f4efa04f64092bec92b48908782683b0d1a2a6b9f44bd1cb52e7ec20ccd54ee7f3b7bf9e10fac1bc232dc6c9954ddb3c1324c6600cb8d457 WHIRLPOOL e493121f9b48364e741ef63935a7e3c17dc59dac721df890d3e5c10a1a7965c9d9978e46268e34b5cfd50aca3d47b66a94d3e79b5dac648093aeba13ffd616ec
 DIST netbeans-trunk-nightly-201607230002-src.zip 217014076 SHA256 b297107296d96cdacd6422fabe0aa3b6f6ccaa516c0eabdf70c034f617e8197a SHA512 09f6695558c1594288e26bd002d1038267c9bcb3706314ddc163fe5d869fd3bc4f747e4a6e00c8590e7606b32c8d04bd0b2b2d32efc765cda72289232eeec7bd WHIRLPOOL 435812a5cfbcdaa3b528aee2c43eb11a48c5241b9689a0135809b8ea87942ed31c16af78acd30bb8c58bd9f4e3c3ad8ab81639df0055ff74eb9411973ca8d942
 DIST netbeans-trunk-nightly-201607250002-src.zip 217019515 SHA256 4f7317d2fa0693c653216be2607fb8e9d2c90f6f22e650ba38971767cdea57aa SHA512 ca97c3cf0bb7bb7031e82445accaed1f09d971b81de6a8e11824c2232968c4acb92077af57d5a91c8dca029ce39f18b3e676a1fdf21ef7190a2a8577652f4181 WHIRLPOOL 64a2af5584458e9a415d83685f99387ad7c2422d21750d4c6234fa5922def0374517081a633837bb45231073fcd0ba366748bf6861d64d987952f4c786529cca
@@ -42,7 +41,6 @@ DIST netbeans-trunk-nightly-201608260002-src.zip 217205973 SHA256 6b68e52a251d6f
 DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc7b49dde50f98461edfc143b64c3ed8ba85f220ae149858b5d7 SHA512 8a036de09a281bbb3ce5473056a074c848ce49fd9165c831f0e3da8f64ea95f39b784bd4ccd4e5b8f9d1c3886a21d1c300d18efb0e78603da729c123246bb81f WHIRLPOOL 81c12e1cc239d723559af6173636d2eb3fd32b05abffcfdac89fd5c9a9c0c2215ad89b4eeef2bc0f04441cdb04a7619b9aafa28ed6e20b314ce9b1679d9ceb2f
 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_p20160721.ebuild 4790 SHA256 080af859fe83fbb1e143ff937594eebf0589abd512b34e20b1c643daba3f2515 SHA512 e969df2c68fc5a985fe007689b40cc69e9262057bbf41bc6c8985e146cde4d4a467725086b48723f4f5ca82c103b70234ae0feeceb3b7751f946e50726b9dda4 WHIRLPOOL 153cbcec692d1df41b74062785b458ba185ea3d04c83001fa4baa833eb139421803cb72c677466668d56e0a04e4d1f02a85e214a47d6f36d99630734e39fb4f8
 EBUILD netbeans-cnd-9999_p20160722.ebuild 4790 SHA256 0556e8420ce95d2f00c840778b4982e5f6a1fda77af87049ea4fb7caf41e7c36 SHA512 a87940cff2ba0f35e7043ac586db9d81aa9d5eae98181aece55f9e780c5a207e3d635221e575029052ea94052dfe3de8b6aec03568fdfcf0d97aac6911b5985a WHIRLPOOL a52a2637c7947f6d9b79adf1b29a009bc57b2c888e2ee9ee976a4a444796d5838fc11e4accfc8b555c5a447ab3c5268a1e1c2197d5315e99b78e6aa6d339ac99
 EBUILD netbeans-cnd-9999_p20160723.ebuild 4790 SHA256 dc08c4c40e07e31ae279f9ab3aaf5baa78c2b6e49b940ea26e954e78a96cd44b SHA512 07a3f1c694eb96049f25826362ad20741ccadcc6bcc7e1431432f80fb5c0c7f7d028464a76df6b8a640bc098eb10cf0dd169a831cdfb9fb5ba8c0fe586904fe3 WHIRLPOOL d2c62d56fa1f312ed883683e28c6244a850d159674bb592837fcfee66c01c1edf56c05a084ebde5450da26314f18532f36a44dd3239dd3cae855eca0a33b9166
 EBUILD netbeans-cnd-9999_p20160725.ebuild 4790 SHA256 1a6a47c15a27ff0c80202dd8d9a2bd495ada9b2271e86ee3fdb8c2af4ef1012c SHA512 8de7178abf45739105bb8385916c6a06e16e34ab13d47ac3840e2eed81e0a87cf53d3476c08658a632e5e763da369899b796549f394a93d09688093be54d89f4 WHIRLPOOL 7ae13d9b2cb409849f79d25ee4f16e3e84a81ed0def6f22308ef1b54db8d9df55c807312f31f1d1c208d832d4d26bc498c8d4d23dc1407c0d5d7ab709db2b8c5

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160721.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160721.ebuild
deleted file mode 100644
index 7200e1a..0000000
--- a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160721.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-21_00-02-33/zip/netbeans-trunk-nightly-201607210002-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/A22324F86EB1673E0D54D0FFF5C8047FAED4A2BA-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}"/A22324F86EB1673E0D54D0FFF5C8047FAED4A2BA-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 eab6b70..d3c55d8 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-201607210002-src.zip 216644136 SHA256 702bd0842f5b2a4cc0f0ca6b668319f9c375ea6e851f0eb05fbe7d2f3ceac74b SHA512 adf04ea3a875e3247631240b02c7b0592097c47aeed350ffd6b043094a07e4b8ad172ec2ddf63c5ae003bcea26178445782b7941f71ee5fc73f72d0a8d99f0ce WHIRLPOOL 6cbaa4fb5f43b66f9b499d5cfd94374e9fd1f5063c231e2a3f098d9519bd08fd7659b63a8ada9fe9952ed7025301abe4f820158f322e888fdbdb889e6b7ea31d
 DIST netbeans-trunk-nightly-201607220002-src.zip 216981902 SHA256 ca38275cd067b732c1b90054b9af9834957052a6e4012f52a2e89e06f2e19b3b SHA512 f8844781d0ed8fa4f4efa04f64092bec92b48908782683b0d1a2a6b9f44bd1cb52e7ec20ccd54ee7f3b7bf9e10fac1bc232dc6c9954ddb3c1324c6600cb8d457 WHIRLPOOL e493121f9b48364e741ef63935a7e3c17dc59dac721df890d3e5c10a1a7965c9d9978e46268e34b5cfd50aca3d47b66a94d3e79b5dac648093aeba13ffd616ec
 DIST netbeans-trunk-nightly-201607230002-src.zip 217014076 SHA256 b297107296d96cdacd6422fabe0aa3b6f6ccaa516c0eabdf70c034f617e8197a SHA512 09f6695558c1594288e26bd002d1038267c9bcb3706314ddc163fe5d869fd3bc4f747e4a6e00c8590e7606b32c8d04bd0b2b2d32efc765cda72289232eeec7bd WHIRLPOOL 435812a5cfbcdaa3b528aee2c43eb11a48c5241b9689a0135809b8ea87942ed31c16af78acd30bb8c58bd9f4e3c3ad8ab81639df0055ff74eb9411973ca8d942
 DIST netbeans-trunk-nightly-201607250002-src.zip 217019515 SHA256 4f7317d2fa0693c653216be2607fb8e9d2c90f6f22e650ba38971767cdea57aa SHA512 ca97c3cf0bb7bb7031e82445accaed1f09d971b81de6a8e11824c2232968c4acb92077af57d5a91c8dca029ce39f18b3e676a1fdf21ef7190a2a8577652f4181 WHIRLPOOL 64a2af5584458e9a415d83685f99387ad7c2422d21750d4c6234fa5922def0374517081a633837bb45231073fcd0ba366748bf6861d64d987952f4c786529cca
@@ -33,7 +32,6 @@ DIST netbeans-trunk-nightly-201608260002-src.zip 217205973 SHA256 6b68e52a251d6f
 DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc7b49dde50f98461edfc143b64c3ed8ba85f220ae149858b5d7 SHA512 8a036de09a281bbb3ce5473056a074c848ce49fd9165c831f0e3da8f64ea95f39b784bd4ccd4e5b8f9d1c3886a21d1c300d18efb0e78603da729c123246bb81f WHIRLPOOL 81c12e1cc239d723559af6173636d2eb3fd32b05abffcfdac89fd5c9a9c0c2215ad89b4eeef2bc0f04441cdb04a7619b9aafa28ed6e20b314ce9b1679d9ceb2f
 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_p20160721.ebuild 2968 SHA256 c4b5aeb07de837df4f1e6875ec17d0e1ce95ef1c99c7354652e6426440b34a4f SHA512 a94f0655e925d30cc95cb99e51f6fa3902e94de91a21c990dc94eb9a26e8a3d422b5e1824be977aab9e1fc8c43e62054e094789b9a2d3678d8a289e6357f875b WHIRLPOOL c080f0df1cfad0994400427c567329fe6fc7ec821a45333ecf93f2e8b5f17d87b705ea4eaf944b6968a929605837f78028a50c8c87cc6ac5ee1adf5384438881
 EBUILD netbeans-dlight-9999_p20160722.ebuild 2968 SHA256 0140eade791d2e4ea913957b2657a91b3a29bb749cc2d884a80a3c1675ac4d54 SHA512 c26ce7a9478de95128767a81bf4f6c3a8d6d7e3034bb21d06514ec0f0256a5ce398195b2909a7df6fd79feab1443acada0519810213400e464114790fbaeca29 WHIRLPOOL 2a45d1e0dfa7c119f9c3cae837fd038ae12d9857ba9f3e4280d0a14e74127cfdae823b780afdaa6f66545129920efbc0c660ace03569957d9bb643bb32abc1eb
 EBUILD netbeans-dlight-9999_p20160723.ebuild 2968 SHA256 77ce61705b89bbcc6ff6a128ced3f64112d0d6d1c15dbcf9445cbba6aef227b9 SHA512 8018e13eb67e790ee6a318a5810a7ac677e12d7d357d4e0ee34a35d4c5d97b1698d6f7c4a010b05df5e2fd43fec214d83092e760466e630ca2a988771c9b4b4f WHIRLPOOL dbf2988880f7348f3d72414b81b7b6fa503f181c10e7dca038b28ff4162f629df154e83c4dc094822107abfdc517eda58790e3f027d764f3e3dfe1a51933b62c
 EBUILD netbeans-dlight-9999_p20160725.ebuild 2968 SHA256 995f70851172b30ab20ca77d72b67a0b418615b24cef98cae3676c689916e7fd SHA512 a7e4dbc214cd6529d1c9b9f017531c300bcc5d57bb303209c782cd71383df864b527c42e5958348b911b906590bc752d46ed7deb207993a8f18abe1ede8d89a1 WHIRLPOOL 8604c66afc3801fa98b90f315b99977482b000fceaefea94a987870c6a9dbf6f3e8b600eeb2c6d1474e6329aff2c29378f361ee4505c0ff3c0441ff7041a7129

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160721.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160721.ebuild
deleted file mode 100644
index 1465ec2..0000000
--- a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160721.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-21_00-02-33/zip/netbeans-trunk-nightly-201607210002-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 a533a7f..9d1b7e6 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-201607210002-src.zip 216644136 SHA256 702bd0842f5b2a4cc0f0ca6b668319f9c375ea6e851f0eb05fbe7d2f3ceac74b SHA512 adf04ea3a875e3247631240b02c7b0592097c47aeed350ffd6b043094a07e4b8ad172ec2ddf63c5ae003bcea26178445782b7941f71ee5fc73f72d0a8d99f0ce WHIRLPOOL 6cbaa4fb5f43b66f9b499d5cfd94374e9fd1f5063c231e2a3f098d9519bd08fd7659b63a8ada9fe9952ed7025301abe4f820158f322e888fdbdb889e6b7ea31d
 DIST netbeans-trunk-nightly-201607220002-src.zip 216981902 SHA256 ca38275cd067b732c1b90054b9af9834957052a6e4012f52a2e89e06f2e19b3b SHA512 f8844781d0ed8fa4f4efa04f64092bec92b48908782683b0d1a2a6b9f44bd1cb52e7ec20ccd54ee7f3b7bf9e10fac1bc232dc6c9954ddb3c1324c6600cb8d457 WHIRLPOOL e493121f9b48364e741ef63935a7e3c17dc59dac721df890d3e5c10a1a7965c9d9978e46268e34b5cfd50aca3d47b66a94d3e79b5dac648093aeba13ffd616ec
 DIST netbeans-trunk-nightly-201607230002-src.zip 217014076 SHA256 b297107296d96cdacd6422fabe0aa3b6f6ccaa516c0eabdf70c034f617e8197a SHA512 09f6695558c1594288e26bd002d1038267c9bcb3706314ddc163fe5d869fd3bc4f747e4a6e00c8590e7606b32c8d04bd0b2b2d32efc765cda72289232eeec7bd WHIRLPOOL 435812a5cfbcdaa3b528aee2c43eb11a48c5241b9689a0135809b8ea87942ed31c16af78acd30bb8c58bd9f4e3c3ad8ab81639df0055ff74eb9411973ca8d942
 DIST netbeans-trunk-nightly-201607250002-src.zip 217019515 SHA256 4f7317d2fa0693c653216be2607fb8e9d2c90f6f22e650ba38971767cdea57aa SHA512 ca97c3cf0bb7bb7031e82445accaed1f09d971b81de6a8e11824c2232968c4acb92077af57d5a91c8dca029ce39f18b3e676a1fdf21ef7190a2a8577652f4181 WHIRLPOOL 64a2af5584458e9a415d83685f99387ad7c2422d21750d4c6234fa5922def0374517081a633837bb45231073fcd0ba366748bf6861d64d987952f4c786529cca
@@ -62,7 +61,6 @@ DIST netbeans-trunk-nightly-201608260002-src.zip 217205973 SHA256 6b68e52a251d6f
 DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc7b49dde50f98461edfc143b64c3ed8ba85f220ae149858b5d7 SHA512 8a036de09a281bbb3ce5473056a074c848ce49fd9165c831f0e3da8f64ea95f39b784bd4ccd4e5b8f9d1c3886a21d1c300d18efb0e78603da729c123246bb81f WHIRLPOOL 81c12e1cc239d723559af6173636d2eb3fd32b05abffcfdac89fd5c9a9c0c2215ad89b4eeef2bc0f04441cdb04a7619b9aafa28ed6e20b314ce9b1679d9ceb2f
 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_p20160721.ebuild 15825 SHA256 8494b21884539c4f7bf884852bf99d36f55ab2c248b3b249400696470f7e228b SHA512 313892211a8166ef004de98d7f67807805f64e05657cfcc9bfbdc52f4479e0844cfd48bca5eb611eadfc42b88dc9616837c82c1c8da00d3019a876fbc0175fcb WHIRLPOOL 142754c5cab6ae0beea45427cb669c51cea91f1606776bf32409e366392606e18d996fc22fdef270baf998fd289634db507f75f27aed6dac355573b0957f5dac
 EBUILD netbeans-enterprise-9999_p20160722.ebuild 15825 SHA256 cea307fa2a1570af19ff7ae8331c780dbd0a7a209673eb1dd53c35509c41465f SHA512 ff20496a6004a574c2f2c7033ca19ddc049bb5b09defb9ca11724bbe9a6e4bef9edb7eaa9d17114db83a45c97ac569493d0c6d3282530c460fd62c9ad04dc12a WHIRLPOOL 8a112be4acc0d32519cb7293b9fd2aa71492e3fc72e59e9ce7816330c36225b14de64d5d6c75070e51f6b79cc6e301b3c3a5fb5ec7bf93d5c699e733f98a86ac
 EBUILD netbeans-enterprise-9999_p20160723.ebuild 15825 SHA256 dc842810ba9ddfa9dcbe75f4e4c2469e1f64e29be3c8a4d4358525cd268ff9af SHA512 5cc4b2c00e557493a65e451e37c46352c52ae4278ab88681552f1b8c8347c377d95715cd1773cf96aaf73b0e7a9e59f01e1d719b978eedb82814e7badb49e0d0 WHIRLPOOL a9ec22bd75e272512e8c76ace3e0f6b9276ad9279864039b3df9ec772f4bb2e4fa6b69f5e06513182e147f2f97f37794baebf14fbccf4bdb8b21e2895638a41c
 EBUILD netbeans-enterprise-9999_p20160725.ebuild 15825 SHA256 18c5bbf7bcc5a321cc2da55b8efddf6b2aba8df5604b1d91d7b2bf6829f80ab2 SHA512 919b78b18a883170a9cba70289f3dfbcfe0ea363091bfea04bc9602c05997b0b708a4f3688fd025af1fa34618754816cd84354afd03a17c7717a2c2035e1c2db WHIRLPOOL c0f53185bd50c6af1f462cfdbe918ed5abe668aa7dd39a9b3228e3a2cac5c0ed66c111bf4b7c13bf9e3e746a97e3f68b00115af1eb018b7ae531e76a0d4648ae

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160721.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160721.ebuild
deleted file mode 100644
index 2c9341b..0000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160721.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-21_00-02-33/zip/netbeans-trunk-nightly-201607210002-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 a29a35d..b20dac4 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-201607210002-src.zip 216644136 SHA256 702bd0842f5b2a4cc0f0ca6b668319f9c375ea6e851f0eb05fbe7d2f3ceac74b SHA512 adf04ea3a875e3247631240b02c7b0592097c47aeed350ffd6b043094a07e4b8ad172ec2ddf63c5ae003bcea26178445782b7941f71ee5fc73f72d0a8d99f0ce WHIRLPOOL 6cbaa4fb5f43b66f9b499d5cfd94374e9fd1f5063c231e2a3f098d9519bd08fd7659b63a8ada9fe9952ed7025301abe4f820158f322e888fdbdb889e6b7ea31d
 DIST netbeans-trunk-nightly-201607220002-src.zip 216981902 SHA256 ca38275cd067b732c1b90054b9af9834957052a6e4012f52a2e89e06f2e19b3b SHA512 f8844781d0ed8fa4f4efa04f64092bec92b48908782683b0d1a2a6b9f44bd1cb52e7ec20ccd54ee7f3b7bf9e10fac1bc232dc6c9954ddb3c1324c6600cb8d457 WHIRLPOOL e493121f9b48364e741ef63935a7e3c17dc59dac721df890d3e5c10a1a7965c9d9978e46268e34b5cfd50aca3d47b66a94d3e79b5dac648093aeba13ffd616ec
 DIST netbeans-trunk-nightly-201607230002-src.zip 217014076 SHA256 b297107296d96cdacd6422fabe0aa3b6f6ccaa516c0eabdf70c034f617e8197a SHA512 09f6695558c1594288e26bd002d1038267c9bcb3706314ddc163fe5d869fd3bc4f747e4a6e00c8590e7606b32c8d04bd0b2b2d32efc765cda72289232eeec7bd WHIRLPOOL 435812a5cfbcdaa3b528aee2c43eb11a48c5241b9689a0135809b8ea87942ed31c16af78acd30bb8c58bd9f4e3c3ad8ab81639df0055ff74eb9411973ca8d942
 DIST netbeans-trunk-nightly-201607250002-src.zip 217019515 SHA256 4f7317d2fa0693c653216be2607fb8e9d2c90f6f22e650ba38971767cdea57aa SHA512 ca97c3cf0bb7bb7031e82445accaed1f09d971b81de6a8e11824c2232968c4acb92077af57d5a91c8dca029ce39f18b3e676a1fdf21ef7190a2a8577652f4181 WHIRLPOOL 64a2af5584458e9a415d83685f99387ad7c2422d21750d4c6234fa5922def0374517081a633837bb45231073fcd0ba366748bf6861d64d987952f4c786529cca
@@ -30,7 +29,6 @@ DIST netbeans-trunk-nightly-201608260002-src.zip 217205973 SHA256 6b68e52a251d6f
 DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc7b49dde50f98461edfc143b64c3ed8ba85f220ae149858b5d7 SHA512 8a036de09a281bbb3ce5473056a074c848ce49fd9165c831f0e3da8f64ea95f39b784bd4ccd4e5b8f9d1c3886a21d1c300d18efb0e78603da729c123246bb81f WHIRLPOOL 81c12e1cc239d723559af6173636d2eb3fd32b05abffcfdac89fd5c9a9c0c2215ad89b4eeef2bc0f04441cdb04a7619b9aafa28ed6e20b314ce9b1679d9ceb2f
 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_p20160721.ebuild 2913 SHA256 23de735f91f351a7d71c1be438c0dedb92b1491890eb11c936b787c61d4c84ee SHA512 212b9a2b21376d99fbeda8d14a2e2c276ed5394339ff5b5d63d2027cc070aeabe1f4a25e872f6a76845b55079bbf9a1efbef6cebcd8d2e6b94075d1633ba82e3 WHIRLPOOL aaf975bcb5d6119fc8562384cf55a5ee0dcdcbeedcd9a81bc1db10649fc5a53accec071f3012ef4d6e96c6754bdf596f73930f2244c5f853575af64bf45331cc
 EBUILD netbeans-ergonomics-9999_p20160722.ebuild 2913 SHA256 a1913ec13948f8fc5f35494749530c742246570838e28d463e04525954710b03 SHA512 279d06d2232873d4b34d278b632cdcf07cf4f1b6e8807aa46841e926aaf1ab80d6f7439307eb70fbd63a5df07dfa3041bdf9cdf621cad064c865986b0891fd4e WHIRLPOOL 4a24dd108409186d63283480fd1a0469a1ac8e8235cc7f719ace13168c3a425fa7ff40a0dc14d30bdd1b9ee3a24b21e30b8ae599e806287b1bf3af277f6be7e3
 EBUILD netbeans-ergonomics-9999_p20160723.ebuild 2913 SHA256 6dea6c001f7962e0fc041b001825c9055ccebdf16474eb29f7ebf16a951f28f9 SHA512 3e58d82d4f795097876f0ee2fc74f5dcba051402c0fefac3e847acc646bc6015004fd6eb6317871da542562a90e48a5056f0c38cbc867b87f55a923e27075878 WHIRLPOOL dfd828102ad977808101f944dec778ce084fa82458b3af9b02a57aa2117d7adc29f3cbef279016ada1d71dd74e6b47a04733a4ea08c9fc9546ac5b4c2a2f3f78
 EBUILD netbeans-ergonomics-9999_p20160725.ebuild 2913 SHA256 98a7b66a7b6e5208185eb4589b2114c67e03bed2c9579d7feb8d1cc936c481a7 SHA512 8612a038ac62d5fcc64724021f1f15ffa239c702fad834e38664334e81882cdb5e1c68c3011fca55c3c54e48615920d71981be31cc091677f807aae6c5e99383 WHIRLPOOL 4745e4bea6dd6a8dd03273a7d8ac2b56fa1e52651d42598532b6daafc0c5371e4d1d230bbd4993d1df4971e857d2611a5b4572ce378923582c3a4cc680a874f9

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160721.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160721.ebuild
deleted file mode 100644
index 4e16bb7..0000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160721.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-21_00-02-33/zip/netbeans-trunk-nightly-201607210002-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 102fce4..7b2ca7d 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-201607210002-src.zip 216644136 SHA256 702bd0842f5b2a4cc0f0ca6b668319f9c375ea6e851f0eb05fbe7d2f3ceac74b SHA512 adf04ea3a875e3247631240b02c7b0592097c47aeed350ffd6b043094a07e4b8ad172ec2ddf63c5ae003bcea26178445782b7941f71ee5fc73f72d0a8d99f0ce WHIRLPOOL 6cbaa4fb5f43b66f9b499d5cfd94374e9fd1f5063c231e2a3f098d9519bd08fd7659b63a8ada9fe9952ed7025301abe4f820158f322e888fdbdb889e6b7ea31d
 DIST netbeans-trunk-nightly-201607220002-src.zip 216981902 SHA256 ca38275cd067b732c1b90054b9af9834957052a6e4012f52a2e89e06f2e19b3b SHA512 f8844781d0ed8fa4f4efa04f64092bec92b48908782683b0d1a2a6b9f44bd1cb52e7ec20ccd54ee7f3b7bf9e10fac1bc232dc6c9954ddb3c1324c6600cb8d457 WHIRLPOOL e493121f9b48364e741ef63935a7e3c17dc59dac721df890d3e5c10a1a7965c9d9978e46268e34b5cfd50aca3d47b66a94d3e79b5dac648093aeba13ffd616ec
 DIST netbeans-trunk-nightly-201607230002-src.zip 217014076 SHA256 b297107296d96cdacd6422fabe0aa3b6f6ccaa516c0eabdf70c034f617e8197a SHA512 09f6695558c1594288e26bd002d1038267c9bcb3706314ddc163fe5d869fd3bc4f747e4a6e00c8590e7606b32c8d04bd0b2b2d32efc765cda72289232eeec7bd WHIRLPOOL 435812a5cfbcdaa3b528aee2c43eb11a48c5241b9689a0135809b8ea87942ed31c16af78acd30bb8c58bd9f4e3c3ad8ab81639df0055ff74eb9411973ca8d942
 DIST netbeans-trunk-nightly-201607250002-src.zip 217019515 SHA256 4f7317d2fa0693c653216be2607fb8e9d2c90f6f22e650ba38971767cdea57aa SHA512 ca97c3cf0bb7bb7031e82445accaed1f09d971b81de6a8e11824c2232968c4acb92077af57d5a91c8dca029ce39f18b3e676a1fdf21ef7190a2a8577652f4181 WHIRLPOOL 64a2af5584458e9a415d83685f99387ad7c2422d21750d4c6234fa5922def0374517081a633837bb45231073fcd0ba366748bf6861d64d987952f4c786529cca
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201608260002-src.zip 217205973 SHA256 6b68e52a251d6f
 DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc7b49dde50f98461edfc143b64c3ed8ba85f220ae149858b5d7 SHA512 8a036de09a281bbb3ce5473056a074c848ce49fd9165c831f0e3da8f64ea95f39b784bd4ccd4e5b8f9d1c3886a21d1c300d18efb0e78603da729c123246bb81f WHIRLPOOL 81c12e1cc239d723559af6173636d2eb3fd32b05abffcfdac89fd5c9a9c0c2215ad89b4eeef2bc0f04441cdb04a7619b9aafa28ed6e20b314ce9b1679d9ceb2f
 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_p20160721.ebuild 3377 SHA256 aa6a1613aeab3198ab354a0edbf6884805996dcd5c88afb62c0e5fcccb1d986c SHA512 738b12e1fecec19d7f343ee92897531f56f69d5bdf405b3e9c0560b5f014042470a42ac82d9d9f5b676f73d01e446db6099b572020efdd57ca8b0526ad5bb955 WHIRLPOOL ca6453b8485ca138bb3f2fa00f89461528cb06cdc444235f9433fcb2ce47afbd7684b8235dbcb9b8e2aef98b32d35fde0e987034b567f80648a1b94c2526b3e3
 EBUILD netbeans-extide-9999_p20160722.ebuild 3377 SHA256 1e12b3c1acb4ef637872006060732c5ee063a818f0c3e715a0b3a4548096b6ee SHA512 4bf210f11470ce0aa4d0baf524cee73f3e08574bce728e28cc4e262991ef2c7cfa2c4dc24603c439c95f2f4c4bb20f2f7c0cab2543f1bf89d1c37ff55178b5f4 WHIRLPOOL 6106f8d8e8a8ef929fe5c80464d1b01176100a7249ee169c761e26dc2d7fdec9f1a60159be9b45507e5a09d10301e547b7470af6e874cd2d7c9aecd5f38fe714
 EBUILD netbeans-extide-9999_p20160723.ebuild 3377 SHA256 2a363bdd94008e428c6eb3112ddba81541015e09a0bff36901103736b2ab521a SHA512 2f29778c370eb7ce7a8d01306a1fbea1a32415be1ad73c3081418b2588bfbc0478644022ca044ed80b9c3703bbbcdf7e9b418701e7a1f00ecdc8793c79fc6bcf WHIRLPOOL 3759d54a5c2dba01493123fcd581a86d8c5c12e4eaa6d6beabe8cc807e9775e9c8eab241ed08776000747613b11421c5e07ed010356c5d1f720444f7ceec3b1a
 EBUILD netbeans-extide-9999_p20160725.ebuild 3377 SHA256 f2362c6a546367162e3a6dacf6f743e394af3ff9978c9260d6553a3dd8703706 SHA512 e003897daf70efac75180a7bfebce810c91ded58ff55dcc94595a84277c8a3a30477e799b4bd6e056c1046eeec5ee1778764d59cd2f36669a1f6adcb58993624 WHIRLPOOL 25473279c9f3a7a9b25052f1457b94711b7c3e65ca8b5fc3963b9878d3e1397302f28f5705a24a665b804f492a4fd410e1155c02e71964f15dc87dc36f4424ca

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160721.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160721.ebuild
deleted file mode 100644
index d9fccaf..0000000
--- a/dev-java/netbeans-extide/netbeans-extide-9999_p20160721.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-21_00-02-33/zip/netbeans-trunk-nightly-201607210002-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 fd7de2a..f8a2cd6 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-201607210002-src.zip 216644136 SHA256 702bd0842f5b2a4cc0f0ca6b668319f9c375ea6e851f0eb05fbe7d2f3ceac74b SHA512 adf04ea3a875e3247631240b02c7b0592097c47aeed350ffd6b043094a07e4b8ad172ec2ddf63c5ae003bcea26178445782b7941f71ee5fc73f72d0a8d99f0ce WHIRLPOOL 6cbaa4fb5f43b66f9b499d5cfd94374e9fd1f5063c231e2a3f098d9519bd08fd7659b63a8ada9fe9952ed7025301abe4f820158f322e888fdbdb889e6b7ea31d
 DIST netbeans-trunk-nightly-201607220002-src.zip 216981902 SHA256 ca38275cd067b732c1b90054b9af9834957052a6e4012f52a2e89e06f2e19b3b SHA512 f8844781d0ed8fa4f4efa04f64092bec92b48908782683b0d1a2a6b9f44bd1cb52e7ec20ccd54ee7f3b7bf9e10fac1bc232dc6c9954ddb3c1324c6600cb8d457 WHIRLPOOL e493121f9b48364e741ef63935a7e3c17dc59dac721df890d3e5c10a1a7965c9d9978e46268e34b5cfd50aca3d47b66a94d3e79b5dac648093aeba13ffd616ec
 DIST netbeans-trunk-nightly-201607230002-src.zip 217014076 SHA256 b297107296d96cdacd6422fabe0aa3b6f6ccaa516c0eabdf70c034f617e8197a SHA512 09f6695558c1594288e26bd002d1038267c9bcb3706314ddc163fe5d869fd3bc4f747e4a6e00c8590e7606b32c8d04bd0b2b2d32efc765cda72289232eeec7bd WHIRLPOOL 435812a5cfbcdaa3b528aee2c43eb11a48c5241b9689a0135809b8ea87942ed31c16af78acd30bb8c58bd9f4e3c3ad8ab81639df0055ff74eb9411973ca8d942
 DIST netbeans-trunk-nightly-201607250002-src.zip 217019515 SHA256 4f7317d2fa0693c653216be2607fb8e9d2c90f6f22e650ba38971767cdea57aa SHA512 ca97c3cf0bb7bb7031e82445accaed1f09d971b81de6a8e11824c2232968c4acb92077af57d5a91c8dca029ce39f18b3e676a1fdf21ef7190a2a8577652f4181 WHIRLPOOL 64a2af5584458e9a415d83685f99387ad7c2422d21750d4c6234fa5922def0374517081a633837bb45231073fcd0ba366748bf6861d64d987952f4c786529cca
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201608260002-src.zip 217205973 SHA256 6b68e52a251d6f
 DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc7b49dde50f98461edfc143b64c3ed8ba85f220ae149858b5d7 SHA512 8a036de09a281bbb3ce5473056a074c848ce49fd9165c831f0e3da8f64ea95f39b784bd4ccd4e5b8f9d1c3886a21d1c300d18efb0e78603da729c123246bb81f WHIRLPOOL 81c12e1cc239d723559af6173636d2eb3fd32b05abffcfdac89fd5c9a9c0c2215ad89b4eeef2bc0f04441cdb04a7619b9aafa28ed6e20b314ce9b1679d9ceb2f
 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_p20160721.ebuild 3416 SHA256 1177e9f7633d2b0d58e6c9aad5c3f24a55b3297df93140e1e2413a6afcdc41a2 SHA512 6026be34953c499dbcb802bbf9c77910eb91045a132fb0aa49dbffc3b83dd5bda12e145a330d3d90520f73f602f1abeb8f889578736001b17632408cf2b8407b WHIRLPOOL 72402882e6bba63db8d13a078c06f7740406924aefbdb16abbaf291be3b6f60738561d1e9de8364c10e818ea4e1771d57c452cc9517b10a1fede37b2b2222814
 EBUILD netbeans-groovy-9999_p20160722.ebuild 3416 SHA256 cc38339dd13b5610be52058c64fbeb74a745fcacff1f5122f1a09e7fb7c3d01c SHA512 a3f0cd900c894f9875d4729f7f29a62575f54a9faef669ec35d6f4b7e154fac04ab92b0bfa6523cbe5b854f78f07412c12282f8a14242ad3e442f5def5ce3560 WHIRLPOOL 1ec0397091e8a1d8cfc34dcdf87988a8595bea873eac7b6d10dd322356d4553018ed9a4f91209ba381e92b8594b4d820833a3d45f044c64ff1f9cd1cf9c6954b
 EBUILD netbeans-groovy-9999_p20160723.ebuild 3416 SHA256 2a2bb9162be60c05af2475f38f64e81ac480228d07373457d905a8b7195d15a3 SHA512 af7d7fde9ca5bcc267eeb59e6fda1ba4620c81129a8205d20b7e4b3748ecb73c65c33a6c465922c5348fd6e2f9e93da3e781359d3c55c41e3aca21162f62979b WHIRLPOOL 0d4136755705fcdc4cdef5b561c949bd6b8a028db624189e1553a6acd5276fe435568072c572ea4de2f38c8caede05b3308daa77664d19672574e37899fc8bea
 EBUILD netbeans-groovy-9999_p20160725.ebuild 3416 SHA256 6d2df034543ef10df794e1a8a000273bced0193486140fd0bc0d3775a48c7b33 SHA512 ff849498b8654f50d79dbb7744929ab569909ff8818d8d446895f1924fe81fc74c0391c54e4c328d55da6e2d9aeb3100d043999a69f3f552c1039bfff92aa224 WHIRLPOOL fc75bd02bbb1bf60179af8a7d9384e3f258e1db88098edd5bc0c4a9e050552597ab9f1273985ab80fe4951f40b4030cb3d57f99ac8777cc4e5869ec419d100ed

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160721.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160721.ebuild
deleted file mode 100644
index b98560e..0000000
--- a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160721.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-21_00-02-33/zip/netbeans-trunk-nightly-201607210002-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 b582d73..67e1fff 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-201607210002-src.zip 216644136 SHA256 702bd0842f5b2a4cc0f0ca6b668319f9c375ea6e851f0eb05fbe7d2f3ceac74b SHA512 adf04ea3a875e3247631240b02c7b0592097c47aeed350ffd6b043094a07e4b8ad172ec2ddf63c5ae003bcea26178445782b7941f71ee5fc73f72d0a8d99f0ce WHIRLPOOL 6cbaa4fb5f43b66f9b499d5cfd94374e9fd1f5063c231e2a3f098d9519bd08fd7659b63a8ada9fe9952ed7025301abe4f820158f322e888fdbdb889e6b7ea31d
 DIST netbeans-trunk-nightly-201607220002-src.zip 216981902 SHA256 ca38275cd067b732c1b90054b9af9834957052a6e4012f52a2e89e06f2e19b3b SHA512 f8844781d0ed8fa4f4efa04f64092bec92b48908782683b0d1a2a6b9f44bd1cb52e7ec20ccd54ee7f3b7bf9e10fac1bc232dc6c9954ddb3c1324c6600cb8d457 WHIRLPOOL e493121f9b48364e741ef63935a7e3c17dc59dac721df890d3e5c10a1a7965c9d9978e46268e34b5cfd50aca3d47b66a94d3e79b5dac648093aeba13ffd616ec
 DIST netbeans-trunk-nightly-201607230002-src.zip 217014076 SHA256 b297107296d96cdacd6422fabe0aa3b6f6ccaa516c0eabdf70c034f617e8197a SHA512 09f6695558c1594288e26bd002d1038267c9bcb3706314ddc163fe5d869fd3bc4f747e4a6e00c8590e7606b32c8d04bd0b2b2d32efc765cda72289232eeec7bd WHIRLPOOL 435812a5cfbcdaa3b528aee2c43eb11a48c5241b9689a0135809b8ea87942ed31c16af78acd30bb8c58bd9f4e3c3ad8ab81639df0055ff74eb9411973ca8d942
 DIST netbeans-trunk-nightly-201607250002-src.zip 217019515 SHA256 4f7317d2fa0693c653216be2607fb8e9d2c90f6f22e650ba38971767cdea57aa SHA512 ca97c3cf0bb7bb7031e82445accaed1f09d971b81de6a8e11824c2232968c4acb92077af57d5a91c8dca029ce39f18b3e676a1fdf21ef7190a2a8577652f4181 WHIRLPOOL 64a2af5584458e9a415d83685f99387ad7c2422d21750d4c6234fa5922def0374517081a633837bb45231073fcd0ba366748bf6861d64d987952f4c786529cca
@@ -35,7 +34,6 @@ DIST netbeans-trunk-nightly-201608260002-src.zip 217205973 SHA256 6b68e52a251d6f
 DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc7b49dde50f98461edfc143b64c3ed8ba85f220ae149858b5d7 SHA512 8a036de09a281bbb3ce5473056a074c848ce49fd9165c831f0e3da8f64ea95f39b784bd4ccd4e5b8f9d1c3886a21d1c300d18efb0e78603da729c123246bb81f WHIRLPOOL 81c12e1cc239d723559af6173636d2eb3fd32b05abffcfdac89fd5c9a9c0c2215ad89b4eeef2bc0f04441cdb04a7619b9aafa28ed6e20b314ce9b1679d9ceb2f
 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_p20160721.ebuild 4126 SHA256 52e5b2a74cbc1cf38be33efebb8f933e32eea493e860c04e0b27f3c3433da6b6 SHA512 18468d8f3e8a86554b453e4c15a9f7616f6cacc2b9e1f413e6cf8b9f7cb04f30ded6e6a13ea49b2c89c23a97ac0a7637c77ce9d1f2ae39368fca5bd0e01e1e56 WHIRLPOOL dbcb7f6f87edc14b8b1c7708c9974af72f054a96b3d7b4f2317d084ad0190db2478825ce3318c65d8b569abf4acd3dbcc1c8ced1aeaee07891bf05b3763d1112
 EBUILD netbeans-harness-9999_p20160722.ebuild 4126 SHA256 e4eb54f5348fbb7d4d6c7214e9ea34cd8549696c9da0ac63aa21b42e4416fd68 SHA512 6645ae5953e9d67a1a59bb9a767ff27f485ed20f08e5445b5238413d4947409e841d9483cdd3f60d827d210c668235268a4a905280ca406bd244abbd7966a267 WHIRLPOOL 32673e96006bd5a12a6c7873378f3e5632a32726dafd040efe6267c13034ae7f14485b157636dbb9611d946e8134604c7fd04923969fff83b8438c729ed65b12
 EBUILD netbeans-harness-9999_p20160723.ebuild 4126 SHA256 26d4a9ceb75dd4cb2c430730529579d29caf0f3da5c19d9f995d0ab0ffe779b5 SHA512 a63f961fa02d69a3226be950d95c6d4f5e05b76d43516ed72d354e2c54c8fb760b0ee34a9079ab19bccc9e778af0b99877dcb32a8e92dfd7e8a6d36fca766554 WHIRLPOOL 6db292025be7b6f4b3be3e98154c51baf084b52cab4a7ae8660cb3d37ce8a0e59eb3d490190f5e7e25b50538f7d7b774ecda77328da1efaa3e58f4b4e91f5a2a
 EBUILD netbeans-harness-9999_p20160725.ebuild 4126 SHA256 364fb4152488cfc97a705db935479c9fce161d830435dfd5b7d9a2bcde346e68 SHA512 dcfc54c1bc057f4be516557547ebe816eca26f8747e9552eb73fc700fd9d7fcb3ccb0189c7a963ddc2a79b2ebc7613ed07aea20e9ecbac166192de119260c180 WHIRLPOOL a8e3e91cbbf8d07f69e650bf5604a05dd19e7a07b0daf7e11f8964d167193f03cba00571425213eef72980e21cafa8557c488e18f65ccb9715c3d397d00e00c6

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160721.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160721.ebuild
deleted file mode 100644
index 1316568..0000000
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20160721.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-21_00-02-33/zip/netbeans-trunk-nightly-201607210002-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 5917212..0bf6e66 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-201607210002-src.zip 216644136 SHA256 702bd0842f5b2a4cc0f0ca6b668319f9c375ea6e851f0eb05fbe7d2f3ceac74b SHA512 adf04ea3a875e3247631240b02c7b0592097c47aeed350ffd6b043094a07e4b8ad172ec2ddf63c5ae003bcea26178445782b7941f71ee5fc73f72d0a8d99f0ce WHIRLPOOL 6cbaa4fb5f43b66f9b499d5cfd94374e9fd1f5063c231e2a3f098d9519bd08fd7659b63a8ada9fe9952ed7025301abe4f820158f322e888fdbdb889e6b7ea31d
 DIST netbeans-trunk-nightly-201607220002-src.zip 216981902 SHA256 ca38275cd067b732c1b90054b9af9834957052a6e4012f52a2e89e06f2e19b3b SHA512 f8844781d0ed8fa4f4efa04f64092bec92b48908782683b0d1a2a6b9f44bd1cb52e7ec20ccd54ee7f3b7bf9e10fac1bc232dc6c9954ddb3c1324c6600cb8d457 WHIRLPOOL e493121f9b48364e741ef63935a7e3c17dc59dac721df890d3e5c10a1a7965c9d9978e46268e34b5cfd50aca3d47b66a94d3e79b5dac648093aeba13ffd616ec
 DIST netbeans-trunk-nightly-201607230002-src.zip 217014076 SHA256 b297107296d96cdacd6422fabe0aa3b6f6ccaa516c0eabdf70c034f617e8197a SHA512 09f6695558c1594288e26bd002d1038267c9bcb3706314ddc163fe5d869fd3bc4f747e4a6e00c8590e7606b32c8d04bd0b2b2d32efc765cda72289232eeec7bd WHIRLPOOL 435812a5cfbcdaa3b528aee2c43eb11a48c5241b9689a0135809b8ea87942ed31c16af78acd30bb8c58bd9f4e3c3ad8ab81639df0055ff74eb9411973ca8d942
 DIST netbeans-trunk-nightly-201607250002-src.zip 217019515 SHA256 4f7317d2fa0693c653216be2607fb8e9d2c90f6f22e650ba38971767cdea57aa SHA512 ca97c3cf0bb7bb7031e82445accaed1f09d971b81de6a8e11824c2232968c4acb92077af57d5a91c8dca029ce39f18b3e676a1fdf21ef7190a2a8577652f4181 WHIRLPOOL 64a2af5584458e9a415d83685f99387ad7c2422d21750d4c6234fa5922def0374517081a633837bb45231073fcd0ba366748bf6861d64d987952f4c786529cca
@@ -169,7 +168,6 @@ DIST netbeans-trunk-nightly-201608260002-src.zip 217205973 SHA256 6b68e52a251d6f
 DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc7b49dde50f98461edfc143b64c3ed8ba85f220ae149858b5d7 SHA512 8a036de09a281bbb3ce5473056a074c848ce49fd9165c831f0e3da8f64ea95f39b784bd4ccd4e5b8f9d1c3886a21d1c300d18efb0e78603da729c123246bb81f WHIRLPOOL 81c12e1cc239d723559af6173636d2eb3fd32b05abffcfdac89fd5c9a9c0c2215ad89b4eeef2bc0f04441cdb04a7619b9aafa28ed6e20b314ce9b1679d9ceb2f
 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_p20160721.ebuild 29867 SHA256 8a787d9662c847fd3b4a08ad5057ba77f41d3c37f8e710493d8236098deeae39 SHA512 83b858ff6575dff23214122ff2f6f7849a92053d2b464029702190f054f12c1000bb6d5e7f071f7fe5e5c00a007a6306001cb15c066ee825f7405f8963d66a8a WHIRLPOOL 7f78f492675b4bd97f90ce9bbdcb6c024a1f0438bd61fb2266b7188883a5600f6e5201deff3489d00bde2bda59910fc336a40430a9d2e7613ea28eca096acf1a
 EBUILD netbeans-ide-9999_p20160722.ebuild 29867 SHA256 ba3aa31baf2e7fd847316794685482310f5dd680193e8c3fd492f4d8b5c0d77c SHA512 fa7d9bbc3086ffd769251ad165de7e9f1e9a1a0e473eda08fc3201bb580c4d50972e3f76f2db8a8bc7771b3049766e19af15ff045a6a45e98decfd227e8c6756 WHIRLPOOL 82af9453640fd380ee80ed20f24996f64b1a33c0e11572fa907e36d9b335538018319d8f136217ced4e401c0b95534c4191d3d9e3530934ee098063b17db55e3
 EBUILD netbeans-ide-9999_p20160723.ebuild 29867 SHA256 420a19b6dafddf384b182553d4179e78b026c54b8fb8c1f59e150f6520e31a01 SHA512 209c289d8a5a7fd33bf0a695df404b2b5e18108a253bfab6121b07ad341d034cd8ef8f0101996e44e52029a7e9db94695fbe15c7caf71f2e995868bc7d4fe150 WHIRLPOOL 95d372c5ece3b235484e9e45a613a34459924b65c0f9ba9b5e3cad42b99d71a3e863d3a3adb8c695a62432a4a67e3088cc25580351ce39fb1bd940fbce783e82
 EBUILD netbeans-ide-9999_p20160725.ebuild 29867 SHA256 93a9a8cc65f92223d82fb6b6fea53afa7340e88dcc2690f95948fea6d25aeb7d SHA512 bc2b519c363b76f2e3652e5869c9dc3be11a76a93f00728dd2ca8cc539f4b5b29a2bee979303fd249fb51d1c23eb6e6251315a7a31b45fa07664efd59d41a67f WHIRLPOOL dbe724fdeb153cb2785d17903245b15be11c87f278ffbecad79b108728cf7b8f6da4e566f3f2f9c6966774c8f472786ef354bc1c2df44a77899526bd1e1d6a66

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160721.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160721.ebuild
deleted file mode 100644
index 6b8e5f5..0000000
--- a/dev-java/netbeans-ide/netbeans-ide-9999_p20160721.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-21_00-02-33/zip/netbeans-trunk-nightly-201607210002-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 b4f69aa..125ae55 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-201607210002-src.zip 216644136 SHA256 702bd0842f5b2a4cc0f0ca6b668319f9c375ea6e851f0eb05fbe7d2f3ceac74b SHA512 adf04ea3a875e3247631240b02c7b0592097c47aeed350ffd6b043094a07e4b8ad172ec2ddf63c5ae003bcea26178445782b7941f71ee5fc73f72d0a8d99f0ce WHIRLPOOL 6cbaa4fb5f43b66f9b499d5cfd94374e9fd1f5063c231e2a3f098d9519bd08fd7659b63a8ada9fe9952ed7025301abe4f820158f322e888fdbdb889e6b7ea31d
 DIST netbeans-trunk-nightly-201607220002-src.zip 216981902 SHA256 ca38275cd067b732c1b90054b9af9834957052a6e4012f52a2e89e06f2e19b3b SHA512 f8844781d0ed8fa4f4efa04f64092bec92b48908782683b0d1a2a6b9f44bd1cb52e7ec20ccd54ee7f3b7bf9e10fac1bc232dc6c9954ddb3c1324c6600cb8d457 WHIRLPOOL e493121f9b48364e741ef63935a7e3c17dc59dac721df890d3e5c10a1a7965c9d9978e46268e34b5cfd50aca3d47b66a94d3e79b5dac648093aeba13ffd616ec
 DIST netbeans-trunk-nightly-201607230002-src.zip 217014076 SHA256 b297107296d96cdacd6422fabe0aa3b6f6ccaa516c0eabdf70c034f617e8197a SHA512 09f6695558c1594288e26bd002d1038267c9bcb3706314ddc163fe5d869fd3bc4f747e4a6e00c8590e7606b32c8d04bd0b2b2d32efc765cda72289232eeec7bd WHIRLPOOL 435812a5cfbcdaa3b528aee2c43eb11a48c5241b9689a0135809b8ea87942ed31c16af78acd30bb8c58bd9f4e3c3ad8ab81639df0055ff74eb9411973ca8d942
 DIST netbeans-trunk-nightly-201607250002-src.zip 217019515 SHA256 4f7317d2fa0693c653216be2607fb8e9d2c90f6f22e650ba38971767cdea57aa SHA512 ca97c3cf0bb7bb7031e82445accaed1f09d971b81de6a8e11824c2232968c4acb92077af57d5a91c8dca029ce39f18b3e676a1fdf21ef7190a2a8577652f4181 WHIRLPOOL 64a2af5584458e9a415d83685f99387ad7c2422d21750d4c6234fa5922def0374517081a633837bb45231073fcd0ba366748bf6861d64d987952f4c786529cca
@@ -64,7 +63,6 @@ DIST netbeans-trunk-nightly-201608260002-src.zip 217205973 SHA256 6b68e52a251d6f
 DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc7b49dde50f98461edfc143b64c3ed8ba85f220ae149858b5d7 SHA512 8a036de09a281bbb3ce5473056a074c848ce49fd9165c831f0e3da8f64ea95f39b784bd4ccd4e5b8f9d1c3886a21d1c300d18efb0e78603da729c123246bb81f WHIRLPOOL 81c12e1cc239d723559af6173636d2eb3fd32b05abffcfdac89fd5c9a9c0c2215ad89b4eeef2bc0f04441cdb04a7619b9aafa28ed6e20b314ce9b1679d9ceb2f
 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_p20160721.ebuild 15656 SHA256 590a855121199271a1902e82214fbbd937280018c0bdc6348452addbd86b2471 SHA512 57c54f78b75a2055bec31c691399268229c619bf48f08b58712848b24587e64e12c3099587d49c0092725ebb6ad13f2ab1c9e13edd1ac5742a16e26d48f50445 WHIRLPOOL 5045b28052124d50d6018f8f391b8bb21410fe5958d99ad4baa14990e5e419b44fc07782f596c7e589b0f93d8b422f218c1cbf757763a768a7c05b97715b7d0d
 EBUILD netbeans-java-9999_p20160722.ebuild 15656 SHA256 bbdd1f525587a1e5bdbdecf71ff243c1598853b0768d70e683cfe4c1d9023627 SHA512 85a4ded6972fef58566f86bdc863a295408028ca7bfd9bf52cbd18396fb2abfc304e8ee00f229d95bc45ca1eef75b3d4c83ccf7492fd6a8fe0e02f4a074dc1e4 WHIRLPOOL 7cbae0b8d2e70c19ea07634c214151534aa4f0be79414f20dbe8a1bb600b77709c643898ca6786a2a2e4fa1d22ec01383da293bd089680bb815c2258e2deae53
 EBUILD netbeans-java-9999_p20160723.ebuild 15656 SHA256 4feb049ec82e942d8d923cffbc46edc90152c227233a81f32d3132d64280dd6e SHA512 b479e8edaa1765b9e7afbe178f7fc4e0f43c445e0fbff28b341c8533b867b4a14a8f0eaa1fed3df033098ca9c592cced85732b50c0b3a29dfbd3986f1b3db662 WHIRLPOOL 54bde800e1bec063e479b4a859bb8667c9463335640dac5608fb1d4bc17fdbad9e224d20023c7ee65eab5f536770bc0bd6568a17fee3cf09de343fc29aa7d3cf
 EBUILD netbeans-java-9999_p20160725.ebuild 15656 SHA256 08626afb9dab6d553903c8c2b283d9c365758c7990ea0826e9c3a2f44c1ca0ef SHA512 0fd1054c62662cb92d4c822bc7d7047ce2aec4dfee4a6cfd12890848a306cbb02d420cc7c48b8abfd7fd9774d92d553cefb50caaa50148df874df88e299abea4 WHIRLPOOL ad1301e2018a2e7613f5c3987b237d32aa34fa53e5d8dda5640b936faaa8c4b579e13ab24357459b36386c5ebb3a586dac37d2ea1d707c68cd6a3f73cb9a2c03

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160721.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160721.ebuild
deleted file mode 100644
index 7979c4b..0000000
--- a/dev-java/netbeans-java/netbeans-java-9999_p20160721.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-21_00-02-33/zip/netbeans-trunk-nightly-201607210002-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/CE81899206FF733BB596523C26FBA17E029689B8-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}"/CE81899206FF733BB596523C26FBA17E029689B8-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 6ddaf19..6fc4154 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-201607210002-src.zip 216644136 SHA256 702bd0842f5b2a4cc0f0ca6b668319f9c375ea6e851f0eb05fbe7d2f3ceac74b SHA512 adf04ea3a875e3247631240b02c7b0592097c47aeed350ffd6b043094a07e4b8ad172ec2ddf63c5ae003bcea26178445782b7941f71ee5fc73f72d0a8d99f0ce WHIRLPOOL 6cbaa4fb5f43b66f9b499d5cfd94374e9fd1f5063c231e2a3f098d9519bd08fd7659b63a8ada9fe9952ed7025301abe4f820158f322e888fdbdb889e6b7ea31d
 DIST netbeans-trunk-nightly-201607220002-src.zip 216981902 SHA256 ca38275cd067b732c1b90054b9af9834957052a6e4012f52a2e89e06f2e19b3b SHA512 f8844781d0ed8fa4f4efa04f64092bec92b48908782683b0d1a2a6b9f44bd1cb52e7ec20ccd54ee7f3b7bf9e10fac1bc232dc6c9954ddb3c1324c6600cb8d457 WHIRLPOOL e493121f9b48364e741ef63935a7e3c17dc59dac721df890d3e5c10a1a7965c9d9978e46268e34b5cfd50aca3d47b66a94d3e79b5dac648093aeba13ffd616ec
 DIST netbeans-trunk-nightly-201607230002-src.zip 217014076 SHA256 b297107296d96cdacd6422fabe0aa3b6f6ccaa516c0eabdf70c034f617e8197a SHA512 09f6695558c1594288e26bd002d1038267c9bcb3706314ddc163fe5d869fd3bc4f747e4a6e00c8590e7606b32c8d04bd0b2b2d32efc765cda72289232eeec7bd WHIRLPOOL 435812a5cfbcdaa3b528aee2c43eb11a48c5241b9689a0135809b8ea87942ed31c16af78acd30bb8c58bd9f4e3c3ad8ab81639df0055ff74eb9411973ca8d942
 DIST netbeans-trunk-nightly-201607250002-src.zip 217019515 SHA256 4f7317d2fa0693c653216be2607fb8e9d2c90f6f22e650ba38971767cdea57aa SHA512 ca97c3cf0bb7bb7031e82445accaed1f09d971b81de6a8e11824c2232968c4acb92077af57d5a91c8dca029ce39f18b3e676a1fdf21ef7190a2a8577652f4181 WHIRLPOOL 64a2af5584458e9a415d83685f99387ad7c2422d21750d4c6234fa5922def0374517081a633837bb45231073fcd0ba366748bf6861d64d987952f4c786529cca
@@ -33,7 +32,6 @@ DIST netbeans-trunk-nightly-201608260002-src.zip 217205973 SHA256 6b68e52a251d6f
 DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc7b49dde50f98461edfc143b64c3ed8ba85f220ae149858b5d7 SHA512 8a036de09a281bbb3ce5473056a074c848ce49fd9165c831f0e3da8f64ea95f39b784bd4ccd4e5b8f9d1c3886a21d1c300d18efb0e78603da729c123246bb81f WHIRLPOOL 81c12e1cc239d723559af6173636d2eb3fd32b05abffcfdac89fd5c9a9c0c2215ad89b4eeef2bc0f04441cdb04a7619b9aafa28ed6e20b314ce9b1679d9ceb2f
 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_p20160721.ebuild 4971 SHA256 f29a678f731b8c5639d77f8bb618ca23ccb31c96d41d6e8a710dbfd9f39b9d30 SHA512 2dfa8f2e044fa886d86205cb455dcfc8019fcfd47e6eed67bac25e431bf893fe4e6f533d8818411c0fbc373fa304c984298680d2274edc96262618c9e93e29a7 WHIRLPOOL 5ca7b6692771210c7f90e9e86e91d5c7e8b4484ff5d8e3a6a560cc3713c76db3ada5629bb9d24d241e5e6a7a72414526ff78398f53c161746e536ea9df9eac01
 EBUILD netbeans-javacard-9999_p20160722.ebuild 4971 SHA256 bfb05adfcc62b6ac7d9f4bb93ec8c9ce4860f4580868beedd056fa1ca2d9b91b SHA512 4a3758315d0b4ed693a5957877bd18d6a0af92e00bd03cd84e7d1c586091d089df3a12092ba9480f070b16b15372f5f6e3e1d6c1f8f83df5ed7754a57564348b WHIRLPOOL 3ebdd82eafdd2105bb40406a5f526b9c82a253fe3bc3908e32375678ee56fbbc08e8b48b28705dd31ff48f696f55fb038c3ce0db30aec55607acde84734c594a
 EBUILD netbeans-javacard-9999_p20160723.ebuild 4971 SHA256 188237f988aea7b0e8809bd1fdad36b7dd9d9a88aaa68386d1c01a763356420a SHA512 9376a1b9003d8295ce12edc2942defdd9186e8a61e6f8febb7798120b48cff10e772ee44ec350d44267540838e73ae7e1485189ef8b7260abe4adcf6068c0d70 WHIRLPOOL cd4234c6917d7b12b75d2cfcdfdde1087c2d207f22dc636771422e0d7994d2732d21fa545d1d24a57e9aa5508b155771ef5f9667d87a3aec6cb1c53d3597da92
 EBUILD netbeans-javacard-9999_p20160725.ebuild 4971 SHA256 6e72305c297d7ba6f2e1a5c114b64b29783ebaf3dda975a1dbd0aef4bd7b0850 SHA512 32137970262f7c6130ed73f719b28c2c94ea7186b54a0d8f020451bf0558d9754c1c339972e9d5647b6761c939996131c0c68b19d93994efa45079acc4cc9d5a WHIRLPOOL c358bd61da14ca2969525d44f7efc8942fa332e4db692936c454d8bac8737baae83897c0724e43cf36e553aedaa3e630b1df9dd9344fc27a7ddba0326640b8b8

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160721.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160721.ebuild
deleted file mode 100644
index 709f0ee..0000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160721.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-21_00-02-33/zip/netbeans-trunk-nightly-201607210002-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 e8d2192..55b395a 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-201607210002-src.zip 216644136 SHA256 702bd0842f5b2a4cc0f0ca6b668319f9c375ea6e851f0eb05fbe7d2f3ceac74b SHA512 adf04ea3a875e3247631240b02c7b0592097c47aeed350ffd6b043094a07e4b8ad172ec2ddf63c5ae003bcea26178445782b7941f71ee5fc73f72d0a8d99f0ce WHIRLPOOL 6cbaa4fb5f43b66f9b499d5cfd94374e9fd1f5063c231e2a3f098d9519bd08fd7659b63a8ada9fe9952ed7025301abe4f820158f322e888fdbdb889e6b7ea31d
 DIST netbeans-trunk-nightly-201607220002-src.zip 216981902 SHA256 ca38275cd067b732c1b90054b9af9834957052a6e4012f52a2e89e06f2e19b3b SHA512 f8844781d0ed8fa4f4efa04f64092bec92b48908782683b0d1a2a6b9f44bd1cb52e7ec20ccd54ee7f3b7bf9e10fac1bc232dc6c9954ddb3c1324c6600cb8d457 WHIRLPOOL e493121f9b48364e741ef63935a7e3c17dc59dac721df890d3e5c10a1a7965c9d9978e46268e34b5cfd50aca3d47b66a94d3e79b5dac648093aeba13ffd616ec
 DIST netbeans-trunk-nightly-201607230002-src.zip 217014076 SHA256 b297107296d96cdacd6422fabe0aa3b6f6ccaa516c0eabdf70c034f617e8197a SHA512 09f6695558c1594288e26bd002d1038267c9bcb3706314ddc163fe5d869fd3bc4f747e4a6e00c8590e7606b32c8d04bd0b2b2d32efc765cda72289232eeec7bd WHIRLPOOL 435812a5cfbcdaa3b528aee2c43eb11a48c5241b9689a0135809b8ea87942ed31c16af78acd30bb8c58bd9f4e3c3ad8ab81639df0055ff74eb9411973ca8d942
 DIST netbeans-trunk-nightly-201607250002-src.zip 217019515 SHA256 4f7317d2fa0693c653216be2607fb8e9d2c90f6f22e650ba38971767cdea57aa SHA512 ca97c3cf0bb7bb7031e82445accaed1f09d971b81de6a8e11824c2232968c4acb92077af57d5a91c8dca029ce39f18b3e676a1fdf21ef7190a2a8577652f4181 WHIRLPOOL 64a2af5584458e9a415d83685f99387ad7c2422d21750d4c6234fa5922def0374517081a633837bb45231073fcd0ba366748bf6861d64d987952f4c786529cca
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201608260002-src.zip 217205973 SHA256 6b68e52a251d6f
 DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc7b49dde50f98461edfc143b64c3ed8ba85f220ae149858b5d7 SHA512 8a036de09a281bbb3ce5473056a074c848ce49fd9165c831f0e3da8f64ea95f39b784bd4ccd4e5b8f9d1c3886a21d1c300d18efb0e78603da729c123246bb81f WHIRLPOOL 81c12e1cc239d723559af6173636d2eb3fd32b05abffcfdac89fd5c9a9c0c2215ad89b4eeef2bc0f04441cdb04a7619b9aafa28ed6e20b314ce9b1679d9ceb2f
 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_p20160721.ebuild 6293 SHA256 4a9f18354306d2aa6fa1c58f97936004065e56ca4a3997acfd3ae81921863bae SHA512 66e3bf0c89e86a6f0c528e97f903ef8d7073a04a983747752df32595a3a8900bd3f5f2a0e5ab01d0408aa1f69c1de5e32e2d07d0d45f1a2f2fce8f0d56bd290e WHIRLPOOL 32f838a2e40bb890c5f12377498979d87f7765593ff4a8e1c44a0afeed527cd800975b96f68b0be6c173ecd0b9604cab162fa317c4402723202ecd9f45a3c67d
 EBUILD netbeans-javadoc-9999_p20160722.ebuild 6293 SHA256 7ebcc2c07792504b4f9beace6b655b1b7ffc1b9f31bb52b96d7655cc6bff6ab2 SHA512 57c6f36c16ac7bf28394ee37d39a61bb09b12f595ec8755f800f89228af5e38c39877f0742cb38ff34756a6e8ca928a6be2ddfbe8c4ccdd08a89fa21255c30e8 WHIRLPOOL 3b58664772a5c510d9e21ee88099f82df4e44df978a09d784b2478e26411329e78f4c71d4cb9841459dc63207f26c6b457d0a1845fa208dc8abaedc3945adf19
 EBUILD netbeans-javadoc-9999_p20160723.ebuild 6293 SHA256 734339816641b1fc548fa772d37393cbf476f71fec3f2697ff1c4f31f95d5d2c SHA512 0903d7abc0680428348f46f51e588acf4b0ee936c738b819a2d0e5c6263acc51a00f98677e30cbcca1c792ee1c8a109373b68679110fd6fe755de429e6f69512 WHIRLPOOL fe694f50626406be693d222c66087d825822c15120ae81a1c798c7d9481baa777cd8cc9860eb754f6bd54fe536b1ed7710e7f7f8b6e5fddb7c27a889d09ca788
 EBUILD netbeans-javadoc-9999_p20160725.ebuild 6293 SHA256 d60457add0b51216b165e0e4632b06f64829992fe3ee3a9fe83b44a9dd74a453 SHA512 7510dc25f701865a1b4e5d7fcbc78ffa2c47dba7afebca48e32e4e9d2153f6893c366607dfb38dfada0a0096787164340df7f773acccccfb76d561bbba7e588b WHIRLPOOL 2ea5c91018849e72755bd158ad026265f777e394032aecca9babd39a040b4c83cc772403522fffed4c3c9dc9bb13f0b2567756f9fbda456c8a06cf35a02927fc

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160721.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160721.ebuild
deleted file mode 100644
index 427acb0..0000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160721.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-21_00-02-33/zip/netbeans-trunk-nightly-201607210002-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 bc6a808..78163d7 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-201607210002-src.zip 216644136 SHA256 702bd0842f5b2a4cc0f0ca6b668319f9c375ea6e851f0eb05fbe7d2f3ceac74b SHA512 adf04ea3a875e3247631240b02c7b0592097c47aeed350ffd6b043094a07e4b8ad172ec2ddf63c5ae003bcea26178445782b7941f71ee5fc73f72d0a8d99f0ce WHIRLPOOL 6cbaa4fb5f43b66f9b499d5cfd94374e9fd1f5063c231e2a3f098d9519bd08fd7659b63a8ada9fe9952ed7025301abe4f820158f322e888fdbdb889e6b7ea31d
 DIST netbeans-trunk-nightly-201607220002-src.zip 216981902 SHA256 ca38275cd067b732c1b90054b9af9834957052a6e4012f52a2e89e06f2e19b3b SHA512 f8844781d0ed8fa4f4efa04f64092bec92b48908782683b0d1a2a6b9f44bd1cb52e7ec20ccd54ee7f3b7bf9e10fac1bc232dc6c9954ddb3c1324c6600cb8d457 WHIRLPOOL e493121f9b48364e741ef63935a7e3c17dc59dac721df890d3e5c10a1a7965c9d9978e46268e34b5cfd50aca3d47b66a94d3e79b5dac648093aeba13ffd616ec
 DIST netbeans-trunk-nightly-201607230002-src.zip 217014076 SHA256 b297107296d96cdacd6422fabe0aa3b6f6ccaa516c0eabdf70c034f617e8197a SHA512 09f6695558c1594288e26bd002d1038267c9bcb3706314ddc163fe5d869fd3bc4f747e4a6e00c8590e7606b32c8d04bd0b2b2d32efc765cda72289232eeec7bd WHIRLPOOL 435812a5cfbcdaa3b528aee2c43eb11a48c5241b9689a0135809b8ea87942ed31c16af78acd30bb8c58bd9f4e3c3ad8ab81639df0055ff74eb9411973ca8d942
 DIST netbeans-trunk-nightly-201607250002-src.zip 217019515 SHA256 4f7317d2fa0693c653216be2607fb8e9d2c90f6f22e650ba38971767cdea57aa SHA512 ca97c3cf0bb7bb7031e82445accaed1f09d971b81de6a8e11824c2232968c4acb92077af57d5a91c8dca029ce39f18b3e676a1fdf21ef7190a2a8577652f4181 WHIRLPOOL 64a2af5584458e9a415d83685f99387ad7c2422d21750d4c6234fa5922def0374517081a633837bb45231073fcd0ba366748bf6861d64d987952f4c786529cca
@@ -38,7 +37,6 @@ DIST netbeans-trunk-nightly-201608260002-src.zip 217205973 SHA256 6b68e52a251d6f
 DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc7b49dde50f98461edfc143b64c3ed8ba85f220ae149858b5d7 SHA512 8a036de09a281bbb3ce5473056a074c848ce49fd9165c831f0e3da8f64ea95f39b784bd4ccd4e5b8f9d1c3886a21d1c300d18efb0e78603da729c123246bb81f WHIRLPOOL 81c12e1cc239d723559af6173636d2eb3fd32b05abffcfdac89fd5c9a9c0c2215ad89b4eeef2bc0f04441cdb04a7619b9aafa28ed6e20b314ce9b1679d9ceb2f
 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_p20160721.ebuild 4717 SHA256 0944aa612a479ba24ad2cb19c7fe9641fb819deeed255d8339cf0ff1b132d05f SHA512 35f894cec7b83c328d435c15c52f12091e46038159252b1abd6a89b077189d1b9c592655075f087a2ccb895ac7a1e992517099024968dc93c759a2a86e1b655e WHIRLPOOL 2e0cf4387ec2c81f1b8fc84f26f41a48374b68fcc68bbbec4f76ea5ac9f672f2006f4fe648af662e63f29f9610d278416f870ed012d20f6fab0037038e69e39a
 EBUILD netbeans-javafx-9999_p20160722.ebuild 4717 SHA256 41ea75fe4e854e21c3899dadc55e7c226bc11a88adf7916cb10226b911afb4f5 SHA512 e2f18abc21fb7a1f9ff05d539e8f45ea5a94c93da00d857e3e8553d06d831aff1f01915a1f36d25cd7c7e3ab65844564db2c66b2b32f4e5597fdf4d03cc83d5c WHIRLPOOL 2fbded680924bf8efde17985b7cc544fd7b3659c8e1ea41ddf744afc5b96ffa38072f9f603f898a363907c0a770c6069434466f8a2c0f60d630a1435e68699ae
 EBUILD netbeans-javafx-9999_p20160723.ebuild 4717 SHA256 1d6ca7979aa901593c3a7552bbd8f6ccbd03c41c3c37dc80931f26a695878aab SHA512 81dc39fc43cd8feb7fee6d19462346deb0beb029f87fcb4537ae74133131911c25f8a7a9d17b7eff8e0fb085fdf0b0950caa1253ec5b4ad36300c64b1e8cc112 WHIRLPOOL b9fcbe52fd7850ca566641a0ce5fee11bf7aa54dc2f3ac713621c237a83bac5d3f0814e908fa1c142a65a5073077138ca6acbf04df4e2e6ae904331785a00b34
 EBUILD netbeans-javafx-9999_p20160725.ebuild 4717 SHA256 e3c5fb7763de76bdfad722c1a41fe28711a9585f619cbdfa0876ab18df03130d SHA512 0557928141da05b87c48fb87cca9b9ff86f92b74e12f8dc038725d2f7cb38dc19d9a34fb544b06f3eae35f5eded9f91dfb53e5880339f3aae99ff3012210e934 WHIRLPOOL 2a3c627c0128094c79666700f2ec544b4bf972e7a1b2a3fe304e27749c9b6b402827620d5db29b61bb080ff5c9b36f208b781c1e369f87f4a948a2f2e5d5d0e8

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160721.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160721.ebuild
deleted file mode 100644
index 893ef90..0000000
--- a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160721.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-21_00-02-33/zip/netbeans-trunk-nightly-201607210002-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 8352824..20c9172 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-201607210002-src.zip 216644136 SHA256 702bd0842f5b2a4cc0f0ca6b668319f9c375ea6e851f0eb05fbe7d2f3ceac74b SHA512 adf04ea3a875e3247631240b02c7b0592097c47aeed350ffd6b043094a07e4b8ad172ec2ddf63c5ae003bcea26178445782b7941f71ee5fc73f72d0a8d99f0ce WHIRLPOOL 6cbaa4fb5f43b66f9b499d5cfd94374e9fd1f5063c231e2a3f098d9519bd08fd7659b63a8ada9fe9952ed7025301abe4f820158f322e888fdbdb889e6b7ea31d
 DIST netbeans-trunk-nightly-201607220002-src.zip 216981902 SHA256 ca38275cd067b732c1b90054b9af9834957052a6e4012f52a2e89e06f2e19b3b SHA512 f8844781d0ed8fa4f4efa04f64092bec92b48908782683b0d1a2a6b9f44bd1cb52e7ec20ccd54ee7f3b7bf9e10fac1bc232dc6c9954ddb3c1324c6600cb8d457 WHIRLPOOL e493121f9b48364e741ef63935a7e3c17dc59dac721df890d3e5c10a1a7965c9d9978e46268e34b5cfd50aca3d47b66a94d3e79b5dac648093aeba13ffd616ec
 DIST netbeans-trunk-nightly-201607230002-src.zip 217014076 SHA256 b297107296d96cdacd6422fabe0aa3b6f6ccaa516c0eabdf70c034f617e8197a SHA512 09f6695558c1594288e26bd002d1038267c9bcb3706314ddc163fe5d869fd3bc4f747e4a6e00c8590e7606b32c8d04bd0b2b2d32efc765cda72289232eeec7bd WHIRLPOOL 435812a5cfbcdaa3b528aee2c43eb11a48c5241b9689a0135809b8ea87942ed31c16af78acd30bb8c58bd9f4e3c3ad8ab81639df0055ff74eb9411973ca8d942
 DIST netbeans-trunk-nightly-201607250002-src.zip 217019515 SHA256 4f7317d2fa0693c653216be2607fb8e9d2c90f6f22e650ba38971767cdea57aa SHA512 ca97c3cf0bb7bb7031e82445accaed1f09d971b81de6a8e11824c2232968c4acb92077af57d5a91c8dca029ce39f18b3e676a1fdf21ef7190a2a8577652f4181 WHIRLPOOL 64a2af5584458e9a415d83685f99387ad7c2422d21750d4c6234fa5922def0374517081a633837bb45231073fcd0ba366748bf6861d64d987952f4c786529cca
@@ -30,7 +29,6 @@ DIST netbeans-trunk-nightly-201608260002-src.zip 217205973 SHA256 6b68e52a251d6f
 DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc7b49dde50f98461edfc143b64c3ed8ba85f220ae149858b5d7 SHA512 8a036de09a281bbb3ce5473056a074c848ce49fd9165c831f0e3da8f64ea95f39b784bd4ccd4e5b8f9d1c3886a21d1c300d18efb0e78603da729c123246bb81f WHIRLPOOL 81c12e1cc239d723559af6173636d2eb3fd32b05abffcfdac89fd5c9a9c0c2215ad89b4eeef2bc0f04441cdb04a7619b9aafa28ed6e20b314ce9b1679d9ceb2f
 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_p20160721.ebuild 4412 SHA256 8705502e08863ccba28335b5ce87ddc1b56b6690073bfb68e7738821b6e78d7a SHA512 8263aad8f36d053ec3a2f66f5a6ab886333cfcbcb7c685ffc25413dce93a3da86be26b5f8d0139f3a83ee1bb89e717c48ff2603e147542edb55132a557ffe8af WHIRLPOOL a80130355ad60294b92d76ab2914cfd09dc4bbb12f78a666000699aec796c08462da40c9b2ff8485023e8d09d7cb9afd9fe6551411d6f5d051a195059359a02c
 EBUILD netbeans-mobility-9999_p20160722.ebuild 4412 SHA256 b88429b832be9df151c2f900d1a054f3c8af5aedaafbe02891097897f4dd034c SHA512 cbcd2e86d93a8ebb44e8b761e0ae3ee9f901c1ed2043c3c06536ede84140447a411d243690e8348105c39ad2b693baffc421ec4732b6b2e61884b3a1428ed0d7 WHIRLPOOL cdd2a21942d573234e8889a190a6b4f25bc1ccc9456f345b058f91cd49633e4afd774ca42d8ca90e929a684b1abd9d9a537130ec4b83661244ca54c53b2011a8
 EBUILD netbeans-mobility-9999_p20160723.ebuild 4412 SHA256 41682f4d83ffe281894816b35c2a2edbd90d13a75470dbe705ffd48a2dd7a602 SHA512 4ccadf1b828ffb1ad7371563c1da5a939becb0d4a38ff0063054c3da696bc9998db6d07e5654a6a149d861e9427632027991803192683f65e85752fff95ff4e9 WHIRLPOOL 7ac12cc368b539472a208335ec33c411fa440b40bf949575e8daa1e6f7be939fed7e9d739e5784f29a43d4c1ce89fa97177d5457a6b78f25c45f8f0bd5ca9384
 EBUILD netbeans-mobility-9999_p20160725.ebuild 4412 SHA256 08ed8b736ac8a756d4c5d97b1dd2869e25352b5562b9c70c9750c94bd7b16160 SHA512 fe21470d446297a9c7c000923dfae5dc4c25128507d0378b54c9223435fbddf42bd87e8066d6b2143a56be946c21e9084d9b8a031460c86774582c4d8e718299 WHIRLPOOL a66a083b664034bd552f8b0c16152ab48598c633b37c4e502dc5853e86534984275c9ba120a9d27abcdbd1679ef09cd2f8fcd54b7947bdfc71c8902a890b1450

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160721.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160721.ebuild
deleted file mode 100644
index 08b1d38..0000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160721.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-21_00-02-33/zip/netbeans-trunk-nightly-201607210002-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 bc71cdf..78b867e 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-201607210002-src.zip 216644136 SHA256 702bd0842f5b2a4cc0f0ca6b668319f9c375ea6e851f0eb05fbe7d2f3ceac74b SHA512 adf04ea3a875e3247631240b02c7b0592097c47aeed350ffd6b043094a07e4b8ad172ec2ddf63c5ae003bcea26178445782b7941f71ee5fc73f72d0a8d99f0ce WHIRLPOOL 6cbaa4fb5f43b66f9b499d5cfd94374e9fd1f5063c231e2a3f098d9519bd08fd7659b63a8ada9fe9952ed7025301abe4f820158f322e888fdbdb889e6b7ea31d
 DIST netbeans-trunk-nightly-201607220002-src.zip 216981902 SHA256 ca38275cd067b732c1b90054b9af9834957052a6e4012f52a2e89e06f2e19b3b SHA512 f8844781d0ed8fa4f4efa04f64092bec92b48908782683b0d1a2a6b9f44bd1cb52e7ec20ccd54ee7f3b7bf9e10fac1bc232dc6c9954ddb3c1324c6600cb8d457 WHIRLPOOL e493121f9b48364e741ef63935a7e3c17dc59dac721df890d3e5c10a1a7965c9d9978e46268e34b5cfd50aca3d47b66a94d3e79b5dac648093aeba13ffd616ec
 DIST netbeans-trunk-nightly-201607230002-src.zip 217014076 SHA256 b297107296d96cdacd6422fabe0aa3b6f6ccaa516c0eabdf70c034f617e8197a SHA512 09f6695558c1594288e26bd002d1038267c9bcb3706314ddc163fe5d869fd3bc4f747e4a6e00c8590e7606b32c8d04bd0b2b2d32efc765cda72289232eeec7bd WHIRLPOOL 435812a5cfbcdaa3b528aee2c43eb11a48c5241b9689a0135809b8ea87942ed31c16af78acd30bb8c58bd9f4e3c3ad8ab81639df0055ff74eb9411973ca8d942
 DIST netbeans-trunk-nightly-201607250002-src.zip 217019515 SHA256 4f7317d2fa0693c653216be2607fb8e9d2c90f6f22e650ba38971767cdea57aa SHA512 ca97c3cf0bb7bb7031e82445accaed1f09d971b81de6a8e11824c2232968c4acb92077af57d5a91c8dca029ce39f18b3e676a1fdf21ef7190a2a8577652f4181 WHIRLPOOL 64a2af5584458e9a415d83685f99387ad7c2422d21750d4c6234fa5922def0374517081a633837bb45231073fcd0ba366748bf6861d64d987952f4c786529cca
@@ -33,7 +32,6 @@ DIST netbeans-trunk-nightly-201608260002-src.zip 217205973 SHA256 6b68e52a251d6f
 DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc7b49dde50f98461edfc143b64c3ed8ba85f220ae149858b5d7 SHA512 8a036de09a281bbb3ce5473056a074c848ce49fd9165c831f0e3da8f64ea95f39b784bd4ccd4e5b8f9d1c3886a21d1c300d18efb0e78603da729c123246bb81f WHIRLPOOL 81c12e1cc239d723559af6173636d2eb3fd32b05abffcfdac89fd5c9a9c0c2215ad89b4eeef2bc0f04441cdb04a7619b9aafa28ed6e20b314ce9b1679d9ceb2f
 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_p20160721.ebuild 4111 SHA256 ee9d5a79535cbccd263871322a5b659cf6b6e3418299dc4940066b4534ff2d70 SHA512 07e9fc4ae0ac4392c14d9bd65acb5e47c60a41fb7553845a726c8aed91b737bf4ba914de8b26a4c08e74161ccc19bd74f87a9f1872082dc4267f522e7d5b050a WHIRLPOOL d5d9459e2729a3e3dc215ee0a919e0acdc71251b6fd2dc2ca5dfe7fcaf7aa85e9d385c4cf49a01693c351ff538a566c6b9788d22afa45f79470d07262a542575
 EBUILD netbeans-nb-9999_p20160722.ebuild 4111 SHA256 101f1f24d9af926af0d549278bd24e1d0f1c1633dac6f4597f8ad42861f24fb2 SHA512 a0a8dc06b66e8f45dc84eb4fd65eb2cb829cb75b669f4a5c2d39f72388d0b8dcd10b28ebc4e4b774bef71877c8582ec4abf7d666bf28f4b11eec96752bc9193e WHIRLPOOL ee8174c9cac1cc76156b38694ef43f42577e6ad7948df938fe1e5588c5f28395ab9b21034b92e9f8d4b4ea308a1d1506b001ed778d5f161f72fb3944e65720c2
 EBUILD netbeans-nb-9999_p20160723.ebuild 4111 SHA256 726677e556b14f337da7004ba57e1771601174aea646a4c174683fcba689569e SHA512 039dea983261e63f2bfec258c63fab808eedfdecf621019cd67a8075dba2cc7b673643750dd1ffc6fd6af91ec6e324d6db43d3c34a08c711ba53ccfcffe87a5e WHIRLPOOL 6b73edeb2146e5966b9c717158e36bdfbd0b6153cd86e127580156dd9816ad8036d522f6a7b611af9b9f6b0d551925d5ab71bfbd23869e1c06e19f4158bd9fd1
 EBUILD netbeans-nb-9999_p20160725.ebuild 4111 SHA256 4ab4d7945efdd34c0188b0460e88524c6b4b9133f391d63b3e61f7a334b530d2 SHA512 2949d2687d7d2703ed4a2f201764296781cc0b2717b93ddb6c9f06203c2e56004cf0d6c280b39c15e6ce94a6971036a1398411b4d939b6c74d6725d4f625bf42 WHIRLPOOL faa8c95e0b5ecac9fb4a252f270391ae57bfc4d00ae9400bfc007bd0561603188ea5f600c745a0c2813730341c793c7142833a523d44fdb5edfc940df865798b

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160721.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160721.ebuild
deleted file mode 100644
index 88a9a47..0000000
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20160721.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-21_00-02-33/zip/netbeans-trunk-nightly-201607210002-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 42155eb..9c02f7b 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-201607210002-src.zip 216644136 SHA256 702bd0842f5b2a4cc0f0ca6b668319f9c375ea6e851f0eb05fbe7d2f3ceac74b SHA512 adf04ea3a875e3247631240b02c7b0592097c47aeed350ffd6b043094a07e4b8ad172ec2ddf63c5ae003bcea26178445782b7941f71ee5fc73f72d0a8d99f0ce WHIRLPOOL 6cbaa4fb5f43b66f9b499d5cfd94374e9fd1f5063c231e2a3f098d9519bd08fd7659b63a8ada9fe9952ed7025301abe4f820158f322e888fdbdb889e6b7ea31d
 DIST netbeans-trunk-nightly-201607220002-src.zip 216981902 SHA256 ca38275cd067b732c1b90054b9af9834957052a6e4012f52a2e89e06f2e19b3b SHA512 f8844781d0ed8fa4f4efa04f64092bec92b48908782683b0d1a2a6b9f44bd1cb52e7ec20ccd54ee7f3b7bf9e10fac1bc232dc6c9954ddb3c1324c6600cb8d457 WHIRLPOOL e493121f9b48364e741ef63935a7e3c17dc59dac721df890d3e5c10a1a7965c9d9978e46268e34b5cfd50aca3d47b66a94d3e79b5dac648093aeba13ffd616ec
 DIST netbeans-trunk-nightly-201607230002-src.zip 217014076 SHA256 b297107296d96cdacd6422fabe0aa3b6f6ccaa516c0eabdf70c034f617e8197a SHA512 09f6695558c1594288e26bd002d1038267c9bcb3706314ddc163fe5d869fd3bc4f747e4a6e00c8590e7606b32c8d04bd0b2b2d32efc765cda72289232eeec7bd WHIRLPOOL 435812a5cfbcdaa3b528aee2c43eb11a48c5241b9689a0135809b8ea87942ed31c16af78acd30bb8c58bd9f4e3c3ad8ab81639df0055ff74eb9411973ca8d942
 DIST netbeans-trunk-nightly-201607250002-src.zip 217019515 SHA256 4f7317d2fa0693c653216be2607fb8e9d2c90f6f22e650ba38971767cdea57aa SHA512 ca97c3cf0bb7bb7031e82445accaed1f09d971b81de6a8e11824c2232968c4acb92077af57d5a91c8dca029ce39f18b3e676a1fdf21ef7190a2a8577652f4181 WHIRLPOOL 64a2af5584458e9a415d83685f99387ad7c2422d21750d4c6234fa5922def0374517081a633837bb45231073fcd0ba366748bf6861d64d987952f4c786529cca
@@ -35,7 +34,6 @@ DIST netbeans-trunk-nightly-201608260002-src.zip 217205973 SHA256 6b68e52a251d6f
 DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc7b49dde50f98461edfc143b64c3ed8ba85f220ae149858b5d7 SHA512 8a036de09a281bbb3ce5473056a074c848ce49fd9165c831f0e3da8f64ea95f39b784bd4ccd4e5b8f9d1c3886a21d1c300d18efb0e78603da729c123246bb81f WHIRLPOOL 81c12e1cc239d723559af6173636d2eb3fd32b05abffcfdac89fd5c9a9c0c2215ad89b4eeef2bc0f04441cdb04a7619b9aafa28ed6e20b314ce9b1679d9ceb2f
 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_p20160721.ebuild 4418 SHA256 2e0f167f059434183b649ea18effdba84d15b7c5a747c1cc21d3b6fdb1a23c71 SHA512 4ac75bb3fb48db6c57c52667faf98b2bc9f1ff8a7117e9dda7efba1d0aff2470e74103fddf3db60b66b9b0448d1db5d60ea2846f201b0418214befd58c4d5a13 WHIRLPOOL 47f4f6885ec0d3fbc35e3ba26d8db6b9ed22edb89e6ac10d2b1c5d801194380e6eca601c111dd4a25a393c14597a76d47a36596d774f0c030fb41a6513acd4d3
 EBUILD netbeans-php-9999_p20160722.ebuild 4418 SHA256 108083ed9bea5495131143ed9bafeb0f031f67b1f65f840466954a2122ad82bb SHA512 4f29183d5be48d12df86efda29a7b77e1d0dcd67231304a2403d53270fa39cefd14b06a791822c08ce05c7a4de6e29dabcce57b3b15a056d34d93308f487e3c7 WHIRLPOOL 655051ae2c160092fc33708160c1a7edd3f2ba34fd30c3788a4e76d092438bab95dede21a389884fba9716b075823b0a1f02816439b9447da9b79e0f3bef4dc3
 EBUILD netbeans-php-9999_p20160723.ebuild 4418 SHA256 b3fe09eeda5f5b5363ec3ed01659f6fd80204cf54896e3e0456c86fd04d1370f SHA512 31ff61981cd8706079327abc8b5d569bf6c7721d5171aebdcdddf5f296279612014a72ae028d53e4233ae8af2718e5947ab39bcac2d0dbc5b878b092d2965d4e WHIRLPOOL 8b963be4a3b4434c061cae2983dec7611ee21c4b3b6fbf32860f0fa38b20e4ae6f6c85442042bedc3ed48abded37007123c1fc1969bc9aa6da2d481d8f200d53
 EBUILD netbeans-php-9999_p20160725.ebuild 4418 SHA256 4f7b330f5c2354c27d270ec32b3e2ca837e0543e9b389082aed6b5117e5190b4 SHA512 9594d0fc21f30a571b0a951532f04259abf3fb8ac798ee53ebef4f10b69e6ff5f531fa320679d7959a1039ce281e3dbba598c3aaca39e1f513a9edffd4fbde47 WHIRLPOOL 7350f82cdf37c516e03290e4a69984a97499ae9768ee8cd47010ac3f48b85d1acbbd13d73dde7c912d99c40000d7dc6f8787391f328d7053c8f9a7266a5634d0

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160721.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160721.ebuild
deleted file mode 100644
index 18e9544..0000000
--- a/dev-java/netbeans-php/netbeans-php-9999_p20160721.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-21_00-02-33/zip/netbeans-trunk-nightly-201607210002-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 cbb4767..94945e3 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-201607210002-src.zip 216644136 SHA256 702bd0842f5b2a4cc0f0ca6b668319f9c375ea6e851f0eb05fbe7d2f3ceac74b SHA512 adf04ea3a875e3247631240b02c7b0592097c47aeed350ffd6b043094a07e4b8ad172ec2ddf63c5ae003bcea26178445782b7941f71ee5fc73f72d0a8d99f0ce WHIRLPOOL 6cbaa4fb5f43b66f9b499d5cfd94374e9fd1f5063c231e2a3f098d9519bd08fd7659b63a8ada9fe9952ed7025301abe4f820158f322e888fdbdb889e6b7ea31d
 DIST netbeans-trunk-nightly-201607220002-src.zip 216981902 SHA256 ca38275cd067b732c1b90054b9af9834957052a6e4012f52a2e89e06f2e19b3b SHA512 f8844781d0ed8fa4f4efa04f64092bec92b48908782683b0d1a2a6b9f44bd1cb52e7ec20ccd54ee7f3b7bf9e10fac1bc232dc6c9954ddb3c1324c6600cb8d457 WHIRLPOOL e493121f9b48364e741ef63935a7e3c17dc59dac721df890d3e5c10a1a7965c9d9978e46268e34b5cfd50aca3d47b66a94d3e79b5dac648093aeba13ffd616ec
 DIST netbeans-trunk-nightly-201607230002-src.zip 217014076 SHA256 b297107296d96cdacd6422fabe0aa3b6f6ccaa516c0eabdf70c034f617e8197a SHA512 09f6695558c1594288e26bd002d1038267c9bcb3706314ddc163fe5d869fd3bc4f747e4a6e00c8590e7606b32c8d04bd0b2b2d32efc765cda72289232eeec7bd WHIRLPOOL 435812a5cfbcdaa3b528aee2c43eb11a48c5241b9689a0135809b8ea87942ed31c16af78acd30bb8c58bd9f4e3c3ad8ab81639df0055ff74eb9411973ca8d942
 DIST netbeans-trunk-nightly-201607250002-src.zip 217019515 SHA256 4f7317d2fa0693c653216be2607fb8e9d2c90f6f22e650ba38971767cdea57aa SHA512 ca97c3cf0bb7bb7031e82445accaed1f09d971b81de6a8e11824c2232968c4acb92077af57d5a91c8dca029ce39f18b3e676a1fdf21ef7190a2a8577652f4181 WHIRLPOOL 64a2af5584458e9a415d83685f99387ad7c2422d21750d4c6234fa5922def0374517081a633837bb45231073fcd0ba366748bf6861d64d987952f4c786529cca
@@ -56,7 +55,6 @@ DIST netbeans-trunk-nightly-201608260002-src.zip 217205973 SHA256 6b68e52a251d6f
 DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc7b49dde50f98461edfc143b64c3ed8ba85f220ae149858b5d7 SHA512 8a036de09a281bbb3ce5473056a074c848ce49fd9165c831f0e3da8f64ea95f39b784bd4ccd4e5b8f9d1c3886a21d1c300d18efb0e78603da729c123246bb81f WHIRLPOOL 81c12e1cc239d723559af6173636d2eb3fd32b05abffcfdac89fd5c9a9c0c2215ad89b4eeef2bc0f04441cdb04a7619b9aafa28ed6e20b314ce9b1679d9ceb2f
 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_p20160721.ebuild 9520 SHA256 d3fa7fcf251ddf872a13799958617be20bd93afcd5397ec5f8e4cbab40615eb0 SHA512 a538d6e5a0ed545ac3647f43ffdaa3c24474778d491d644be40b7970ef6cafd9fd07ed8ff0ee980b1f6725e8480d6bd57dbae7e7e7c564c904282f1db06ed037 WHIRLPOOL 94dc22645bb56a2a3a26211dab7190b4d5c19bf1d7492eefba3f8c6a1f6db070959c96d432f0a34e212fd631707dad714d5695dc80bcd2914a4bb06fb1ccfa40
 EBUILD netbeans-platform-9999_p20160722.ebuild 9520 SHA256 1ab00a35494857a5b39d3d06b377968be312b170251bd62d564ea4cb8839caa3 SHA512 88321b175e248c45d48384212e63ad0ab4c032e56dcfe71b3926a2c2b2b16ed73d5a1fc1775cfa9f578363af129f54f9cb86641d4ffc5daaf0f107baa6ca4ba6 WHIRLPOOL 7a05c63329f8a330357ed147c97c05ca4f0ef1487d6e6d2a8a3e33f59ad48a0a5d3dfbe675d13b2965a9315e454dfead33cfc4a3c17dd2a9361e0337a3c2467e
 EBUILD netbeans-platform-9999_p20160723.ebuild 9520 SHA256 c5391542d914c6b28f3b3e0d589d68b31df9f4b34c2b546d9c43aa6e9689556a SHA512 c334881d352c1539632ab44c9d8549ff6a909e99150b1a97496bbbc6d470ec8d15be2659128f9244f3b641d2ee8c62ad902a42db57df8069826cc33f0dcf0576 WHIRLPOOL a6af0c7e47e19105fdcebfdb90ff812decb52acadc07b7e0255148255479e093c1be1c4e9d4205c5af5ae7ee55d41290f5676e5c2a2bb8753c64a6dcc424d844
 EBUILD netbeans-platform-9999_p20160725.ebuild 9520 SHA256 79131725e93c3f96b6343ce3e6a958c3bd34b149767fdedbe6c6604360dc8c9b SHA512 7c0f91158e1aa2e8aa3d28caaa790b9256b66483277341c0477a40bed19eaf6eca9693143b6f7af9ecb1920623fec75aa2a403ee8a6d62416f849e6574b192d5 WHIRLPOOL 9fa76a1dadc80685e0d9ad7021da6fcd93c4a2ca2f9a656005eaf7b14bf10e388e9f4c57c0eb828bdcb41851d0f56bafb7fbc3bb127871b8e341f98912bd2a36

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160721.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160721.ebuild
deleted file mode 100644
index ff06cef..0000000
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20160721.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-21_00-02-33/zip/netbeans-trunk-nightly-201607210002-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 7425f44..6e4fa65 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-201607210002-src.zip 216644136 SHA256 702bd0842f5b2a4cc0f0ca6b668319f9c375ea6e851f0eb05fbe7d2f3ceac74b SHA512 adf04ea3a875e3247631240b02c7b0592097c47aeed350ffd6b043094a07e4b8ad172ec2ddf63c5ae003bcea26178445782b7941f71ee5fc73f72d0a8d99f0ce WHIRLPOOL 6cbaa4fb5f43b66f9b499d5cfd94374e9fd1f5063c231e2a3f098d9519bd08fd7659b63a8ada9fe9952ed7025301abe4f820158f322e888fdbdb889e6b7ea31d
 DIST netbeans-trunk-nightly-201607220002-src.zip 216981902 SHA256 ca38275cd067b732c1b90054b9af9834957052a6e4012f52a2e89e06f2e19b3b SHA512 f8844781d0ed8fa4f4efa04f64092bec92b48908782683b0d1a2a6b9f44bd1cb52e7ec20ccd54ee7f3b7bf9e10fac1bc232dc6c9954ddb3c1324c6600cb8d457 WHIRLPOOL e493121f9b48364e741ef63935a7e3c17dc59dac721df890d3e5c10a1a7965c9d9978e46268e34b5cfd50aca3d47b66a94d3e79b5dac648093aeba13ffd616ec
 DIST netbeans-trunk-nightly-201607230002-src.zip 217014076 SHA256 b297107296d96cdacd6422fabe0aa3b6f6ccaa516c0eabdf70c034f617e8197a SHA512 09f6695558c1594288e26bd002d1038267c9bcb3706314ddc163fe5d869fd3bc4f747e4a6e00c8590e7606b32c8d04bd0b2b2d32efc765cda72289232eeec7bd WHIRLPOOL 435812a5cfbcdaa3b528aee2c43eb11a48c5241b9689a0135809b8ea87942ed31c16af78acd30bb8c58bd9f4e3c3ad8ab81639df0055ff74eb9411973ca8d942
 DIST netbeans-trunk-nightly-201607250002-src.zip 217019515 SHA256 4f7317d2fa0693c653216be2607fb8e9d2c90f6f22e650ba38971767cdea57aa SHA512 ca97c3cf0bb7bb7031e82445accaed1f09d971b81de6a8e11824c2232968c4acb92077af57d5a91c8dca029ce39f18b3e676a1fdf21ef7190a2a8577652f4181 WHIRLPOOL 64a2af5584458e9a415d83685f99387ad7c2422d21750d4c6234fa5922def0374517081a633837bb45231073fcd0ba366748bf6861d64d987952f4c786529cca
@@ -30,7 +29,6 @@ DIST netbeans-trunk-nightly-201608260002-src.zip 217205973 SHA256 6b68e52a251d6f
 DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc7b49dde50f98461edfc143b64c3ed8ba85f220ae149858b5d7 SHA512 8a036de09a281bbb3ce5473056a074c848ce49fd9165c831f0e3da8f64ea95f39b784bd4ccd4e5b8f9d1c3886a21d1c300d18efb0e78603da729c123246bb81f WHIRLPOOL 81c12e1cc239d723559af6173636d2eb3fd32b05abffcfdac89fd5c9a9c0c2215ad89b4eeef2bc0f04441cdb04a7619b9aafa28ed6e20b314ce9b1679d9ceb2f
 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_p20160721.ebuild 3472 SHA256 56f46af28381d3880005b7fac7103b96d47e9dac789b20397073d446c1cfaf25 SHA512 87275cdf0a71e9223adf840454ff3d8ec13dfa8967d5d27b4cb20c505b211dfe5b10cd54ea774031c9fa964f5a03731261aeb2aad5ff1e8c0b044c67ef17e494 WHIRLPOOL 0f58c4f0ef3b34f9af9c782d35cd6b77899bfdda3b73a2fe626197b3f466dc0d2131ea22935f4561723cf8368c66f02035b3cfb3a081167e0f317f0201766101
 EBUILD netbeans-profiler-9999_p20160722.ebuild 3472 SHA256 7c47284e2f1839b0701226dd55454d89a41458d2b1972c4541d5ac787e35f399 SHA512 4a68d800274374380db2905bd7a25e65e81ba210091ce1e3307d4853122a22b0fb63ad8def31c8601d6bb0fc7a169b8ff60bfc3d0646bc63dd8dbc7f0f331190 WHIRLPOOL 01165360025aef89b450702cb772ebce96610ba034f8ac10ae6ad3b1bfe0695a9f2f11223cc3208b7feaf16a48ae7deef662b3f7a9672de1772b3024a7f64aee
 EBUILD netbeans-profiler-9999_p20160723.ebuild 3472 SHA256 8ca9dedaf45ab872053e695bfa9efe4ab6008ed0d089f09bbc7da18ed3387f01 SHA512 bea87435393b51aad68c4d5e2df5fac4607118cd3a44c6a3b31eb6b9a0d376ec956756c8f811ab289143cca589cccf9ae7810e8ddf4a5a57ab0c376aa7286523 WHIRLPOOL 2f25e563a333f8b7f51e1ddc19ff7f82d2e15c73f5c88e59c90a2c1e01a86360bd805bbee6e82601cbe6b1b5af2fe78d775ed4b62107ca37a2719aec54dbcf85
 EBUILD netbeans-profiler-9999_p20160725.ebuild 3472 SHA256 76f8214d5b4cc26e81eaefbeb1d98a8d8e56736a6e396fdf9d3ba489cf98eb53 SHA512 2d5618c8d95471eef1441fd3838551ab82f289c52abe16f3e8bfc88f08e213d8ede57bd0bfd2436a98eaf149ee20c29e02890d3f2af95f3513316f6edc84cf12 WHIRLPOOL bcda56f9da6dea0dd46bc4a26d03aa0b8a028cce2eaa1a5cf866513da7fa5b9d98ee9c7dc7acfa6df0246dcf56298d15273f0d3cebabf4622cf20142eab25417

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160721.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160721.ebuild
deleted file mode 100644
index b60cc6f..0000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160721.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-21_00-02-33/zip/netbeans-trunk-nightly-201607210002-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 72200c1..305662e 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -22,7 +22,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-201607210002-src.zip 216644136 SHA256 702bd0842f5b2a4cc0f0ca6b668319f9c375ea6e851f0eb05fbe7d2f3ceac74b SHA512 adf04ea3a875e3247631240b02c7b0592097c47aeed350ffd6b043094a07e4b8ad172ec2ddf63c5ae003bcea26178445782b7941f71ee5fc73f72d0a8d99f0ce WHIRLPOOL 6cbaa4fb5f43b66f9b499d5cfd94374e9fd1f5063c231e2a3f098d9519bd08fd7659b63a8ada9fe9952ed7025301abe4f820158f322e888fdbdb889e6b7ea31d
 DIST netbeans-trunk-nightly-201607220002-src.zip 216981902 SHA256 ca38275cd067b732c1b90054b9af9834957052a6e4012f52a2e89e06f2e19b3b SHA512 f8844781d0ed8fa4f4efa04f64092bec92b48908782683b0d1a2a6b9f44bd1cb52e7ec20ccd54ee7f3b7bf9e10fac1bc232dc6c9954ddb3c1324c6600cb8d457 WHIRLPOOL e493121f9b48364e741ef63935a7e3c17dc59dac721df890d3e5c10a1a7965c9d9978e46268e34b5cfd50aca3d47b66a94d3e79b5dac648093aeba13ffd616ec
 DIST netbeans-trunk-nightly-201607230002-src.zip 217014076 SHA256 b297107296d96cdacd6422fabe0aa3b6f6ccaa516c0eabdf70c034f617e8197a SHA512 09f6695558c1594288e26bd002d1038267c9bcb3706314ddc163fe5d869fd3bc4f747e4a6e00c8590e7606b32c8d04bd0b2b2d32efc765cda72289232eeec7bd WHIRLPOOL 435812a5cfbcdaa3b528aee2c43eb11a48c5241b9689a0135809b8ea87942ed31c16af78acd30bb8c58bd9f4e3c3ad8ab81639df0055ff74eb9411973ca8d942
 DIST netbeans-trunk-nightly-201607250002-src.zip 217019515 SHA256 4f7317d2fa0693c653216be2607fb8e9d2c90f6f22e650ba38971767cdea57aa SHA512 ca97c3cf0bb7bb7031e82445accaed1f09d971b81de6a8e11824c2232968c4acb92077af57d5a91c8dca029ce39f18b3e676a1fdf21ef7190a2a8577652f4181 WHIRLPOOL 64a2af5584458e9a415d83685f99387ad7c2422d21750d4c6234fa5922def0374517081a633837bb45231073fcd0ba366748bf6861d64d987952f4c786529cca
@@ -49,7 +48,6 @@ DIST netbeans-trunk-nightly-201608260002-src.zip 217205973 SHA256 6b68e52a251d6f
 DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc7b49dde50f98461edfc143b64c3ed8ba85f220ae149858b5d7 SHA512 8a036de09a281bbb3ce5473056a074c848ce49fd9165c831f0e3da8f64ea95f39b784bd4ccd4e5b8f9d1c3886a21d1c300d18efb0e78603da729c123246bb81f WHIRLPOOL 81c12e1cc239d723559af6173636d2eb3fd32b05abffcfdac89fd5c9a9c0c2215ad89b4eeef2bc0f04441cdb04a7619b9aafa28ed6e20b314ce9b1679d9ceb2f
 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_p20160721.ebuild 6242 SHA256 593a7d40a4db192d8be56a66f3c24bd912381f680800edcaeb6c3e558ea39610 SHA512 d56f7085d42f033795bda1ca5226b6d83705bfbce383557e46b2ad1315388c44f4e115c01b9d0bb832de2cf018edd7332582dec10f261c3501c8f3a38c663563 WHIRLPOOL 085603d3a5d02f547feb568055b55ec5883551e67e690a02a0960c26a47dcda3b459e8aff9c72ebcd843a81b56e60f27a2a4a751b5b75af4daa6b13230a19f18
 EBUILD netbeans-webcommon-9999_p20160722.ebuild 6242 SHA256 82949b54767dfc860b82f454bab21d2e1367fdfdeeaadaedf0dd4a362250417d SHA512 71e462c4f2ce3a0e0bce139f087c6cd7789e417bce82a82bc8dde8952dfbf3c7ca5177b67725935420140f695646445342738fed2816708fbc48db2f56ffc6ac WHIRLPOOL 2b7e7060f59d1ce30cfb5871dfc935169d9a2e3403880b2d87605804eb4b02e072c474a3490a25caa97ad4fd131272d6843f72cbfbdc5d3a6ef19958a5f02538
 EBUILD netbeans-webcommon-9999_p20160723.ebuild 6242 SHA256 65d9a58c4c744d41f9367a673231efc16f6480c5456ffe60bf1411aaaf262984 SHA512 b83ce8fb7f18c88925515b7b03b6262b80311342997864f4a764ff08efcc6c96b4623eff141a8d75201892d57336d636fed94c528ea18270e33b4c4e2479a797 WHIRLPOOL 39de355f34fe7060ef55282659cd4d28a056ba88f26f8f159da706ed132e667f45c20ae13c553ba9253b90542fa45441a9f8168e89c12928d0148fae266d0a96
 EBUILD netbeans-webcommon-9999_p20160725.ebuild 6242 SHA256 7c6f193c82c754fbe6234b3c3192824e11b13d07220f5f530935fd7c180ba563 SHA512 ff3b3a341610e6018a00610a6a2cdb01551a41e611dea5df367be9b4dd2530057d3f2840df11bf987e7ed1ebed58182665baaec8fc0be96795042adac35a7e9a WHIRLPOOL d4320b3ac883ca90f746a9f67cd76cce383046b7fb01afb0eeb603baac85c8ab80fd208de694b1ef5744fc8c877e729825afc5fc4cc66565b97dc9aebbb124f4

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160721.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160721.ebuild
deleted file mode 100644
index fcca2dc..0000000
--- a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160721.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-21_00-02-33/zip/netbeans-trunk-nightly-201607210002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/7CA13589F586F659BB0E1561719A91CA47BF1897-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}"/7CA13589F586F659BB0E1561719A91CA47BF1897-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 4dcdb1e..dbc121c 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-201607210002-src.zip 216644136 SHA256 702bd0842f5b2a4cc0f0ca6b668319f9c375ea6e851f0eb05fbe7d2f3ceac74b SHA512 adf04ea3a875e3247631240b02c7b0592097c47aeed350ffd6b043094a07e4b8ad172ec2ddf63c5ae003bcea26178445782b7941f71ee5fc73f72d0a8d99f0ce WHIRLPOOL 6cbaa4fb5f43b66f9b499d5cfd94374e9fd1f5063c231e2a3f098d9519bd08fd7659b63a8ada9fe9952ed7025301abe4f820158f322e888fdbdb889e6b7ea31d
 DIST netbeans-trunk-nightly-201607220002-src.zip 216981902 SHA256 ca38275cd067b732c1b90054b9af9834957052a6e4012f52a2e89e06f2e19b3b SHA512 f8844781d0ed8fa4f4efa04f64092bec92b48908782683b0d1a2a6b9f44bd1cb52e7ec20ccd54ee7f3b7bf9e10fac1bc232dc6c9954ddb3c1324c6600cb8d457 WHIRLPOOL e493121f9b48364e741ef63935a7e3c17dc59dac721df890d3e5c10a1a7965c9d9978e46268e34b5cfd50aca3d47b66a94d3e79b5dac648093aeba13ffd616ec
 DIST netbeans-trunk-nightly-201607230002-src.zip 217014076 SHA256 b297107296d96cdacd6422fabe0aa3b6f6ccaa516c0eabdf70c034f617e8197a SHA512 09f6695558c1594288e26bd002d1038267c9bcb3706314ddc163fe5d869fd3bc4f747e4a6e00c8590e7606b32c8d04bd0b2b2d32efc765cda72289232eeec7bd WHIRLPOOL 435812a5cfbcdaa3b528aee2c43eb11a48c5241b9689a0135809b8ea87942ed31c16af78acd30bb8c58bd9f4e3c3ad8ab81639df0055ff74eb9411973ca8d942
 DIST netbeans-trunk-nightly-201607250002-src.zip 217019515 SHA256 4f7317d2fa0693c653216be2607fb8e9d2c90f6f22e650ba38971767cdea57aa SHA512 ca97c3cf0bb7bb7031e82445accaed1f09d971b81de6a8e11824c2232968c4acb92077af57d5a91c8dca029ce39f18b3e676a1fdf21ef7190a2a8577652f4181 WHIRLPOOL 64a2af5584458e9a415d83685f99387ad7c2422d21750d4c6234fa5922def0374517081a633837bb45231073fcd0ba366748bf6861d64d987952f4c786529cca
@@ -30,7 +29,6 @@ DIST netbeans-trunk-nightly-201608260002-src.zip 217205973 SHA256 6b68e52a251d6f
 DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc7b49dde50f98461edfc143b64c3ed8ba85f220ae149858b5d7 SHA512 8a036de09a281bbb3ce5473056a074c848ce49fd9165c831f0e3da8f64ea95f39b784bd4ccd4e5b8f9d1c3886a21d1c300d18efb0e78603da729c123246bb81f WHIRLPOOL 81c12e1cc239d723559af6173636d2eb3fd32b05abffcfdac89fd5c9a9c0c2215ad89b4eeef2bc0f04441cdb04a7619b9aafa28ed6e20b314ce9b1679d9ceb2f
 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_p20160721.ebuild 2721 SHA256 ba9e41b8923f2a1284bb85daacbea18ce72b5be66d66b9752f97a1750c5196d7 SHA512 d21fd8dea651f5920edacb01bfc8949eaae66999ed257a232f88c833fc27d21ae149e2e826932bf386346bc778c27ec6cad03a89575fc6701f103f68c3f88791 WHIRLPOOL b67c712a4fab38335a2da12c16e0eb4b66c19c7da540030ca5255b05484615423d33cfc0cd805d6d574eb7a9f43aaa83cfc42829abc16937400a8db8efcb5fda
 EBUILD netbeans-websvccommon-9999_p20160722.ebuild 2721 SHA256 57928dc4afc9eedff9efcca08cd5d47c34dec9717eb19b9bbdda020bb056eaef SHA512 0e6b6e3f2b1ae0ff95454454a8a54f184c0931ff4966d2aa7702033000fc59d28e6f9d01db37010274c1404402fd51d300ac7f7b6b0be9dd82e94c75b7d2e098 WHIRLPOOL 5a1098ec00658ac95ec7add3d4d92be79a352abc3e33f744f85b29985e42d194ba068156ce35c864fda00170e5de75f648be1b526a486ef7248472a7a7992246
 EBUILD netbeans-websvccommon-9999_p20160723.ebuild 2721 SHA256 ba6ab450b681f24f257b68713671d72862fefe510568d2f95273864307a4de5a SHA512 3c70e4864c565876b88de320d130a2a53d463f6f249c357e6cccc8b01cbc832ac0064798970ea006c3ad0b2a6a76c3bf1d9e7d7dd42ca8f4fc6dc7bfcb884ad6 WHIRLPOOL d6a1aa629418ca78a2a4a338c32aef77b44cf67da623b3b354e3a86597494a39e5bdb212faf38bfe27b56884bbbb10e189ea191fc2a16b0fa21118ccce45ba6a
 EBUILD netbeans-websvccommon-9999_p20160725.ebuild 2721 SHA256 0f146a3c605899891880e2bd666517b0b8b8398662f3d63f9dade338dfc6395b SHA512 c88f313ee23d1df38cdeacd6d74848a34f756227dc4855036466ddc7c036e211ff43882540cbaa1cabe269220c308d1b7dada4e9484b31f28fd882120034e96b WHIRLPOOL 8278867610de581e842347eb533976ab3bdd6f8ddefc923dc1f3b5ceb051b1ba9fd26bcf072d2c8841a3e58a976c8946eb718f4cb93cca42cd3a7d81736c72c2

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160721.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160721.ebuild
deleted file mode 100644
index 29b1e5d..0000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160721.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-21_00-02-33/zip/netbeans-trunk-nightly-201607210002-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 2afca33..5811b7c 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-201607210002-src.zip 216644136 SHA256 702bd0842f5b2a4cc0f0ca6b668319f9c375ea6e851f0eb05fbe7d2f3ceac74b SHA512 adf04ea3a875e3247631240b02c7b0592097c47aeed350ffd6b043094a07e4b8ad172ec2ddf63c5ae003bcea26178445782b7941f71ee5fc73f72d0a8d99f0ce WHIRLPOOL 6cbaa4fb5f43b66f9b499d5cfd94374e9fd1f5063c231e2a3f098d9519bd08fd7659b63a8ada9fe9952ed7025301abe4f820158f322e888fdbdb889e6b7ea31d
 DIST netbeans-trunk-nightly-201607220002-src.zip 216981902 SHA256 ca38275cd067b732c1b90054b9af9834957052a6e4012f52a2e89e06f2e19b3b SHA512 f8844781d0ed8fa4f4efa04f64092bec92b48908782683b0d1a2a6b9f44bd1cb52e7ec20ccd54ee7f3b7bf9e10fac1bc232dc6c9954ddb3c1324c6600cb8d457 WHIRLPOOL e493121f9b48364e741ef63935a7e3c17dc59dac721df890d3e5c10a1a7965c9d9978e46268e34b5cfd50aca3d47b66a94d3e79b5dac648093aeba13ffd616ec
 DIST netbeans-trunk-nightly-201607230002-src.zip 217014076 SHA256 b297107296d96cdacd6422fabe0aa3b6f6ccaa516c0eabdf70c034f617e8197a SHA512 09f6695558c1594288e26bd002d1038267c9bcb3706314ddc163fe5d869fd3bc4f747e4a6e00c8590e7606b32c8d04bd0b2b2d32efc765cda72289232eeec7bd WHIRLPOOL 435812a5cfbcdaa3b528aee2c43eb11a48c5241b9689a0135809b8ea87942ed31c16af78acd30bb8c58bd9f4e3c3ad8ab81639df0055ff74eb9411973ca8d942
 DIST netbeans-trunk-nightly-201607250002-src.zip 217019515 SHA256 4f7317d2fa0693c653216be2607fb8e9d2c90f6f22e650ba38971767cdea57aa SHA512 ca97c3cf0bb7bb7031e82445accaed1f09d971b81de6a8e11824c2232968c4acb92077af57d5a91c8dca029ce39f18b3e676a1fdf21ef7190a2a8577652f4181 WHIRLPOOL 64a2af5584458e9a415d83685f99387ad7c2422d21750d4c6234fa5922def0374517081a633837bb45231073fcd0ba366748bf6861d64d987952f4c786529cca
@@ -33,7 +32,6 @@ DIST netbeans-trunk-nightly-201608260002-src.zip 217205973 SHA256 6b68e52a251d6f
 DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc7b49dde50f98461edfc143b64c3ed8ba85f220ae149858b5d7 SHA512 8a036de09a281bbb3ce5473056a074c848ce49fd9165c831f0e3da8f64ea95f39b784bd4ccd4e5b8f9d1c3886a21d1c300d18efb0e78603da729c123246bb81f WHIRLPOOL 81c12e1cc239d723559af6173636d2eb3fd32b05abffcfdac89fd5c9a9c0c2215ad89b4eeef2bc0f04441cdb04a7619b9aafa28ed6e20b314ce9b1679d9ceb2f
 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_p20160721.ebuild 6939 SHA256 3e456c3798c501880d01ddb1912e2a5905774a52f81be325a3fbc1a2660f3e8d SHA512 3ff5afa30823fe8367da8fc14d2c69c9c2f1f0e34190cdc032180935295df1d5274b5cc04c4ffd440e2ba3a65dd51d0383f1d235ba86256457814f2172348ed2 WHIRLPOOL f04959ff41ea23c7f1d5c702d2c1903102ff742aca019ec5600d67816435539e2cf08d56746426e637c8808ac0c2b9713539582fcc8eeb9b0021dcad29676806
 EBUILD netbeans-9999_p20160722.ebuild 6939 SHA256 69cef2b5663ed86d3bc968c2b5e0f7def15779e18659ccf0ac294a74911f83ee SHA512 05ff29fe252cc305be13a0ca87a7cfa26453959b055c5307b74df2301d54aeb95737c7c0a99e3255bf02906a4052085170dafd87622c8276be01d0e688ab1e69 WHIRLPOOL af01218ee7cd312fcc6e81d51696c009440b0a9f3d654f563b95332d76caab780fff78878cb3eeecb86d687edf456c176c08504f9937b38750a5da2fd8bd3a5f
 EBUILD netbeans-9999_p20160723.ebuild 6939 SHA256 279217c6f4f7a0e98e8ba0475abb026e22458266d3e030f40d81c0a00d16dfbd SHA512 96da51624d7380db7a740e3042390a7db42028594ca566d33648baca5fc233b515c44e47d76be1b833c50cef06e42b8753fdf2e0c6d71134f03c2270bff82cc4 WHIRLPOOL bfc9f59b6281b9dd590256cbc717cc7acfa55066795e1abcda61464d99b75cb6e084f689bb069abab3a4eb2af2b689654d5d8fddbb73f4e0e417656fa43c0797
 EBUILD netbeans-9999_p20160725.ebuild 6939 SHA256 acdfae78a6312e7ea8046251bf99fa9aa1fed3207fe1968493ca65e9b5a2d6c0 SHA512 e590b8af97e9f3a3ae8fa2d06ecb12cd3f177240cc93eb7414b27df4bb5a5fc6b3d50bb0c86b117f918bdc58d7be6ed3a49efbbb13a80fc53ea647e89c6df64c WHIRLPOOL f1ed746f78103d360d589f9b9f9fe9dc62e1bac8bb21beea11c15e55f6f547bd060410df91ef207d1f9d78ac66acee703db4894c285e792212ce018c3ee465e9

diff --git a/dev-util/netbeans/netbeans-9999_p20160721.ebuild b/dev-util/netbeans/netbeans-9999_p20160721.ebuild
deleted file mode 100644
index 24d6094..0000000
--- a/dev-util/netbeans/netbeans-9999_p20160721.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-21_00-02-33/zip/netbeans-trunk-nightly-201607210002-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
-}