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

[Miroslav Šulc]

commit:     b69204e9a59900e00f6f7f750c8dded288a677d0
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 24 07:30:27 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Sep 24 07:30:27 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=b69204e9

netbeans: removed obsolete ebuilds

Package-Manager: portage-2.3.1

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index cd6c82c..a810a99 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-201608220002-src.zip 217192718 SHA256 c1c463c39d59f48f75bb0f03507317de43f95394f04066e514d5bfbde1397082 SHA512 812c8a71f16979e91ca46d7553b6d056eaacfede0d4875d6c7a362576b2484844b83cd6c70792325ba24645da0dd906290e2498afb578771d280e8488c2c5fd4 WHIRLPOOL 98f36742c3a8776a203b98e73057938fe4695b486a7321c10af1ec24fb54e671dd05958adf3db34953486d393f475eff6e46d8ce40d4d4508195ad0025be1530
 DIST netbeans-trunk-nightly-201608230002-src.zip 217197989 SHA256 59c6008364fd1d27a1742fdc1c76f93fd3782608b3db5799c42c89e95a516610 SHA512 a3a1d9be874fc9e040a43acf4ac0128776af08e1fb4de49a95fd1fab9e3e4773ad896f9bd7bbd4d82d5c4ab992a13a6d19427e8158ee88dca0c0bab78e75f957 WHIRLPOOL 0ebdc401e0728f01ce3554cb0b2acb516f040f925f563465d48cfb6b65cba87110c6646ad5a9ea1d738cff2eec35fb827ea7d76b4992d7d15548975a06afd9be
 DIST netbeans-trunk-nightly-201608240002-src.zip 217199132 SHA256 75e77e61eb9684fc0c844421dec20016894be29d98d155605c3694d052f4d29b SHA512 8614f3155b861016196a4d88da7efeacd501e5c57a5749c3dbed0898a9e0a7c20b66cca77002da2ae1e2b64d1fd73895f0182e1a95e523fda40bd776ca4c5c9a WHIRLPOOL ea35b1961eb3574b3a6d7561e41192141042f22b49a8ce58c674ac87e0f99d5b714482f170a8b052cd81e3db87521a69af1f6e0bbbceaf2b00bdfe6b3821f2aa
 DIST netbeans-trunk-nightly-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
@@ -33,7 +32,6 @@ DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b3
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
 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_p20160822.ebuild 3384 SHA256 5261587b909de7ca28df515d78cec7c2ead3bb5988a8114dd82589f34413dffe SHA512 87f79b448d957e8fb0950bd861cb2844df5ff83bb2a4bc2c3405ac542f1c2d35ea0254fd232382a3e86d77ce0e7be7a5a92413f932ecf7e2863bd06a0536b188 WHIRLPOOL dfebccb3c31961f27051ca0f95a9a282c4c22050902db398e829ab575de44a17730c4c12d1778f9decce0b3ef87a536bdf76b5ba2e8588920a6f46c86f8dd97b
 EBUILD netbeans-apisupport-9999_p20160823.ebuild 3384 SHA256 35b21bd18a2dcddbeb229915e2ac3859b634bb9b53835bc62a4bfc0b623b5684 SHA512 95b8c39505958153a67dfb71a106cd182b3f57c54ad7892f19fc3a5692a64de791647a5ec120cb6468f0ea67e78149e2aaacc7fcc5c0ccb4bdd2a554ce02ff60 WHIRLPOOL 09c2bdfd8bfaa191aeec209eb6177b68cab5e9c72fdf8a292e92bcae722de3d4767d66f5980783434cd0fd21d0a3ab9acb36cd2c5a0b0e511bfd83811a5212dc
 EBUILD netbeans-apisupport-9999_p20160824.ebuild 3384 SHA256 924d33a1a34a430ae37e5cd124ccb2b245d8ec594cdecb07ddd9443c3d639143 SHA512 51bd0bb777b04ae6a942c9bc85e6cca37e1df45025c2e24caf3bdee8214252341a8c8feed45c0025a071a6298a14fa2f3ddc105b077c0d9c32109fca4f9b3247 WHIRLPOOL c48e0215c215ebae805ca678b5137e986dcdfbab3170e6ec90118c430e276752c033c7febf8902186802fe0699f1f777bbcd4b833bc639fbb4ceed97a44fac81
 EBUILD netbeans-apisupport-9999_p20160825.ebuild 3384 SHA256 54df3760b13ced6617ea9208decb3891f3415460e5d70ea275e0da9cc368bbaa SHA512 2e598096f62c7a94c10a70c6310a138028a9cb205493c189eafc88b9a1a613f3ed14fbf9f92f125bb752f2e00daab2681082b45a92897fcf9857cfe137d47ce0 WHIRLPOOL cb34027bd03d79b8dca8d9f94e987cbf497e687aea7886b492c57fb900ab093349e98a652c0cecbf6536e98773332e9a6fb60394e691a0f4efbe8c503f933ba7

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160822.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160822.ebuild
deleted file mode 100644
index c1f8ea9..0000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160822.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-22_00-02-33/zip/netbeans-trunk-nightly-201608220002-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 abfe083..8cf8482 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -19,7 +19,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-201608220002-src.zip 217192718 SHA256 c1c463c39d59f48f75bb0f03507317de43f95394f04066e514d5bfbde1397082 SHA512 812c8a71f16979e91ca46d7553b6d056eaacfede0d4875d6c7a362576b2484844b83cd6c70792325ba24645da0dd906290e2498afb578771d280e8488c2c5fd4 WHIRLPOOL 98f36742c3a8776a203b98e73057938fe4695b486a7321c10af1ec24fb54e671dd05958adf3db34953486d393f475eff6e46d8ce40d4d4508195ad0025be1530
 DIST netbeans-trunk-nightly-201608230002-src.zip 217197989 SHA256 59c6008364fd1d27a1742fdc1c76f93fd3782608b3db5799c42c89e95a516610 SHA512 a3a1d9be874fc9e040a43acf4ac0128776af08e1fb4de49a95fd1fab9e3e4773ad896f9bd7bbd4d82d5c4ab992a13a6d19427e8158ee88dca0c0bab78e75f957 WHIRLPOOL 0ebdc401e0728f01ce3554cb0b2acb516f040f925f563465d48cfb6b65cba87110c6646ad5a9ea1d738cff2eec35fb827ea7d76b4992d7d15548975a06afd9be
 DIST netbeans-trunk-nightly-201608240002-src.zip 217199132 SHA256 75e77e61eb9684fc0c844421dec20016894be29d98d155605c3694d052f4d29b SHA512 8614f3155b861016196a4d88da7efeacd501e5c57a5749c3dbed0898a9e0a7c20b66cca77002da2ae1e2b64d1fd73895f0182e1a95e523fda40bd776ca4c5c9a WHIRLPOOL ea35b1961eb3574b3a6d7561e41192141042f22b49a8ce58c674ac87e0f99d5b714482f170a8b052cd81e3db87521a69af1f6e0bbbceaf2b00bdfe6b3821f2aa
 DIST netbeans-trunk-nightly-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
@@ -49,7 +48,6 @@ DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b3
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
 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_p20160822.ebuild 4790 SHA256 8f3ccb921fde599cab34bf650e8c6c05a0f123ddc56aec04c1cb1b0db56a7c6e SHA512 ac07b7d4efa3d50bf3557e7506fdf9d80b3ea6fe4fa06fdd45f04dda29dd187cfffed33e3f09bb4290d9d8f166068811571d2a66cb8195b0cb9a02a8c40bf364 WHIRLPOOL 006789b9ea8e4fd5d37e9a43ea59ceb3a2f91ebfaaa1d43c40f5f8fd45c08a23dcc35f75e89577d7cdf7247af5f085e4a122803fde572307baccfe5cd68f1b7a
 EBUILD netbeans-cnd-9999_p20160823.ebuild 4790 SHA256 40ccad64d128bbbb16f9b56b88cc9ff33f416bfd47f988d2e38dead791d40391 SHA512 43f90442259811ed0adc9f2ce23e9d34e77c0fd04bee2f3e8f571798edb9f8b10a5824a7e76753150fcd2c85b76d96a43bab4b68a68e42cafaae4b1540ee4d6c WHIRLPOOL 34a7a25714040d68b36401cfc4d504b9b6ced6740f18bf9e5f37a059ea6c5fe7f5d060095cefa41b7e6e3e8a687ede4d137e2c8038446b8f3653b935b669b9e9
 EBUILD netbeans-cnd-9999_p20160824.ebuild 4790 SHA256 89a4efa4ab9a415a3cc34556b9ff4c7c3839eaa454f6da2d8ffeb428d6f5bc9b SHA512 c19b321b93bdf4f091f45cd9e056ef4e898c8b83c1fbbf655977e6553a98a312ff73acedaef775d5d95e252f0a958f617b328a0b7fef185dac9a2556094e0d70 WHIRLPOOL 17185c23cd1b14c00c1b01809a52258e40ba28a9a0519ee6e49da8ad42da69317c2288cc0194f236aab1a5dd12fde2b465255e2a9140d9f2d6c28ecb479d472f
 EBUILD netbeans-cnd-9999_p20160825.ebuild 4790 SHA256 10e901d81c2445a84e7869649d684322379df036e4cacf5275cf92c115ad1ef6 SHA512 506a606cc624ac4fa268ae0b3861034b1f141ac5533a16c022a33e50f5a2a22f5f86faa64ed5831c89b376ff247c031e10316dbc8891f8cb158b7baad0010a39 WHIRLPOOL 0f6b9a09e23f24a66faac5d0aa6861b51aa11ec19efcf39680b776cd2b5eac0765a54fd9d0f911377fbdf0d1dbb3eaafed2a74b51bb64f2e01ccbe658912cd71

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

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index abd1a3a..43fafec 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-201608220002-src.zip 217192718 SHA256 c1c463c39d59f48f75bb0f03507317de43f95394f04066e514d5bfbde1397082 SHA512 812c8a71f16979e91ca46d7553b6d056eaacfede0d4875d6c7a362576b2484844b83cd6c70792325ba24645da0dd906290e2498afb578771d280e8488c2c5fd4 WHIRLPOOL 98f36742c3a8776a203b98e73057938fe4695b486a7321c10af1ec24fb54e671dd05958adf3db34953486d393f475eff6e46d8ce40d4d4508195ad0025be1530
 DIST netbeans-trunk-nightly-201608230002-src.zip 217197989 SHA256 59c6008364fd1d27a1742fdc1c76f93fd3782608b3db5799c42c89e95a516610 SHA512 a3a1d9be874fc9e040a43acf4ac0128776af08e1fb4de49a95fd1fab9e3e4773ad896f9bd7bbd4d82d5c4ab992a13a6d19427e8158ee88dca0c0bab78e75f957 WHIRLPOOL 0ebdc401e0728f01ce3554cb0b2acb516f040f925f563465d48cfb6b65cba87110c6646ad5a9ea1d738cff2eec35fb827ea7d76b4992d7d15548975a06afd9be
 DIST netbeans-trunk-nightly-201608240002-src.zip 217199132 SHA256 75e77e61eb9684fc0c844421dec20016894be29d98d155605c3694d052f4d29b SHA512 8614f3155b861016196a4d88da7efeacd501e5c57a5749c3dbed0898a9e0a7c20b66cca77002da2ae1e2b64d1fd73895f0182e1a95e523fda40bd776ca4c5c9a WHIRLPOOL ea35b1961eb3574b3a6d7561e41192141042f22b49a8ce58c674ac87e0f99d5b714482f170a8b052cd81e3db87521a69af1f6e0bbbceaf2b00bdfe6b3821f2aa
 DIST netbeans-trunk-nightly-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
@@ -38,7 +37,6 @@ DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b3
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
 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_p20160822.ebuild 2968 SHA256 6be304c45fbe73ab48c9327f9941381f6d938cdfc610b24b231e7fade1bcd5d4 SHA512 87ba0b68239103239a54ad9fbe00109eef5b37baa6ff085a2b323270fd36eeeb1d4df328a7e36a963b387015115743418ebb3258df86d13b1df3ac4025531e9e WHIRLPOOL 0d3d3153de85aafe4e0c54ed21a6bb81292c535021a5235f83f29591525123256c1df2cc7177663df6e55ef829b773a304c844edd86019565494e665de2a852e
 EBUILD netbeans-dlight-9999_p20160823.ebuild 2968 SHA256 10cd01f8c224ac76c7006e2e1923d86e15c42869b92ec83f79909aae328b4b41 SHA512 69d65210d4ca7fedfde3a87f710e521841a9b2d5131f1d4fb495c9ce482be6a3c04a3098b92be831875fddb02f6593e63e6c05e415af9924658bc11bec61ab4d WHIRLPOOL 6dcba7a3b3ea87c101e8a346038bf50406da92a46c76e3f93cbfca54d9350cdd8bb4279d8acbcd9fcaaee1607e4ed4f64c5669b3c3cb0fbbe7ab0e04ae6205de
 EBUILD netbeans-dlight-9999_p20160824.ebuild 2968 SHA256 949edc853f258a3454030a4491ee81eb2d45e41d7ab7cec21694d5da451c3849 SHA512 bffb00f7adab472733cf975d1a71be78971ebbf43b8449af8e0ee7c06293680b317ad71de2104b260df7f98629a3ece4ad813c66005d4cb0a954d185dc313e99 WHIRLPOOL 029429be2d724948df91481bd5fb7456aa9fd899e4925f82d852661e5cc8c8d386f9000e88802505a294f90702b0ae7e0b20876b8260bc227d2b722cd7e03bfe
 EBUILD netbeans-dlight-9999_p20160825.ebuild 2968 SHA256 743d37e86e9b8218fcbf14190c16219c112fbcd179f5b940eb9444b0c5ae13f1 SHA512 841416e8f73cb90b08f4f4f5299ab013b8892e0eca8daefbfb8c7804e5352438a69194ed613a992ff2d23fd197e2d08278e0854be542a9198d196953b732c2ba WHIRLPOOL c439d387fc8ab48ac64765a6eb7a6c21e9a99206d6d45ce8304b25bfcbdc12a7c4f667ddaa5ba778eba456e35e3231b73b2698f9cc7efd6502ff2eaf06ebb5e4

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160822.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160822.ebuild
deleted file mode 100644
index b41361f..0000000
--- a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160822.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-22_00-02-33/zip/netbeans-trunk-nightly-201608220002-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 2b36b68..4dd83fa 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-201608220002-src.zip 217192718 SHA256 c1c463c39d59f48f75bb0f03507317de43f95394f04066e514d5bfbde1397082 SHA512 812c8a71f16979e91ca46d7553b6d056eaacfede0d4875d6c7a362576b2484844b83cd6c70792325ba24645da0dd906290e2498afb578771d280e8488c2c5fd4 WHIRLPOOL 98f36742c3a8776a203b98e73057938fe4695b486a7321c10af1ec24fb54e671dd05958adf3db34953486d393f475eff6e46d8ce40d4d4508195ad0025be1530
 DIST netbeans-trunk-nightly-201608230002-src.zip 217197989 SHA256 59c6008364fd1d27a1742fdc1c76f93fd3782608b3db5799c42c89e95a516610 SHA512 a3a1d9be874fc9e040a43acf4ac0128776af08e1fb4de49a95fd1fab9e3e4773ad896f9bd7bbd4d82d5c4ab992a13a6d19427e8158ee88dca0c0bab78e75f957 WHIRLPOOL 0ebdc401e0728f01ce3554cb0b2acb516f040f925f563465d48cfb6b65cba87110c6646ad5a9ea1d738cff2eec35fb827ea7d76b4992d7d15548975a06afd9be
 DIST netbeans-trunk-nightly-201608240002-src.zip 217199132 SHA256 75e77e61eb9684fc0c844421dec20016894be29d98d155605c3694d052f4d29b SHA512 8614f3155b861016196a4d88da7efeacd501e5c57a5749c3dbed0898a9e0a7c20b66cca77002da2ae1e2b64d1fd73895f0182e1a95e523fda40bd776ca4c5c9a WHIRLPOOL ea35b1961eb3574b3a6d7561e41192141042f22b49a8ce58c674ac87e0f99d5b714482f170a8b052cd81e3db87521a69af1f6e0bbbceaf2b00bdfe6b3821f2aa
 DIST netbeans-trunk-nightly-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
@@ -65,7 +64,6 @@ DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b3
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
 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_p20160822.ebuild 15825 SHA256 80d138107e1fa1c195cca6f14c56fc548ae8df36b706d969610c687bc77d0e43 SHA512 6224e4a5a7f995ba9a776038d215d9530627fdae18c674b1b74fc7ff208f6a20530f06927e450e880773b86bcb25c19c2e7e49804c4bed1353332df99ae813cb WHIRLPOOL d97a36a7ea14a02b477952c00887304bb00354b6e1f9ab2e78296c2cc5b06c52ddbd8bc6f60dc3476891143fb44914f53f4f9886b3979d6941be19381465937f
 EBUILD netbeans-enterprise-9999_p20160823.ebuild 15825 SHA256 3b8a47c2bdaa4d2b75d7c0dc06fd4b83deb14b63debbe08a7bc11653dd51e17a SHA512 26bafbd3d4bd6d75509f636d302924db669f65d120771c1185493fe77d2ac3b2456ea3d7fb37a7d512ccc771f8f46908dc376c47982ac930f8eef9866ea2953c WHIRLPOOL 423852e833a6939433f7de6c1cb7548a814b785d5eb9e14e1efe528ec5ea076b582ded26293affc9ce2491ae80cbe0ec26c42fc9be50674818849b9b74f8958a
 EBUILD netbeans-enterprise-9999_p20160824.ebuild 15825 SHA256 29c63a6ece611a951ba4a82af86fe19985e8f7aa629fa77a1473fc40da1bcb30 SHA512 3c9fa42b20eaad51964f42eaf50b48f363da045ed35f678862857213db5461a7daae583a4e8b298ea6ca7a36595a903c16f7dbf416391863c633f7a116f7fa3e WHIRLPOOL 2d496d7b87720033e2fcf5a350376fdf53da71c48cd9e468204ffd954c964fbfc5d0b4ef5a10e40625c75d0b3656803aa4da3111e0bd2e818ec8900233379c9f
 EBUILD netbeans-enterprise-9999_p20160825.ebuild 15825 SHA256 f6f4815c70f4efe2834668a2c0290398543f251d0086736b4ca14d33d4b79728 SHA512 164e18ea566c2c888eb917f569f9d3ac1b54c35b5facc70ece393bc8899a269a3daea3c6d3c2205093b04770cc75f4e63f7ca4092b35bb66241f20e130c3f8b7 WHIRLPOOL 8e3ee7e0fc0d48d1642f15f94f231654110158e00766a4bb223fd5826c2dc11de614a15eddc80ee7212686c4ef866581ec1ff439fdec4f21185ccdf735b739e8

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160822.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160822.ebuild
deleted file mode 100644
index 9cca586..0000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160822.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-22_00-02-33/zip/netbeans-trunk-nightly-201608220002-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 d7bb026..ce7a69c 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-201608220002-src.zip 217192718 SHA256 c1c463c39d59f48f75bb0f03507317de43f95394f04066e514d5bfbde1397082 SHA512 812c8a71f16979e91ca46d7553b6d056eaacfede0d4875d6c7a362576b2484844b83cd6c70792325ba24645da0dd906290e2498afb578771d280e8488c2c5fd4 WHIRLPOOL 98f36742c3a8776a203b98e73057938fe4695b486a7321c10af1ec24fb54e671dd05958adf3db34953486d393f475eff6e46d8ce40d4d4508195ad0025be1530
 DIST netbeans-trunk-nightly-201608230002-src.zip 217197989 SHA256 59c6008364fd1d27a1742fdc1c76f93fd3782608b3db5799c42c89e95a516610 SHA512 a3a1d9be874fc9e040a43acf4ac0128776af08e1fb4de49a95fd1fab9e3e4773ad896f9bd7bbd4d82d5c4ab992a13a6d19427e8158ee88dca0c0bab78e75f957 WHIRLPOOL 0ebdc401e0728f01ce3554cb0b2acb516f040f925f563465d48cfb6b65cba87110c6646ad5a9ea1d738cff2eec35fb827ea7d76b4992d7d15548975a06afd9be
 DIST netbeans-trunk-nightly-201608240002-src.zip 217199132 SHA256 75e77e61eb9684fc0c844421dec20016894be29d98d155605c3694d052f4d29b SHA512 8614f3155b861016196a4d88da7efeacd501e5c57a5749c3dbed0898a9e0a7c20b66cca77002da2ae1e2b64d1fd73895f0182e1a95e523fda40bd776ca4c5c9a WHIRLPOOL ea35b1961eb3574b3a6d7561e41192141042f22b49a8ce58c674ac87e0f99d5b714482f170a8b052cd81e3db87521a69af1f6e0bbbceaf2b00bdfe6b3821f2aa
 DIST netbeans-trunk-nightly-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
@@ -33,7 +32,6 @@ DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b3
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
 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_p20160822.ebuild 2913 SHA256 94a8b9d735d446fbccb376962e8c93d8654f5733bba53fcf8c0fa32f5076dc8e SHA512 9c25d10113e81c814fe82fb0248c7d30659d039e288b0543eb33268fad525f1ab341825ef432c43eda295df5a5a0e7f1ffbac155ac308d2dc728043b1131ebd1 WHIRLPOOL a0f74cffb2bb42e6f888b622991f1a053f3b5143f68fa520f13d75023592c55600913431c4ccab4a0eff78160c0c6e3f71946b7366424977d23226cdd3739a07
 EBUILD netbeans-ergonomics-9999_p20160823.ebuild 2913 SHA256 5d874987a81194d5be1b5299e2772f00f1fccc364528c12b63863a1f44067fa8 SHA512 3f150b1e141337410c6b6854634d4431523741d3bceae13a0a4e02a42874fbf55a359ad655028ad5d0fc05cbada0114dbf0268cfa87c4f36d8346b6bb5d2353d WHIRLPOOL d37df3444e4d11fdb41ef412a404629b6d61f8f0fba392427232e9fcaa1563580033cbad1a2f4589fe0c9cbe002323a11b84735e162193ad110d976db085cb61
 EBUILD netbeans-ergonomics-9999_p20160824.ebuild 2913 SHA256 6a38b215ebc7aa80cb9b1331bbaf8e8a12bc9a78943ee9f0792d70ff49cddd47 SHA512 511ce3316307dbe454ed6e4ec692f973cc7918cec96870bfd03e5dcbd8483eff0090056ec32dd5b577effa59028e466e2e1d43fff8c54cd7bc7e7deeeaa08ddd WHIRLPOOL bd4b4ef3ef5ba81da1ebe8bcc83d8425990e39ee0e2b5e979b74fb93357ca50845bf922ea028d8455b6c0c8d7d8f7e3b022020c4d768a3a1f4836b21012a0df6
 EBUILD netbeans-ergonomics-9999_p20160825.ebuild 2913 SHA256 dc08ae009bc847ab79333d54fc1c2e5324c18a663513c53f373590979d1adf13 SHA512 331cbc62d84c4fb2d8c714c09bd4b81bd1162754f9b8e31ac93a0dc518acdc4c5c71a50b6ff15960667fd1ee73aff7a240fc5b39e07c6889d4a856d5b592f934 WHIRLPOOL 06daad702a77d4e3bb1f38515cf9356a3ff9b3f8b559a78cc351d10c2fc4bbb2ed8c775424aebd69d379406df4e33a5424be4600239027a5a764a9f6fedcc657

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160822.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160822.ebuild
deleted file mode 100644
index 3d56ba7..0000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160822.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-22_00-02-33/zip/netbeans-trunk-nightly-201608220002-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 b0726ba..24e8e80 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-201608220002-src.zip 217192718 SHA256 c1c463c39d59f48f75bb0f03507317de43f95394f04066e514d5bfbde1397082 SHA512 812c8a71f16979e91ca46d7553b6d056eaacfede0d4875d6c7a362576b2484844b83cd6c70792325ba24645da0dd906290e2498afb578771d280e8488c2c5fd4 WHIRLPOOL 98f36742c3a8776a203b98e73057938fe4695b486a7321c10af1ec24fb54e671dd05958adf3db34953486d393f475eff6e46d8ce40d4d4508195ad0025be1530
 DIST netbeans-trunk-nightly-201608230002-src.zip 217197989 SHA256 59c6008364fd1d27a1742fdc1c76f93fd3782608b3db5799c42c89e95a516610 SHA512 a3a1d9be874fc9e040a43acf4ac0128776af08e1fb4de49a95fd1fab9e3e4773ad896f9bd7bbd4d82d5c4ab992a13a6d19427e8158ee88dca0c0bab78e75f957 WHIRLPOOL 0ebdc401e0728f01ce3554cb0b2acb516f040f925f563465d48cfb6b65cba87110c6646ad5a9ea1d738cff2eec35fb827ea7d76b4992d7d15548975a06afd9be
 DIST netbeans-trunk-nightly-201608240002-src.zip 217199132 SHA256 75e77e61eb9684fc0c844421dec20016894be29d98d155605c3694d052f4d29b SHA512 8614f3155b861016196a4d88da7efeacd501e5c57a5749c3dbed0898a9e0a7c20b66cca77002da2ae1e2b64d1fd73895f0182e1a95e523fda40bd776ca4c5c9a WHIRLPOOL ea35b1961eb3574b3a6d7561e41192141042f22b49a8ce58c674ac87e0f99d5b714482f170a8b052cd81e3db87521a69af1f6e0bbbceaf2b00bdfe6b3821f2aa
 DIST netbeans-trunk-nightly-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
@@ -37,7 +36,6 @@ DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b3
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
 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_p20160822.ebuild 3377 SHA256 f06fd66e1d0ce4fc88b608ebde9a86a89f1dbb8e0a2a977691e6b698b7c920ca SHA512 8eb32437e4c68c3cc4d4c0509f3ad1b88a73bd7112613ae222aabe1ea3c42d0b59b617c259f8fdb5f3ee6977f0915e82ab33247436a4866e2b9cddae16634f29 WHIRLPOOL 012c40b69e36a4b8d17bc442efc2f10b63d7e74282838af8bd575eaf361e9163368cbfa79f1ad81617ff3af22d61762e16a3ffbaee939594e058f3faba003f7f
 EBUILD netbeans-extide-9999_p20160823.ebuild 3377 SHA256 a59447c6bd7857f086ed57f62fc2d283ee52390727fe817575f67450781da2b3 SHA512 32729a9f723e14371a79e2bb2087c7b822ad4743d7a0bd4db65a114b71aa9edfa9c92241a609d1c4cf39eb7da15536702d07c0e6277ace0638f0d7ae7899b7c1 WHIRLPOOL 0dfd0f904abce48cdf86e623d3b12f1565dc84a9c5fa9ece482907acdc716a6dc9a3a5774891fa69ea5ce931f549c073fc64d372f316faaab45e5811605d5274
 EBUILD netbeans-extide-9999_p20160824.ebuild 3377 SHA256 309fc77647b3e6de1df8ea49f15e462bab8d67beda24b539d0e743d6382135d9 SHA512 f35dd1edb3600a36df4d0a6d2596c9fd1f67b9c3a3f531fdef99dddc273303140131b0023337443a638343bb4a8927dd5385ac077790b9624327673b45a74aa1 WHIRLPOOL 182abfc1b987c49ccdf1084acb6b18d0667f685bab379e6d94fe0fe28208c6837ff992700adc0b3c4a990fdee752b08c32779279516c97d5b8f4c9c3c61d9553
 EBUILD netbeans-extide-9999_p20160825.ebuild 3377 SHA256 d539a0ff543871f2f3cf9905b20c85831e9dae57fe12d7bd97794b802a62f68f SHA512 0ad413dbb47995839c160a750ee75de36051f0b779b6eed94e7b441d991735d427ceee401f649ed0a691de231940948660426fee30327542d50ad9e7ca93daa8 WHIRLPOOL fc6a237cf280eab919ff7823036e63fd74c4ff67d63de554e6acbed733b32b7aae69c8d09fdd718fe2863efa94213204df89dce8593c4c99ec73dceb37390099

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160822.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160822.ebuild
deleted file mode 100644
index 9feff8d..0000000
--- a/dev-java/netbeans-extide/netbeans-extide-9999_p20160822.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-22_00-02-33/zip/netbeans-trunk-nightly-201608220002-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 93d73fa..6b87571 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-201608220002-src.zip 217192718 SHA256 c1c463c39d59f48f75bb0f03507317de43f95394f04066e514d5bfbde1397082 SHA512 812c8a71f16979e91ca46d7553b6d056eaacfede0d4875d6c7a362576b2484844b83cd6c70792325ba24645da0dd906290e2498afb578771d280e8488c2c5fd4 WHIRLPOOL 98f36742c3a8776a203b98e73057938fe4695b486a7321c10af1ec24fb54e671dd05958adf3db34953486d393f475eff6e46d8ce40d4d4508195ad0025be1530
 DIST netbeans-trunk-nightly-201608230002-src.zip 217197989 SHA256 59c6008364fd1d27a1742fdc1c76f93fd3782608b3db5799c42c89e95a516610 SHA512 a3a1d9be874fc9e040a43acf4ac0128776af08e1fb4de49a95fd1fab9e3e4773ad896f9bd7bbd4d82d5c4ab992a13a6d19427e8158ee88dca0c0bab78e75f957 WHIRLPOOL 0ebdc401e0728f01ce3554cb0b2acb516f040f925f563465d48cfb6b65cba87110c6646ad5a9ea1d738cff2eec35fb827ea7d76b4992d7d15548975a06afd9be
 DIST netbeans-trunk-nightly-201608240002-src.zip 217199132 SHA256 75e77e61eb9684fc0c844421dec20016894be29d98d155605c3694d052f4d29b SHA512 8614f3155b861016196a4d88da7efeacd501e5c57a5749c3dbed0898a9e0a7c20b66cca77002da2ae1e2b64d1fd73895f0182e1a95e523fda40bd776ca4c5c9a WHIRLPOOL ea35b1961eb3574b3a6d7561e41192141042f22b49a8ce58c674ac87e0f99d5b714482f170a8b052cd81e3db87521a69af1f6e0bbbceaf2b00bdfe6b3821f2aa
 DIST netbeans-trunk-nightly-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
@@ -35,7 +34,6 @@ DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b3
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
 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_p20160822.ebuild 3416 SHA256 c3588311be328a8761cf96cf0b62db9aada1e400da3c7705c7fbfa00ba51a4cc SHA512 a6313f9d4a0ed1aa78938d86431eaaba725fb4eb61966ccbbbd916f48554bf770cc3c4d6f0011e77de9839378c6ef23a22467c654343e713beeee6fdfc917ced WHIRLPOOL c5ebf01f32808b6bee16a323543e5e3300210150723f26aca5a11c66e5f24b269fcc48d6ae9ac85da5f1be58ba1d5d2ed635eeb8bed0bc85655e941922b58549
 EBUILD netbeans-groovy-9999_p20160823.ebuild 3416 SHA256 cfa018adc1167c6df621c732aef1a6b27886a372e0b2dd50fdaf3c505d139922 SHA512 f5269daae77cd1480ba1f7a589b4cc57dc4d3711d43384a0b2d4afb24f0cd2ae60cbe473a812783218928c69f86398f33a423032e647c502c9cda16cb9ad0477 WHIRLPOOL 2bf7497c1f86909f411e0293b4255e943456abe72a1f489d631f31fd71cd3ea6645cf17be5871955fd09a46c1780cf5656d13e897c9805cc80fa951c37e9a3d2
 EBUILD netbeans-groovy-9999_p20160824.ebuild 3416 SHA256 2cf74a23b87733e1c6f3a91eb2543e5b536c379c88fba59d2b9bf2d42835c891 SHA512 6d0bfeeb09e46a49a8657cd235cfce429adc86f0b53d22fd244c6f318aaf3560933f1c14084108d7c30a7dbf6633154c74be3e58c68c652db919de95b88a64e9 WHIRLPOOL 0e9818c72228627504d3e056fef72b7a4435fa39953070fb0a6051444027ae5a71fe63da05a981f6bdfc397da0ab1be367f056a9ab850f286bc52b33f813bb05
 EBUILD netbeans-groovy-9999_p20160825.ebuild 3416 SHA256 6c5e86afe2c2da71d9d818bbaf21c31e6b5244ad64bcf4afc1052b56039391a8 SHA512 d3375254af1608b01053b01ee27b40007ef12988871a85b96cf836e9e27b9506de27d7fb779d7665233cab2034aad6680a4c00e4f54bc2651b218df3217ab1e5 WHIRLPOOL 89c387754b4f8b85fdb973d83fa2b6b7e944a7ea54d98ff4f9e194caeece515a5d41331da5d06a2f37b9e58b0531e7aea293e71d85bca651617efea7e63ccb6b

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160822.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160822.ebuild
deleted file mode 100644
index 69d9043..0000000
--- a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160822.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-22_00-02-33/zip/netbeans-trunk-nightly-201608220002-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 4594131..ab162b5 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-201608220002-src.zip 217192718 SHA256 c1c463c39d59f48f75bb0f03507317de43f95394f04066e514d5bfbde1397082 SHA512 812c8a71f16979e91ca46d7553b6d056eaacfede0d4875d6c7a362576b2484844b83cd6c70792325ba24645da0dd906290e2498afb578771d280e8488c2c5fd4 WHIRLPOOL 98f36742c3a8776a203b98e73057938fe4695b486a7321c10af1ec24fb54e671dd05958adf3db34953486d393f475eff6e46d8ce40d4d4508195ad0025be1530
 DIST netbeans-trunk-nightly-201608230002-src.zip 217197989 SHA256 59c6008364fd1d27a1742fdc1c76f93fd3782608b3db5799c42c89e95a516610 SHA512 a3a1d9be874fc9e040a43acf4ac0128776af08e1fb4de49a95fd1fab9e3e4773ad896f9bd7bbd4d82d5c4ab992a13a6d19427e8158ee88dca0c0bab78e75f957 WHIRLPOOL 0ebdc401e0728f01ce3554cb0b2acb516f040f925f563465d48cfb6b65cba87110c6646ad5a9ea1d738cff2eec35fb827ea7d76b4992d7d15548975a06afd9be
 DIST netbeans-trunk-nightly-201608240002-src.zip 217199132 SHA256 75e77e61eb9684fc0c844421dec20016894be29d98d155605c3694d052f4d29b SHA512 8614f3155b861016196a4d88da7efeacd501e5c57a5749c3dbed0898a9e0a7c20b66cca77002da2ae1e2b64d1fd73895f0182e1a95e523fda40bd776ca4c5c9a WHIRLPOOL ea35b1961eb3574b3a6d7561e41192141042f22b49a8ce58c674ac87e0f99d5b714482f170a8b052cd81e3db87521a69af1f6e0bbbceaf2b00bdfe6b3821f2aa
 DIST netbeans-trunk-nightly-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
@@ -38,7 +37,6 @@ DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b3
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
 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_p20160822.ebuild 4126 SHA256 72cccf3d42b6f9c38612514af2169f979c68b3290f6cb62e9e9e0887aa441a43 SHA512 43e6e20e0f4e4ea29c7e0dd45bd05732a18ea7e5a35b86740517da7148057bb05fc003709f57462428dbe937840a13c50ff01d4e8a8f1bcf4121ee74ed0a43bd WHIRLPOOL 26423f6dfa02677edb4b21b19b163cd40c729b62aeb12092d37f2c6d74dd8ce3ed12cd78e4489d4b7758f528187cc77167e3d7a0b50889395d4b1519bc4be7eb
 EBUILD netbeans-harness-9999_p20160823.ebuild 4126 SHA256 3deff245d1a3ec9c5bf424d3fd34dd65e36905541194cab8cd785b55a094c58f SHA512 789f86d39ec2088442c14dd01321ed82e1b5ff0450ca3602685d825b38c5c27f4838976427ce7c21e5762790cf6a547eef06b34d69932644bdc4ea33edd45967 WHIRLPOOL 3afa6275957560aad0e3c2cde615b0dd028cb5165849a090e3bc676cf40a3671d9293db9dfc42d01451c2df147c635a46a9911f9034308055ef8f86f19e387c2
 EBUILD netbeans-harness-9999_p20160824.ebuild 4126 SHA256 80cdff17b518df32de0c9a4861d9155738a51468388d9aad9889b46cf4fa7d0f SHA512 3372d835a00e9d6bc58a9497aa51a2c1ee801d32823ee41cd45326ef0dcfd6235befd017dfb55c162ca3784b7b155c7dade718770a352387b6c7b291222a4e25 WHIRLPOOL 0c7ee12d6d46f52a676258c2ee51725a22f4db5c253fd7123e15ab317b8cc3b78b1ec570cbf8c7efb4a57b715565d50e75000466f9216ac3a46c7d064582d3a7
 EBUILD netbeans-harness-9999_p20160825.ebuild 4126 SHA256 68e19b301e715f30dd7d0bdc52127a0b7e53efdcb233d3940dd4b8a9a87e8584 SHA512 57a0b9f9994ada380d9907fcf234d589a296a45d5fb8375cbd7ffb5a9e4ad493c3dba0c7bc8f593acbdacfb2cb6e84b59c007a7424a5a05b9782f538af4ac986 WHIRLPOOL 8ea9a59693f22cc6ec42228958ef44896423c899f5c492b759c70737184119e192e37ee8a9583ab21efdc1e858ce3c2705e61759478408edf613afbc563d8a01

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160822.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160822.ebuild
deleted file mode 100644
index d13fe33..0000000
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20160822.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-22_00-02-33/zip/netbeans-trunk-nightly-201608220002-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 d3bfcb7..f8fe37e 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-201608220002-src.zip 217192718 SHA256 c1c463c39d59f48f75bb0f03507317de43f95394f04066e514d5bfbde1397082 SHA512 812c8a71f16979e91ca46d7553b6d056eaacfede0d4875d6c7a362576b2484844b83cd6c70792325ba24645da0dd906290e2498afb578771d280e8488c2c5fd4 WHIRLPOOL 98f36742c3a8776a203b98e73057938fe4695b486a7321c10af1ec24fb54e671dd05958adf3db34953486d393f475eff6e46d8ce40d4d4508195ad0025be1530
 DIST netbeans-trunk-nightly-201608230002-src.zip 217197989 SHA256 59c6008364fd1d27a1742fdc1c76f93fd3782608b3db5799c42c89e95a516610 SHA512 a3a1d9be874fc9e040a43acf4ac0128776af08e1fb4de49a95fd1fab9e3e4773ad896f9bd7bbd4d82d5c4ab992a13a6d19427e8158ee88dca0c0bab78e75f957 WHIRLPOOL 0ebdc401e0728f01ce3554cb0b2acb516f040f925f563465d48cfb6b65cba87110c6646ad5a9ea1d738cff2eec35fb827ea7d76b4992d7d15548975a06afd9be
 DIST netbeans-trunk-nightly-201608240002-src.zip 217199132 SHA256 75e77e61eb9684fc0c844421dec20016894be29d98d155605c3694d052f4d29b SHA512 8614f3155b861016196a4d88da7efeacd501e5c57a5749c3dbed0898a9e0a7c20b66cca77002da2ae1e2b64d1fd73895f0182e1a95e523fda40bd776ca4c5c9a WHIRLPOOL ea35b1961eb3574b3a6d7561e41192141042f22b49a8ce58c674ac87e0f99d5b714482f170a8b052cd81e3db87521a69af1f6e0bbbceaf2b00bdfe6b3821f2aa
 DIST netbeans-trunk-nightly-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
@@ -172,7 +171,6 @@ DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b3
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
 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_p20160822.ebuild 29867 SHA256 97f27bf75c64e32e06f0668b8c64055ece3cb1d5431e339f34cb77f94e36b637 SHA512 3e101f3ce8e363d0282dc1525720dbb4f039fc81af1419dfda3c35ca9d5780ff2a3ba0d715787f3993d0f2e36476ab71c814d2e52f0a156ce27ff6aaf3024bae WHIRLPOOL 804ffa7d9130b3b19df44bb2ba8c17800b59085f0894c3c7449777d9067a6128f8574544dee47f1e6cafd74b7541fa83355a4ca41be4c780c9652f91d50e874d
 EBUILD netbeans-ide-9999_p20160823.ebuild 29867 SHA256 8f2efe0e79cec54b3f6a36bb45f9644d1f614a9cd90ac5ece5c1d98c379e3cbb SHA512 42bc926beb5c1cc61d0d46c3c9e97196db8d168689f623cdeb8ccb6e8bfff3635280e291ccb0cfbf24b35dc5b962aa8be5acdf60995f80b2bc4b1ad74ba9f50b WHIRLPOOL 63831233671e8e022e0e45c47298a0bb61d3c00c7d0ffc84c3a52077d15f0f8eccb514a205cd0a3e60b77935de7109faa98512f2aa2be30382887a494dbfd5f6
 EBUILD netbeans-ide-9999_p20160824.ebuild 29867 SHA256 cfa81eb2d0f68b0d1f78136db0f31f11a24ec38f054c4c74df37e1fb2b61a11e SHA512 8c88471a99809992b55490b8bcf5d8057848bcaefbc2308f00287d415aa4dfa65734a4c1c7a75666c244180d58d5f939608c4a84aea2bf4167bc4dc741991bf4 WHIRLPOOL b8afc9f19f9cf72e2df00509842fe7916408f7c1c022c88b07c9008cfa26f582e422f9f1aa679b42182e394785ed7bbdfbebb00e11798c2e0935ebc9c8324dd2
 EBUILD netbeans-ide-9999_p20160825.ebuild 29867 SHA256 db8c4e3e6972ccda7d90646e10b117bec8cd5c2d2006a20a5829332f7ff371eb SHA512 9073a5f3c04f371b20403fafa1e3ee2e19545abcf56f54c99077c8004268b306d4cca5429f3e94417c461e675025315b1146bfb8692535b4945573a505430427 WHIRLPOOL befc4a88ffec455f4112bb66a7cbcc8957e66e3ed8a429eeab07004d1e5de0c5bc4b456ab27d3a9bdef91e4d3be0fe455b8a3e10e23d9486a0f87d786c8bad00

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160822.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160822.ebuild
deleted file mode 100644
index b6ce62b..0000000
--- a/dev-java/netbeans-ide/netbeans-ide-9999_p20160822.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-22_00-02-33/zip/netbeans-trunk-nightly-201608220002-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 25d2a60..870cab2 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-201608220002-src.zip 217192718 SHA256 c1c463c39d59f48f75bb0f03507317de43f95394f04066e514d5bfbde1397082 SHA512 812c8a71f16979e91ca46d7553b6d056eaacfede0d4875d6c7a362576b2484844b83cd6c70792325ba24645da0dd906290e2498afb578771d280e8488c2c5fd4 WHIRLPOOL 98f36742c3a8776a203b98e73057938fe4695b486a7321c10af1ec24fb54e671dd05958adf3db34953486d393f475eff6e46d8ce40d4d4508195ad0025be1530
 DIST netbeans-trunk-nightly-201608230002-src.zip 217197989 SHA256 59c6008364fd1d27a1742fdc1c76f93fd3782608b3db5799c42c89e95a516610 SHA512 a3a1d9be874fc9e040a43acf4ac0128776af08e1fb4de49a95fd1fab9e3e4773ad896f9bd7bbd4d82d5c4ab992a13a6d19427e8158ee88dca0c0bab78e75f957 WHIRLPOOL 0ebdc401e0728f01ce3554cb0b2acb516f040f925f563465d48cfb6b65cba87110c6646ad5a9ea1d738cff2eec35fb827ea7d76b4992d7d15548975a06afd9be
 DIST netbeans-trunk-nightly-201608240002-src.zip 217199132 SHA256 75e77e61eb9684fc0c844421dec20016894be29d98d155605c3694d052f4d29b SHA512 8614f3155b861016196a4d88da7efeacd501e5c57a5749c3dbed0898a9e0a7c20b66cca77002da2ae1e2b64d1fd73895f0182e1a95e523fda40bd776ca4c5c9a WHIRLPOOL ea35b1961eb3574b3a6d7561e41192141042f22b49a8ce58c674ac87e0f99d5b714482f170a8b052cd81e3db87521a69af1f6e0bbbceaf2b00bdfe6b3821f2aa
 DIST netbeans-trunk-nightly-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
@@ -70,7 +69,6 @@ DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b3
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
 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_p20160822.ebuild 15656 SHA256 eb590bc15efc6ae7026d0a7d206d12a7c28aafcf7899cd93d8f97eae10effbe2 SHA512 c9385d89fc95b0a31d8e4102f3caca151ffd4587b0b1597d3256218193aab7b993b240b51bc098100589546a6e12a8dfbe3f357e7575f6ffe24179757f3fafe7 WHIRLPOOL 2e69758b8e42c93e968d5a0b7b63d40330edc653f3aafc2a6befff1d34d042ba26d725440713f1e94bbfa2e695aed7acf7f4e766872b0f54dcc28f97f7c324b1
 EBUILD netbeans-java-9999_p20160823.ebuild 15656 SHA256 ed0797c71be547652d0d57dc1b222c248f3b06977083ca94b2166d3f1c339c6e SHA512 31300865f3ecedb7c4291680de2a187f72eda4a254538e411f26e2535b83237f01e43a35a8cf8449946ee250f5d5dc7b8f1daf7bb5df4e2a8294816ce21b53d5 WHIRLPOOL 6aa802fb0f4db2e10e71f5e902b3c55d744f0c4340bee06470991cc425ba12fc0d90cef9c4d392ffb3bb9a3c9285fd965df975f7d2c81778e096e049cfbb0c23
 EBUILD netbeans-java-9999_p20160824.ebuild 15656 SHA256 e9733f942d0ccf49b05de3e404fe257dfe7ae77fa3b207f45a82dfdfaa381568 SHA512 ddb071f4cefe4bfb1f19829157338ae692e46531076afbfd02f54d17bdaf0d81bb6ce7091a4824d3dea5c4a268830110518b0762a3cf0a8923486fb540243f27 WHIRLPOOL 6cccc18c82ca1cb9e54a1ab67a3fd4bb7c833588582a6fdd37cc49ce19ba668e4a4314c1021233de876565b6084a853968a61b00b9905d4ca80fce9d1daf9d77
 EBUILD netbeans-java-9999_p20160825.ebuild 15656 SHA256 383f84044a068ad8c529256c405eb53e12934a1adbd402bccd18dab316e9e87c SHA512 06eb4ef2288c0f7726a4042e5d4225588d532aba36716ff1f6221cf76d32aafeee3f84da306e3467b4ed23773fafa86cfd78b7376cde9476a939e775fe4e94ac WHIRLPOOL 52ddb44db707b4d77022cedc80af245872f634c51a24a3691b68679a99ee35dea1a465b90ccc6a42b45fcfa8d290ff35bd7f7ecfd014bed9475d0eb39e469495

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160822.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160822.ebuild
deleted file mode 100644
index 62dfee6..0000000
--- a/dev-java/netbeans-java/netbeans-java-9999_p20160822.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-22_00-02-33/zip/netbeans-trunk-nightly-201608220002-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 50459da..09fb791 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-201608220002-src.zip 217192718 SHA256 c1c463c39d59f48f75bb0f03507317de43f95394f04066e514d5bfbde1397082 SHA512 812c8a71f16979e91ca46d7553b6d056eaacfede0d4875d6c7a362576b2484844b83cd6c70792325ba24645da0dd906290e2498afb578771d280e8488c2c5fd4 WHIRLPOOL 98f36742c3a8776a203b98e73057938fe4695b486a7321c10af1ec24fb54e671dd05958adf3db34953486d393f475eff6e46d8ce40d4d4508195ad0025be1530
 DIST netbeans-trunk-nightly-201608230002-src.zip 217197989 SHA256 59c6008364fd1d27a1742fdc1c76f93fd3782608b3db5799c42c89e95a516610 SHA512 a3a1d9be874fc9e040a43acf4ac0128776af08e1fb4de49a95fd1fab9e3e4773ad896f9bd7bbd4d82d5c4ab992a13a6d19427e8158ee88dca0c0bab78e75f957 WHIRLPOOL 0ebdc401e0728f01ce3554cb0b2acb516f040f925f563465d48cfb6b65cba87110c6646ad5a9ea1d738cff2eec35fb827ea7d76b4992d7d15548975a06afd9be
 DIST netbeans-trunk-nightly-201608240002-src.zip 217199132 SHA256 75e77e61eb9684fc0c844421dec20016894be29d98d155605c3694d052f4d29b SHA512 8614f3155b861016196a4d88da7efeacd501e5c57a5749c3dbed0898a9e0a7c20b66cca77002da2ae1e2b64d1fd73895f0182e1a95e523fda40bd776ca4c5c9a WHIRLPOOL ea35b1961eb3574b3a6d7561e41192141042f22b49a8ce58c674ac87e0f99d5b714482f170a8b052cd81e3db87521a69af1f6e0bbbceaf2b00bdfe6b3821f2aa
 DIST netbeans-trunk-nightly-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
@@ -36,7 +35,6 @@ DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b3
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
 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_p20160822.ebuild 4971 SHA256 14091f7ff32dcf5e6895dc60c35f063cf423ddc389bcc6ab5df9b56df9509d1c SHA512 e622c6699651bcb046a8eb79f31a742951481f79f55b1406b648fc46f798e9402eff6b532f23fa6ef4cc936ac97c7e151ed5a8d09b91d92b5231be9464627aff WHIRLPOOL 0c34fa2111b6d86d0d35a2dcd9c4d6bc88f9631d26e0e87480a517c4b8c4a6adad65a5aed93509698790f4b3461e779c200312a57e1835994d439f31723ab292
 EBUILD netbeans-javacard-9999_p20160823.ebuild 4971 SHA256 281682079c1b9cf2e4148db4315396933b8494cb9b4d3fc200d2f62fbebac700 SHA512 87712094b0318db35f4203f689190aba38c84d28c22df5808b0b9b545e155c0af5053b507325801b10bb9257fbfe449da65e77efa1e8df7fb24e422da7494de9 WHIRLPOOL 42a8164f4d202ae6f956f93b1cf74a4e6ebd00e86b5b50ecf13f086dbf8828cbebdf70dc48740a7837097a9308a110c3b009af1e82ed940e18b112c360d25776
 EBUILD netbeans-javacard-9999_p20160824.ebuild 4971 SHA256 647b3f4b62183936f8a9ec6e1195cd4a4b44f911f056bc4645bdef4ae7ec37b8 SHA512 535b622221b6111641d2ca9a2534aebfae734cad7e2776d749bfe587c0d43a6e040de34222a7e18edd87dc3e058c0a7e2c887865a7dc821edfd036af279d90c3 WHIRLPOOL cc408d6c0d2c810d13ffa2e8b9ffb18ad10ef21ba2fd840aed2149cb51ac74eccda99ea2ddf192703514f5521b93a6f7f8c25927710552b4493fd3852be461c9
 EBUILD netbeans-javacard-9999_p20160825.ebuild 4971 SHA256 1ad6c689d98e9fe3042e46d6c01280ac27e1f8b02aa7274000e4fb47424e59fc SHA512 7ad46e1aa10252480af42ed06651ef020e2b52e4bdda1e31da295b1d410d7c4da2cc565d4df27c006f408a11e41325196e6f0a326d1c253ba9ea39a7dce874a8 WHIRLPOOL 3da79b47cb5ea46835711389202751240ce2f92b336320f19c6839c61928211043b7d2e9300f813f07594497f18933c690885bc85b446b85f4507f249db65ed2

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160822.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160822.ebuild
deleted file mode 100644
index a276c95..0000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160822.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-22_00-02-33/zip/netbeans-trunk-nightly-201608220002-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 4e2542f..ebaa27f 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-201608220002-src.zip 217192718 SHA256 c1c463c39d59f48f75bb0f03507317de43f95394f04066e514d5bfbde1397082 SHA512 812c8a71f16979e91ca46d7553b6d056eaacfede0d4875d6c7a362576b2484844b83cd6c70792325ba24645da0dd906290e2498afb578771d280e8488c2c5fd4 WHIRLPOOL 98f36742c3a8776a203b98e73057938fe4695b486a7321c10af1ec24fb54e671dd05958adf3db34953486d393f475eff6e46d8ce40d4d4508195ad0025be1530
 DIST netbeans-trunk-nightly-201608230002-src.zip 217197989 SHA256 59c6008364fd1d27a1742fdc1c76f93fd3782608b3db5799c42c89e95a516610 SHA512 a3a1d9be874fc9e040a43acf4ac0128776af08e1fb4de49a95fd1fab9e3e4773ad896f9bd7bbd4d82d5c4ab992a13a6d19427e8158ee88dca0c0bab78e75f957 WHIRLPOOL 0ebdc401e0728f01ce3554cb0b2acb516f040f925f563465d48cfb6b65cba87110c6646ad5a9ea1d738cff2eec35fb827ea7d76b4992d7d15548975a06afd9be
 DIST netbeans-trunk-nightly-201608240002-src.zip 217199132 SHA256 75e77e61eb9684fc0c844421dec20016894be29d98d155605c3694d052f4d29b SHA512 8614f3155b861016196a4d88da7efeacd501e5c57a5749c3dbed0898a9e0a7c20b66cca77002da2ae1e2b64d1fd73895f0182e1a95e523fda40bd776ca4c5c9a WHIRLPOOL ea35b1961eb3574b3a6d7561e41192141042f22b49a8ce58c674ac87e0f99d5b714482f170a8b052cd81e3db87521a69af1f6e0bbbceaf2b00bdfe6b3821f2aa
 DIST netbeans-trunk-nightly-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
@@ -35,7 +34,6 @@ DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b3
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
 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_p20160822.ebuild 6293 SHA256 e7029328e94e19bc485c5d87142d3dfe59e5da89d37f2f396fa2d1307e40283d SHA512 45889df048887c9d2e4b3eb03e14b2666a063d6ef5b9d2613d77f8a96d24f5c4540f474e53ea572b3d02465bdd1ad05377775b276f158139a1671634058abb8a WHIRLPOOL e0279140fe161ad9ae36cccb76b403beb3a1340498841c3102ce9a8dc6660b305946046ffcbfaad89f178667c599df71faf9afae9224b2128d29c820885d0a0b
 EBUILD netbeans-javadoc-9999_p20160823.ebuild 6293 SHA256 e0af01521fa0308e5b4e9626cdf50e052c66b39c8e9fef7a6ae82e7792bc9b8c SHA512 03d8133bd9f79f093c6e7552f58f8a954feba048830a3e66d2e7cd1b59700f6e6a155dd36d390a644c52974e3906bfc891339ddaf90fa1315790a7d48f32969a WHIRLPOOL 595e11edc37932665b54518e6258c7d9ecca3019f4950a7b63045be389092a36f0f9cc05945ef361fa3ba42105fc4f756b4401cfef54d1f5f7bbed73d6dc0116
 EBUILD netbeans-javadoc-9999_p20160824.ebuild 6293 SHA256 c21df57259ab764d613e9273e2988e625c21187f7e40ea5224e4fc8a62825d6e SHA512 5531fb079acaa9e879aef540aa1c81baa7c10460f4f23d799ce49902d11588daa80ebf2f327090116414c57add5522784df53e11b0234a2cd777622fb670b9ce WHIRLPOOL 8305ad0c6ceec4038f3e5f79bdc064f1b39a6ba6c8bf2a45e33bff665804753a489e3ddb587d618d88f8eaa506ed5575b93bd68412b8fb52614765563a963088
 EBUILD netbeans-javadoc-9999_p20160825.ebuild 6293 SHA256 397161e1b881f316169969dce096f9b8f60ff587782fdfdaeb26bf93189250e0 SHA512 c28b8e4b440dd947ffabefaef84352a707c7525cb34e1fdef441ae3226a8f01524d2d4adc42f545072165d00daa2a04f4e034eb808a585e494956e87a47269d4 WHIRLPOOL 0b71c8b7b258f7e5047114a862205e1729860b5dc8974f48bfec6feb5c1b8679c0c104201c641f5bca80b8648bfd9b08efd6bb640614677ae94d8472e58e030f

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160822.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160822.ebuild
deleted file mode 100644
index 8d9a1e0..0000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160822.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-22_00-02-33/zip/netbeans-trunk-nightly-201608220002-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 794984a..f2ee001 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-201608220002-src.zip 217192718 SHA256 c1c463c39d59f48f75bb0f03507317de43f95394f04066e514d5bfbde1397082 SHA512 812c8a71f16979e91ca46d7553b6d056eaacfede0d4875d6c7a362576b2484844b83cd6c70792325ba24645da0dd906290e2498afb578771d280e8488c2c5fd4 WHIRLPOOL 98f36742c3a8776a203b98e73057938fe4695b486a7321c10af1ec24fb54e671dd05958adf3db34953486d393f475eff6e46d8ce40d4d4508195ad0025be1530
 DIST netbeans-trunk-nightly-201608230002-src.zip 217197989 SHA256 59c6008364fd1d27a1742fdc1c76f93fd3782608b3db5799c42c89e95a516610 SHA512 a3a1d9be874fc9e040a43acf4ac0128776af08e1fb4de49a95fd1fab9e3e4773ad896f9bd7bbd4d82d5c4ab992a13a6d19427e8158ee88dca0c0bab78e75f957 WHIRLPOOL 0ebdc401e0728f01ce3554cb0b2acb516f040f925f563465d48cfb6b65cba87110c6646ad5a9ea1d738cff2eec35fb827ea7d76b4992d7d15548975a06afd9be
 DIST netbeans-trunk-nightly-201608240002-src.zip 217199132 SHA256 75e77e61eb9684fc0c844421dec20016894be29d98d155605c3694d052f4d29b SHA512 8614f3155b861016196a4d88da7efeacd501e5c57a5749c3dbed0898a9e0a7c20b66cca77002da2ae1e2b64d1fd73895f0182e1a95e523fda40bd776ca4c5c9a WHIRLPOOL ea35b1961eb3574b3a6d7561e41192141042f22b49a8ce58c674ac87e0f99d5b714482f170a8b052cd81e3db87521a69af1f6e0bbbceaf2b00bdfe6b3821f2aa
 DIST netbeans-trunk-nightly-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
@@ -41,7 +40,6 @@ DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b3
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
 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_p20160822.ebuild 4717 SHA256 b917bd5183abafa7c75f56b7da70c75300a179566615129d63d1073e602f01b9 SHA512 449afeccd77896edb7757850b8a8cf6a67b12b00996a2ef48040a5dad5899619ea5787daa3c2542b0c042731be5c948b0c1a2805f7759bfd2cb2c42004c22300 WHIRLPOOL f59b0e4524de67b4227676e2333970f44c306bfa148b42806ed9c03b6ee2c95ce1d08ebeac11ea636a99fcb1e33aaeeef4879b15701e2c69dddd401f8b6157c6
 EBUILD netbeans-javafx-9999_p20160823.ebuild 4717 SHA256 fbde37b4307a53a4f762367cd36d9adb9f01ad87684cacff4e424f2483d0d74b SHA512 f4c908d71568ba543180320453b0069db2e2de53b96233384d510238bd0a68369262cbaaa303a76c6651d8989c85bf7bbc89bb79eb777f1f8cf62c7a72a1cb79 WHIRLPOOL 22b6af5b18b13568f9ab3ebd2c9ffe0cdfeabf6346b90d3f230f3b530ed4c75fa085a202a7dff70851511c47a32a6ad40418ad43dabd6b0bbcd3a4e772578012
 EBUILD netbeans-javafx-9999_p20160824.ebuild 4717 SHA256 9f4715bd760d470f70f11c03a50e97d15b61c64a0e84d170dd809ed4605d3550 SHA512 0b184ffa72dff85c85dacd47ae793cb790dcddc84067080fe7c15ff6179649e4e32c5d21643890639dee65b298ffa0e34b1bf91b47047401a0d3d263eb395618 WHIRLPOOL be5b04e33062d1106519a00a5bfe8f761026dd49750c49fefe83ba6422365bf4da9fc010fa018364e1ccd3fbd6c0b0fe327c02bd616aee8c99b174de691486e6
 EBUILD netbeans-javafx-9999_p20160825.ebuild 4717 SHA256 9a5ea2a3816088926dfa808a60b42768faef3b20c8fa0a28e60131b51025fd59 SHA512 ece73b9c85dfaa7cc791831e7d385f211432358dc57f8367bc72372e22a1a8a2220f5d8147109088220bca59f72ed4681b80bf9739ef3c7b2b7327db45e1ad70 WHIRLPOOL b5afbc34115c9cc977aa172467d3bbbb39140b0d1af5ad33bc56728895e2e66139d9d8d90697ab0bee48209b409e953ab44d081924fe2ecc6c4825b7f83ae1eb

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160822.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160822.ebuild
deleted file mode 100644
index 0d0c506..0000000
--- a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160822.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-22_00-02-33/zip/netbeans-trunk-nightly-201608220002-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 89c5df9..7f28a1b 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-201608220002-src.zip 217192718 SHA256 c1c463c39d59f48f75bb0f03507317de43f95394f04066e514d5bfbde1397082 SHA512 812c8a71f16979e91ca46d7553b6d056eaacfede0d4875d6c7a362576b2484844b83cd6c70792325ba24645da0dd906290e2498afb578771d280e8488c2c5fd4 WHIRLPOOL 98f36742c3a8776a203b98e73057938fe4695b486a7321c10af1ec24fb54e671dd05958adf3db34953486d393f475eff6e46d8ce40d4d4508195ad0025be1530
 DIST netbeans-trunk-nightly-201608230002-src.zip 217197989 SHA256 59c6008364fd1d27a1742fdc1c76f93fd3782608b3db5799c42c89e95a516610 SHA512 a3a1d9be874fc9e040a43acf4ac0128776af08e1fb4de49a95fd1fab9e3e4773ad896f9bd7bbd4d82d5c4ab992a13a6d19427e8158ee88dca0c0bab78e75f957 WHIRLPOOL 0ebdc401e0728f01ce3554cb0b2acb516f040f925f563465d48cfb6b65cba87110c6646ad5a9ea1d738cff2eec35fb827ea7d76b4992d7d15548975a06afd9be
 DIST netbeans-trunk-nightly-201608240002-src.zip 217199132 SHA256 75e77e61eb9684fc0c844421dec20016894be29d98d155605c3694d052f4d29b SHA512 8614f3155b861016196a4d88da7efeacd501e5c57a5749c3dbed0898a9e0a7c20b66cca77002da2ae1e2b64d1fd73895f0182e1a95e523fda40bd776ca4c5c9a WHIRLPOOL ea35b1961eb3574b3a6d7561e41192141042f22b49a8ce58c674ac87e0f99d5b714482f170a8b052cd81e3db87521a69af1f6e0bbbceaf2b00bdfe6b3821f2aa
 DIST netbeans-trunk-nightly-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
@@ -33,7 +32,6 @@ DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b3
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
 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_p20160822.ebuild 4412 SHA256 084f4bf0d9fcde52c51f807bd644918cfbedb322b0ad10881efef4d04da27533 SHA512 3a5ee0700944bae5bfa53bb2b78331f8b4221528c171888a0066e7948c2c398b1d758c8538ab95def5b108bac968fe225ce0dcc4994b9c477874d28e243394ac WHIRLPOOL 4c904fd6ddc32926e5783761f0037bca8004197204360af4d61b5dc04cad6ee24da761cc9faa1a3d45a52600f07059757fc5d724187339fd5d77ab0aae0325b4
 EBUILD netbeans-mobility-9999_p20160823.ebuild 4412 SHA256 00be0b421d1120f27b29acef23b5633d8aafe28ee4ffd7ef50f1c4f17635c622 SHA512 7dcdc8cd3888f9ba3f62620b77bfa678d69dc2cffff76235ab9511574e8a98de6bb2303422a16905430a8c48b0499e8c51b23552d605d1fb8fab9b9d4d1d7366 WHIRLPOOL 06dfda10627ddfcc1af7ddfb273b13d9e89d5fe50fbd59a91a373739042a4b2e7d891e417689b50e6c15885a9be8c9d17dab99851e93e944d76d9102876b1ced
 EBUILD netbeans-mobility-9999_p20160824.ebuild 4412 SHA256 15ab4616b731d1c0787ff96f2be0bb19bd71579b3358aba6b624e724a9ef3a39 SHA512 0c491ddff1c84d185f69f2ae6a16ec371dbbcb455079f2cb4fabb959defa811f5d2f4e1eeb7908e08c6cd4b7ef3cf8c03ce5c1a326e130c7d27ac3723dfb7895 WHIRLPOOL d89e964f44cd838986fbea4000d98f951bb0e87dd5162cebf3751ad4ecb59440872945906aeb71c54d1b0b4fd8646e7e9c904b67f4da3bf2d07da73215da1f5a
 EBUILD netbeans-mobility-9999_p20160825.ebuild 4412 SHA256 4ab57687bf33011aa2c283782d73f7b9893c4cfc1d6e4cb39c88a26ca948e861 SHA512 e10ce12acdd7bca3212c6c03c889a9d675643ebcfc8b727193a7437ca16b2c8d6aadc62d75834faa491d43bd4964190f082f572311127425ff6178f4dde00294 WHIRLPOOL 74e9abe4811e1de04917e717110fb9fc03ddf3a488c108fbc8293475658d0be170c44d97700e3ef5ebd8aaa331b069bf03983183bb0d96862add5df5f3e40206

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160822.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160822.ebuild
deleted file mode 100644
index f50c6e4..0000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160822.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-22_00-02-33/zip/netbeans-trunk-nightly-201608220002-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 0fca0c3..ad32597 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-201608220002-src.zip 217192718 SHA256 c1c463c39d59f48f75bb0f03507317de43f95394f04066e514d5bfbde1397082 SHA512 812c8a71f16979e91ca46d7553b6d056eaacfede0d4875d6c7a362576b2484844b83cd6c70792325ba24645da0dd906290e2498afb578771d280e8488c2c5fd4 WHIRLPOOL 98f36742c3a8776a203b98e73057938fe4695b486a7321c10af1ec24fb54e671dd05958adf3db34953486d393f475eff6e46d8ce40d4d4508195ad0025be1530
 DIST netbeans-trunk-nightly-201608230002-src.zip 217197989 SHA256 59c6008364fd1d27a1742fdc1c76f93fd3782608b3db5799c42c89e95a516610 SHA512 a3a1d9be874fc9e040a43acf4ac0128776af08e1fb4de49a95fd1fab9e3e4773ad896f9bd7bbd4d82d5c4ab992a13a6d19427e8158ee88dca0c0bab78e75f957 WHIRLPOOL 0ebdc401e0728f01ce3554cb0b2acb516f040f925f563465d48cfb6b65cba87110c6646ad5a9ea1d738cff2eec35fb827ea7d76b4992d7d15548975a06afd9be
 DIST netbeans-trunk-nightly-201608240002-src.zip 217199132 SHA256 75e77e61eb9684fc0c844421dec20016894be29d98d155605c3694d052f4d29b SHA512 8614f3155b861016196a4d88da7efeacd501e5c57a5749c3dbed0898a9e0a7c20b66cca77002da2ae1e2b64d1fd73895f0182e1a95e523fda40bd776ca4c5c9a WHIRLPOOL ea35b1961eb3574b3a6d7561e41192141042f22b49a8ce58c674ac87e0f99d5b714482f170a8b052cd81e3db87521a69af1f6e0bbbceaf2b00bdfe6b3821f2aa
 DIST netbeans-trunk-nightly-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
@@ -36,7 +35,6 @@ DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b3
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
 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_p20160822.ebuild 4111 SHA256 fdc00071f847351b6d9f645acf909fa2da0db143f0817da2d328f90de256c44f SHA512 e2a9beb12d25235d6ecfb59b73a50029a1360de96d91ae907d7b560948b3a1f10d252f15a3d4afeb543f34788503ee424f3692adde506a4bf2f80f32053ed7fe WHIRLPOOL 47c4b43bbb32211c59ccd8a9e047746414c779166077a7b0c080f9ad08324612a5b27906a7a1f719be548c946d5eef9b3ac6fbbb8dc30b71abdab04c50a15682
 EBUILD netbeans-nb-9999_p20160823.ebuild 4111 SHA256 3482f7df8c6865e62faf14dcce0ff6583c67bc0a43e070e27d574ecbc3045ffe SHA512 19e9d9db0dca38dbb7a8d63b8ebddecf5edcd93027480590e18357355a1ea69b13a41bbbc7162f99797a0cded7109b24c9d4894604cd3ccc8ebb19c18928bcd9 WHIRLPOOL 2bf848c7521e33c1d3401ca1eaabbd7a6a0a051e66f71ab0b4cf258d7c79369f6b12cba1f9858ee2ddb5b3edd3fb88044ce5a588be97f435a98c4ab44a5dfa23
 EBUILD netbeans-nb-9999_p20160824.ebuild 4111 SHA256 19a6cd06abff76c2ea1adad4fbcc28f1d3505940c37211bb8b02e2eb1190b6b3 SHA512 3a89d1d8fda034c7845895e0423d55287ad86f44c131f540a87ccdb054b80d25a1852d823a756142f6783baaabe0b753ff997028f753bf0e3a195968743e9ee0 WHIRLPOOL 79a76a645baed447aa12a86d947bd7e66edecd30575a7bebb8d6880d1ec61770a207d7a97c0fe08364ce4e768105fc49ff4cd29b9d1a72e11cb825583f2bc986
 EBUILD netbeans-nb-9999_p20160825.ebuild 4111 SHA256 88e54635f632804b71d90f783352779e4f6cb11ac12cb3ea4d55935074b913c4 SHA512 15b58912f71fc1829d9853420405d3b7826c292f9bd99d4dcd7ecce751fa7ebe5a4ac526c8533796acce4c98cc87e4787344aba55874555221ff1673f0bdd3c8 WHIRLPOOL b8dca15ca706bd8da17cd6ed0a3da2864427a4ba9715a655a6503869e4ec0f884580feb72bf3a708923c29c201f96141e016a91dd3d3137d8e7654ed37405a46

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160822.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160822.ebuild
deleted file mode 100644
index 48ebce6..0000000
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20160822.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-22_00-02-33/zip/netbeans-trunk-nightly-201608220002-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 d87244f..f1f29d7 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-201608220002-src.zip 217192718 SHA256 c1c463c39d59f48f75bb0f03507317de43f95394f04066e514d5bfbde1397082 SHA512 812c8a71f16979e91ca46d7553b6d056eaacfede0d4875d6c7a362576b2484844b83cd6c70792325ba24645da0dd906290e2498afb578771d280e8488c2c5fd4 WHIRLPOOL 98f36742c3a8776a203b98e73057938fe4695b486a7321c10af1ec24fb54e671dd05958adf3db34953486d393f475eff6e46d8ce40d4d4508195ad0025be1530
 DIST netbeans-trunk-nightly-201608230002-src.zip 217197989 SHA256 59c6008364fd1d27a1742fdc1c76f93fd3782608b3db5799c42c89e95a516610 SHA512 a3a1d9be874fc9e040a43acf4ac0128776af08e1fb4de49a95fd1fab9e3e4773ad896f9bd7bbd4d82d5c4ab992a13a6d19427e8158ee88dca0c0bab78e75f957 WHIRLPOOL 0ebdc401e0728f01ce3554cb0b2acb516f040f925f563465d48cfb6b65cba87110c6646ad5a9ea1d738cff2eec35fb827ea7d76b4992d7d15548975a06afd9be
 DIST netbeans-trunk-nightly-201608240002-src.zip 217199132 SHA256 75e77e61eb9684fc0c844421dec20016894be29d98d155605c3694d052f4d29b SHA512 8614f3155b861016196a4d88da7efeacd501e5c57a5749c3dbed0898a9e0a7c20b66cca77002da2ae1e2b64d1fd73895f0182e1a95e523fda40bd776ca4c5c9a WHIRLPOOL ea35b1961eb3574b3a6d7561e41192141042f22b49a8ce58c674ac87e0f99d5b714482f170a8b052cd81e3db87521a69af1f6e0bbbceaf2b00bdfe6b3821f2aa
 DIST netbeans-trunk-nightly-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
@@ -38,7 +37,6 @@ DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b3
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
 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_p20160822.ebuild 4418 SHA256 3d2bcdf57d080907518ef5231538d8da3f39ca3b0753e5706cb3d2783632f27b SHA512 35d3a8d87576e298eccb49463cbfdd877dc0058e17c7d5b25f08835f1f79ddaf66ac9a9216a6d5459e5f6f39d2a718d7b9e7d0b2c98de847564b87693c3df799 WHIRLPOOL e29b4cc4f3c763344bd8e204f4bb101169bfe427088cbe65461c763cb226e54a4f6ed0c390cc139f8ceaebfe35bbd1ddc6e795897d6f09fb516f6e68fd677c73
 EBUILD netbeans-php-9999_p20160823.ebuild 4418 SHA256 70f82f30d50b637ad266eafb3fd3cbca37ac57b6ec7d90f9996657e973279fce SHA512 e3b6cc09999f23aa908871f5da2786b7607c5f4434c3b44b218a581b2219d059e958e74b55c730727330e57f58face4b4ce489932a92ca1b5957dd305108d79a WHIRLPOOL 71f2c57e1931456822264e8bda36cd2d84079db33e4cad08c8ee3dbdc679932823b6adb23966db6377d0510771c05e89485559c597667e29c1d8fa17e8ab9523
 EBUILD netbeans-php-9999_p20160824.ebuild 4418 SHA256 c65df09cbe40ee1f132cecdfa1aaa8cff03ab9b285fea3d67d258c3dd2390794 SHA512 6a382fd3bd8c347c5a43da86b18ff99cb51289596a1aa7ec56b101a7cfde6ccb9b47171374421f50e81c28bcb846623e3454fd2b15daeb2a994688f2f78d9dbc WHIRLPOOL 31eefca48f0694c08e141a084fd8e56af06545b5821cede67735e9a355830ad98e8daa3ed97ab3d983d03fc9f3b8153d60cd09ef9aedfa8d99a1eeab621250dd
 EBUILD netbeans-php-9999_p20160825.ebuild 4418 SHA256 2eb50c4cbb8635b87bb3fbff94e523518b61d4f75a37bdf6981b7e9e97777856 SHA512 657dd4b6790419955a75fcf91104af14209912bdaa9ca3299c54328a6512d4f6ef7da1992758ae7965feaaa0cc73229aec89984ea2d19f725ca2ae1694f1a2d7 WHIRLPOOL 33077ea63b113ae479875854d4445f068b3b293bc3a3017761f2fdbe3dd7272b75b05246ebd6bf32645b0214a8e2d374fce0f96d15c345bed9957812b342f450

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160822.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160822.ebuild
deleted file mode 100644
index d9c1bfb..0000000
--- a/dev-java/netbeans-php/netbeans-php-9999_p20160822.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-22_00-02-33/zip/netbeans-trunk-nightly-201608220002-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 96ba86b..97ce1a4 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-201608220002-src.zip 217192718 SHA256 c1c463c39d59f48f75bb0f03507317de43f95394f04066e514d5bfbde1397082 SHA512 812c8a71f16979e91ca46d7553b6d056eaacfede0d4875d6c7a362576b2484844b83cd6c70792325ba24645da0dd906290e2498afb578771d280e8488c2c5fd4 WHIRLPOOL 98f36742c3a8776a203b98e73057938fe4695b486a7321c10af1ec24fb54e671dd05958adf3db34953486d393f475eff6e46d8ce40d4d4508195ad0025be1530
 DIST netbeans-trunk-nightly-201608230002-src.zip 217197989 SHA256 59c6008364fd1d27a1742fdc1c76f93fd3782608b3db5799c42c89e95a516610 SHA512 a3a1d9be874fc9e040a43acf4ac0128776af08e1fb4de49a95fd1fab9e3e4773ad896f9bd7bbd4d82d5c4ab992a13a6d19427e8158ee88dca0c0bab78e75f957 WHIRLPOOL 0ebdc401e0728f01ce3554cb0b2acb516f040f925f563465d48cfb6b65cba87110c6646ad5a9ea1d738cff2eec35fb827ea7d76b4992d7d15548975a06afd9be
 DIST netbeans-trunk-nightly-201608240002-src.zip 217199132 SHA256 75e77e61eb9684fc0c844421dec20016894be29d98d155605c3694d052f4d29b SHA512 8614f3155b861016196a4d88da7efeacd501e5c57a5749c3dbed0898a9e0a7c20b66cca77002da2ae1e2b64d1fd73895f0182e1a95e523fda40bd776ca4c5c9a WHIRLPOOL ea35b1961eb3574b3a6d7561e41192141042f22b49a8ce58c674ac87e0f99d5b714482f170a8b052cd81e3db87521a69af1f6e0bbbceaf2b00bdfe6b3821f2aa
 DIST netbeans-trunk-nightly-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
@@ -59,7 +58,6 @@ DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b3
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
 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_p20160822.ebuild 9520 SHA256 a8bf540b50f88664bd3f2d7cbfa2d3d0a1e8599b77a6d4ecdcf52e2d403a4cca SHA512 94ec7d0d7e7f69370fcf477cd67b075ce46071968df9324dc8352a2e8be367571c4004f90137eef35cb5e7c29ca295cc4ad09b93c70739dba5e2deb5d7a8ab07 WHIRLPOOL b455b195b98a7d440f909a268886e98aa1439e0603ae5147fbca5e93f985d061057132acc9f9d9af10f5b72b318279b51b5a756a03d74089495be871c06c8013
 EBUILD netbeans-platform-9999_p20160823.ebuild 9520 SHA256 29da0a37ca6506374924bc718fa02888348ce3badb1559ac0ee95f1bd06b87dd SHA512 d127b384fc92d2970ff6577fc777319d690ca5dcbd243d5afe000da6b85aeaa86923afb64d86aee818040196e7d65a3a6063e0ffa758fd2db870b032102a00bb WHIRLPOOL a4e39c6835f96049c7e3cec9c0fe51128cba7d7be2df6e861a30bdbbaaed0b7e79e0a0dfa8abd37f88a2252da335e834e7a21fee9749fb09749fb8cc4163df6a
 EBUILD netbeans-platform-9999_p20160824.ebuild 9520 SHA256 2b8febdacbe878b503f949eb592d6426596166c04f9bbe135ad2eb4d1bbd230e SHA512 60f3c86f6adfa9ca112421d0a3701df41008f2f3ba7747196e4489ff38f7473a1d534cde9f128eab4b824ed4d6f1425cb5c5658dae0172c84ab5decc8ee96a27 WHIRLPOOL ed44e84980f7d71f3884dfed84db9c0f7a3c99c5a8b88a14a9774a4949c2124ae815e907714acbb05b049dece7d804cbd53a609eeee82d2bb05338fa47111f1d
 EBUILD netbeans-platform-9999_p20160825.ebuild 9520 SHA256 18d59ae0a3a34b18f883ec6c7c53ee22b4e43034447c422523a8d1cdd94fe214 SHA512 8d50a78543035f6d01d13c383ef94ec19806912fb1079874d717a713eabe168a4bdae749e5dfd3678db0606cf133b9a0d9c8abc68bed99644df56f3826980f5d WHIRLPOOL 4a5f5ab3b8c46bd40882a8045b905fefa16737d5793803851821f4a1a639230d0e88b05da7e564b8ab5b6f5dbf86bb31118f0f457835925af0f680fd4efb07d4

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160822.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160822.ebuild
deleted file mode 100644
index e30d18e..0000000
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20160822.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-22_00-02-33/zip/netbeans-trunk-nightly-201608220002-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 2eeb7da..f1fb53c 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-201608220002-src.zip 217192718 SHA256 c1c463c39d59f48f75bb0f03507317de43f95394f04066e514d5bfbde1397082 SHA512 812c8a71f16979e91ca46d7553b6d056eaacfede0d4875d6c7a362576b2484844b83cd6c70792325ba24645da0dd906290e2498afb578771d280e8488c2c5fd4 WHIRLPOOL 98f36742c3a8776a203b98e73057938fe4695b486a7321c10af1ec24fb54e671dd05958adf3db34953486d393f475eff6e46d8ce40d4d4508195ad0025be1530
 DIST netbeans-trunk-nightly-201608230002-src.zip 217197989 SHA256 59c6008364fd1d27a1742fdc1c76f93fd3782608b3db5799c42c89e95a516610 SHA512 a3a1d9be874fc9e040a43acf4ac0128776af08e1fb4de49a95fd1fab9e3e4773ad896f9bd7bbd4d82d5c4ab992a13a6d19427e8158ee88dca0c0bab78e75f957 WHIRLPOOL 0ebdc401e0728f01ce3554cb0b2acb516f040f925f563465d48cfb6b65cba87110c6646ad5a9ea1d738cff2eec35fb827ea7d76b4992d7d15548975a06afd9be
 DIST netbeans-trunk-nightly-201608240002-src.zip 217199132 SHA256 75e77e61eb9684fc0c844421dec20016894be29d98d155605c3694d052f4d29b SHA512 8614f3155b861016196a4d88da7efeacd501e5c57a5749c3dbed0898a9e0a7c20b66cca77002da2ae1e2b64d1fd73895f0182e1a95e523fda40bd776ca4c5c9a WHIRLPOOL ea35b1961eb3574b3a6d7561e41192141042f22b49a8ce58c674ac87e0f99d5b714482f170a8b052cd81e3db87521a69af1f6e0bbbceaf2b00bdfe6b3821f2aa
 DIST netbeans-trunk-nightly-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
@@ -33,7 +32,6 @@ DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b3
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
 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_p20160822.ebuild 3472 SHA256 e823b942d816a74bf8541aab1d5831ae006f9d90f76152f37d6324c3f02d0175 SHA512 ef0bad4c7bf05fac6fc35f21215c7f1cf201537aa6e48b1db83971f1a601442066c1955886891855c99580b9e6c3f9b43d536f7cae7450214dc89b5d6e3fcab3 WHIRLPOOL e8cff85a712d259e5c5e8810674e5c93f6b99fa0c05e45575d426e469752daa887fc333d3919407396040bcf24ac10d7ed4227a90fe0886b9e39a6ce671e16a0
 EBUILD netbeans-profiler-9999_p20160823.ebuild 3472 SHA256 741ce1f42f33b75300465f4fd5e0d88bd7400b31fcccd308b005ce1fbe1bbe24 SHA512 ab606cf897e989e179fd11fe5d02e69f1f180aa00702ab1082521fdbfc88b8f9331cd8ce59ce8647a317b03591e72fc1b6603ffa0f2b23e716511f4a28ca473c WHIRLPOOL f0a6f115ce279b0aa19ed118a9576f747c6788520cd0095b1db221fe928b6f428edd743545431959db0f9178f832a58e461107aafbf287796574ec9c52f97c3d
 EBUILD netbeans-profiler-9999_p20160824.ebuild 3472 SHA256 289ab907fe8705a4b501604309169f1116291290a3e45cce33e38a16eeb495e4 SHA512 64d24c3f00ea906096495f6cd360adbbf2fbdb38a91f65934581cc7040648bf38b266f6ad97dec94c52018e842d9d1a2646f0c91bad3904e364e316ba1e254ef WHIRLPOOL 9c0302c2d3267166b26c33624fcbeaa2ab1bd13a345cbcdfe565a9bd15302bf30eb762534ea0e325fb97c72dc055dc1d1fa3f0e36c769d7421fac354f85f78f6
 EBUILD netbeans-profiler-9999_p20160825.ebuild 3472 SHA256 55caf73d283ef2aa3eb9d54d21d6705e0a4bd9568a791ed3586f28deb11d959a SHA512 0b00215522538a4c2a26299c9471264162a9749af2231ea4d302bdf7a9927931498b856c7c126134725d33a3f26ac07c2e2a26030491f25915a2c88e4e73ad00 WHIRLPOOL 0c1e3f9e44217c81083d0abe788c26cc5024fa5a64c204d729c27cc497792542f2643e6386342b263f1282ba2d0f0d2dadadf405770f9fa208517e2f2aad9bfc

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160822.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160822.ebuild
deleted file mode 100644
index 41f1970..0000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160822.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-22_00-02-33/zip/netbeans-trunk-nightly-201608220002-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 d64075d..3a13f18 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-201608220002-src.zip 217192718 SHA256 c1c463c39d59f48f75bb0f03507317de43f95394f04066e514d5bfbde1397082 SHA512 812c8a71f16979e91ca46d7553b6d056eaacfede0d4875d6c7a362576b2484844b83cd6c70792325ba24645da0dd906290e2498afb578771d280e8488c2c5fd4 WHIRLPOOL 98f36742c3a8776a203b98e73057938fe4695b486a7321c10af1ec24fb54e671dd05958adf3db34953486d393f475eff6e46d8ce40d4d4508195ad0025be1530
 DIST netbeans-trunk-nightly-201608230002-src.zip 217197989 SHA256 59c6008364fd1d27a1742fdc1c76f93fd3782608b3db5799c42c89e95a516610 SHA512 a3a1d9be874fc9e040a43acf4ac0128776af08e1fb4de49a95fd1fab9e3e4773ad896f9bd7bbd4d82d5c4ab992a13a6d19427e8158ee88dca0c0bab78e75f957 WHIRLPOOL 0ebdc401e0728f01ce3554cb0b2acb516f040f925f563465d48cfb6b65cba87110c6646ad5a9ea1d738cff2eec35fb827ea7d76b4992d7d15548975a06afd9be
 DIST netbeans-trunk-nightly-201608240002-src.zip 217199132 SHA256 75e77e61eb9684fc0c844421dec20016894be29d98d155605c3694d052f4d29b SHA512 8614f3155b861016196a4d88da7efeacd501e5c57a5749c3dbed0898a9e0a7c20b66cca77002da2ae1e2b64d1fd73895f0182e1a95e523fda40bd776ca4c5c9a WHIRLPOOL ea35b1961eb3574b3a6d7561e41192141042f22b49a8ce58c674ac87e0f99d5b714482f170a8b052cd81e3db87521a69af1f6e0bbbceaf2b00bdfe6b3821f2aa
 DIST netbeans-trunk-nightly-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
@@ -52,7 +51,6 @@ DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b3
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
 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_p20160822.ebuild 6242 SHA256 eed953337bfe337d8833d1ec5e1ed9e5cb697063741cacfe7594a7befd7dd084 SHA512 d6b134797cf3e6891d9a708ccfae0b83dac22b952c60765988ed55c384e7517ca87889f5d49ef9d03e53ae706a1cfe082f66a696abacd4558f05e872c65f442e WHIRLPOOL a9689dfcbadafc8325e09c29fb6ef01d37bf1d060c049a09db1293b558aa3b9a470276d14ef1ad7fe8d108779ba6e5e9054396329dc73c8516f834bdfb391e3d
 EBUILD netbeans-webcommon-9999_p20160823.ebuild 6242 SHA256 de2120eee0f25deb37914c13b742e15215c6a4f696964b7eee3a6783f6227cda SHA512 4cb8d916f65e867de4ef5ebef8056895325ff5744dab638f45e44ba2258afc9fcd1f09a02cadb08a286a540fd562e8fa904a0fdd34daa9f246834459d599939e WHIRLPOOL 2327de2677695ea739be8c206535e0990298f003d52248b6676677751d1105b93a9b98e5b1e0f36088a1fd1f397fdbb3191a678b9fb752cc008217dae372872d
 EBUILD netbeans-webcommon-9999_p20160824.ebuild 6242 SHA256 330208fbb2fd49e74efca409ad8cdd8b89e3674f9202d6d62c7afc3750cd9fcc SHA512 7c623e97a0c1a315c9ab305579c3a7a7e788c1206e2460f5e2407a609c2a08d728a653d296e40ca191b2c7ae322cd7974ec36b269b9d51b4a16d3be167cd6aa1 WHIRLPOOL 8cc5f529189aad8ad1d6d4b67d8c107a5a8dd4374583fed240a00e752557ff36aa822ef761e80798441753ea7d1adb4fdee971b71ffe26b757f39b2c42e5e4d4
 EBUILD netbeans-webcommon-9999_p20160825.ebuild 6242 SHA256 415b1826b44a57db71695d6a16591aa0c4a4bdabf3975e248596976992ffcab3 SHA512 b996620adeecb27be061bbfb800c91c36ddfd743779be7039244d5b0a9d98a69d10241c81a0984285ccdf106a2884f5c20492d7e51b2746ecd4f915a6b9105ed WHIRLPOOL 763a992f19aa3f2729a95ece19eb5d6dffb4c595cea407f6742c964eb5935ab91a6e107aaa35587c09878421bfdea295fe95a229b9cecb11b41f07d365ac2cd3

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160822.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160822.ebuild
deleted file mode 100644
index d8b1794..0000000
--- a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160822.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-22_00-02-33/zip/netbeans-trunk-nightly-201608220002-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 7313e9c..96ff010 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-201608220002-src.zip 217192718 SHA256 c1c463c39d59f48f75bb0f03507317de43f95394f04066e514d5bfbde1397082 SHA512 812c8a71f16979e91ca46d7553b6d056eaacfede0d4875d6c7a362576b2484844b83cd6c70792325ba24645da0dd906290e2498afb578771d280e8488c2c5fd4 WHIRLPOOL 98f36742c3a8776a203b98e73057938fe4695b486a7321c10af1ec24fb54e671dd05958adf3db34953486d393f475eff6e46d8ce40d4d4508195ad0025be1530
 DIST netbeans-trunk-nightly-201608230002-src.zip 217197989 SHA256 59c6008364fd1d27a1742fdc1c76f93fd3782608b3db5799c42c89e95a516610 SHA512 a3a1d9be874fc9e040a43acf4ac0128776af08e1fb4de49a95fd1fab9e3e4773ad896f9bd7bbd4d82d5c4ab992a13a6d19427e8158ee88dca0c0bab78e75f957 WHIRLPOOL 0ebdc401e0728f01ce3554cb0b2acb516f040f925f563465d48cfb6b65cba87110c6646ad5a9ea1d738cff2eec35fb827ea7d76b4992d7d15548975a06afd9be
 DIST netbeans-trunk-nightly-201608240002-src.zip 217199132 SHA256 75e77e61eb9684fc0c844421dec20016894be29d98d155605c3694d052f4d29b SHA512 8614f3155b861016196a4d88da7efeacd501e5c57a5749c3dbed0898a9e0a7c20b66cca77002da2ae1e2b64d1fd73895f0182e1a95e523fda40bd776ca4c5c9a WHIRLPOOL ea35b1961eb3574b3a6d7561e41192141042f22b49a8ce58c674ac87e0f99d5b714482f170a8b052cd81e3db87521a69af1f6e0bbbceaf2b00bdfe6b3821f2aa
 DIST netbeans-trunk-nightly-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
@@ -33,7 +32,6 @@ DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b3
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
 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_p20160822.ebuild 2721 SHA256 86dda955ebb02ad9efd93ded83da35b7d860c835e147dfadb0bf30c635592919 SHA512 15c754c0a01c412ba17bba07806f34b98382b07361ca8d5da8717353ab349bfeda2b08740b4036edc4476a8791195b703f85916ea2e25b690ba01f4f8990c9b9 WHIRLPOOL b032d522b4c70bca50529cccc700f52e556af9ff3e6b2ece601ac41d87cf859a14fc949cd08f09ce99dead41459ac435dface5d3ae1e043d9b05fa78d271d0df
 EBUILD netbeans-websvccommon-9999_p20160823.ebuild 2721 SHA256 20702ac8814079ae74788cb5b29630008117778a60f82969f70386a52f2c05d2 SHA512 156dac5e5a0582b1583bca7484249bc18aeddfdd25ead5db86c05bb67b52e2067144f264e813946875a114779403cc7fc6842ad54a9050ff8532c1dcf0dd7e14 WHIRLPOOL faa336a56c48d7fd27881c3dccc7ae7b8b9e74092f45fe2ebac8278aa15ecd1d29abf7afcb63d94c141e9709cebeba6a3e9f44227482b47a2f2a6d34254c0d7c
 EBUILD netbeans-websvccommon-9999_p20160824.ebuild 2721 SHA256 7c588280ddc9ac4af211f364b0770b67e3dfaa7900d225f3d86450c735cf604c SHA512 72ed3bb7bcdc736d98778c8a377a55cf5a58f6616a02b53db7ecabdcba9338af4a4d16851357f70bda052928d6ca5eff5a4ca84c3d256f7a27b01d4e1e772aab WHIRLPOOL 627509221724359bc1e171665b81f67c1926a703c06890b9f5a5db5767532d30a6bdf91a42e4d0d2d5f01ab1b4d2193c8307e429692030631552306efd07913a
 EBUILD netbeans-websvccommon-9999_p20160825.ebuild 2721 SHA256 54db5cbb865d355ace7a311b74a0eb5fee2e0d67a1e6ff99e78970e798d58722 SHA512 99700db3d980e2ae8330c57a4ecf527e83d46c87492c07796f1d63972bb6f114dc16bd2b8950117528d7d495b26ad540754a697b3915e676047248bb5f491fca WHIRLPOOL c2b15b9689df167f782f48f8b09936b42693ee62027a41b7ebc09d7e5f162938a0fe7e79017829885e5e1ffc4266f54b6a3480615c87d77869903aa5c51e2350

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160822.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160822.ebuild
deleted file mode 100644
index 3114a6f..0000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160822.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-22_00-02-33/zip/netbeans-trunk-nightly-201608220002-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 33ffbd4..7d33587 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-201608220002-src.zip 217192718 SHA256 c1c463c39d59f48f75bb0f03507317de43f95394f04066e514d5bfbde1397082 SHA512 812c8a71f16979e91ca46d7553b6d056eaacfede0d4875d6c7a362576b2484844b83cd6c70792325ba24645da0dd906290e2498afb578771d280e8488c2c5fd4 WHIRLPOOL 98f36742c3a8776a203b98e73057938fe4695b486a7321c10af1ec24fb54e671dd05958adf3db34953486d393f475eff6e46d8ce40d4d4508195ad0025be1530
 DIST netbeans-trunk-nightly-201608230002-src.zip 217197989 SHA256 59c6008364fd1d27a1742fdc1c76f93fd3782608b3db5799c42c89e95a516610 SHA512 a3a1d9be874fc9e040a43acf4ac0128776af08e1fb4de49a95fd1fab9e3e4773ad896f9bd7bbd4d82d5c4ab992a13a6d19427e8158ee88dca0c0bab78e75f957 WHIRLPOOL 0ebdc401e0728f01ce3554cb0b2acb516f040f925f563465d48cfb6b65cba87110c6646ad5a9ea1d738cff2eec35fb827ea7d76b4992d7d15548975a06afd9be
 DIST netbeans-trunk-nightly-201608240002-src.zip 217199132 SHA256 75e77e61eb9684fc0c844421dec20016894be29d98d155605c3694d052f4d29b SHA512 8614f3155b861016196a4d88da7efeacd501e5c57a5749c3dbed0898a9e0a7c20b66cca77002da2ae1e2b64d1fd73895f0182e1a95e523fda40bd776ca4c5c9a WHIRLPOOL ea35b1961eb3574b3a6d7561e41192141042f22b49a8ce58c674ac87e0f99d5b714482f170a8b052cd81e3db87521a69af1f6e0bbbceaf2b00bdfe6b3821f2aa
 DIST netbeans-trunk-nightly-201608250002-src.zip 217203025 SHA256 c61d85fca76ce078a1c131d5e5fb4303c7e473b412e9f15fecb10860ee3805b3 SHA512 a29b009c6c99771aaddf07d78e4a3f9a3163784694bae89f0c4f0220dc134fd7f00177d68d3339e8e3773fcef654dbdc8efbba2b3c9a720b78840ea3c5859d98 WHIRLPOOL ff6ea3ce7aaff79bb49116584842a162f3b9bf9593156b411f114996320cd311ede058cb6f309c764318b2787276807ad70c305cbab50653dd736a1cf14f339a
@@ -36,7 +35,6 @@ DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b3
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
 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_p20160822.ebuild 6939 SHA256 d393a7dabcaac2f5e6ff6069ecce2513f054357ced7177ba3e90246630c6b03f SHA512 22d2826a83ef1bf9fd818fbe0e9c823ab5f7a63a14d84c1d0215edda75de271e8a9462d6f29b5151de7b2cc43fe3f23ec90b597f77c2a4a233d56792bc860a4c WHIRLPOOL 7a06852802b3e2620fc84527f85b3f9bdb766045c6fa56f2d1441d23cb3419ee11877fbba56f1871f93d3acf96af524b04b85538d1d6586627d640355ab2d33b
 EBUILD netbeans-9999_p20160823.ebuild 6939 SHA256 11795cf190402e43ca2cbd9ac9eddfe3ae67eea2b11ece465e7015f436994f81 SHA512 da82efd102cc54e55891840a67c086c9ba609db99d9dfdafce77b463a279e5453743eea4b604c057323a46ccb702192af6403c694c5c7d3dafbae2721fddb3c3 WHIRLPOOL c204fdeaa0a3d02e7b221f9a58ba563cde2e656c2ef6500c86a1412a570c1c6d8fa9114bd08586d85809456dd4f0d4925b948f4d0a247b00fc52bfae9f880ad1
 EBUILD netbeans-9999_p20160824.ebuild 6939 SHA256 e763db23e9f0cf9c6958f229360ce85e698285cd4adf4ee0491cc7dd425c5fd2 SHA512 523a7ed5cea2ba21d6c8656f450320cf20b7f7055558ca0d7575615a78b84466d875f211e1c9725b820ff1888c372110a1b39e8629cfe575b48b8c67807469d4 WHIRLPOOL 5fcfac8471221e34c12e32fa39620458ff8fc92345228920c1cdb06866be0e54390e22e59b94eb09f2da1906b9dd58877e27f8626d00cbd9915122ad0ad8a312
 EBUILD netbeans-9999_p20160825.ebuild 6939 SHA256 946148aecd8afdf24b197447989dcbab99e5e884efe4ec92a760472d607c3703 SHA512 8fd23f5aa72c1eef4c981c9b3639ac71695853ba05088609513153ba5708d5e87ee5560187576b7d474a5c241f067e94d90b49991d378ee7b1d0ede0f14009a3 WHIRLPOOL 9d58f33121e55d66baffca88e9da7f53727b41e079735cec758845508509cf757400ce9fb20ce5aaa75ff846518987ab4b1b62ae4d986c95037e7543118f2201

diff --git a/dev-util/netbeans/netbeans-9999_p20160822.ebuild b/dev-util/netbeans/netbeans-9999_p20160822.ebuild
deleted file mode 100644
index e09739f..0000000
--- a/dev-util/netbeans/netbeans-9999_p20160822.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-22_00-02-33/zip/netbeans-trunk-nightly-201608220002-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
-}