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

[Miroslav Šulc]

commit:     d77ad3fdb00d8fa062774aac9ea5e03fd196f01e
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 27 06:30:02 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Sep 27 06:30:02 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=d77ad3fd

netbeans: removed obsolete ebuilds

Package-Manager: portage-2.3.1

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index c536608..0f5b3f1 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-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
 DIST netbeans-trunk-nightly-201608260002-src.zip 217205973 SHA256 6b68e52a251d6fbbb51fe7391a34d92d48a16db09c9174dc11a63c9e6cbf6fb7 SHA512 89b9173774cd9f8bca6deb9978b05c6a249295941a5a2a2934904d6b19a3716f97f6bf3872e46cb8e0b5643da1bb1aa600c10968e1bdb6d7bed391bff62472e6 WHIRLPOOL 4bfe3e0f29fc0afe434facd60186c346308897c792b55f837ebbbe4f1817eac810f9ea3c42fbb41b8303d94c698996b95b0f0f9e8856a4df68b1c0774b735048
 DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc7b49dde50f98461edfc143b64c3ed8ba85f220ae149858b5d7 SHA512 8a036de09a281bbb3ce5473056a074c848ce49fd9165c831f0e3da8f64ea95f39b784bd4ccd4e5b8f9d1c3886a21d1c300d18efb0e78603da729c123246bb81f WHIRLPOOL 81c12e1cc239d723559af6173636d2eb3fd32b05abffcfdac89fd5c9a9c0c2215ad89b4eeef2bc0f04441cdb04a7619b9aafa28ed6e20b314ce9b1679d9ceb2f
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
@@ -33,7 +32,6 @@ DIST netbeans-trunk-nightly-201609250002-src.zip 218005446 SHA256 c28a4ee7eaa239
 DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1bf5de335c280b679d32646b7740176e0e3e91bdac284bc6fe66 SHA512 fe60ff01cdb7e1e8b044c4e9a51446198d8401180a66fa32f8d14953ec3d719e215e5161193253edc21c00bbca7f23af5903d4d59f5e4a9f5fb28d3be2aed235 WHIRLPOOL 4bbc58439fec5202aa774f3aa0057258aef8f9a259ed1aeab5110038462a727523bc27a845f05aa31c230cb730a988d5710735eb87f72bd53e434d21ccd4be21
 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_p20160825.ebuild 3384 SHA256 54df3760b13ced6617ea9208decb3891f3415460e5d70ea275e0da9cc368bbaa SHA512 2e598096f62c7a94c10a70c6310a138028a9cb205493c189eafc88b9a1a613f3ed14fbf9f92f125bb752f2e00daab2681082b45a92897fcf9857cfe137d47ce0 WHIRLPOOL cb34027bd03d79b8dca8d9f94e987cbf497e687aea7886b492c57fb900ab093349e98a652c0cecbf6536e98773332e9a6fb60394e691a0f4efbe8c503f933ba7
 EBUILD netbeans-apisupport-9999_p20160826.ebuild 3384 SHA256 1b9fff4a21f34f36c45a98b3084d091d29fa7bc7bbb630e32e317d8fcd9d6324 SHA512 a96a87df2c655b8badc26f442c6a567aaf4d5533b2996eaa6e5c7402d7185bc2808ea62740b11e361daef73a4b2478730a9f3afffa8dd657c0a79e45609721a1 WHIRLPOOL 390d286c1f54666ef3d98f56f7e69545881eb9455ebd2e126a3588196f32043146c150ed73b0b501b1c0f55cbc50687c0a822a9bef85bb019298de9b29344908
 EBUILD netbeans-apisupport-9999_p20160829.ebuild 3384 SHA256 6945ea971f3d7a987f06ff1622bdbdd9b15b3362771db75b3740194ca4a8b2a7 SHA512 c257f30aae0bb4df1de514d1e1ef1369a4648c4095f7793943dcaebcb418307a63864b0ee6a6f7417ff37042de83e4541fe4a8db9a92d2a30734b27289f5bfbe WHIRLPOOL 920bead5f863c9a08cc3008498ce69c0e802618d8a7e7b21a5c5952948201df08674a047d471d4fc17d15aaf3f999831e0b8839bf5e3ffb41b85f6893dbc93c9
 EBUILD netbeans-apisupport-9999_p20160901.ebuild 3384 SHA256 510bf247897091f2ad67b95928d5a23f8288a94f876cd96fa4ffb0526aac2ef5 SHA512 67f635482ff8cdcabe3e5e2f41f6ff3f4222de79ef4cc9dae6603ee4ae047728350baaaa35c056ef7de960178c9f73cbcebe377fff5a5afc8feaefb27b4cda53 WHIRLPOOL f3b2c08334b0a0c0c0d1653ee3f62a4de7093c81d54c77d1ccb47c992b9f9664542da94007fbd2210aa32f0f1656f577b1359b64985786ce72add2268700b3bb

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160825.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160825.ebuild
deleted file mode 100644
index 5ca348a..0000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160825.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-08-25_00-02-33/zip/netbeans-trunk-nightly-201608250002-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 f5d9d78..89c5023 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -18,7 +18,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-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
 DIST netbeans-trunk-nightly-201608260002-src.zip 217205973 SHA256 6b68e52a251d6fbbb51fe7391a34d92d48a16db09c9174dc11a63c9e6cbf6fb7 SHA512 89b9173774cd9f8bca6deb9978b05c6a249295941a5a2a2934904d6b19a3716f97f6bf3872e46cb8e0b5643da1bb1aa600c10968e1bdb6d7bed391bff62472e6 WHIRLPOOL 4bfe3e0f29fc0afe434facd60186c346308897c792b55f837ebbbe4f1817eac810f9ea3c42fbb41b8303d94c698996b95b0f0f9e8856a4df68b1c0774b735048
 DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc7b49dde50f98461edfc143b64c3ed8ba85f220ae149858b5d7 SHA512 8a036de09a281bbb3ce5473056a074c848ce49fd9165c831f0e3da8f64ea95f39b784bd4ccd4e5b8f9d1c3886a21d1c300d18efb0e78603da729c123246bb81f WHIRLPOOL 81c12e1cc239d723559af6173636d2eb3fd32b05abffcfdac89fd5c9a9c0c2215ad89b4eeef2bc0f04441cdb04a7619b9aafa28ed6e20b314ce9b1679d9ceb2f
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
@@ -48,7 +47,6 @@ DIST netbeans-trunk-nightly-201609250002-src.zip 218005446 SHA256 c28a4ee7eaa239
 DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1bf5de335c280b679d32646b7740176e0e3e91bdac284bc6fe66 SHA512 fe60ff01cdb7e1e8b044c4e9a51446198d8401180a66fa32f8d14953ec3d719e215e5161193253edc21c00bbca7f23af5903d4d59f5e4a9f5fb28d3be2aed235 WHIRLPOOL 4bbc58439fec5202aa774f3aa0057258aef8f9a259ed1aeab5110038462a727523bc27a845f05aa31c230cb730a988d5710735eb87f72bd53e434d21ccd4be21
 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_p20160825.ebuild 4790 SHA256 10e901d81c2445a84e7869649d684322379df036e4cacf5275cf92c115ad1ef6 SHA512 506a606cc624ac4fa268ae0b3861034b1f141ac5533a16c022a33e50f5a2a22f5f86faa64ed5831c89b376ff247c031e10316dbc8891f8cb158b7baad0010a39 WHIRLPOOL 0f6b9a09e23f24a66faac5d0aa6861b51aa11ec19efcf39680b776cd2b5eac0765a54fd9d0f911377fbdf0d1dbb3eaafed2a74b51bb64f2e01ccbe658912cd71
 EBUILD netbeans-cnd-9999_p20160826.ebuild 4790 SHA256 b34e4a018aafed0e7a8b3aa46cdc0cd976316ff9bc5e3fccc9ab7f47f8ff4356 SHA512 0d170fc9a1152f39638a2c9ad94109faf53c764ecc3b57faf28933bcb232cd6ab81d9ba6fd17741a7cbd0bda03021a7de20e05eddb5fc1e8b74a3676ae0a8b12 WHIRLPOOL 6e39ab4092129d4a67a54f44a69a1878518dd956c175512dd7340041eda8cb370cef3762729ed3f8d1e4135c333f5fc7fb21e2e73ff900be457ea0dca4857ad7
 EBUILD netbeans-cnd-9999_p20160829.ebuild 4790 SHA256 f7746423ecd033715e809822b187f4b4d8887747b08df4e7c7d10bcdf9c31251 SHA512 d36d72c0c5be22fb2efef9ac776a3e637536a0933eea2cdb61e465330ef78f6f0c9f9a84a74b99d59a246da670c1752adc0fe1cc1ba8a069774d5ffbb402b234 WHIRLPOOL dc311eb8666cb7544de448807a56fd12d62e07655224d26bd9d75e943db2d6711b248d692e87d546aa54a385c18884e46d7191758a8fe28801130fc21f8d9db4
 EBUILD netbeans-cnd-9999_p20160901.ebuild 4790 SHA256 10294fbb52396e0c50d7fa3e91583141798e0193b4ddf2e3a4b888ddb3bfed3e SHA512 bc12f02584a4f4cdb9d9b134f7c0b6233b714134316149555349afca3c7f14532321029175c6c185ff997a69f17eab40b794489c4c5b2fba2189b9006ebfeed6 WHIRLPOOL e1f4d41c146f3663a612dcfea0e2d325240bf86f7928ae994d9fdf5e73972c2802eaa0fdb4b7c4fa4d0d98a7c391218716158f4cb6cedcaad8e11bd42960995e

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160825.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160825.ebuild
deleted file mode 100644
index d6a4cd3..0000000
--- a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160825.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-08-25_00-02-33/zip/netbeans-trunk-nightly-201608250002-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/371AD978F940F80738D147BA611D646BF82538A5-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}"/371AD978F940F80738D147BA611D646BF82538A5-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 9fc5d24..3448124 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/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-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
 DIST netbeans-trunk-nightly-201608260002-src.zip 217205973 SHA256 6b68e52a251d6fbbb51fe7391a34d92d48a16db09c9174dc11a63c9e6cbf6fb7 SHA512 89b9173774cd9f8bca6deb9978b05c6a249295941a5a2a2934904d6b19a3716f97f6bf3872e46cb8e0b5643da1bb1aa600c10968e1bdb6d7bed391bff62472e6 WHIRLPOOL 4bfe3e0f29fc0afe434facd60186c346308897c792b55f837ebbbe4f1817eac810f9ea3c42fbb41b8303d94c698996b95b0f0f9e8856a4df68b1c0774b735048
 DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc7b49dde50f98461edfc143b64c3ed8ba85f220ae149858b5d7 SHA512 8a036de09a281bbb3ce5473056a074c848ce49fd9165c831f0e3da8f64ea95f39b784bd4ccd4e5b8f9d1c3886a21d1c300d18efb0e78603da729c123246bb81f WHIRLPOOL 81c12e1cc239d723559af6173636d2eb3fd32b05abffcfdac89fd5c9a9c0c2215ad89b4eeef2bc0f04441cdb04a7619b9aafa28ed6e20b314ce9b1679d9ceb2f
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
@@ -38,7 +37,6 @@ DIST netbeans-trunk-nightly-201609250002-src.zip 218005446 SHA256 c28a4ee7eaa239
 DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1bf5de335c280b679d32646b7740176e0e3e91bdac284bc6fe66 SHA512 fe60ff01cdb7e1e8b044c4e9a51446198d8401180a66fa32f8d14953ec3d719e215e5161193253edc21c00bbca7f23af5903d4d59f5e4a9f5fb28d3be2aed235 WHIRLPOOL 4bbc58439fec5202aa774f3aa0057258aef8f9a259ed1aeab5110038462a727523bc27a845f05aa31c230cb730a988d5710735eb87f72bd53e434d21ccd4be21
 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_p20160825.ebuild 2968 SHA256 743d37e86e9b8218fcbf14190c16219c112fbcd179f5b940eb9444b0c5ae13f1 SHA512 841416e8f73cb90b08f4f4f5299ab013b8892e0eca8daefbfb8c7804e5352438a69194ed613a992ff2d23fd197e2d08278e0854be542a9198d196953b732c2ba WHIRLPOOL c439d387fc8ab48ac64765a6eb7a6c21e9a99206d6d45ce8304b25bfcbdc12a7c4f667ddaa5ba778eba456e35e3231b73b2698f9cc7efd6502ff2eaf06ebb5e4
 EBUILD netbeans-dlight-9999_p20160826.ebuild 2968 SHA256 91ae72752e753f9c57769bfe309acd9fa65175e19e4c32b98ca318db44957c61 SHA512 db5ae2f64fbe7e34bce7935601e4cf4b01d5f8ca485325028f578935bf4b21b46f0ce01fc497f2e21832e7ed3f38ba0aecfe6c19cfc79b8b5192a8e2262f8c5d WHIRLPOOL 1751e2553001913b5d2316ac7ffc79c579b65ddeaf726d5ca1d9b89254fd97d79a2f627f9590c2c4cdc88865da936c366b765617b9073eea499532afb0edc2e4
 EBUILD netbeans-dlight-9999_p20160829.ebuild 2968 SHA256 a98a009495c7fce4f058deb98a0eeb1523bde7a92b2876178bf8c7da71c7fb33 SHA512 e26c577e9736f9868901e73b60765ea1ecc809f25495169a5eb094713980847e9f45ab6e414cd7dc2a4fd7e3a9fd2a2166331e2ea97f104f3beb6c5769de7959 WHIRLPOOL 99b58e1920fbfda4d583bfb97408e1dbc41b54fd652e9890c6dd4634dda9c928cba46c773b940a6c0f8de2a6ed5e53e3853ae35517688f1829f19db51b938cb9
 EBUILD netbeans-dlight-9999_p20160901.ebuild 2968 SHA256 d0b5fb71275970b2c852bd12c4216e7b07ca17920924aff5b7a009db73a8e18c SHA512 3229515011cc8336648deaa46e20fc16973cb2c10dbe4cb9d53d911d96dee22c68da598d8e1cbc128690accde68e025b052a23ff3bb0cc66c46b72cdfb02d138 WHIRLPOOL 93ecb0b678d5f9efb4eb18d7ae1a1a352816e8c798daf3f265dfc40c2585a45150f6d3d194fb58e283a9e6f7b85d3eb7e205b4d140c9be7559e4a514f16c146d

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160825.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160825.ebuild
deleted file mode 100644
index e2283d7..0000000
--- a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160825.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-08-25_00-02-33/zip/netbeans-trunk-nightly-201608250002-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 a2f3dea..e8e7797 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-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
 DIST netbeans-trunk-nightly-201608260002-src.zip 217205973 SHA256 6b68e52a251d6fbbb51fe7391a34d92d48a16db09c9174dc11a63c9e6cbf6fb7 SHA512 89b9173774cd9f8bca6deb9978b05c6a249295941a5a2a2934904d6b19a3716f97f6bf3872e46cb8e0b5643da1bb1aa600c10968e1bdb6d7bed391bff62472e6 WHIRLPOOL 4bfe3e0f29fc0afe434facd60186c346308897c792b55f837ebbbe4f1817eac810f9ea3c42fbb41b8303d94c698996b95b0f0f9e8856a4df68b1c0774b735048
 DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc7b49dde50f98461edfc143b64c3ed8ba85f220ae149858b5d7 SHA512 8a036de09a281bbb3ce5473056a074c848ce49fd9165c831f0e3da8f64ea95f39b784bd4ccd4e5b8f9d1c3886a21d1c300d18efb0e78603da729c123246bb81f WHIRLPOOL 81c12e1cc239d723559af6173636d2eb3fd32b05abffcfdac89fd5c9a9c0c2215ad89b4eeef2bc0f04441cdb04a7619b9aafa28ed6e20b314ce9b1679d9ceb2f
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
@@ -65,7 +64,6 @@ DIST netbeans-trunk-nightly-201609250002-src.zip 218005446 SHA256 c28a4ee7eaa239
 DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1bf5de335c280b679d32646b7740176e0e3e91bdac284bc6fe66 SHA512 fe60ff01cdb7e1e8b044c4e9a51446198d8401180a66fa32f8d14953ec3d719e215e5161193253edc21c00bbca7f23af5903d4d59f5e4a9f5fb28d3be2aed235 WHIRLPOOL 4bbc58439fec5202aa774f3aa0057258aef8f9a259ed1aeab5110038462a727523bc27a845f05aa31c230cb730a988d5710735eb87f72bd53e434d21ccd4be21
 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_p20160825.ebuild 15825 SHA256 f6f4815c70f4efe2834668a2c0290398543f251d0086736b4ca14d33d4b79728 SHA512 164e18ea566c2c888eb917f569f9d3ac1b54c35b5facc70ece393bc8899a269a3daea3c6d3c2205093b04770cc75f4e63f7ca4092b35bb66241f20e130c3f8b7 WHIRLPOOL 8e3ee7e0fc0d48d1642f15f94f231654110158e00766a4bb223fd5826c2dc11de614a15eddc80ee7212686c4ef866581ec1ff439fdec4f21185ccdf735b739e8
 EBUILD netbeans-enterprise-9999_p20160826.ebuild 15825 SHA256 61c1621c7e67914e0833abcacf1d592a5b2b8d19050a873be77c65e7ca901e3b SHA512 606aff2ab0446d30928310299d2c164fa257dcbb08ea082367b9c6a548257e2e0774a98168b01e199b08024d5fd9f866ed93eb55d2d7cfaf2615e57d7d6910fd WHIRLPOOL 47e1597a6d863ac6d053bbdd9290a99f674a0349456e7af55f4300595738a5da593051146a1881e60830a2dff1a513870686f85f8454a61925c7bdcc4df28e38
 EBUILD netbeans-enterprise-9999_p20160829.ebuild 15825 SHA256 d948ea9be53b33a5a2df9651c71b9fc344f174c23aeec8aead7c9e1fdec637f6 SHA512 56367a3d941b121ab9813908dfaabfa27a1cc3abbc73b85f59c6272d1ba05a37f964b9c5c2fbdfc51dbd1367c9ea10d565b8127b7dc6396073d4bd72d0b63f9b WHIRLPOOL bf503f0bbfb2fdd1492ce95c3ca73a9202ed451884b620d05ab2158414f492ecf4cb9ff28e8f703cd4d0676e5ea4e339e1593856008e55b41d6c19ca76ad38e5
 EBUILD netbeans-enterprise-9999_p20160901.ebuild 15825 SHA256 09a619ebd3bb9b72c41c7e06d0d55addad3d3a912bd12da537182e03900396b6 SHA512 213021feb7f6676d989c37c5c7495e94e0101a3c3694ac8980f897923c5d2373661f616521d34d5995f08b8ad7024e39bcd93346eb79f14647b4e0408f7a6e21 WHIRLPOOL a108e1734dd563ca2fdb910db89f7b4e21c98f6a0bffcfaae653d9d6af93f54cbd4d8c4460df0ea1dd98db03cbd40612adf7e6115bb00384121d58a33102d6dc

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160825.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160825.ebuild
deleted file mode 100644
index 233b8fd..0000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160825.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-08-25_00-02-33/zip/netbeans-trunk-nightly-201608250002-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 008be03..200e170 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-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
 DIST netbeans-trunk-nightly-201608260002-src.zip 217205973 SHA256 6b68e52a251d6fbbb51fe7391a34d92d48a16db09c9174dc11a63c9e6cbf6fb7 SHA512 89b9173774cd9f8bca6deb9978b05c6a249295941a5a2a2934904d6b19a3716f97f6bf3872e46cb8e0b5643da1bb1aa600c10968e1bdb6d7bed391bff62472e6 WHIRLPOOL 4bfe3e0f29fc0afe434facd60186c346308897c792b55f837ebbbe4f1817eac810f9ea3c42fbb41b8303d94c698996b95b0f0f9e8856a4df68b1c0774b735048
 DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc7b49dde50f98461edfc143b64c3ed8ba85f220ae149858b5d7 SHA512 8a036de09a281bbb3ce5473056a074c848ce49fd9165c831f0e3da8f64ea95f39b784bd4ccd4e5b8f9d1c3886a21d1c300d18efb0e78603da729c123246bb81f WHIRLPOOL 81c12e1cc239d723559af6173636d2eb3fd32b05abffcfdac89fd5c9a9c0c2215ad89b4eeef2bc0f04441cdb04a7619b9aafa28ed6e20b314ce9b1679d9ceb2f
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
@@ -33,7 +32,6 @@ DIST netbeans-trunk-nightly-201609250002-src.zip 218005446 SHA256 c28a4ee7eaa239
 DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1bf5de335c280b679d32646b7740176e0e3e91bdac284bc6fe66 SHA512 fe60ff01cdb7e1e8b044c4e9a51446198d8401180a66fa32f8d14953ec3d719e215e5161193253edc21c00bbca7f23af5903d4d59f5e4a9f5fb28d3be2aed235 WHIRLPOOL 4bbc58439fec5202aa774f3aa0057258aef8f9a259ed1aeab5110038462a727523bc27a845f05aa31c230cb730a988d5710735eb87f72bd53e434d21ccd4be21
 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_p20160825.ebuild 2913 SHA256 dc08ae009bc847ab79333d54fc1c2e5324c18a663513c53f373590979d1adf13 SHA512 331cbc62d84c4fb2d8c714c09bd4b81bd1162754f9b8e31ac93a0dc518acdc4c5c71a50b6ff15960667fd1ee73aff7a240fc5b39e07c6889d4a856d5b592f934 WHIRLPOOL 06daad702a77d4e3bb1f38515cf9356a3ff9b3f8b559a78cc351d10c2fc4bbb2ed8c775424aebd69d379406df4e33a5424be4600239027a5a764a9f6fedcc657
 EBUILD netbeans-ergonomics-9999_p20160826.ebuild 2913 SHA256 4ed6803ffcbdcc975d02cf9f671a45d0154fa4cef89f370c6edb8043591500f2 SHA512 9ddc46ea066ac41fcc784311cd7532b90ebd5997817bea548f1a27f6643e85d5f76826ad073695bba050562a2c5ea51bd3626c4b296e046c5b1ea891f04b428d WHIRLPOOL d57305ea89237c984f8b2777db908e9e48fc2e81a56c2b1a45317a83c6dd51e97cc03966a46434c7a127f419768212c2606ad734d28c61b54ae0959c6b5837b9
 EBUILD netbeans-ergonomics-9999_p20160829.ebuild 2913 SHA256 ec8672e62b3c57e3b9bf9328ab4c601077d9fba1afaeba42f3572a8c79f9a6c3 SHA512 fc8824a32cd6cd204445511b541407ca6b98cf551d6df693f241735eb43a4d99a324ebaf2b5a376d8a2b2ddf937bec113249131522aead2906dfe4f391792ae1 WHIRLPOOL dbac8b6ac0b7a01ac92b5bad3b825fc76153efac113ca64e31560832f64fa97b148523bed61bad378d33c79055735314c3bd22a86f41978c8b7107a71f61daef
 EBUILD netbeans-ergonomics-9999_p20160901.ebuild 2913 SHA256 8efe7cf5c02e556106330c243ea525b618176cb83a9a7628e90fce30fbb13804 SHA512 8becc42d5249dd48752a77c8bfcaee83046b992d450d13c938352ef30e7e59f4db45df34403723e900f1136ff4d0fd46cfd817505424ad7ff86c8f3a0de99fc6 WHIRLPOOL 633a4624ecbb75c3addd5529bba726f32340ef5d1cc38d539cab0551af01a2b0b6c7f30ee85fd23bd4c773fbacd5f63cc8c813b0d8983f97371e057169b9b178

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160825.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160825.ebuild
deleted file mode 100644
index 9d6e917..0000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160825.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-08-25_00-02-33/zip/netbeans-trunk-nightly-201608250002-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 1babbd6..8d0d09b 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-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
 DIST netbeans-trunk-nightly-201608260002-src.zip 217205973 SHA256 6b68e52a251d6fbbb51fe7391a34d92d48a16db09c9174dc11a63c9e6cbf6fb7 SHA512 89b9173774cd9f8bca6deb9978b05c6a249295941a5a2a2934904d6b19a3716f97f6bf3872e46cb8e0b5643da1bb1aa600c10968e1bdb6d7bed391bff62472e6 WHIRLPOOL 4bfe3e0f29fc0afe434facd60186c346308897c792b55f837ebbbe4f1817eac810f9ea3c42fbb41b8303d94c698996b95b0f0f9e8856a4df68b1c0774b735048
 DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc7b49dde50f98461edfc143b64c3ed8ba85f220ae149858b5d7 SHA512 8a036de09a281bbb3ce5473056a074c848ce49fd9165c831f0e3da8f64ea95f39b784bd4ccd4e5b8f9d1c3886a21d1c300d18efb0e78603da729c123246bb81f WHIRLPOOL 81c12e1cc239d723559af6173636d2eb3fd32b05abffcfdac89fd5c9a9c0c2215ad89b4eeef2bc0f04441cdb04a7619b9aafa28ed6e20b314ce9b1679d9ceb2f
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
@@ -37,7 +36,6 @@ DIST netbeans-trunk-nightly-201609250002-src.zip 218005446 SHA256 c28a4ee7eaa239
 DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1bf5de335c280b679d32646b7740176e0e3e91bdac284bc6fe66 SHA512 fe60ff01cdb7e1e8b044c4e9a51446198d8401180a66fa32f8d14953ec3d719e215e5161193253edc21c00bbca7f23af5903d4d59f5e4a9f5fb28d3be2aed235 WHIRLPOOL 4bbc58439fec5202aa774f3aa0057258aef8f9a259ed1aeab5110038462a727523bc27a845f05aa31c230cb730a988d5710735eb87f72bd53e434d21ccd4be21
 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_p20160825.ebuild 3377 SHA256 d539a0ff543871f2f3cf9905b20c85831e9dae57fe12d7bd97794b802a62f68f SHA512 0ad413dbb47995839c160a750ee75de36051f0b779b6eed94e7b441d991735d427ceee401f649ed0a691de231940948660426fee30327542d50ad9e7ca93daa8 WHIRLPOOL fc6a237cf280eab919ff7823036e63fd74c4ff67d63de554e6acbed733b32b7aae69c8d09fdd718fe2863efa94213204df89dce8593c4c99ec73dceb37390099
 EBUILD netbeans-extide-9999_p20160826.ebuild 3377 SHA256 a5dd9fedf7a6f32515622c5bd34d53523c848b42db96f0f6234c0b052c9b09bd SHA512 4a8a31c6b7f05c7bd124298fdd8708f32f34629ac00022db075621cdffe5d85dab217256ac8913207b662b4b93536ab17773c7440c5b927237a5406f04cb9de0 WHIRLPOOL 82e857737569c9539cd2a4ff734c7184cead8eb830d7c7b8799aa426fca6752f635fc4bcb1ff4334e5447f868d222e844f354c47daf67dec06d3e7a4077f8e87
 EBUILD netbeans-extide-9999_p20160829.ebuild 3377 SHA256 626ced6297160a5a078e2dd4d92c76d39cb60a7d5737813bb257e84ec8946a4f SHA512 a900efe79b93d70a21cf15e41e5e4fe5e1ab915de1b45c390e7a96cb1c843a6076f5893d2696d3917e30de0fb157ca37c689cf2b5c9c8c10ddde564ac7a98802 WHIRLPOOL b12c00856ab2fe3de1b7fbce2ea53469064089b9bcd545cf05c541a92217ad83f81b913ecce4ac182f105c4d2a1414777b03e538a95d43ee3a05225353de8b53
 EBUILD netbeans-extide-9999_p20160901.ebuild 3377 SHA256 044a6d90a3bbc5b2ea976a60626d163646258b8f9b607f48807c9e5fc205eacc SHA512 7299576b1232e56bc56eaf961a225e5d01bc16d45ac89640b8547c31c1342b77714c9fa9733c6a81d06e51cbad5422a896f101fcd80ccde50365c4d6adaebef6 WHIRLPOOL 7c638df833b0c52fc9bd3d47bdb324bffd3ff898ef849d472187328fb79b6cc5511e2eed7592762903439ef51863e809b001eb3df56d06d318f29fc1bb672faf

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160825.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160825.ebuild
deleted file mode 100644
index 283dd1b..0000000
--- a/dev-java/netbeans-extide/netbeans-extide-9999_p20160825.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-08-25_00-02-33/zip/netbeans-trunk-nightly-201608250002-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 785b714..79dbba6 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-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
 DIST netbeans-trunk-nightly-201608260002-src.zip 217205973 SHA256 6b68e52a251d6fbbb51fe7391a34d92d48a16db09c9174dc11a63c9e6cbf6fb7 SHA512 89b9173774cd9f8bca6deb9978b05c6a249295941a5a2a2934904d6b19a3716f97f6bf3872e46cb8e0b5643da1bb1aa600c10968e1bdb6d7bed391bff62472e6 WHIRLPOOL 4bfe3e0f29fc0afe434facd60186c346308897c792b55f837ebbbe4f1817eac810f9ea3c42fbb41b8303d94c698996b95b0f0f9e8856a4df68b1c0774b735048
 DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc7b49dde50f98461edfc143b64c3ed8ba85f220ae149858b5d7 SHA512 8a036de09a281bbb3ce5473056a074c848ce49fd9165c831f0e3da8f64ea95f39b784bd4ccd4e5b8f9d1c3886a21d1c300d18efb0e78603da729c123246bb81f WHIRLPOOL 81c12e1cc239d723559af6173636d2eb3fd32b05abffcfdac89fd5c9a9c0c2215ad89b4eeef2bc0f04441cdb04a7619b9aafa28ed6e20b314ce9b1679d9ceb2f
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
@@ -35,7 +34,6 @@ DIST netbeans-trunk-nightly-201609250002-src.zip 218005446 SHA256 c28a4ee7eaa239
 DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1bf5de335c280b679d32646b7740176e0e3e91bdac284bc6fe66 SHA512 fe60ff01cdb7e1e8b044c4e9a51446198d8401180a66fa32f8d14953ec3d719e215e5161193253edc21c00bbca7f23af5903d4d59f5e4a9f5fb28d3be2aed235 WHIRLPOOL 4bbc58439fec5202aa774f3aa0057258aef8f9a259ed1aeab5110038462a727523bc27a845f05aa31c230cb730a988d5710735eb87f72bd53e434d21ccd4be21
 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_p20160825.ebuild 3416 SHA256 6c5e86afe2c2da71d9d818bbaf21c31e6b5244ad64bcf4afc1052b56039391a8 SHA512 d3375254af1608b01053b01ee27b40007ef12988871a85b96cf836e9e27b9506de27d7fb779d7665233cab2034aad6680a4c00e4f54bc2651b218df3217ab1e5 WHIRLPOOL 89c387754b4f8b85fdb973d83fa2b6b7e944a7ea54d98ff4f9e194caeece515a5d41331da5d06a2f37b9e58b0531e7aea293e71d85bca651617efea7e63ccb6b
 EBUILD netbeans-groovy-9999_p20160826.ebuild 3416 SHA256 27fa8b34d22c54cd444dd1ba67b63ff76f5481cf4c6ca385c497be39e187774b SHA512 2d365b3644053de38e150d8d2b08353b1cd35d4af96ec8c92e53ef11e6620c8c63a95b2446c049bf4d7592c330486cc1cc902710c2efe222873ace5d58f00428 WHIRLPOOL 5dbdfa2b6a91da0297054910ac681c93b08db0b21466e53f637f097001581dc28ebb36fcad28db7a6288c4ad7c62326ffa990b86d6e746d6bcb56c925bf3be0c
 EBUILD netbeans-groovy-9999_p20160829.ebuild 3416 SHA256 915f8dbcbe1387e92c2a8a2942867855dda0d88fb46c8040ff0738e232debf69 SHA512 a013161b6a0ee8e4fbf29342632484efe5496fa492b8608380a89b3b073d1abdab3ff400ee0ac08456d6ebb62a0bfd3ce7dca80242eddf2609308764a3bc3a16 WHIRLPOOL 1f4ec2e318489afab731cd2411434725d5a75eab00c43de0ae6b027d78729810098a0c939175292fde30e8c878665e9e3b479c4d168f503630d62900943c7410
 EBUILD netbeans-groovy-9999_p20160901.ebuild 3416 SHA256 46be5790e675abd9d835ef7863d357674bb0769ffbb1c4cba45ecf8610e4fca1 SHA512 e3719edef1d6820f322b928f4d99b363a4610cd9909f2d6b599f810af4b4f166c75612ffa9dd0627959d59fd96d773b958744ce314e97e9e43f8ae0d8d80321d WHIRLPOOL decd91bb91b98a18c6f7a7a49d3864db0f710cf09f8c1dfeaa31032481c80659e702d1096558ca298dd482dd48c350ffd3cab774f2645e6cb59d7e573695c34d

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160825.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160825.ebuild
deleted file mode 100644
index 0f6c1c8..0000000
--- a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160825.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-08-25_00-02-33/zip/netbeans-trunk-nightly-201608250002-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 913f22c..cad69e4 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-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
 DIST netbeans-trunk-nightly-201608260002-src.zip 217205973 SHA256 6b68e52a251d6fbbb51fe7391a34d92d48a16db09c9174dc11a63c9e6cbf6fb7 SHA512 89b9173774cd9f8bca6deb9978b05c6a249295941a5a2a2934904d6b19a3716f97f6bf3872e46cb8e0b5643da1bb1aa600c10968e1bdb6d7bed391bff62472e6 WHIRLPOOL 4bfe3e0f29fc0afe434facd60186c346308897c792b55f837ebbbe4f1817eac810f9ea3c42fbb41b8303d94c698996b95b0f0f9e8856a4df68b1c0774b735048
 DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc7b49dde50f98461edfc143b64c3ed8ba85f220ae149858b5d7 SHA512 8a036de09a281bbb3ce5473056a074c848ce49fd9165c831f0e3da8f64ea95f39b784bd4ccd4e5b8f9d1c3886a21d1c300d18efb0e78603da729c123246bb81f WHIRLPOOL 81c12e1cc239d723559af6173636d2eb3fd32b05abffcfdac89fd5c9a9c0c2215ad89b4eeef2bc0f04441cdb04a7619b9aafa28ed6e20b314ce9b1679d9ceb2f
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
@@ -38,7 +37,6 @@ DIST netbeans-trunk-nightly-201609250002-src.zip 218005446 SHA256 c28a4ee7eaa239
 DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1bf5de335c280b679d32646b7740176e0e3e91bdac284bc6fe66 SHA512 fe60ff01cdb7e1e8b044c4e9a51446198d8401180a66fa32f8d14953ec3d719e215e5161193253edc21c00bbca7f23af5903d4d59f5e4a9f5fb28d3be2aed235 WHIRLPOOL 4bbc58439fec5202aa774f3aa0057258aef8f9a259ed1aeab5110038462a727523bc27a845f05aa31c230cb730a988d5710735eb87f72bd53e434d21ccd4be21
 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_p20160825.ebuild 4126 SHA256 68e19b301e715f30dd7d0bdc52127a0b7e53efdcb233d3940dd4b8a9a87e8584 SHA512 57a0b9f9994ada380d9907fcf234d589a296a45d5fb8375cbd7ffb5a9e4ad493c3dba0c7bc8f593acbdacfb2cb6e84b59c007a7424a5a05b9782f538af4ac986 WHIRLPOOL 8ea9a59693f22cc6ec42228958ef44896423c899f5c492b759c70737184119e192e37ee8a9583ab21efdc1e858ce3c2705e61759478408edf613afbc563d8a01
 EBUILD netbeans-harness-9999_p20160826.ebuild 4126 SHA256 6f188e8a6bc5d05c135d913ca9200c3a157628a682fc7fe7a4c410da4c5d19ff SHA512 f617b1267c46a15abc8c02a61fa3c645dc470bac186e6993210904848d0b44c97d878b56ef85f4d63df594668a76559b617f92238868dffa1fdda065238138ad WHIRLPOOL c9f4b55da4a2c2f99c8e5e657d3492bc5d5db3d28e884b66258426558183bbd0734c1fa60f50ac93260c047cb327de2263a5e5553f4e74ef4e94891f9ff3df07
 EBUILD netbeans-harness-9999_p20160829.ebuild 4126 SHA256 f0db647af3fa24d48fc76405c19e20dcdaac75ca0a5e0c49d294bd8b87b573d2 SHA512 40764f17d61c0dfd040ae2820a59cd166d2a1d3b1be66cfaa9f83b1037e004a73adadcd375ffef70d5981356498bd892f21d36eec222f3d2d2744ccd13fb2636 WHIRLPOOL a21e0350d1b3d4aa579b10486eb46d8ebb408d63011e1fbe1086d68d4da13bf3b05fcdb05c41d4f634fbaa93d09f94d0ca516aeea52f60982ea27112c3c7c90f
 EBUILD netbeans-harness-9999_p20160901.ebuild 4126 SHA256 7df8b62ce9b8e8d1f051aa05ffbc0b7e9f0dcb427983b01a14a114bf6e243400 SHA512 d5dbecf2dfbf2bfeedbc886c5abb76a81deeb8d5c1fe8b6d0bc9bbecad070c52eed91817361c620bf24a1c7b32b6420e8a296f153cdcda7f64f029e154d6eb3c WHIRLPOOL f2300981e99f99f11319d24c62249b064bb526b88650e6defeac73dfe4e3f142ed27d79a13fe1ba30f621eb1a87867d8f62c1a053daa2543a1177a0af6166d89

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160825.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160825.ebuild
deleted file mode 100644
index 571f4cf..0000000
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20160825.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-08-25_00-02-33/zip/netbeans-trunk-nightly-201608250002-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 c931cca..b4d2d94 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-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
 DIST netbeans-trunk-nightly-201608260002-src.zip 217205973 SHA256 6b68e52a251d6fbbb51fe7391a34d92d48a16db09c9174dc11a63c9e6cbf6fb7 SHA512 89b9173774cd9f8bca6deb9978b05c6a249295941a5a2a2934904d6b19a3716f97f6bf3872e46cb8e0b5643da1bb1aa600c10968e1bdb6d7bed391bff62472e6 WHIRLPOOL 4bfe3e0f29fc0afe434facd60186c346308897c792b55f837ebbbe4f1817eac810f9ea3c42fbb41b8303d94c698996b95b0f0f9e8856a4df68b1c0774b735048
 DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc7b49dde50f98461edfc143b64c3ed8ba85f220ae149858b5d7 SHA512 8a036de09a281bbb3ce5473056a074c848ce49fd9165c831f0e3da8f64ea95f39b784bd4ccd4e5b8f9d1c3886a21d1c300d18efb0e78603da729c123246bb81f WHIRLPOOL 81c12e1cc239d723559af6173636d2eb3fd32b05abffcfdac89fd5c9a9c0c2215ad89b4eeef2bc0f04441cdb04a7619b9aafa28ed6e20b314ce9b1679d9ceb2f
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
@@ -172,7 +171,6 @@ DIST netbeans-trunk-nightly-201609250002-src.zip 218005446 SHA256 c28a4ee7eaa239
 DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1bf5de335c280b679d32646b7740176e0e3e91bdac284bc6fe66 SHA512 fe60ff01cdb7e1e8b044c4e9a51446198d8401180a66fa32f8d14953ec3d719e215e5161193253edc21c00bbca7f23af5903d4d59f5e4a9f5fb28d3be2aed235 WHIRLPOOL 4bbc58439fec5202aa774f3aa0057258aef8f9a259ed1aeab5110038462a727523bc27a845f05aa31c230cb730a988d5710735eb87f72bd53e434d21ccd4be21
 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_p20160825.ebuild 29867 SHA256 db8c4e3e6972ccda7d90646e10b117bec8cd5c2d2006a20a5829332f7ff371eb SHA512 9073a5f3c04f371b20403fafa1e3ee2e19545abcf56f54c99077c8004268b306d4cca5429f3e94417c461e675025315b1146bfb8692535b4945573a505430427 WHIRLPOOL befc4a88ffec455f4112bb66a7cbcc8957e66e3ed8a429eeab07004d1e5de0c5bc4b456ab27d3a9bdef91e4d3be0fe455b8a3e10e23d9486a0f87d786c8bad00
 EBUILD netbeans-ide-9999_p20160826.ebuild 29867 SHA256 a8864aa5ed9c7bc53d7d447a2989bb4da6bc18b2539a9b568ad9ac070a06b49e SHA512 bba08b16c89a30e706e725784915b04dcd0e4699abcfc4287ddf8e0230ab68bf1debca3641d377bc9918a00238743c1c430d21e8863dbaa77cd4318a883990eb WHIRLPOOL 1e689c1f47714be4d2e0ad4e210f2e91c867feee80a4af36bdae35257dce0c5f882e08377f771621d2fba4a4593339f31ec8ba41a0ec9279dcf5d7b5b0473a85
 EBUILD netbeans-ide-9999_p20160829.ebuild 29849 SHA256 a6f7fab5c9676f4258ba58360ed0232e8dfc97aeb3b98fcf37f6c9c8930ec093 SHA512 bb800f90796a6980ee8fabdf5f7af898d020a841f35031dfc47c050275e3e1c65cb240910aefe729161a73f9a547b57f520147e70f7a2d8837bc22c8e3525819 WHIRLPOOL 0beb8336aafd5b5bdb28c8c6693ac63f83c8c0ecae44553a760d649edb92d061016053d50df09a01990ee2f78ed434808b3dbeb8ce2807273422ee5f05fc9008
 EBUILD netbeans-ide-9999_p20160901.ebuild 29849 SHA256 c1cbbcf929e5d8d7b4308f18929032c82a75de4cf674a52b44aa029a0e33fd7f SHA512 f70b98cb010431cf8389e111e023695abf8689721560252df25b9679d584f08dece3583327ea078404eea481bcee38d136d3221f93f766735cc6fc24170f2dcf WHIRLPOOL 448b751ab2996d8dc1989ad4211dd9a20a7e6d31e7a3cc2889994726ecd21df1417329f410810c918695f605117fafe89b123881ff5ef5c010ee42408ed71945

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160825.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160825.ebuild
deleted file mode 100644
index aae39c0..0000000
--- a/dev-java/netbeans-ide/netbeans-ide-9999_p20160825.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-08-25_00-02-33/zip/netbeans-trunk-nightly-201608250002-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 87e382d..26501f2 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -40,7 +40,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-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
 DIST netbeans-trunk-nightly-201608260002-src.zip 217205973 SHA256 6b68e52a251d6fbbb51fe7391a34d92d48a16db09c9174dc11a63c9e6cbf6fb7 SHA512 89b9173774cd9f8bca6deb9978b05c6a249295941a5a2a2934904d6b19a3716f97f6bf3872e46cb8e0b5643da1bb1aa600c10968e1bdb6d7bed391bff62472e6 WHIRLPOOL 4bfe3e0f29fc0afe434facd60186c346308897c792b55f837ebbbe4f1817eac810f9ea3c42fbb41b8303d94c698996b95b0f0f9e8856a4df68b1c0774b735048
 DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc7b49dde50f98461edfc143b64c3ed8ba85f220ae149858b5d7 SHA512 8a036de09a281bbb3ce5473056a074c848ce49fd9165c831f0e3da8f64ea95f39b784bd4ccd4e5b8f9d1c3886a21d1c300d18efb0e78603da729c123246bb81f WHIRLPOOL 81c12e1cc239d723559af6173636d2eb3fd32b05abffcfdac89fd5c9a9c0c2215ad89b4eeef2bc0f04441cdb04a7619b9aafa28ed6e20b314ce9b1679d9ceb2f
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
@@ -70,7 +69,6 @@ DIST netbeans-trunk-nightly-201609250002-src.zip 218005446 SHA256 c28a4ee7eaa239
 DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1bf5de335c280b679d32646b7740176e0e3e91bdac284bc6fe66 SHA512 fe60ff01cdb7e1e8b044c4e9a51446198d8401180a66fa32f8d14953ec3d719e215e5161193253edc21c00bbca7f23af5903d4d59f5e4a9f5fb28d3be2aed235 WHIRLPOOL 4bbc58439fec5202aa774f3aa0057258aef8f9a259ed1aeab5110038462a727523bc27a845f05aa31c230cb730a988d5710735eb87f72bd53e434d21ccd4be21
 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_p20160825.ebuild 15656 SHA256 383f84044a068ad8c529256c405eb53e12934a1adbd402bccd18dab316e9e87c SHA512 06eb4ef2288c0f7726a4042e5d4225588d532aba36716ff1f6221cf76d32aafeee3f84da306e3467b4ed23773fafa86cfd78b7376cde9476a939e775fe4e94ac WHIRLPOOL 52ddb44db707b4d77022cedc80af245872f634c51a24a3691b68679a99ee35dea1a465b90ccc6a42b45fcfa8d290ff35bd7f7ecfd014bed9475d0eb39e469495
 EBUILD netbeans-java-9999_p20160826.ebuild 15656 SHA256 0b5ce778dc51cdbb011382006e103263948969681870d7948f2546a5cca0aabe SHA512 5746b9d4d85e1ad9797bb3a8f90e6f3eff2a87243b007b85bc7e664b16a4c056363193cba0993f519867d1456411f928de6bff1098cdd3b9e8498dbcfc0eb759 WHIRLPOOL 90312c441234b7fa736daf7150f539e9ee473f29cbcb41ab15d9cb90db24c9a1d8ca490e88e180c6684941b9e5f07e626e2cf62d606e873dcebee92af6b25620
 EBUILD netbeans-java-9999_p20160829.ebuild 15656 SHA256 bc83101c53e23a1d651468baa0d8a2375175b1da0b81691206d811640b70c369 SHA512 3f108ac7aea8be7db61a7a9410d8dd4d6260e76e23bfa7d42dabc6d9ea487acdb0f01be7428a8c690908da82fa43112ac17163d99cf21b75ab0fcaad5df7c5f9 WHIRLPOOL aafff004669eb554dfe6d4b58a8b39ce43690188c0f58e7390c2c487e54deab0563355172af756afbd3cd18bf712daf4821401b6f353593cd1017b794f1a55d7
 EBUILD netbeans-java-9999_p20160901.ebuild 15656 SHA256 5147b0072c79f93d2afa3d9e38f9d5a5c03f6517431d20599b1c524e571efec5 SHA512 7c3c9b9e5e9e403dd6ee876d55984aa6352d117205134d5233534e3b74dec57b6925809e46e4a40843990eaeda124c33796633c28efc731dcede63a7b5107c4c WHIRLPOOL d04a1868162cfa5c869c1827ec4fb194d2c1cecc2c307fc4a618280c1aab484e3d6125b0ff9064627c965787ca66c75803aafbd1ac8e93c7a9afd5d2cdd2c73a

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160825.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160825.ebuild
deleted file mode 100644
index 247dcae..0000000
--- a/dev-java/netbeans-java/netbeans-java-9999_p20160825.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-08-25_00-02-33/zip/netbeans-trunk-nightly-201608250002-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 f9cfb23..1dd0c77 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-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
 DIST netbeans-trunk-nightly-201608260002-src.zip 217205973 SHA256 6b68e52a251d6fbbb51fe7391a34d92d48a16db09c9174dc11a63c9e6cbf6fb7 SHA512 89b9173774cd9f8bca6deb9978b05c6a249295941a5a2a2934904d6b19a3716f97f6bf3872e46cb8e0b5643da1bb1aa600c10968e1bdb6d7bed391bff62472e6 WHIRLPOOL 4bfe3e0f29fc0afe434facd60186c346308897c792b55f837ebbbe4f1817eac810f9ea3c42fbb41b8303d94c698996b95b0f0f9e8856a4df68b1c0774b735048
 DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc7b49dde50f98461edfc143b64c3ed8ba85f220ae149858b5d7 SHA512 8a036de09a281bbb3ce5473056a074c848ce49fd9165c831f0e3da8f64ea95f39b784bd4ccd4e5b8f9d1c3886a21d1c300d18efb0e78603da729c123246bb81f WHIRLPOOL 81c12e1cc239d723559af6173636d2eb3fd32b05abffcfdac89fd5c9a9c0c2215ad89b4eeef2bc0f04441cdb04a7619b9aafa28ed6e20b314ce9b1679d9ceb2f
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
@@ -36,7 +35,6 @@ DIST netbeans-trunk-nightly-201609250002-src.zip 218005446 SHA256 c28a4ee7eaa239
 DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1bf5de335c280b679d32646b7740176e0e3e91bdac284bc6fe66 SHA512 fe60ff01cdb7e1e8b044c4e9a51446198d8401180a66fa32f8d14953ec3d719e215e5161193253edc21c00bbca7f23af5903d4d59f5e4a9f5fb28d3be2aed235 WHIRLPOOL 4bbc58439fec5202aa774f3aa0057258aef8f9a259ed1aeab5110038462a727523bc27a845f05aa31c230cb730a988d5710735eb87f72bd53e434d21ccd4be21
 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_p20160825.ebuild 4971 SHA256 1ad6c689d98e9fe3042e46d6c01280ac27e1f8b02aa7274000e4fb47424e59fc SHA512 7ad46e1aa10252480af42ed06651ef020e2b52e4bdda1e31da295b1d410d7c4da2cc565d4df27c006f408a11e41325196e6f0a326d1c253ba9ea39a7dce874a8 WHIRLPOOL 3da79b47cb5ea46835711389202751240ce2f92b336320f19c6839c61928211043b7d2e9300f813f07594497f18933c690885bc85b446b85f4507f249db65ed2
 EBUILD netbeans-javacard-9999_p20160826.ebuild 4971 SHA256 288458ccec997d9ed63eef8802956889ccb36c60a901fc863fdd9513882bcc9c SHA512 6560e19f2092d78ad95bba52cd392b8349396990f483b44c4ff9c49571aaad7577ae7eb4d0661bddf3e52f2f57d98e621fc0efcb5acda62da545ccb195e4dc6e WHIRLPOOL 6c08ab25d2b61340be92edf8e2c285a566fa5c27460cd09ae1b321827cb10471c68829d9cda49383c480d9d0d861cd3f64717d2ae26f54ed9f4345698bc300ca
 EBUILD netbeans-javacard-9999_p20160829.ebuild 4971 SHA256 6ee1fd71a7bacf2aac7562fbb3475301c2158f35f41925990bcb2a927e9ac31c SHA512 313206273aaa618f7b2043a036da7eb218c718ebd8fe609c03381d28827da0e937ab13a4f60c55b3bc0c25b04b81baea3570f5d27fdd4d4d158a80eac846d221 WHIRLPOOL e5c41a017e7dae48ebe35f8b376684243d01e3a7569317aa0473ef4c1757570189529e64f526cf84a060edb7c75130b09420bf54b4098164492964307c44d914
 EBUILD netbeans-javacard-9999_p20160901.ebuild 4971 SHA256 771e34db8c9fb8270fed4124ae9e3f9bcd968415afc1d62e6f53fb8e6ebfae80 SHA512 c5330952122e0cb95d56ffa19bd51216177179a3d9396bea5563b064b8f6392534a4415c4e2184c45f7fe6e1124ef718e5690b781328efd7b3f48f427e861256 WHIRLPOOL e876f88b48f8c06d81e0404158a3f688c03f409d89df3ed015a3cb709c9cf0dd68170f905c29f959df1024b416fd8853173b09ce7c2b3650cb98f55f8e7460ef

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160825.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160825.ebuild
deleted file mode 100644
index a673f11..0000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160825.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-08-25_00-02-33/zip/netbeans-trunk-nightly-201608250002-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 a59543c..3b979fd 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-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
 DIST netbeans-trunk-nightly-201608260002-src.zip 217205973 SHA256 6b68e52a251d6fbbb51fe7391a34d92d48a16db09c9174dc11a63c9e6cbf6fb7 SHA512 89b9173774cd9f8bca6deb9978b05c6a249295941a5a2a2934904d6b19a3716f97f6bf3872e46cb8e0b5643da1bb1aa600c10968e1bdb6d7bed391bff62472e6 WHIRLPOOL 4bfe3e0f29fc0afe434facd60186c346308897c792b55f837ebbbe4f1817eac810f9ea3c42fbb41b8303d94c698996b95b0f0f9e8856a4df68b1c0774b735048
 DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc7b49dde50f98461edfc143b64c3ed8ba85f220ae149858b5d7 SHA512 8a036de09a281bbb3ce5473056a074c848ce49fd9165c831f0e3da8f64ea95f39b784bd4ccd4e5b8f9d1c3886a21d1c300d18efb0e78603da729c123246bb81f WHIRLPOOL 81c12e1cc239d723559af6173636d2eb3fd32b05abffcfdac89fd5c9a9c0c2215ad89b4eeef2bc0f04441cdb04a7619b9aafa28ed6e20b314ce9b1679d9ceb2f
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
@@ -35,7 +34,6 @@ DIST netbeans-trunk-nightly-201609250002-src.zip 218005446 SHA256 c28a4ee7eaa239
 DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1bf5de335c280b679d32646b7740176e0e3e91bdac284bc6fe66 SHA512 fe60ff01cdb7e1e8b044c4e9a51446198d8401180a66fa32f8d14953ec3d719e215e5161193253edc21c00bbca7f23af5903d4d59f5e4a9f5fb28d3be2aed235 WHIRLPOOL 4bbc58439fec5202aa774f3aa0057258aef8f9a259ed1aeab5110038462a727523bc27a845f05aa31c230cb730a988d5710735eb87f72bd53e434d21ccd4be21
 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_p20160825.ebuild 6293 SHA256 397161e1b881f316169969dce096f9b8f60ff587782fdfdaeb26bf93189250e0 SHA512 c28b8e4b440dd947ffabefaef84352a707c7525cb34e1fdef441ae3226a8f01524d2d4adc42f545072165d00daa2a04f4e034eb808a585e494956e87a47269d4 WHIRLPOOL 0b71c8b7b258f7e5047114a862205e1729860b5dc8974f48bfec6feb5c1b8679c0c104201c641f5bca80b8648bfd9b08efd6bb640614677ae94d8472e58e030f
 EBUILD netbeans-javadoc-9999_p20160826.ebuild 6293 SHA256 e5744c59952f1f97bb452d7ee589fde975619b7c7a261d729c4ca8662be93858 SHA512 b6ca95e812d3bf056ecba2bf5576a5a08a5a4e13e77b1de24910d2be9f3a4955257136d55bfa0d6ab370f591e3b90abd055e6ffbea17e530a9bb5d718ea5d080 WHIRLPOOL c6b5b77e16183d2df6f8c1d97f39274bf3d6dd3cc92cf20442a97cc9f97d3708d710027cabf6c7bc1b6fe0f4547422cd04a3644e4c8b7fbbc69e1e973b614a9b
 EBUILD netbeans-javadoc-9999_p20160829.ebuild 6293 SHA256 87ddccfa705ea33c6371f5ebe16685c8ad47766440e8007aef9550dc01d6c8a2 SHA512 220eb340112b42dc0d83eea08ddb4b86812fd2b803438f1fe65eaac2d49cf140595e0ef71aa668ed6b8fa7fd52a3d1d8ec4eadea273ae639cf6bcaef6c5d8800 WHIRLPOOL fcc327a8fd7f450aa2ad7b9b4dfb1fdc37366619ea915db9a8ebf4e346622418685abfd56c37ef1ea21f723b7b5e33be8f93cc90e2967bd5386fa6909a456a2c
 EBUILD netbeans-javadoc-9999_p20160901.ebuild 6293 SHA256 df11758b565df7b1870cccb82ca013f95107c10a8bcfea17d24f66d87402187b SHA512 8a9390acec77716d1cf5d346d76158a28ef9ad26d08d7809a11a76979f6b0ed14a5920fb70d6f8616c00207d535e11d7aab90bbd7a79d12d85448e97f90a604c WHIRLPOOL 8dc1ba9f260910815ec9e1d878a96c0a0a622cd6fb076eb5527d97aaff0487d8d017955463ec556ba8c29c01db1b0a32b19911649ab1d08f0130846d948e3b6a

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160825.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160825.ebuild
deleted file mode 100644
index 9e4aa47..0000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160825.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-08-25_00-02-33/zip/netbeans-trunk-nightly-201608250002-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 1c29f87..c294f47 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-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
 DIST netbeans-trunk-nightly-201608260002-src.zip 217205973 SHA256 6b68e52a251d6fbbb51fe7391a34d92d48a16db09c9174dc11a63c9e6cbf6fb7 SHA512 89b9173774cd9f8bca6deb9978b05c6a249295941a5a2a2934904d6b19a3716f97f6bf3872e46cb8e0b5643da1bb1aa600c10968e1bdb6d7bed391bff62472e6 WHIRLPOOL 4bfe3e0f29fc0afe434facd60186c346308897c792b55f837ebbbe4f1817eac810f9ea3c42fbb41b8303d94c698996b95b0f0f9e8856a4df68b1c0774b735048
 DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc7b49dde50f98461edfc143b64c3ed8ba85f220ae149858b5d7 SHA512 8a036de09a281bbb3ce5473056a074c848ce49fd9165c831f0e3da8f64ea95f39b784bd4ccd4e5b8f9d1c3886a21d1c300d18efb0e78603da729c123246bb81f WHIRLPOOL 81c12e1cc239d723559af6173636d2eb3fd32b05abffcfdac89fd5c9a9c0c2215ad89b4eeef2bc0f04441cdb04a7619b9aafa28ed6e20b314ce9b1679d9ceb2f
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
@@ -41,7 +40,6 @@ DIST netbeans-trunk-nightly-201609250002-src.zip 218005446 SHA256 c28a4ee7eaa239
 DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1bf5de335c280b679d32646b7740176e0e3e91bdac284bc6fe66 SHA512 fe60ff01cdb7e1e8b044c4e9a51446198d8401180a66fa32f8d14953ec3d719e215e5161193253edc21c00bbca7f23af5903d4d59f5e4a9f5fb28d3be2aed235 WHIRLPOOL 4bbc58439fec5202aa774f3aa0057258aef8f9a259ed1aeab5110038462a727523bc27a845f05aa31c230cb730a988d5710735eb87f72bd53e434d21ccd4be21
 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_p20160825.ebuild 4717 SHA256 9a5ea2a3816088926dfa808a60b42768faef3b20c8fa0a28e60131b51025fd59 SHA512 ece73b9c85dfaa7cc791831e7d385f211432358dc57f8367bc72372e22a1a8a2220f5d8147109088220bca59f72ed4681b80bf9739ef3c7b2b7327db45e1ad70 WHIRLPOOL b5afbc34115c9cc977aa172467d3bbbb39140b0d1af5ad33bc56728895e2e66139d9d8d90697ab0bee48209b409e953ab44d081924fe2ecc6c4825b7f83ae1eb
 EBUILD netbeans-javafx-9999_p20160826.ebuild 4717 SHA256 7bedbace3130491f64441fd13b3a3720c2797ad57a683fbe27ea183930328e50 SHA512 85f609346c563926ae883d89008512e1abc5de67b5d0fce9a39e40c1d961b6dc0d83ecca2233f56a0e76a4709ea3a0a9a298c01f7bc4705cdeb6025728620502 WHIRLPOOL 2ebf3581517cd364976965293ed127dc2088aa1a0b93f0a623fb185798c86ce10bcbe1a5f31e4cf817b02648b720fa9325e70a5df07445dc098b4d321757bfe3
 EBUILD netbeans-javafx-9999_p20160829.ebuild 4717 SHA256 7f01aa38f26cbf90052418099112d0fd3af95239fb2dcdb884c216fc8d288ca4 SHA512 4d32df7c07a9a98ff01fc84e294bc943113caeda15b3cf8efa16cdbca322e9df0faaf79679cf2fab1819a294b96ae27e748ca2f51591673d05c5e1531d03bb9b WHIRLPOOL ad3f0f5fc6d3b441d67cd998ae7ebcfb20ffe2124b876a0227721b93c1f69d691b281381f9cf3cf4968a25f48bbe8f05e14258bb520db554ab1e330194964c2c
 EBUILD netbeans-javafx-9999_p20160901.ebuild 4717 SHA256 afda23e506ad84f0c3b9faaa6f239f36b07e16eba600086efb7ebd2bf5a6f739 SHA512 1f8192151c037eb1ea1df568cd13ad3ccd92928ad5c4000de1a4f142c868fddcb72e23a78dd91bec1e9c6cdd049d55816d5af538def5221c628a80aae536a53a WHIRLPOOL 9b22ac91892e92287033d245ad630b0f03df805989fa0380b0254f1acc6693301553edaf074f70261ee2adde8de0f8898a18dca281b0d0fde7b80d47c509a09c

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160825.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160825.ebuild
deleted file mode 100644
index b2f158f..0000000
--- a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160825.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-08-25_00-02-33/zip/netbeans-trunk-nightly-201608250002-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 5e1a510..ea7b907 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-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
 DIST netbeans-trunk-nightly-201608260002-src.zip 217205973 SHA256 6b68e52a251d6fbbb51fe7391a34d92d48a16db09c9174dc11a63c9e6cbf6fb7 SHA512 89b9173774cd9f8bca6deb9978b05c6a249295941a5a2a2934904d6b19a3716f97f6bf3872e46cb8e0b5643da1bb1aa600c10968e1bdb6d7bed391bff62472e6 WHIRLPOOL 4bfe3e0f29fc0afe434facd60186c346308897c792b55f837ebbbe4f1817eac810f9ea3c42fbb41b8303d94c698996b95b0f0f9e8856a4df68b1c0774b735048
 DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc7b49dde50f98461edfc143b64c3ed8ba85f220ae149858b5d7 SHA512 8a036de09a281bbb3ce5473056a074c848ce49fd9165c831f0e3da8f64ea95f39b784bd4ccd4e5b8f9d1c3886a21d1c300d18efb0e78603da729c123246bb81f WHIRLPOOL 81c12e1cc239d723559af6173636d2eb3fd32b05abffcfdac89fd5c9a9c0c2215ad89b4eeef2bc0f04441cdb04a7619b9aafa28ed6e20b314ce9b1679d9ceb2f
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
@@ -33,7 +32,6 @@ DIST netbeans-trunk-nightly-201609250002-src.zip 218005446 SHA256 c28a4ee7eaa239
 DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1bf5de335c280b679d32646b7740176e0e3e91bdac284bc6fe66 SHA512 fe60ff01cdb7e1e8b044c4e9a51446198d8401180a66fa32f8d14953ec3d719e215e5161193253edc21c00bbca7f23af5903d4d59f5e4a9f5fb28d3be2aed235 WHIRLPOOL 4bbc58439fec5202aa774f3aa0057258aef8f9a259ed1aeab5110038462a727523bc27a845f05aa31c230cb730a988d5710735eb87f72bd53e434d21ccd4be21
 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_p20160825.ebuild 4412 SHA256 4ab57687bf33011aa2c283782d73f7b9893c4cfc1d6e4cb39c88a26ca948e861 SHA512 e10ce12acdd7bca3212c6c03c889a9d675643ebcfc8b727193a7437ca16b2c8d6aadc62d75834faa491d43bd4964190f082f572311127425ff6178f4dde00294 WHIRLPOOL 74e9abe4811e1de04917e717110fb9fc03ddf3a488c108fbc8293475658d0be170c44d97700e3ef5ebd8aaa331b069bf03983183bb0d96862add5df5f3e40206
 EBUILD netbeans-mobility-9999_p20160826.ebuild 4412 SHA256 cfefadc0747768f1fb0d3cb5187ff8e485e6345ed759ea81492fec6b126af0f6 SHA512 0e736d18077296ebf6e37cd9a3c220431b084dbb91a73c1148f10de94fa986e01a880a4a1a324f418e92f809c4bbcc9d11e6729e80445df9676f5da153f9de23 WHIRLPOOL 608417c1f69445edbd896110cd1f825abbd2c9ae6f83fa9ecd76e3658bb325fe9cdb73f48cb44abd827ee8fc52f8b37baf49c58ee5b6845f3988b1b95eca956b
 EBUILD netbeans-mobility-9999_p20160829.ebuild 4412 SHA256 1c18d11fb3069006a7c1fccde3fb6b0ac733b5e1feace665120806e52f2898bf SHA512 878c04a878793e35c664ef969c8553a841e817c4a654e10e9ad48c22aa0862875d8116caf40945c2118297fd51fcb034d4a888fed4e4cba9b86a3ca1693c6bf7 WHIRLPOOL 13940ef22900cfebf8053ef7d8ba8aa212faca1247097baf5cbd7e43eeb31e059ca40439a7f02c0948052e6c243f954f6095a8c67367caae2c4dc84a9e9a824f
 EBUILD netbeans-mobility-9999_p20160901.ebuild 4412 SHA256 f89bb05601b815be0214a46e4b2f9e7629653fbb24d7c47fe8346dfc05805876 SHA512 5936e4e719ea10a3bd3469bf058dd18ea82a767868a238340d5cb38612db9e91ed02dec4ea89be94a523e0a4fcab44a2c056d0c8a6304ee263d19cebf0492986 WHIRLPOOL 6c7dba0c13eb79fd596efd755084072dd13e3a9a51d0fd48943f30ca00aa38b0b84416e013a67385690f03dc9fb347941864bbfca4ed093625149428281d5624

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160825.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160825.ebuild
deleted file mode 100644
index e3182d7..0000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160825.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-08-25_00-02-33/zip/netbeans-trunk-nightly-201608250002-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 577c171..9732aa0 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-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
 DIST netbeans-trunk-nightly-201608260002-src.zip 217205973 SHA256 6b68e52a251d6fbbb51fe7391a34d92d48a16db09c9174dc11a63c9e6cbf6fb7 SHA512 89b9173774cd9f8bca6deb9978b05c6a249295941a5a2a2934904d6b19a3716f97f6bf3872e46cb8e0b5643da1bb1aa600c10968e1bdb6d7bed391bff62472e6 WHIRLPOOL 4bfe3e0f29fc0afe434facd60186c346308897c792b55f837ebbbe4f1817eac810f9ea3c42fbb41b8303d94c698996b95b0f0f9e8856a4df68b1c0774b735048
 DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc7b49dde50f98461edfc143b64c3ed8ba85f220ae149858b5d7 SHA512 8a036de09a281bbb3ce5473056a074c848ce49fd9165c831f0e3da8f64ea95f39b784bd4ccd4e5b8f9d1c3886a21d1c300d18efb0e78603da729c123246bb81f WHIRLPOOL 81c12e1cc239d723559af6173636d2eb3fd32b05abffcfdac89fd5c9a9c0c2215ad89b4eeef2bc0f04441cdb04a7619b9aafa28ed6e20b314ce9b1679d9ceb2f
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
@@ -36,7 +35,6 @@ DIST netbeans-trunk-nightly-201609250002-src.zip 218005446 SHA256 c28a4ee7eaa239
 DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1bf5de335c280b679d32646b7740176e0e3e91bdac284bc6fe66 SHA512 fe60ff01cdb7e1e8b044c4e9a51446198d8401180a66fa32f8d14953ec3d719e215e5161193253edc21c00bbca7f23af5903d4d59f5e4a9f5fb28d3be2aed235 WHIRLPOOL 4bbc58439fec5202aa774f3aa0057258aef8f9a259ed1aeab5110038462a727523bc27a845f05aa31c230cb730a988d5710735eb87f72bd53e434d21ccd4be21
 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_p20160825.ebuild 4111 SHA256 88e54635f632804b71d90f783352779e4f6cb11ac12cb3ea4d55935074b913c4 SHA512 15b58912f71fc1829d9853420405d3b7826c292f9bd99d4dcd7ecce751fa7ebe5a4ac526c8533796acce4c98cc87e4787344aba55874555221ff1673f0bdd3c8 WHIRLPOOL b8dca15ca706bd8da17cd6ed0a3da2864427a4ba9715a655a6503869e4ec0f884580feb72bf3a708923c29c201f96141e016a91dd3d3137d8e7654ed37405a46
 EBUILD netbeans-nb-9999_p20160826.ebuild 4111 SHA256 f6a9e539b677ec9afdeac9552e6aef2f9e0e0867a8230d208844c5f8e40a8dfc SHA512 472b1aaf411642e9ed13fd2ad185731769fd0198f54bfbd4fa6c8dabed9d600f8bd6664c56b7cfd05fc6beb38d666e2c153d13c149a6566ab92e49a3abc574ab WHIRLPOOL 1cac95f9a5526db4923385ddd97938534a5b40b431d40728fbc606850aa298403c7b94fd349f3dad34996a79a1896517c6de20a5314f34903cad99281f0ab354
 EBUILD netbeans-nb-9999_p20160829.ebuild 4111 SHA256 3a140e3e604be1da276330118439a2e8e02eb2612bad967f36f2b2368b5a6c39 SHA512 082bfaeec04f45a8a1d41a00318eb93a954ac5a5e9c4db94b53cf3fa2f012e37e7030fd34c249e447cf0fc88b7aa2d77a83582651d86e49f7a17e66c9c81a0e6 WHIRLPOOL ef5187023c9a0b3270f22a1bd4e01e7ae3a3ad03f4bd5090d8a3c7a73a594ff7e41c958814e6ea10fbcc523170daf36ba4b734219c0a8a927df6dcd3d98276c2
 EBUILD netbeans-nb-9999_p20160901.ebuild 4111 SHA256 ac43a3847c3a425129a9762b672638648e0adb1ead273f370f422ac8a40c5a00 SHA512 a9cdbf5243d3f0c99e35fe16384b23fbb3e678adf8e1adf3dc19a0e0befc653924d0b2d5b81f1d94cdb3c4de817544df1ce013569cc13f18851273da3c1d8509 WHIRLPOOL 72ab9db58379041a80fe899b6ca25a37194536ed2c0bd76ab43092d65817dff300cb03ff709e4765daec65be6745a6297844b7678b64185a4497309310bb9207

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160825.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160825.ebuild
deleted file mode 100644
index a1039d3..0000000
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20160825.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-08-25_00-02-33/zip/netbeans-trunk-nightly-201608250002-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 4c48023..2d929c2 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-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
 DIST netbeans-trunk-nightly-201608260002-src.zip 217205973 SHA256 6b68e52a251d6fbbb51fe7391a34d92d48a16db09c9174dc11a63c9e6cbf6fb7 SHA512 89b9173774cd9f8bca6deb9978b05c6a249295941a5a2a2934904d6b19a3716f97f6bf3872e46cb8e0b5643da1bb1aa600c10968e1bdb6d7bed391bff62472e6 WHIRLPOOL 4bfe3e0f29fc0afe434facd60186c346308897c792b55f837ebbbe4f1817eac810f9ea3c42fbb41b8303d94c698996b95b0f0f9e8856a4df68b1c0774b735048
 DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc7b49dde50f98461edfc143b64c3ed8ba85f220ae149858b5d7 SHA512 8a036de09a281bbb3ce5473056a074c848ce49fd9165c831f0e3da8f64ea95f39b784bd4ccd4e5b8f9d1c3886a21d1c300d18efb0e78603da729c123246bb81f WHIRLPOOL 81c12e1cc239d723559af6173636d2eb3fd32b05abffcfdac89fd5c9a9c0c2215ad89b4eeef2bc0f04441cdb04a7619b9aafa28ed6e20b314ce9b1679d9ceb2f
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
@@ -38,7 +37,6 @@ DIST netbeans-trunk-nightly-201609250002-src.zip 218005446 SHA256 c28a4ee7eaa239
 DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1bf5de335c280b679d32646b7740176e0e3e91bdac284bc6fe66 SHA512 fe60ff01cdb7e1e8b044c4e9a51446198d8401180a66fa32f8d14953ec3d719e215e5161193253edc21c00bbca7f23af5903d4d59f5e4a9f5fb28d3be2aed235 WHIRLPOOL 4bbc58439fec5202aa774f3aa0057258aef8f9a259ed1aeab5110038462a727523bc27a845f05aa31c230cb730a988d5710735eb87f72bd53e434d21ccd4be21
 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_p20160825.ebuild 4418 SHA256 2eb50c4cbb8635b87bb3fbff94e523518b61d4f75a37bdf6981b7e9e97777856 SHA512 657dd4b6790419955a75fcf91104af14209912bdaa9ca3299c54328a6512d4f6ef7da1992758ae7965feaaa0cc73229aec89984ea2d19f725ca2ae1694f1a2d7 WHIRLPOOL 33077ea63b113ae479875854d4445f068b3b293bc3a3017761f2fdbe3dd7272b75b05246ebd6bf32645b0214a8e2d374fce0f96d15c345bed9957812b342f450
 EBUILD netbeans-php-9999_p20160826.ebuild 4418 SHA256 6e0f24181c656b9bc235115870158913bd5a5d2ca904d4d975fd5f417a657551 SHA512 e8e214711fe544f53953bf8710cd532e3cc2cbb0b04936de0c193b7f205854283f327ed9d071b83b013d799094d498b492263dff5d25c2cf48cab7687301643f WHIRLPOOL ac6274b6a07fa72493c049732077175df7010ae00122d9c57f8819217410e707dbb0ea3c9f3fe2d7962a33d9cdc5ac2985111884f40b4e5d3787d095d9391193
 EBUILD netbeans-php-9999_p20160829.ebuild 4418 SHA256 8271d2a5823efb1756378ff76a718dd2784b809d314d8d4eb74cb1c4236fe833 SHA512 fae728c8ceeffb31bb08faa75b90d6f353fa9d0688656cdfb4e6a0213f5f7ecb908286707339851510de55b816ae28bde261d803c879b19a9ba169c30d0e83ec WHIRLPOOL d9efa8e2589288466b34837b7f99bbe97e17b96e1f7d6a04ab275edfa2fbe7dc669c883fcb72c9c3ce6451442391e551561efbb89c1886215ecfb52bc91f33b1
 EBUILD netbeans-php-9999_p20160901.ebuild 4418 SHA256 4c21387443b8257d5598bff2323ea12ee5f59bcbbece9aade5176ef8649bfc72 SHA512 92d4305f2a4260652df7ac8bde324305eab2d89f5061f91aab5b946d0c739cc832c08475a21c745aeb2999a8bb19508dec63cda7fd46b1beead680c81290b77d WHIRLPOOL 37b231db271985e5b1f187c7b51530f740159c0af14444adaa03bef9d1f39d440d3ea8195502c8c8de771a0af6ef89e593633ac52b3f476ea510ee302aec6da9

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160825.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160825.ebuild
deleted file mode 100644
index c057731..0000000
--- a/dev-java/netbeans-php/netbeans-php-9999_p20160825.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-08-25_00-02-33/zip/netbeans-trunk-nightly-201608250002-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 3305c68..c71b9f0 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-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
 DIST netbeans-trunk-nightly-201608260002-src.zip 217205973 SHA256 6b68e52a251d6fbbb51fe7391a34d92d48a16db09c9174dc11a63c9e6cbf6fb7 SHA512 89b9173774cd9f8bca6deb9978b05c6a249295941a5a2a2934904d6b19a3716f97f6bf3872e46cb8e0b5643da1bb1aa600c10968e1bdb6d7bed391bff62472e6 WHIRLPOOL 4bfe3e0f29fc0afe434facd60186c346308897c792b55f837ebbbe4f1817eac810f9ea3c42fbb41b8303d94c698996b95b0f0f9e8856a4df68b1c0774b735048
 DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc7b49dde50f98461edfc143b64c3ed8ba85f220ae149858b5d7 SHA512 8a036de09a281bbb3ce5473056a074c848ce49fd9165c831f0e3da8f64ea95f39b784bd4ccd4e5b8f9d1c3886a21d1c300d18efb0e78603da729c123246bb81f WHIRLPOOL 81c12e1cc239d723559af6173636d2eb3fd32b05abffcfdac89fd5c9a9c0c2215ad89b4eeef2bc0f04441cdb04a7619b9aafa28ed6e20b314ce9b1679d9ceb2f
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
@@ -59,7 +58,6 @@ DIST netbeans-trunk-nightly-201609250002-src.zip 218005446 SHA256 c28a4ee7eaa239
 DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1bf5de335c280b679d32646b7740176e0e3e91bdac284bc6fe66 SHA512 fe60ff01cdb7e1e8b044c4e9a51446198d8401180a66fa32f8d14953ec3d719e215e5161193253edc21c00bbca7f23af5903d4d59f5e4a9f5fb28d3be2aed235 WHIRLPOOL 4bbc58439fec5202aa774f3aa0057258aef8f9a259ed1aeab5110038462a727523bc27a845f05aa31c230cb730a988d5710735eb87f72bd53e434d21ccd4be21
 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_p20160825.ebuild 9520 SHA256 18d59ae0a3a34b18f883ec6c7c53ee22b4e43034447c422523a8d1cdd94fe214 SHA512 8d50a78543035f6d01d13c383ef94ec19806912fb1079874d717a713eabe168a4bdae749e5dfd3678db0606cf133b9a0d9c8abc68bed99644df56f3826980f5d WHIRLPOOL 4a5f5ab3b8c46bd40882a8045b905fefa16737d5793803851821f4a1a639230d0e88b05da7e564b8ab5b6f5dbf86bb31118f0f457835925af0f680fd4efb07d4
 EBUILD netbeans-platform-9999_p20160826.ebuild 9520 SHA256 be23d9f80c382efe48c8cfaf4fcc0653672be99cdf110f2a4b3966f703df9b56 SHA512 c99be942466670b9ac2f64da7d5ae7a50dc706ccb0ec5628e246edc53943baa35c66c2525bf34e402a8be5f2e6c2d9ca31fed11bb004471b7cfa5ac2bfe8c66f WHIRLPOOL e59105bc21b38c32eb256b98f6d1005c8d0f90dcfdbcc895cc21ee02f855cde28b6c736291ba5762f58a0670403a4a3cb95360f81bde6fd50bbbb6c8a835236b
 EBUILD netbeans-platform-9999_p20160829.ebuild 9520 SHA256 0f78647b9f0684f9c3c3ccbe995e0d8f3cf77dd8880c8a56381927c23ca71c67 SHA512 629d7cbfe8dbdc867bf7c250a6f52fd4a826a7b1a113be51c5422f9fb24b1a9e9c661195f15cf956adc4e6a53598432628657a82908aed35883f1f7c5a6abc98 WHIRLPOOL cd8a5ab546745c8b630fa9bd80d85a359d181f2b063ace7d6d608027e5e7fbcdef2a2b6690589fbd87836d0d4b07ab450303df604282942bb88946adf45205b1
 EBUILD netbeans-platform-9999_p20160901.ebuild 9520 SHA256 9e58f6281f7dc2b135e95047be70133098c8aa8841e72a51942b88b50da5d51e SHA512 01e963910202ed93b07ac1b99dd9214fc88989d27904dddf2082cb7f334035281bfff2c4fa63a7d5ef115ce5fb43bd4d42e5d6d325f65c995e662e63fee6e969 WHIRLPOOL c6a57988c8c04a6c2efd4abee7719e7cea63e135b944e167109e343f47b3dfe3b44573b48e76aad2bc3e6270ff166d45daad99f250cad94f7d8229b96bbcb178

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160825.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160825.ebuild
deleted file mode 100644
index d3b6458..0000000
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20160825.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-08-25_00-02-33/zip/netbeans-trunk-nightly-201608250002-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 619145b..61af4d1 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-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
 DIST netbeans-trunk-nightly-201608260002-src.zip 217205973 SHA256 6b68e52a251d6fbbb51fe7391a34d92d48a16db09c9174dc11a63c9e6cbf6fb7 SHA512 89b9173774cd9f8bca6deb9978b05c6a249295941a5a2a2934904d6b19a3716f97f6bf3872e46cb8e0b5643da1bb1aa600c10968e1bdb6d7bed391bff62472e6 WHIRLPOOL 4bfe3e0f29fc0afe434facd60186c346308897c792b55f837ebbbe4f1817eac810f9ea3c42fbb41b8303d94c698996b95b0f0f9e8856a4df68b1c0774b735048
 DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc7b49dde50f98461edfc143b64c3ed8ba85f220ae149858b5d7 SHA512 8a036de09a281bbb3ce5473056a074c848ce49fd9165c831f0e3da8f64ea95f39b784bd4ccd4e5b8f9d1c3886a21d1c300d18efb0e78603da729c123246bb81f WHIRLPOOL 81c12e1cc239d723559af6173636d2eb3fd32b05abffcfdac89fd5c9a9c0c2215ad89b4eeef2bc0f04441cdb04a7619b9aafa28ed6e20b314ce9b1679d9ceb2f
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
@@ -33,7 +32,6 @@ DIST netbeans-trunk-nightly-201609250002-src.zip 218005446 SHA256 c28a4ee7eaa239
 DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1bf5de335c280b679d32646b7740176e0e3e91bdac284bc6fe66 SHA512 fe60ff01cdb7e1e8b044c4e9a51446198d8401180a66fa32f8d14953ec3d719e215e5161193253edc21c00bbca7f23af5903d4d59f5e4a9f5fb28d3be2aed235 WHIRLPOOL 4bbc58439fec5202aa774f3aa0057258aef8f9a259ed1aeab5110038462a727523bc27a845f05aa31c230cb730a988d5710735eb87f72bd53e434d21ccd4be21
 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_p20160825.ebuild 3472 SHA256 55caf73d283ef2aa3eb9d54d21d6705e0a4bd9568a791ed3586f28deb11d959a SHA512 0b00215522538a4c2a26299c9471264162a9749af2231ea4d302bdf7a9927931498b856c7c126134725d33a3f26ac07c2e2a26030491f25915a2c88e4e73ad00 WHIRLPOOL 0c1e3f9e44217c81083d0abe788c26cc5024fa5a64c204d729c27cc497792542f2643e6386342b263f1282ba2d0f0d2dadadf405770f9fa208517e2f2aad9bfc
 EBUILD netbeans-profiler-9999_p20160826.ebuild 3472 SHA256 9ffce38d11f17f7b1e95ba0ed22957e0c9f28290c3a1bc4a39464250520b14ea SHA512 7609fde5c906f5fe077072a850d4f63787fbdcccc8d0ba92728aaafb69127d6667a8fb78f5d5ce7553916f48ebc44ae4aac6833853fac1037df5d96084accd5e WHIRLPOOL 5438cdee9d7f3e0697ee6926c74eefff598cde36af5739e42c6904b42b65d0d77d3faef3a4a29b162e31fb7a016422c40b1ac08b25fcee3aac49afa28007509a
 EBUILD netbeans-profiler-9999_p20160829.ebuild 3472 SHA256 5b2114102e446e49f573fc22e4c19eecdf011d4f9977b4dfb631323c5c963b8e SHA512 6c6ea263812380b2eee414500bc60645866a58d652fd86395ea12b299b3269affb77326e65d22ef042d3731711788694f33e101768d8d5c1d013f4687dbd9b46 WHIRLPOOL c29cdd5e6532efb85854e733f0f4d72c2a66654f7306109ac12963094eb077669caf6ffc895a5312dc3d2ea56f1de8480695dce906bb524f951e75ebbd32d27d
 EBUILD netbeans-profiler-9999_p20160901.ebuild 3472 SHA256 f5edd5388e32394979dc528bdf3818d27500a6ded3041c07a0e675bbb3274af3 SHA512 1c312dcc8754a84121916706864826e36283e73611744977b5821ab25cb6aa8c7768f1a42f1daf68a61a0b2b62a90fdc741d45a5855682c3b4292b75c02b5a12 WHIRLPOOL a792c1d76aab6d528d6a43b0e440fa74b75bcdda092d1ff994ef2d9b412e2a43dd9c5c81d51a06daa8ae51d7228b73994d882fb1bad2d39e04b5fff55fe38622

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160825.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160825.ebuild
deleted file mode 100644
index c71c606..0000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160825.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-08-25_00-02-33/zip/netbeans-trunk-nightly-201608250002-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 be0bbb2..49f9a68 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-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
 DIST netbeans-trunk-nightly-201608260002-src.zip 217205973 SHA256 6b68e52a251d6fbbb51fe7391a34d92d48a16db09c9174dc11a63c9e6cbf6fb7 SHA512 89b9173774cd9f8bca6deb9978b05c6a249295941a5a2a2934904d6b19a3716f97f6bf3872e46cb8e0b5643da1bb1aa600c10968e1bdb6d7bed391bff62472e6 WHIRLPOOL 4bfe3e0f29fc0afe434facd60186c346308897c792b55f837ebbbe4f1817eac810f9ea3c42fbb41b8303d94c698996b95b0f0f9e8856a4df68b1c0774b735048
 DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc7b49dde50f98461edfc143b64c3ed8ba85f220ae149858b5d7 SHA512 8a036de09a281bbb3ce5473056a074c848ce49fd9165c831f0e3da8f64ea95f39b784bd4ccd4e5b8f9d1c3886a21d1c300d18efb0e78603da729c123246bb81f WHIRLPOOL 81c12e1cc239d723559af6173636d2eb3fd32b05abffcfdac89fd5c9a9c0c2215ad89b4eeef2bc0f04441cdb04a7619b9aafa28ed6e20b314ce9b1679d9ceb2f
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
@@ -52,7 +51,6 @@ DIST netbeans-trunk-nightly-201609250002-src.zip 218005446 SHA256 c28a4ee7eaa239
 DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1bf5de335c280b679d32646b7740176e0e3e91bdac284bc6fe66 SHA512 fe60ff01cdb7e1e8b044c4e9a51446198d8401180a66fa32f8d14953ec3d719e215e5161193253edc21c00bbca7f23af5903d4d59f5e4a9f5fb28d3be2aed235 WHIRLPOOL 4bbc58439fec5202aa774f3aa0057258aef8f9a259ed1aeab5110038462a727523bc27a845f05aa31c230cb730a988d5710735eb87f72bd53e434d21ccd4be21
 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_p20160825.ebuild 6242 SHA256 415b1826b44a57db71695d6a16591aa0c4a4bdabf3975e248596976992ffcab3 SHA512 b996620adeecb27be061bbfb800c91c36ddfd743779be7039244d5b0a9d98a69d10241c81a0984285ccdf106a2884f5c20492d7e51b2746ecd4f915a6b9105ed WHIRLPOOL 763a992f19aa3f2729a95ece19eb5d6dffb4c595cea407f6742c964eb5935ab91a6e107aaa35587c09878421bfdea295fe95a229b9cecb11b41f07d365ac2cd3
 EBUILD netbeans-webcommon-9999_p20160826.ebuild 6242 SHA256 fee24751dac6592590ce42e8bf2da9566a380bb048f0a943616459cad1f588bf SHA512 e068053580143fc21c4dabfdf3ff5867a79ba96da6c884d121952d2ca1d6cca1e0f0b1662150492583277e8ffd77bc0efe244a37f1b55c354e7208d4c0c982e3 WHIRLPOOL 1cb483a43e8c97e14183c03998e5f0de292bc70fec164204f2a46d7043ffc101c7c01182dc2a3382be844f25d22b78e5cbb7080402026f5f0ac7fc32ff7a9a15
 EBUILD netbeans-webcommon-9999_p20160829.ebuild 6242 SHA256 ef73c787c9210d44569ea262acf6539a9ad9d97bbb0dd5fd9f445478c3828c01 SHA512 8fc9808fa49cf16de3b9ff4df2a1b9ab8a7b2fb088663399fd5622b17edb155deee9fa366becc34bd92ef0034a7c77523aab25fac339a00d80efdc70c919fe19 WHIRLPOOL dffc697f36e1e452d164be4c4eed9ad2510c060838d273e194e6d597cc0c6620215427c79f69c1e1d02e05f3ba5539db2349a83f6af3aff94793762884bf2ebf
 EBUILD netbeans-webcommon-9999_p20160901.ebuild 6242 SHA256 46564b33607829cb2f0da5a2167f53a1be8a62c2c4f8754ef3fe384cf3bea584 SHA512 51558f03f77aa0c85ea437860a62f307b56187e43fc0a2bc1724011c62599a17b157b212e42c27b90cd4c7b2227cb541002ef4738d546afc6196175525e9458a WHIRLPOOL e41cac853513b3e3fa214ba2747fa32b0054dcd56c9d13f985c15400076180607ba7c953818a07165a979e584618d65b58bee623b80c103f739a9835762d79dd

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160825.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160825.ebuild
deleted file mode 100644
index eac5176..0000000
--- a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160825.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-08-25_00-02-33/zip/netbeans-trunk-nightly-201608250002-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 f0bad08..09abbdb 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-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
 DIST netbeans-trunk-nightly-201608260002-src.zip 217205973 SHA256 6b68e52a251d6fbbb51fe7391a34d92d48a16db09c9174dc11a63c9e6cbf6fb7 SHA512 89b9173774cd9f8bca6deb9978b05c6a249295941a5a2a2934904d6b19a3716f97f6bf3872e46cb8e0b5643da1bb1aa600c10968e1bdb6d7bed391bff62472e6 WHIRLPOOL 4bfe3e0f29fc0afe434facd60186c346308897c792b55f837ebbbe4f1817eac810f9ea3c42fbb41b8303d94c698996b95b0f0f9e8856a4df68b1c0774b735048
 DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc7b49dde50f98461edfc143b64c3ed8ba85f220ae149858b5d7 SHA512 8a036de09a281bbb3ce5473056a074c848ce49fd9165c831f0e3da8f64ea95f39b784bd4ccd4e5b8f9d1c3886a21d1c300d18efb0e78603da729c123246bb81f WHIRLPOOL 81c12e1cc239d723559af6173636d2eb3fd32b05abffcfdac89fd5c9a9c0c2215ad89b4eeef2bc0f04441cdb04a7619b9aafa28ed6e20b314ce9b1679d9ceb2f
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
@@ -33,7 +32,6 @@ DIST netbeans-trunk-nightly-201609250002-src.zip 218005446 SHA256 c28a4ee7eaa239
 DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1bf5de335c280b679d32646b7740176e0e3e91bdac284bc6fe66 SHA512 fe60ff01cdb7e1e8b044c4e9a51446198d8401180a66fa32f8d14953ec3d719e215e5161193253edc21c00bbca7f23af5903d4d59f5e4a9f5fb28d3be2aed235 WHIRLPOOL 4bbc58439fec5202aa774f3aa0057258aef8f9a259ed1aeab5110038462a727523bc27a845f05aa31c230cb730a988d5710735eb87f72bd53e434d21ccd4be21
 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_p20160825.ebuild 2721 SHA256 54db5cbb865d355ace7a311b74a0eb5fee2e0d67a1e6ff99e78970e798d58722 SHA512 99700db3d980e2ae8330c57a4ecf527e83d46c87492c07796f1d63972bb6f114dc16bd2b8950117528d7d495b26ad540754a697b3915e676047248bb5f491fca WHIRLPOOL c2b15b9689df167f782f48f8b09936b42693ee62027a41b7ebc09d7e5f162938a0fe7e79017829885e5e1ffc4266f54b6a3480615c87d77869903aa5c51e2350
 EBUILD netbeans-websvccommon-9999_p20160826.ebuild 2721 SHA256 8f5b00efa0aa48059aeaf926e861163c409315343a39c216bb3e7ab28c3160f5 SHA512 299f15342ccb1f935e16ed6a4db5df104430c1762821dae7bdfd68bde164eda5e1fb4bd574a2c50ee282830b113e50c2a43cfa7b19e78421306bd31f561f957e WHIRLPOOL a8988818ac7c68c8442dd2777bfc4fb6d4f14d53c3b0ba56cd023a417615481a45a8b334f2fa626fbb1b8ab5ea68ac2440c3e2193efa845d821bc2b494378da7
 EBUILD netbeans-websvccommon-9999_p20160829.ebuild 2721 SHA256 3dac61291723c9248cc5e89cec12bd2a04a9cebd777c052c69f4b2b3d3b394d0 SHA512 50aacd4220f92343310c26452e19ec40bcc14ab31c24788cafe129bf9273f967becf763e703b7e96e45677fc30c9c2a3ac2967ba1f064c63e0f3469ae337711c WHIRLPOOL e956d0cf551b3e89ace53512f6ea4f6fb204502d01bb410f6eb684c13379e4ecb97d149467db82dd41d127ee53bc8cf67ce5fd42d7f04150dde754ecd012fb19
 EBUILD netbeans-websvccommon-9999_p20160901.ebuild 2721 SHA256 91c5896de81d6ec33f5170b1ae03eefdccc531fe717a7965b29b1307736fd2fc SHA512 dd006f9188a31b559f452b844b9e82fd221536d629c55a8ad0d617aeb20f9d4cc905edf7e640acb8fdf783282004bcb036d13ee0c744104b0028d29e8bf33d0a WHIRLPOOL d329b2bef5896dcb93946f8bd6f1495ad5b4e125c38ae449eead2e9491db0766fcd895254e3f95e2ace97c29771eac434c82744d35dcc025879b5b0986b27ee9

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160825.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160825.ebuild
deleted file mode 100644
index d90d3eb..0000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160825.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-08-25_00-02-33/zip/netbeans-trunk-nightly-201608250002-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 f418cb5..6a8dd53 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-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
 DIST netbeans-trunk-nightly-201608260002-src.zip 217205973 SHA256 6b68e52a251d6fbbb51fe7391a34d92d48a16db09c9174dc11a63c9e6cbf6fb7 SHA512 89b9173774cd9f8bca6deb9978b05c6a249295941a5a2a2934904d6b19a3716f97f6bf3872e46cb8e0b5643da1bb1aa600c10968e1bdb6d7bed391bff62472e6 WHIRLPOOL 4bfe3e0f29fc0afe434facd60186c346308897c792b55f837ebbbe4f1817eac810f9ea3c42fbb41b8303d94c698996b95b0f0f9e8856a4df68b1c0774b735048
 DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc7b49dde50f98461edfc143b64c3ed8ba85f220ae149858b5d7 SHA512 8a036de09a281bbb3ce5473056a074c848ce49fd9165c831f0e3da8f64ea95f39b784bd4ccd4e5b8f9d1c3886a21d1c300d18efb0e78603da729c123246bb81f WHIRLPOOL 81c12e1cc239d723559af6173636d2eb3fd32b05abffcfdac89fd5c9a9c0c2215ad89b4eeef2bc0f04441cdb04a7619b9aafa28ed6e20b314ce9b1679d9ceb2f
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
@@ -36,7 +35,6 @@ DIST netbeans-trunk-nightly-201609250002-src.zip 218005446 SHA256 c28a4ee7eaa239
 DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1bf5de335c280b679d32646b7740176e0e3e91bdac284bc6fe66 SHA512 fe60ff01cdb7e1e8b044c4e9a51446198d8401180a66fa32f8d14953ec3d719e215e5161193253edc21c00bbca7f23af5903d4d59f5e4a9f5fb28d3be2aed235 WHIRLPOOL 4bbc58439fec5202aa774f3aa0057258aef8f9a259ed1aeab5110038462a727523bc27a845f05aa31c230cb730a988d5710735eb87f72bd53e434d21ccd4be21
 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_p20160825.ebuild 6939 SHA256 946148aecd8afdf24b197447989dcbab99e5e884efe4ec92a760472d607c3703 SHA512 8fd23f5aa72c1eef4c981c9b3639ac71695853ba05088609513153ba5708d5e87ee5560187576b7d474a5c241f067e94d90b49991d378ee7b1d0ede0f14009a3 WHIRLPOOL 9d58f33121e55d66baffca88e9da7f53727b41e079735cec758845508509cf757400ce9fb20ce5aaa75ff846518987ab4b1b62ae4d986c95037e7543118f2201
 EBUILD netbeans-9999_p20160826.ebuild 6939 SHA256 9d0c979041b5c79f58c291540a0b002fa1e8db59a2b99ca51a3306dcdf77be0d SHA512 78f034e29eaa2dfd10e531416ce932f7850592eb8b85e77f8457339c06b3edffd752fd95ee2e7f7983c09d3777e4c1fb88c496d1aa8cf962d491b99e700707d8 WHIRLPOOL ae9e687b04560493ab183ca4ca22b807bbf87e67b40892fe87a619c7fd4d2d6d608c767f0efba5c72f5cb97f2814da1e10046a18dc720b7f1d08d6d782f6c5ae
 EBUILD netbeans-9999_p20160829.ebuild 6939 SHA256 0ef0e941b9969a3c0d7fdee5eefff49d481acaac5eafa1818053ad276cd243e9 SHA512 42f540aecb27babea0d52dccee0c0ba38187aad33b2c73f4a9455a02ddf5b1be404fc076d33da6c202e9babca8dffb12253dc12623c6122d3fd96722ef34ed2a WHIRLPOOL a931a8f6b4e73ffa2d472adb1bbddfc66268570b632e57f333ff358a9646017f6df27e66c2bffdb2a5c4048d7966df5089218249d4181acd445625518def9722
 EBUILD netbeans-9999_p20160901.ebuild 6939 SHA256 e5770caa7f53a2d42a136a4eaf8ee427d6b160c097e3eeb9cd6edfa73d0f40c1 SHA512 e47e2aaf66892b07f9e4bbb31b2643fef1141c86d780d6d1d0666f1678674dda490fcfa8edebf4527943c1426531f423460b06499c1821abc3e38d784ac5e848 WHIRLPOOL 0b7dfc7134c5f3966a1299e128ee8257a59dc49a072e6faae9a2ea76ddda1fc6e7dd9d8ffd67e8091a74864817e340e06a2246822af903581c4ad59c953cb972

diff --git a/dev-util/netbeans/netbeans-9999_p20160825.ebuild b/dev-util/netbeans/netbeans-9999_p20160825.ebuild
deleted file mode 100644
index 92e159b..0000000
--- a/dev-util/netbeans/netbeans-9999_p20160825.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-08-25_00-02-33/zip/netbeans-trunk-nightly-201608250002-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
-}