public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Miroslav Šulc" <fordfrog@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-groovy/, dev-java/netbeans-mobility/, ...
Date: Sun,  3 Jul 2016 14:44:46 +0000 (UTC)	[thread overview]
Message-ID: <1467548109.f57f0261ca85ed09e6a809b31b9d8377118e361a.fordfrog@gentoo> (raw)

commit:     f57f0261ca85ed09e6a809b31b9d8377118e361a
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  3 12:15:09 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Jul  3 12:15:09 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=f57f0261

netbeans: removed obsolete ebuilds

Package-Manager: portage-2.3.0

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index e840e06..c3e689f 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -3,8 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-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-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
-DIST netbeans-trunk-nightly-201606030002-src.zip 213220744 SHA256 c90867dac6486f399b74933e9a771646dd5a288b94f41cf0b5c44f9cb9c911a7 SHA512 00cb8987fba28724277b070a177d3b008eff889cca0a98517b799a573dd79e8af083c19ca3243c079ff2c8e50a65c6649cdd0a8a5f282a756feb7e7b347791d4 WHIRLPOOL a8f2a23e4f1a92cb2305d7fdbe533173f8d66b5caaf0e7b63ef7427295b821301ac44d55bc0603cc5f4572d2cddd110e7ef35eb15600951468f67ff532730d27
 DIST netbeans-trunk-nightly-201606060002-src.zip 213364709 SHA256 1a79c71748ce658072b147847154a7c22df4666d3f5a7969d144e17e261a3a56 SHA512 024afad41bea8bdd4e8c557a46f836f0826bf5c2fe28bd5ac794c77825e9acc16c694fd823c2295a727c52710028b077c9436ecc7d97c97e20a894a80ff4b84c WHIRLPOOL eaa6191b5d80b7671045fd1f46b3fefd32382354d49e370eb1b590b2d8110cb4136e9a06b7fbc4b5d56d49d633266e23994860e96a2625980a26a1416dfabf47
 DIST netbeans-trunk-nightly-201606070002-src.zip 213362540 SHA256 c75366669710c7a350710285f5fe420a60739fd03fb00b1a1c597c604917a6ee SHA512 72e0b0bc2e387e9d3d5fff28dbd04c6a9ca4d857b9fa65a001b717913d5cf7d1fc2d37e7a270a5b3a7839a9ade61ffacbbbec406709da133639c819dda71e9aa WHIRLPOOL bdd02855a99902180a54981e24012c66357f739679046757e81d811052704a2ab2cf68f3da2c963aaf360c621e4d816ddff1dfe14d3034151d296adf0803251f
 DIST netbeans-trunk-nightly-201606080002-src.zip 216271844 SHA256 d4a75eb5aa2b3b0abc7efc2bbaffd105ea0002b00b2b4d87b2c1b563c8804f88 SHA512 96ad8c01d3323a1ce22eb18fb3b66e5b0bd6467a2fbafcb213af1bb4e19de7c3aa8ded83bd877b408fb883d7f2b0c228f0f56253f1941435d82920f59961e889 WHIRLPOOL ead7f333cd600b2c334021f21ccb1b808be6afbac4d024f11ba173d5feab44fae87516cd7d19794e1fd429121d78f39663b14ea04bbbf4150338467feef8de88
@@ -28,8 +26,6 @@ DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b89
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 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_p20160602.ebuild 3384 SHA256 9f9e0061fd2123bd1d5018466e7a64f3cd376b30d528fff37056e38d18cf89b1 SHA512 099cce38418570263bd2c8d4ec44980e1bcd7a320ebcd00abf511e58d7517964d51086495ac45388cb2e8e0caafa313bd8536c8e7dca5e67d49b43967f4187ab WHIRLPOOL d1ab187f69d55dbbb869f200463b0e82be1bb1964b092b2808a455a04a44e3944d7d1206a0d46e7ab1f14e60f9ec6836c288c8435be268193f4dc4bad5afabb4
-EBUILD netbeans-apisupport-9999_p20160603.ebuild 3384 SHA256 69ee2eadb5a39a566802993b0b947fb728d57b053fa3dd757118bd4510eab104 SHA512 465b671bfa3f518247a520b8435c813008295139d5a75e802bbb99ad61cd282487868a9065ee17f0269474f1b815edcc4f57049fe6cb64dc95f7336fd580bf6e WHIRLPOOL c70b39a582e447a9995c7e87d247c9582b4e2b81ce188331c025de3efb34e7617840aa78c9b3477cee293788440265c17bad9351acd10b725e5c5095b3989be4
 EBUILD netbeans-apisupport-9999_p20160606.ebuild 3384 SHA256 d9d7fda88e50276b0be653e8931833dc18269751b51b4a96e2d1d01dca5c375e SHA512 f8eaf39c28beafeeb7a6bc281c5c0efcf50f1c757ee3d43642cc57d23761514531898a8e64b7cbbc669fd06a20aa8ca92d4eafe6c49bd63ab5ee5c0d643a7a57 WHIRLPOOL 8e00aabb160f1ffaccd8dbdfa70bb4816ec9ae00a89868bfec2a491d20e6f468477a3a9e5d228f542a37b10f53dff3e28c4582e7b2d1ac144fff5c9ec7381ae6
 EBUILD netbeans-apisupport-9999_p20160607.ebuild 3384 SHA256 e474ce29c7a88298bfc01a2ddb39c5282abc64c1cc441e137f406e6164ea7240 SHA512 e7114816a8894ec02e592f52f070b817e8d00d610dad8afc9e63668b4444f3d31a5310431c1cdf1ef37f62d6b92ace9e3d526453e46cdf4b0a23ccdca2803511 WHIRLPOOL 5eabd3b727cf2461e5adcac2fdfe22fff5a659bf32b2e67f8560b30f1469dc3f03e6087d7864c787131d447db97e494265bdfa4c600155f892a077afca37de3e
 EBUILD netbeans-apisupport-9999_p20160608.ebuild 3384 SHA256 fef0e34d4306671c2760b0c32dfc9c954d29cbb17ca9b8d73d6b12f8c267f8aa SHA512 d3904a93b2b8915d8a60c396d6039351acbf0560cae67ae2c8e695d6b5ad84392203d49e21a90ebe3230855e5784efb27b97e5eefe57d921a1afb779a7480b8e WHIRLPOOL cff28ab36a04bb088b35988dd42ccbc5babec882327a7de52feec0449e473f0ce47a7ab8463a72d6da70b00a1a24ddbaed52318e7c0ee99961a333d8c3466e2d

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160602.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160602.ebuild
deleted file mode 100644
index 81f06bb..0000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160602.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-06-02_00-02-33/zip/netbeans-trunk-nightly-201606020002-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-apisupport/netbeans-apisupport-9999_p20160603.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160603.ebuild
deleted file mode 100644
index 3ea8bc4..0000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160603.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-06-03_00-02-33/zip/netbeans-trunk-nightly-201606030002-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 7c96bdd..51f4b4b 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -1,6 +1,5 @@
 DIST 1BD2563498D0E0BE1C7B3DD31FAD892B41EC041A-clank_0.3.6.zip 8610458 SHA256 b0d2581ad9f99b9d81bef35470b5b582ee286a0897395f5f0765494a7e7539eb SHA512 3d1cd5a9a0fc68300510e63cd4eec76227379a6cf58585aad7f82c25e837b90f971b2d90145fc83f273013adb5577abac118d2598d9072f1c33635627ba56234 WHIRLPOOL 8abd59083bd1e503fde7030116a2825c4922286d96ae923872826a66c6387ccecb37a7a7fe6a25386ca4f15f1d08a71194e3d81c78b414b38ca527e9632a6bb1
 DIST 24C58A1D3C410AD3E23CD828871630C17068B238-cnd-build-trace-1.0.zip 28980 SHA256 205a14a41fb7232c2a20779278ee1e303e6d3dedb3c84496b370ae397a7767b5 SHA512 0e570745cfb163cb54ac8b6b0f6feb6c76e3c414f03eab213f93637dc84471c0bb5b786af096acdd6265383474bf26db763ebda066add398efe601e5749a51b9 WHIRLPOOL 2d0042e180eba66269d4ccdf6279dcd166b4a34947406b5f7279b0017ebed27b2ea95f1565e57908e3567b303fb69d2cb5ca6504653126611ced84f103650a0c
-DIST 2B406087CE1AF289539768BDF36F52E63F69F1CB-cnd-build-trace-1.0.zip 39843 SHA256 94d7adb090b5ed021c5042a749d43bfdf948dfa4c42d413d0abcdb72133c4cc3 SHA512 206ea6f4fb31d79469650121ac9b2e05b427f55a9ec303d40ce4901b867e39ab70d0d45198d161c9a2de9b96df18b850b5104d1c08547acf78054b6c893e931b WHIRLPOOL b7911ae3fd50c79690ca24e8f7fe26200a540df31c830b41085911be67e42ba8476f2823f446f8fedf184b4ded376d40323f041f11da80e1c9e3e3067f095184
 DIST 2BCF2047382FB68A2F275677745C80E79B4046AB-cnd-rfs-1.0.zip 152701 SHA256 ee454c52dab7af01a0c292bbbd9bd5fa62e07480d4284a34e38746aba4bb501b SHA512 222ae7d6fc8a1f5610a107264fd249180a7a865094979dd5426fb266b94e1d24ef421199cdcb923ab58577c292a183863c45a1434b4dcb35bd67dbdcde945e54 WHIRLPOOL 821c0e5e9534955ee9b4200476fa1fe65b453520551cb71a71a225bb96ac69ba6c408e9d59b5df7008ec1b8d173035e76358172cf3ebafbbd50d0971db3a8983
 DIST 43A82EB3CE61B9B0B1C60586C7D84729BD5BE3E0-cnd-build-trace-1.0.zip 38904 SHA256 d97735f723292f9fe534d0821841370ee3a14a577c3fc959078ae865c16201d4 SHA512 ae3b1865e32403c09354fe9bda5092f88bdfc9bf36c18f21dbf4cccbbb2874881aee3cadea039860a3ddc5770b9ba95201faeb13ebcdfe5a403fee12e8935852 WHIRLPOOL 8a5f7ff0b4b94054a0fcd7366d37f6cc34f3c5e90d94172447993b9bc06753e13d57fbb2d2c14fe2a4ca5b15285b5165fc7f66b6012710669878cea67c6463e8
 DIST 4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar 164365 SHA256 8633aa79a2566f51a089195e09a4581af3ee71bfc13eb234af5e0cf6383078b4 SHA512 f1300e2d1e47659f6113a0a3dcc953766b5a8ab32f13bedf4d6ac652ffcf828c17474d47edec08d7ad9039d7abb8570770b48fa53b8ff6b47a028836490777bc WHIRLPOOL 765c87803d9cf622ae7936cb922ad9bff8823a09baf01a6c8b4a81df8ba5fd7cd17b513b36da9910b75349de45185f4641680f35be8335e08b9c30283b6d3345
@@ -17,8 +16,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
-DIST netbeans-trunk-nightly-201606030002-src.zip 213220744 SHA256 c90867dac6486f399b74933e9a771646dd5a288b94f41cf0b5c44f9cb9c911a7 SHA512 00cb8987fba28724277b070a177d3b008eff889cca0a98517b799a573dd79e8af083c19ca3243c079ff2c8e50a65c6649cdd0a8a5f282a756feb7e7b347791d4 WHIRLPOOL a8f2a23e4f1a92cb2305d7fdbe533173f8d66b5caaf0e7b63ef7427295b821301ac44d55bc0603cc5f4572d2cddd110e7ef35eb15600951468f67ff532730d27
 DIST netbeans-trunk-nightly-201606060002-src.zip 213364709 SHA256 1a79c71748ce658072b147847154a7c22df4666d3f5a7969d144e17e261a3a56 SHA512 024afad41bea8bdd4e8c557a46f836f0826bf5c2fe28bd5ac794c77825e9acc16c694fd823c2295a727c52710028b077c9436ecc7d97c97e20a894a80ff4b84c WHIRLPOOL eaa6191b5d80b7671045fd1f46b3fefd32382354d49e370eb1b590b2d8110cb4136e9a06b7fbc4b5d56d49d633266e23994860e96a2625980a26a1416dfabf47
 DIST netbeans-trunk-nightly-201606070002-src.zip 213362540 SHA256 c75366669710c7a350710285f5fe420a60739fd03fb00b1a1c597c604917a6ee SHA512 72e0b0bc2e387e9d3d5fff28dbd04c6a9ca4d857b9fa65a001b717913d5cf7d1fc2d37e7a270a5b3a7839a9ade61ffacbbbec406709da133639c819dda71e9aa WHIRLPOOL bdd02855a99902180a54981e24012c66357f739679046757e81d811052704a2ab2cf68f3da2c963aaf360c621e4d816ddff1dfe14d3034151d296adf0803251f
 DIST netbeans-trunk-nightly-201606080002-src.zip 216271844 SHA256 d4a75eb5aa2b3b0abc7efc2bbaffd105ea0002b00b2b4d87b2c1b563c8804f88 SHA512 96ad8c01d3323a1ce22eb18fb3b66e5b0bd6467a2fbafcb213af1bb4e19de7c3aa8ded83bd877b408fb883d7f2b0c228f0f56253f1941435d82920f59961e889 WHIRLPOOL ead7f333cd600b2c334021f21ccb1b808be6afbac4d024f11ba173d5feab44fae87516cd7d19794e1fd429121d78f39663b14ea04bbbf4150338467feef8de88
@@ -42,8 +39,6 @@ DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b89
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 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_p20160602.ebuild 4790 SHA256 2459de80a913934d021318558ac0f674d838ac9829bff2a13e3a645948ba6b44 SHA512 6b13ec3c8f2d537f753c62b14935c8dbe9f39d28a36dec434d47ce4c46cf0f8310cd76cc0814530b2b46f31b19c1cc06d076d82ccf5719fd38a6961f863df5d4 WHIRLPOOL 57e8efd404a66954e969aa1b3f54378e5766fe97b077d064c2ae73abdfdd68301e0edab2df4c668f2f5ec992f500cc9710fc68001ed53cfda31332cd23250a32
-EBUILD netbeans-cnd-9999_p20160603.ebuild 4790 SHA256 a3648171d92b77a61300fbc53523bf78cfc27827b9d2e82295e47a2398c8d1b1 SHA512 8c9f6e18e55721626fda45aa438a4e34edc2fd4f676c717390103a43faaa4a3f68455d0ff533dcfba3b6509fa9f195f9efd00cfc888d3a50e88d08811dd756e5 WHIRLPOOL 5de059517672498e9ddb52bcec24ef6dfc4a3ecba183ebd5404714f43b306eb337a3067bd3a9ee91b887f73f9b868c28f8a3e913254c4b8e78fc9fcf4b78c87f
 EBUILD netbeans-cnd-9999_p20160606.ebuild 4790 SHA256 57c9d72c05eef78cdff0f3084cad23820153076a6630c64f72f8e29905d87cbf SHA512 5582bbc5a5e359e0bba7b7f9c72b15dfcd41a1d5ad0ae68c92e1a497a296b73139cbf0241bfb6309a6e527aea04f35d5e56b7f4da985942860b7377325fc2308 WHIRLPOOL 8091e8b0c30579d851d67db49fab63f5a4fd84624ecb7d25a3fa127a48c792a5c7a5823eb8fdc912e095eb009c42eec3a23fe40523699fe2e69e0d901a6d7755
 EBUILD netbeans-cnd-9999_p20160607.ebuild 4790 SHA256 f090a6840be96a50440d56a9e841980b0a0b3e72c4c944e2a6184b975842efe0 SHA512 dca2070ec38583905580ef3a50d0df9ec3e07cf10c55e699c4b3c9e082ae917b3289392f3e7a68533b7466f4d59c0cf640da282ad63a4193d1efc0d08c2c4f24 WHIRLPOOL 332468a9615c7bc707d19424e4e1fd1323eeded1404aa32eaba5aa2c56d36c957465238fafafba4477f9cbd44f7e39b74ae9740b4ad15a3c502910c9838c7a43
 EBUILD netbeans-cnd-9999_p20160608.ebuild 4790 SHA256 4cf79d337eafec4c8f56b70d9006e431c21df99a4fafb0ff68d2a1b7b81e736a SHA512 413521322481c6bad9b876dfdd8fc038782cd35af02bc5c5c38edd078dc18e9054d5b500fd1af8fbc2eec1ae314d698d41b6f143a23fcb6e7e6c697949562450 WHIRLPOOL d93b826975b7e78066d1a1d46fd408f20dfdbf911340805eeeb7c9f69da1c6f25a83c506dc8e99d0ada5e92035a18776e4f2c033f45418f166c09102386d337a

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160602.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160602.ebuild
deleted file mode 100644
index 157e9c3..0000000
--- a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160602.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-06-02_00-02-33/zip/netbeans-trunk-nightly-201606020002-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/85FD13415B0553D6421F4BBA5FE0F587B9748B20-clank_0.3.6.zip
-	http://hg.netbeans.org/binaries/2B406087CE1AF289539768BDF36F52E63F69F1CB-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}"/85FD13415B0553D6421F4BBA5FE0F587B9748B20-clank_0.3.6.zip libs.clank/external/clank_0.3.6.zip || die
-	ln -s "${DISTDIR}"/2B406087CE1AF289539768BDF36F52E63F69F1CB-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-cnd/netbeans-cnd-9999_p20160603.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160603.ebuild
deleted file mode 100644
index c08b586..0000000
--- a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160603.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-06-03_00-02-33/zip/netbeans-trunk-nightly-201606030002-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/85FD13415B0553D6421F4BBA5FE0F587B9748B20-clank_0.3.6.zip
-	http://hg.netbeans.org/binaries/2B406087CE1AF289539768BDF36F52E63F69F1CB-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}"/85FD13415B0553D6421F4BBA5FE0F587B9748B20-clank_0.3.6.zip libs.clank/external/clank_0.3.6.zip || die
-	ln -s "${DISTDIR}"/2B406087CE1AF289539768BDF36F52E63F69F1CB-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 0d5fa76..27d6ae1 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -6,8 +6,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-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-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
-DIST netbeans-trunk-nightly-201606030002-src.zip 213220744 SHA256 c90867dac6486f399b74933e9a771646dd5a288b94f41cf0b5c44f9cb9c911a7 SHA512 00cb8987fba28724277b070a177d3b008eff889cca0a98517b799a573dd79e8af083c19ca3243c079ff2c8e50a65c6649cdd0a8a5f282a756feb7e7b347791d4 WHIRLPOOL a8f2a23e4f1a92cb2305d7fdbe533173f8d66b5caaf0e7b63ef7427295b821301ac44d55bc0603cc5f4572d2cddd110e7ef35eb15600951468f67ff532730d27
 DIST netbeans-trunk-nightly-201606060002-src.zip 213364709 SHA256 1a79c71748ce658072b147847154a7c22df4666d3f5a7969d144e17e261a3a56 SHA512 024afad41bea8bdd4e8c557a46f836f0826bf5c2fe28bd5ac794c77825e9acc16c694fd823c2295a727c52710028b077c9436ecc7d97c97e20a894a80ff4b84c WHIRLPOOL eaa6191b5d80b7671045fd1f46b3fefd32382354d49e370eb1b590b2d8110cb4136e9a06b7fbc4b5d56d49d633266e23994860e96a2625980a26a1416dfabf47
 DIST netbeans-trunk-nightly-201606070002-src.zip 213362540 SHA256 c75366669710c7a350710285f5fe420a60739fd03fb00b1a1c597c604917a6ee SHA512 72e0b0bc2e387e9d3d5fff28dbd04c6a9ca4d857b9fa65a001b717913d5cf7d1fc2d37e7a270a5b3a7839a9ade61ffacbbbec406709da133639c819dda71e9aa WHIRLPOOL bdd02855a99902180a54981e24012c66357f739679046757e81d811052704a2ab2cf68f3da2c963aaf360c621e4d816ddff1dfe14d3034151d296adf0803251f
 DIST netbeans-trunk-nightly-201606080002-src.zip 216271844 SHA256 d4a75eb5aa2b3b0abc7efc2bbaffd105ea0002b00b2b4d87b2c1b563c8804f88 SHA512 96ad8c01d3323a1ce22eb18fb3b66e5b0bd6467a2fbafcb213af1bb4e19de7c3aa8ded83bd877b408fb883d7f2b0c228f0f56253f1941435d82920f59961e889 WHIRLPOOL ead7f333cd600b2c334021f21ccb1b808be6afbac4d024f11ba173d5feab44fae87516cd7d19794e1fd429121d78f39663b14ea04bbbf4150338467feef8de88
@@ -31,8 +29,6 @@ DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b89
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 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_p20160602.ebuild 2968 SHA256 351088ebb237b03559f3dda345e6e6d6ce56cfe5e64489006f96fb36528891c8 SHA512 5c1f3c5ebb06d5724524766b9ba32ee672e40489170a8300dba367d0ded696eea0db5874f9859c673d8133ccf6a541ec618dae0e822e454280d277113683a327 WHIRLPOOL a41ea5b2ff9f23bff25f7075e9786d224551a1413a3604e14f1a8a23e45185d42e3ed36cc677e41e105c684a41e0aeea365d59b50bd3a6b5cbd5ead6871cb941
-EBUILD netbeans-dlight-9999_p20160603.ebuild 2968 SHA256 ac3f70b6b69522a477f68c4cf7bfe769cf9d1ec705e25ec9330fe51b51f5ae32 SHA512 148b7393120bb874d9d2e212e7efe8a28260fa78ade34d09ca618bec66a31370fc517f864ee43d8f592536c4c599d02c86152d4e27f7f93ffecb3ea1db2d3fe9 WHIRLPOOL 6c6e3ba09232b5ff5223d358b0a793f51ddb4f2e15f239362f6142fe9f38fd06db958050c189e3bb52eed223c52a4b0a4d1290d3897cca416efdb36db03f69f3
 EBUILD netbeans-dlight-9999_p20160606.ebuild 2968 SHA256 eace9f04be0c3ab093f5a8452f762e0c7fd3ddb4bb9778a5fa6a3beb95763474 SHA512 7889d109855cbcafcdca41ced2097993fb0b014647a1ac2cbd53bd3771bbe8e31f9c64fbc7fafebde89d8a8cfd2cddbfae3e143a49b27bf98d55d5a2bbfc74fc WHIRLPOOL 67b57d267edd0f50bd81ef44a33d2cf988a44be405487a840552775b937831b0dd4d466ecc8a4b09c473ef1cdb4bfd3b349e6d6a92ac034bb83c162b30e21733
 EBUILD netbeans-dlight-9999_p20160607.ebuild 2968 SHA256 bb36c06321669232558a3f9e1c179924346dd7b2a43b1db9dcac90e7aedcaf57 SHA512 0bf834aa813ddd60d23aac3c91a9db1f136c836e719ffc224e50abab1fd7ff117aaf314f3b968841b3577d0a4a42614119d1f88136c0b0438b99d0f3ef62e5f0 WHIRLPOOL 0593304854762266c1133e32632603cd972668411dd04377f1642a8f2f7933844f53048aadf56fccdba1b62d41951c6cb7520d99866f21412306b970347ff024
 EBUILD netbeans-dlight-9999_p20160608.ebuild 2968 SHA256 b91b4319a9a05eefeaf14e3d36385468585dfab0dd638eb415419553e905f4ca SHA512 8159ba95417eb962fa30d0ca72bb7cb8c2dcda7c25b44ebaf61971e7f7892669aa4190dbb968cad9f119f89536774c0b8ea81e74cbeb4c71af167187184de47a WHIRLPOOL be7048e960c1938b2c6ad9e76fb83e1cd8aca69223de267e8c9b803532fd1abd3f098bb69a25a955db59bda7a77265b371e0a8a93422150ed11aa9c563b7b151

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160602.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160602.ebuild
deleted file mode 100644
index 4c8d94d..0000000
--- a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160602.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-06-02_00-02-33/zip/netbeans-trunk-nightly-201606020002-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-dlight/netbeans-dlight-9999_p20160603.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160603.ebuild
deleted file mode 100644
index e83a95f..0000000
--- a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160603.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-06-03_00-02-33/zip/netbeans-trunk-nightly-201606030002-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 22d868e..58f024b 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -35,8 +35,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-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-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
-DIST netbeans-trunk-nightly-201606030002-src.zip 213220744 SHA256 c90867dac6486f399b74933e9a771646dd5a288b94f41cf0b5c44f9cb9c911a7 SHA512 00cb8987fba28724277b070a177d3b008eff889cca0a98517b799a573dd79e8af083c19ca3243c079ff2c8e50a65c6649cdd0a8a5f282a756feb7e7b347791d4 WHIRLPOOL a8f2a23e4f1a92cb2305d7fdbe533173f8d66b5caaf0e7b63ef7427295b821301ac44d55bc0603cc5f4572d2cddd110e7ef35eb15600951468f67ff532730d27
 DIST netbeans-trunk-nightly-201606060002-src.zip 213364709 SHA256 1a79c71748ce658072b147847154a7c22df4666d3f5a7969d144e17e261a3a56 SHA512 024afad41bea8bdd4e8c557a46f836f0826bf5c2fe28bd5ac794c77825e9acc16c694fd823c2295a727c52710028b077c9436ecc7d97c97e20a894a80ff4b84c WHIRLPOOL eaa6191b5d80b7671045fd1f46b3fefd32382354d49e370eb1b590b2d8110cb4136e9a06b7fbc4b5d56d49d633266e23994860e96a2625980a26a1416dfabf47
 DIST netbeans-trunk-nightly-201606070002-src.zip 213362540 SHA256 c75366669710c7a350710285f5fe420a60739fd03fb00b1a1c597c604917a6ee SHA512 72e0b0bc2e387e9d3d5fff28dbd04c6a9ca4d857b9fa65a001b717913d5cf7d1fc2d37e7a270a5b3a7839a9ade61ffacbbbec406709da133639c819dda71e9aa WHIRLPOOL bdd02855a99902180a54981e24012c66357f739679046757e81d811052704a2ab2cf68f3da2c963aaf360c621e4d816ddff1dfe14d3034151d296adf0803251f
 DIST netbeans-trunk-nightly-201606080002-src.zip 216271844 SHA256 d4a75eb5aa2b3b0abc7efc2bbaffd105ea0002b00b2b4d87b2c1b563c8804f88 SHA512 96ad8c01d3323a1ce22eb18fb3b66e5b0bd6467a2fbafcb213af1bb4e19de7c3aa8ded83bd877b408fb883d7f2b0c228f0f56253f1941435d82920f59961e889 WHIRLPOOL ead7f333cd600b2c334021f21ccb1b808be6afbac4d024f11ba173d5feab44fae87516cd7d19794e1fd429121d78f39663b14ea04bbbf4150338467feef8de88
@@ -60,8 +58,6 @@ DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b89
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 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_p20160602.ebuild 15825 SHA256 f0d497d0a62a9fddaee1a27f3b53b430d13fa5a012e78adecc176860dc287174 SHA512 63cdd3fea0813992e4b55f4e5d63c0efd596f4f8c4c96ebfe8ae284814d9aa04db0336e6973801591b17a394f1557df9e19779c64051d89aa37303765b6d466a WHIRLPOOL 8785f4139ecc23a225c1fd0de9478b18de97061097a3529bbc2bd425cabbc6f60fb14ef187e4288cdbea759b7161204139768c65004750dc563f4602627950d0
-EBUILD netbeans-enterprise-9999_p20160603.ebuild 15825 SHA256 c2341b75632753bdc414b1d6ee72aa424e21d001c08eb69bf79c654769bcffb3 SHA512 eff678abacdecfc0ad714f1b97a19e1fb5749f1cff64802e01b5b45dffd6c9d1727a332b8faf6dad58f88dcd9889fd827e00cbe6a35c40d33795381f05b7bc23 WHIRLPOOL ca8febdd203a9de067b184847d73bf85d9f9ea5a8e92770895626ebc18c034fd7095fdd63cac2a5f324b570a786873fd4a5c1597a618d7ce32d69c2f2f48377f
 EBUILD netbeans-enterprise-9999_p20160606.ebuild 15825 SHA256 b56d5e6e816cee9c0d13690b3e152e3c39abba39af6522fa3d42449f26e029ae SHA512 438781fd2724bd860af2d7b19ff014eea74dc465f74aa9c91b532cf7437d180837fdd1c050072b880f6cca0a6d5b3af61bc707088bd59eba7d5138bac5ffc44b WHIRLPOOL f4d91c86dab32f57c3bfcd00b81897442cd6eb7025b609633a112e5e919e381f9f3e518f0f77b1f1a58668874ad30a5711a785250c8d2a32338209480375f524
 EBUILD netbeans-enterprise-9999_p20160607.ebuild 15825 SHA256 1fa1831e73aecfbd41c338f6c09515f855ef415b9a7ea5093f922f4287387f6f SHA512 26451a0af860882879b287adf48ac77c7e0062f1d255f13bb449aeabaf2c654e0c30ebc67ae20c75863c3b6f38a341257213e2f36fea2266f61d6fa58e140446 WHIRLPOOL cc37eec57f95ec9d7b3ac353da664bf1c34d4273e5025514138f87a3951b66b674cb2cf17657b8416a569ba996a31928213f07b6e2bbca54f920455b46c038f1
 EBUILD netbeans-enterprise-9999_p20160608.ebuild 15825 SHA256 36defa7266b234b9514d2af8ad8a8e982188b80a0229a0ad27b856b91060b1af SHA512 004a42dcf1dcbbfa79a3c19f97b8073360b82ba8792f229431ff0c2c7a381f7356d5c67d4bd33912786b688923b9f759d2f6880b72c626e490fb10ab455e6a73 WHIRLPOOL 4627ee149a0278364990aa23081e44571fb5f0a2ab3e7ebbad9803567f54be44027952aac6d4dccc569c2dcbbcdba1e57040f2af73838447a543f1ffb4406527

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160602.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160602.ebuild
deleted file mode 100644
index 3074d69..0000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160602.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-06-02_00-02-33/zip/netbeans-trunk-nightly-201606020002-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-enterprise/netbeans-enterprise-9999_p20160603.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160603.ebuild
deleted file mode 100644
index 31b9338..0000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160603.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-06-03_00-02-33/zip/netbeans-trunk-nightly-201606030002-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 e019b38..e29de36 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -3,8 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-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-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
-DIST netbeans-trunk-nightly-201606030002-src.zip 213220744 SHA256 c90867dac6486f399b74933e9a771646dd5a288b94f41cf0b5c44f9cb9c911a7 SHA512 00cb8987fba28724277b070a177d3b008eff889cca0a98517b799a573dd79e8af083c19ca3243c079ff2c8e50a65c6649cdd0a8a5f282a756feb7e7b347791d4 WHIRLPOOL a8f2a23e4f1a92cb2305d7fdbe533173f8d66b5caaf0e7b63ef7427295b821301ac44d55bc0603cc5f4572d2cddd110e7ef35eb15600951468f67ff532730d27
 DIST netbeans-trunk-nightly-201606060002-src.zip 213364709 SHA256 1a79c71748ce658072b147847154a7c22df4666d3f5a7969d144e17e261a3a56 SHA512 024afad41bea8bdd4e8c557a46f836f0826bf5c2fe28bd5ac794c77825e9acc16c694fd823c2295a727c52710028b077c9436ecc7d97c97e20a894a80ff4b84c WHIRLPOOL eaa6191b5d80b7671045fd1f46b3fefd32382354d49e370eb1b590b2d8110cb4136e9a06b7fbc4b5d56d49d633266e23994860e96a2625980a26a1416dfabf47
 DIST netbeans-trunk-nightly-201606070002-src.zip 213362540 SHA256 c75366669710c7a350710285f5fe420a60739fd03fb00b1a1c597c604917a6ee SHA512 72e0b0bc2e387e9d3d5fff28dbd04c6a9ca4d857b9fa65a001b717913d5cf7d1fc2d37e7a270a5b3a7839a9ade61ffacbbbec406709da133639c819dda71e9aa WHIRLPOOL bdd02855a99902180a54981e24012c66357f739679046757e81d811052704a2ab2cf68f3da2c963aaf360c621e4d816ddff1dfe14d3034151d296adf0803251f
 DIST netbeans-trunk-nightly-201606080002-src.zip 216271844 SHA256 d4a75eb5aa2b3b0abc7efc2bbaffd105ea0002b00b2b4d87b2c1b563c8804f88 SHA512 96ad8c01d3323a1ce22eb18fb3b66e5b0bd6467a2fbafcb213af1bb4e19de7c3aa8ded83bd877b408fb883d7f2b0c228f0f56253f1941435d82920f59961e889 WHIRLPOOL ead7f333cd600b2c334021f21ccb1b808be6afbac4d024f11ba173d5feab44fae87516cd7d19794e1fd429121d78f39663b14ea04bbbf4150338467feef8de88
@@ -28,8 +26,6 @@ DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b89
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 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_p20160602.ebuild 2913 SHA256 8a7812ccff99e623b71ae4996708dc44bd2afec57f32f8f67820dec994db0cce SHA512 5e482ab060145b2ead40c7f338665ca918635445ab9f40d23508785588b96f6b1755271fae96462124382d3388e2b810776c233c39054239112035ff16215da7 WHIRLPOOL 453cdd733a2e346ed12998f1c70f6ac33c0931b5b8be3f8b8dca0cede9561ef5fd995e71eb842d9b509bb559f559612c39a4dff33c6a18bf0e4611dff2033108
-EBUILD netbeans-ergonomics-9999_p20160603.ebuild 2913 SHA256 a18f1e11ab7f6fda357beb9a768c6d741c618bb65a10eed9fa94c81e3aac7e56 SHA512 cbcece526c10b28a36513269447a2e61db8db9ebd6624a4fe68821fc2662fc44119d6a0ce254104c693b76092dfd0422fe1f8b2f72064be502c6012c18d39b56 WHIRLPOOL 0b8c1339bfb07b03e641b675571067104aebb22061de3edc23110afe8ad130acb149cf4b4e4ae8c72ccbe598f3f972c92800ad728d4e98b6bfd724f0470c24fb
 EBUILD netbeans-ergonomics-9999_p20160606.ebuild 2913 SHA256 8c4b3cfe1d285065e964f1959f27688b5e55e8030ca2c0536db76dcdb95c0572 SHA512 04665163417286cd5de14b523db4e00598216505c7afa4522a6cbe493083520a11ca90002008459e43e75d5011df07f9eaf1b3b364d414fa5a62916c8ca1324c WHIRLPOOL 891401c30e52345432e72d42444df079d4d8b871cfdaf1c9f3b5744cc23c3dfa4380be62c68e4b24086ab3a3e55c06b9c638162124f9e9016823bba7bda3925d
 EBUILD netbeans-ergonomics-9999_p20160607.ebuild 2913 SHA256 1774c0355cf11127184e424ef64a31b4194bbff59bbf549776559fe1b35b8c48 SHA512 78bb1351de612d216b91793feaef8483fe4355692483ac98b035e7330eeba00e96ec3189c70796ea6a69b079a4defa663d56a30aa7613d82c29f6c064d88e3cc WHIRLPOOL 9a784aaa49bbcf6690db5535d689cc45f0c73764521bc1e3e5a40c61eb8c628ac5385f1c7d2ba16df4c7de717ee0344d574d386ced538916ee2bf967353c56c7
 EBUILD netbeans-ergonomics-9999_p20160608.ebuild 2913 SHA256 55ff2f3a9b96184996a2559695b5aa608e8fd7ea7a44266a0d19f8d14f831c6c SHA512 bbc88e212e5ca006034319bd83a17e9fbac3bbb35b58f06ee0097e8f7752b928da0dfe6f43e977063b7d371c3b8ae69b1c0844d5123554ceee155d7675b35125 WHIRLPOOL 85cc0a2b6cd2af13cb7716c8cbbafa30699f44e516fc90621bc6c591858f4a06adac897bd1fde14c0b025bd60e1b9949dac21637510ae23cf41ac62a469428c8

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160602.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160602.ebuild
deleted file mode 100644
index aa1c907..0000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160602.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-06-02_00-02-33/zip/netbeans-trunk-nightly-201606020002-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-ergonomics/netbeans-ergonomics-9999_p20160603.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160603.ebuild
deleted file mode 100644
index 37e916e..0000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160603.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-06-03_00-02-33/zip/netbeans-trunk-nightly-201606030002-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 1fee56f..01661e2 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -7,8 +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-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
-DIST netbeans-trunk-nightly-201606030002-src.zip 213220744 SHA256 c90867dac6486f399b74933e9a771646dd5a288b94f41cf0b5c44f9cb9c911a7 SHA512 00cb8987fba28724277b070a177d3b008eff889cca0a98517b799a573dd79e8af083c19ca3243c079ff2c8e50a65c6649cdd0a8a5f282a756feb7e7b347791d4 WHIRLPOOL a8f2a23e4f1a92cb2305d7fdbe533173f8d66b5caaf0e7b63ef7427295b821301ac44d55bc0603cc5f4572d2cddd110e7ef35eb15600951468f67ff532730d27
 DIST netbeans-trunk-nightly-201606060002-src.zip 213364709 SHA256 1a79c71748ce658072b147847154a7c22df4666d3f5a7969d144e17e261a3a56 SHA512 024afad41bea8bdd4e8c557a46f836f0826bf5c2fe28bd5ac794c77825e9acc16c694fd823c2295a727c52710028b077c9436ecc7d97c97e20a894a80ff4b84c WHIRLPOOL eaa6191b5d80b7671045fd1f46b3fefd32382354d49e370eb1b590b2d8110cb4136e9a06b7fbc4b5d56d49d633266e23994860e96a2625980a26a1416dfabf47
 DIST netbeans-trunk-nightly-201606070002-src.zip 213362540 SHA256 c75366669710c7a350710285f5fe420a60739fd03fb00b1a1c597c604917a6ee SHA512 72e0b0bc2e387e9d3d5fff28dbd04c6a9ca4d857b9fa65a001b717913d5cf7d1fc2d37e7a270a5b3a7839a9ade61ffacbbbec406709da133639c819dda71e9aa WHIRLPOOL bdd02855a99902180a54981e24012c66357f739679046757e81d811052704a2ab2cf68f3da2c963aaf360c621e4d816ddff1dfe14d3034151d296adf0803251f
 DIST netbeans-trunk-nightly-201606080002-src.zip 216271844 SHA256 d4a75eb5aa2b3b0abc7efc2bbaffd105ea0002b00b2b4d87b2c1b563c8804f88 SHA512 96ad8c01d3323a1ce22eb18fb3b66e5b0bd6467a2fbafcb213af1bb4e19de7c3aa8ded83bd877b408fb883d7f2b0c228f0f56253f1941435d82920f59961e889 WHIRLPOOL ead7f333cd600b2c334021f21ccb1b808be6afbac4d024f11ba173d5feab44fae87516cd7d19794e1fd429121d78f39663b14ea04bbbf4150338467feef8de88
@@ -32,8 +30,6 @@ DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b89
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 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_p20160602.ebuild 3377 SHA256 accab66f7708728148d4ac2f50cfa3675debee5b43d10f0a907eb03232ebff7a SHA512 5399f07b2bdb4c7b5d0d65657d360717392d2b9a931f8bed52e052630757de37052e31b256f1864fb2cf1268cc048c49512fb14f9146bd44be90dd1ef32abcc7 WHIRLPOOL 80c3103b8cc790e0202b1519f14c15d704fdd7fb40fe837ca867b05de913fd7e4b4ac301ac62c95d1b9d06eb1aaff76cb309e55812c6cee34ae35d3cfc350fcc
-EBUILD netbeans-extide-9999_p20160603.ebuild 3377 SHA256 e4b4378d726c11b69f137cfccd0e2e7c7b93ec9684a4c7fdc2c4d6e46c676648 SHA512 b0632996aa3f9d703e6f0b8ecf500691b3d8eec4c9d7d678356e039bb28be72cd11f93dc760209fdd2061f9be3e8f0a69daaf33651c31b66d9d5de8e557e215c WHIRLPOOL 69098cdb56c2865e31e069441732967e47b30088bb5482ffc6502d75d5ba38b1372151b2167997916173e83c53308fb0c129e164a6ab1d92c46f2f088e407809
 EBUILD netbeans-extide-9999_p20160606.ebuild 3377 SHA256 24df61ba752a163f83a487f6ad0ef51b155c99a08b98e2c779176ff58878a6e7 SHA512 26e48ccfef92a981c2684cc54ff7a62cc9be8dbf2a3685c4fa51d1264e4337941048212b096d807dbcb4f33601ba0853f930795a379c242c6b89dbd35c17e4f7 WHIRLPOOL be01cb203f35bd0a8fbc11d80876c5e98859f470397b539d25786feac1a57d5024d12fd224a9e1268775f7062603c7112a8d06fe426a79490b0653bd023125ef
 EBUILD netbeans-extide-9999_p20160607.ebuild 3377 SHA256 bb939c57bcaca79abe627c54bf31120c30429d8dfd1c3ce0fe43c1b1de76d503 SHA512 207e91a2b647c7630be91c079fffde91fa9aa065aafc2efcec27acf85afc130f68a4f82c82ba2974c96fa0777239073350db9992984cf6267b2ea72058513d9c WHIRLPOOL a2e61d3bb10bd13eee70678cccfc53f656aab48540f4a580e5005817a6f169fa624192fd1c11e6d58124c7e56fb992e8adec4cf571744185890f61701a5b4e67
 EBUILD netbeans-extide-9999_p20160608.ebuild 3377 SHA256 e53f634ccc760f390b70d56ff22ab720b6a795591c7048d77ea8378e225ce52f SHA512 3a0003a3b00f67fdd0ba5c7566f4d94d4e7a73cc819268ebf328e8093f9f3332cd805bf50a18284b39ae5f7fb95a2642731a73910697025b5c49009d82594808 WHIRLPOOL c6cc735e1521d523bf7e1c672fcb13ecf0faf60a2e3d24aea3e52efd236c5093b39dd881809ee2630325064b2800b6c28ae08a93be8da8cb7887ec280a7d4780

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160602.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160602.ebuild
deleted file mode 100644
index 5b08ffe..0000000
--- a/dev-java/netbeans-extide/netbeans-extide-9999_p20160602.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-06-02_00-02-33/zip/netbeans-trunk-nightly-201606020002-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-extide/netbeans-extide-9999_p20160603.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160603.ebuild
deleted file mode 100644
index 424b18b..0000000
--- a/dev-java/netbeans-extide/netbeans-extide-9999_p20160603.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-06-03_00-02-33/zip/netbeans-trunk-nightly-201606030002-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 7a363c9..69553fc 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -5,8 +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-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
-DIST netbeans-trunk-nightly-201606030002-src.zip 213220744 SHA256 c90867dac6486f399b74933e9a771646dd5a288b94f41cf0b5c44f9cb9c911a7 SHA512 00cb8987fba28724277b070a177d3b008eff889cca0a98517b799a573dd79e8af083c19ca3243c079ff2c8e50a65c6649cdd0a8a5f282a756feb7e7b347791d4 WHIRLPOOL a8f2a23e4f1a92cb2305d7fdbe533173f8d66b5caaf0e7b63ef7427295b821301ac44d55bc0603cc5f4572d2cddd110e7ef35eb15600951468f67ff532730d27
 DIST netbeans-trunk-nightly-201606060002-src.zip 213364709 SHA256 1a79c71748ce658072b147847154a7c22df4666d3f5a7969d144e17e261a3a56 SHA512 024afad41bea8bdd4e8c557a46f836f0826bf5c2fe28bd5ac794c77825e9acc16c694fd823c2295a727c52710028b077c9436ecc7d97c97e20a894a80ff4b84c WHIRLPOOL eaa6191b5d80b7671045fd1f46b3fefd32382354d49e370eb1b590b2d8110cb4136e9a06b7fbc4b5d56d49d633266e23994860e96a2625980a26a1416dfabf47
 DIST netbeans-trunk-nightly-201606070002-src.zip 213362540 SHA256 c75366669710c7a350710285f5fe420a60739fd03fb00b1a1c597c604917a6ee SHA512 72e0b0bc2e387e9d3d5fff28dbd04c6a9ca4d857b9fa65a001b717913d5cf7d1fc2d37e7a270a5b3a7839a9ade61ffacbbbec406709da133639c819dda71e9aa WHIRLPOOL bdd02855a99902180a54981e24012c66357f739679046757e81d811052704a2ab2cf68f3da2c963aaf360c621e4d816ddff1dfe14d3034151d296adf0803251f
 DIST netbeans-trunk-nightly-201606080002-src.zip 216271844 SHA256 d4a75eb5aa2b3b0abc7efc2bbaffd105ea0002b00b2b4d87b2c1b563c8804f88 SHA512 96ad8c01d3323a1ce22eb18fb3b66e5b0bd6467a2fbafcb213af1bb4e19de7c3aa8ded83bd877b408fb883d7f2b0c228f0f56253f1941435d82920f59961e889 WHIRLPOOL ead7f333cd600b2c334021f21ccb1b808be6afbac4d024f11ba173d5feab44fae87516cd7d19794e1fd429121d78f39663b14ea04bbbf4150338467feef8de88
@@ -30,8 +28,6 @@ DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b89
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 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_p20160602.ebuild 3416 SHA256 214540d35a040cf91bcfcf173f730ef69e49a2950a2936c42996b4c169fa51b9 SHA512 9dcf127f42f8af264068b876cd094ff570c478105e856759835218f5cc84dbe98b052b11c27962229d4168d39cd32d73638d3a760e0ed96d91de4b15cefa0a07 WHIRLPOOL af0c027f196481280ae8131d511b9318f3d0c1bf1d893bfb08ad7bddc5e92cd1713d747d84f9cc4b4cc6687560ace1f48dc2c99c5bc6e84e29eabc64f6e81408
-EBUILD netbeans-groovy-9999_p20160603.ebuild 3416 SHA256 0951e9bcdf7ac663c4534defc5e51b1cbda8d266a65805d91826265c2405c6cb SHA512 f0b5dd482a96ce98602ae256ccae9c166b6d217f5a7f8ed9948d82474f1fcf31e0819ee53ed2a2d9a73bbdd2d5e574c24b19bc45f320b253977d9d0e6f2e53f2 WHIRLPOOL 004fb585be59ecd5c97dc89944c9de0007d3a31ea5665c3b1358231576a5a4484cd39cf31f111ff2307be4b60b90e51e8dc7fc2b37e0f44de0aa7835ac1ad34b
 EBUILD netbeans-groovy-9999_p20160606.ebuild 3416 SHA256 f981750d39c645681123d280a3088da72805bb6368a631b2e577467ef62d3ed0 SHA512 0cb3b37b346e3fa445a4095a6b069030c6be2d2d58a9fc3b245fe5de67d8d0272f66585db68f63b61469fced31feacaf74648513714b0244a6efe6917a41406b WHIRLPOOL e0933ea494c7d95a1da450f10198e4a4d2ed520e1eaa53e75446b99efa8fa29ba22d7ce349944901f57c5a7e2e643b219a57e0338f988140af9bdae25b7a2522
 EBUILD netbeans-groovy-9999_p20160607.ebuild 3416 SHA256 cfdda78bd9e650a80ceca8cf46ad5aa57fdd50c1d715a86ccd4ebef209abda20 SHA512 a1f108d23204a0558103f84dea79a9d932304b2991d2c6205adbeabc49a58ee2b68bb0d0e7cadddeb3221499b47d740470de5815428a2151b2551b4889a29ca6 WHIRLPOOL 85b9e5395ef6ed4909fec1bf80cbcf95cf44f8dd6d4038b8795cffdf83f41893067473b0fe6c6e02801d77b2161898f86ee56a54afd5e26da514ee2c05da993f
 EBUILD netbeans-groovy-9999_p20160608.ebuild 3416 SHA256 7a05afd7b2c5d25b3e7631d2ce1cf8fee4ac230af07fb342bf69977bf7160f6f SHA512 9fdceff92ac66993f5f9dd9d9d7c30b99e70607a8cc63c650a664a01435df52df879366cf8f89dcc36a19412c6a541d6c195f1676b59904c2ec0a2c5c82bbabd WHIRLPOOL c0ff5af646cd9e1a04d0afb43f0140bf9f31badf571455b92e01f4f1788943fa4e1e29cea90a77db4dec860915a183fbe99f0b9f69c85fd4db203b1df1bb39e0

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160602.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160602.ebuild
deleted file mode 100644
index a4405b8..0000000
--- a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160602.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-06-02_00-02-33/zip/netbeans-trunk-nightly-201606020002-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-groovy/netbeans-groovy-9999_p20160603.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160603.ebuild
deleted file mode 100644
index 0930268..0000000
--- a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160603.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-06-03_00-02-33/zip/netbeans-trunk-nightly-201606030002-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 b074a62..2e31767 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -8,8 +8,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-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-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
-DIST netbeans-trunk-nightly-201606030002-src.zip 213220744 SHA256 c90867dac6486f399b74933e9a771646dd5a288b94f41cf0b5c44f9cb9c911a7 SHA512 00cb8987fba28724277b070a177d3b008eff889cca0a98517b799a573dd79e8af083c19ca3243c079ff2c8e50a65c6649cdd0a8a5f282a756feb7e7b347791d4 WHIRLPOOL a8f2a23e4f1a92cb2305d7fdbe533173f8d66b5caaf0e7b63ef7427295b821301ac44d55bc0603cc5f4572d2cddd110e7ef35eb15600951468f67ff532730d27
 DIST netbeans-trunk-nightly-201606060002-src.zip 213364709 SHA256 1a79c71748ce658072b147847154a7c22df4666d3f5a7969d144e17e261a3a56 SHA512 024afad41bea8bdd4e8c557a46f836f0826bf5c2fe28bd5ac794c77825e9acc16c694fd823c2295a727c52710028b077c9436ecc7d97c97e20a894a80ff4b84c WHIRLPOOL eaa6191b5d80b7671045fd1f46b3fefd32382354d49e370eb1b590b2d8110cb4136e9a06b7fbc4b5d56d49d633266e23994860e96a2625980a26a1416dfabf47
 DIST netbeans-trunk-nightly-201606070002-src.zip 213362540 SHA256 c75366669710c7a350710285f5fe420a60739fd03fb00b1a1c597c604917a6ee SHA512 72e0b0bc2e387e9d3d5fff28dbd04c6a9ca4d857b9fa65a001b717913d5cf7d1fc2d37e7a270a5b3a7839a9ade61ffacbbbec406709da133639c819dda71e9aa WHIRLPOOL bdd02855a99902180a54981e24012c66357f739679046757e81d811052704a2ab2cf68f3da2c963aaf360c621e4d816ddff1dfe14d3034151d296adf0803251f
 DIST netbeans-trunk-nightly-201606080002-src.zip 216271844 SHA256 d4a75eb5aa2b3b0abc7efc2bbaffd105ea0002b00b2b4d87b2c1b563c8804f88 SHA512 96ad8c01d3323a1ce22eb18fb3b66e5b0bd6467a2fbafcb213af1bb4e19de7c3aa8ded83bd877b408fb883d7f2b0c228f0f56253f1941435d82920f59961e889 WHIRLPOOL ead7f333cd600b2c334021f21ccb1b808be6afbac4d024f11ba173d5feab44fae87516cd7d19794e1fd429121d78f39663b14ea04bbbf4150338467feef8de88
@@ -33,8 +31,6 @@ DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b89
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 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_p20160602.ebuild 4126 SHA256 aa6cd18675cff39af819566282a6ca2ba7517022887258c0cca45c1eef0f0472 SHA512 316a736a27c44368af9e6c418b417b0c0495c82eaff9f692f745dabdb68c02361a0910bf13c5710b15c57696a15226ff7fbe9fd85f8b6fa9827dae772039044f WHIRLPOOL d0576ff6178bf7e690808dbd22aa6c8a2534bd1f03ccefe1b311d38c3a9f645ea2df1b969afb9491f68309361ecfb8cbb2ee3563246c90a96d3b587154442d4c
-EBUILD netbeans-harness-9999_p20160603.ebuild 4126 SHA256 63e37d2551036e0ffc3e6027b3af27c58a05f26cca652d004125eea6e1584e42 SHA512 4b6ca8fa5d9905a031a28890cfce6f20f4fa81c8bb0c5009ee57021f6662b1a509bdf00a6b1a0afd723c243743a2e162ff89b8a7ad64e7afd6efeb89563587c0 WHIRLPOOL 7a4ac3fc55a80ab0952085a0dbea302de2263a332637d2154a3d2fe7a824458efcd0a9e1a1b13730aa95e28dd2ed76a1c1f2f14f648ddede921ddbfb54ad4612
 EBUILD netbeans-harness-9999_p20160606.ebuild 4126 SHA256 514ff520724dcf59dfea147a31def444cb4cb30e251255033d62fabc45f2ae16 SHA512 fa631be9abfe034f89c499891e35243a65bc09c4d72cf4d2c3c73ef8c5f96273088001219490922e889cb0486ae351d294000f2415fb0ecb8b10315f1b6d8bc4 WHIRLPOOL 5c43ee95fe05ea6d33b61adeb87a93441c4eb5cb58c7b3e0d9b47008ebe856f12cd27d2f9da9f358b56b15923173831c4c941aedd1fcbe74450ba2acdec52cea
 EBUILD netbeans-harness-9999_p20160607.ebuild 4126 SHA256 538401fe39969f4cbffebc48a74208050d98b277add37c8f35357b8d200cd544 SHA512 f5ac5f367a88ad6d5a28011c998a17f8244b03fbdec90f578d627c6364821dcf96ca02722319ee0a11731cf623e97b8c352f02ecdfe34e378b3e25062f1cdbb9 WHIRLPOOL 6ed2766b98eb41247482d80fccfbf53b583cea6eb2968b0acd49b63d634f6789c0a2a8a65cdf42f5ee952af9ec7877f71a5282d161d3cfb922f7388dfd6d3051
 EBUILD netbeans-harness-9999_p20160608.ebuild 4126 SHA256 e3210ee3a0de309a33d079a3d3d835fa86b7513b43357b6c8f3381ee0377ad98 SHA512 18a157ba23833b4d1a80e8cc039b2fa0ae6fca47049ae77ceeada93396c00f1abaf04bc0cf8b1993f106384328730f180cefc2b702969d4ad66a5f33256a8bba WHIRLPOOL f0717fed0f1fc0fd74af833118f6d2300829fa02adedf6d0aa1b86d5c45bef551c7ff6e93e94739b24006fd921dc8e6c07873b7fb1e89aa0bcf0eed07a653e37

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160602.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160602.ebuild
deleted file mode 100644
index f79c95e..0000000
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20160602.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-06-02_00-02-33/zip/netbeans-trunk-nightly-201606020002-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-harness/netbeans-harness-9999_p20160603.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160603.ebuild
deleted file mode 100644
index f487ccd..0000000
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20160603.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-06-03_00-02-33/zip/netbeans-trunk-nightly-201606030002-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 b29b5a3..35911ea 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -143,8 +143,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-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
-DIST netbeans-trunk-nightly-201606030002-src.zip 213220744 SHA256 c90867dac6486f399b74933e9a771646dd5a288b94f41cf0b5c44f9cb9c911a7 SHA512 00cb8987fba28724277b070a177d3b008eff889cca0a98517b799a573dd79e8af083c19ca3243c079ff2c8e50a65c6649cdd0a8a5f282a756feb7e7b347791d4 WHIRLPOOL a8f2a23e4f1a92cb2305d7fdbe533173f8d66b5caaf0e7b63ef7427295b821301ac44d55bc0603cc5f4572d2cddd110e7ef35eb15600951468f67ff532730d27
 DIST netbeans-trunk-nightly-201606060002-src.zip 213364709 SHA256 1a79c71748ce658072b147847154a7c22df4666d3f5a7969d144e17e261a3a56 SHA512 024afad41bea8bdd4e8c557a46f836f0826bf5c2fe28bd5ac794c77825e9acc16c694fd823c2295a727c52710028b077c9436ecc7d97c97e20a894a80ff4b84c WHIRLPOOL eaa6191b5d80b7671045fd1f46b3fefd32382354d49e370eb1b590b2d8110cb4136e9a06b7fbc4b5d56d49d633266e23994860e96a2625980a26a1416dfabf47
 DIST netbeans-trunk-nightly-201606070002-src.zip 213362540 SHA256 c75366669710c7a350710285f5fe420a60739fd03fb00b1a1c597c604917a6ee SHA512 72e0b0bc2e387e9d3d5fff28dbd04c6a9ca4d857b9fa65a001b717913d5cf7d1fc2d37e7a270a5b3a7839a9ade61ffacbbbec406709da133639c819dda71e9aa WHIRLPOOL bdd02855a99902180a54981e24012c66357f739679046757e81d811052704a2ab2cf68f3da2c963aaf360c621e4d816ddff1dfe14d3034151d296adf0803251f
 DIST netbeans-trunk-nightly-201606080002-src.zip 216271844 SHA256 d4a75eb5aa2b3b0abc7efc2bbaffd105ea0002b00b2b4d87b2c1b563c8804f88 SHA512 96ad8c01d3323a1ce22eb18fb3b66e5b0bd6467a2fbafcb213af1bb4e19de7c3aa8ded83bd877b408fb883d7f2b0c228f0f56253f1941435d82920f59961e889 WHIRLPOOL ead7f333cd600b2c334021f21ccb1b808be6afbac4d024f11ba173d5feab44fae87516cd7d19794e1fd429121d78f39663b14ea04bbbf4150338467feef8de88
@@ -168,8 +166,6 @@ DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b89
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 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_p20160602.ebuild 30761 SHA256 25a187d71b98cc313552edef677f1574768cb8ac9001d9357459c97547893bbc SHA512 a34cdce3f7cb3ae23437d433929891349f933d3dd8eaa5792927b8a619a58507e246dbd7ef1b0d1d38e5a01601df1f3bf03b72d0e10c72be481e2872d98ffe76 WHIRLPOOL f795e0395924136cd8cb1b1864059bc0973ac423313e44764de112717bc186d5b4afe3ea625d2d95019a7106286919fb02b2ed7fd991d6e82ad25d57bdd7fdc3
-EBUILD netbeans-ide-9999_p20160603.ebuild 30761 SHA256 c513df7ac72c16af426b80f091b5affc10af7c4ea6f91f73ba75185893a26bfe SHA512 a8ef06e29929f7fddd28f9a62579dbe7ab8a2f1548e3039c022c169950420c158d35aed182b67c3519b42e16911a4696a6c6cf6f70930da078dd415cc338abe8 WHIRLPOOL 466cf61b820e4e7d1c4a92f4d03d88d9e895905122544db2702d8c7439dc3d5c806632c94daa8b1e7b21bcfe9ea66386380c6715d9af80217a0c1f734e2a1bfb
 EBUILD netbeans-ide-9999_p20160606.ebuild 30761 SHA256 54a5c2805a74eaf0c623c98ad090b2b7d78254f42dd2f44b58dc8bbd99420436 SHA512 37064a64ce85aea7efc242357fd50bb6b648a13b60ebc6cb1cc417156fde75a0df083e0943be291b692ca8083e0b5e469c366ee792c7139ac59f7622430223eb WHIRLPOOL 967b9db8bd4d6b8a53c47126c2bb0ec1d8ee0c8916a796d38979ec47f9d616a1ea97c1c161abd88e9b622456491bdf018574ebebd83d504c47a1dca4102bf90b
 EBUILD netbeans-ide-9999_p20160607.ebuild 30761 SHA256 daa9cd6c3335966abca10bc7c136de077206cdd5571f13308c5499d32b296697 SHA512 ab5ad4ebf695fa423c26fcc161bc607831d9d4e8e3d4b428665f85d55ba2fb9d741e42741b00688596c651a98da1bbc95dc08388435cd7ac20b21ae8a82d10fb WHIRLPOOL 6b0f764bb80c52f528e3885ad8011845942271395634cbb3204cf4cea4b2356c7f1e8cb974e3c5eb78b8a52914bf5c32c4d03aad78094d19b59ed5a59d78a17e
 EBUILD netbeans-ide-9999_p20160608.ebuild 30761 SHA256 b9bf5ca9d81e896f62976e0acd3f627bedbb0484631f0cb8aeb57db237dde627 SHA512 465b1abc3b1b6c1cd99991f3dc117ed8c0406625ff0c107963787c1a2fccbc5f6e58382f9545e141c8be4292dbfc974c7b78d2b8fcaeb6ea0d2d2340b0431006 WHIRLPOOL c9a53ce61a48012ccc594744d4b193ef23ebaee063865633db6499ef1fa860ace289ca96d32024ac58e6b789b3983d1bd0ab7edc542c98bc0c40f7df54088e45

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160602.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160602.ebuild
deleted file mode 100644
index 84f77c7..0000000
--- a/dev-java/netbeans-ide/netbeans-ide-9999_p20160602.ebuild
+++ /dev/null
@@ -1,382 +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-06-02_00-02-33/zip/netbeans-trunk-nightly-201606020002-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/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.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/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip
-	http://hg.netbeans.org/binaries/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip
-	http://hg.netbeans.org/binaries/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip
-	http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar
-	http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar
-	http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar
-	http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar
-	http://hg.netbeans.org/binaries/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar
-	http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
-	http://hg.netbeans.org/binaries/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar
-	http://hg.netbeans.org/binaries/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/5C322A10E13FADE0451263035B7AA26B63AAFA47-validator.jar
-	http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar
-	http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar
-	http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar
-	http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-platform-${PV}
-	dev-java/commons-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}"/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar libs.nashorn/external/asm-all-4.0.jar || die
-	ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
-	ln -s "${DISTDIR}"/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}"/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip javascript2.editor/external/js-corestubs.zip || die
-	ln -s "${DISTDIR}"/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip javascript2.editor/external/js-domstubs.zip || die
-	ln -s "${DISTDIR}"/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip javascript2.editor/external/js-reststubs.zip || die
-	ln -s "${DISTDIR}"/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.core-0.0.7.jar || die
-	ln -s "${DISTDIR}"/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.sshagent-0.0.7.jar || die
-	ln -s "${DISTDIR}"/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.pageant-0.0.7.jar || die
-	ln -s "${DISTDIR}"/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.usocket-jna-0.0.7.jar || die
-	ln -s "${DISTDIR}"/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}"/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar libs.nashorn/external/nashorn-02f810c26ff9-patched.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}"/5C322A10E13FADE0451263035B7AA26B63AAFA47-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 --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	popd >/dev/null || die
-
-	java-pkg_jar-from --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.53.jar
-	java-pkg_jar-from --into 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 --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.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
-
-	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 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-ide/netbeans-ide-9999_p20160603.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160603.ebuild
deleted file mode 100644
index 040e411..0000000
--- a/dev-java/netbeans-ide/netbeans-ide-9999_p20160603.ebuild
+++ /dev/null
@@ -1,382 +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-06-03_00-02-33/zip/netbeans-trunk-nightly-201606030002-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/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.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/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip
-	http://hg.netbeans.org/binaries/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip
-	http://hg.netbeans.org/binaries/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip
-	http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar
-	http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar
-	http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar
-	http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar
-	http://hg.netbeans.org/binaries/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar
-	http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
-	http://hg.netbeans.org/binaries/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar
-	http://hg.netbeans.org/binaries/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/5C322A10E13FADE0451263035B7AA26B63AAFA47-validator.jar
-	http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar
-	http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar
-	http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar
-	http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-platform-${PV}
-	dev-java/commons-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}"/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar libs.nashorn/external/asm-all-4.0.jar || die
-	ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
-	ln -s "${DISTDIR}"/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}"/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip javascript2.editor/external/js-corestubs.zip || die
-	ln -s "${DISTDIR}"/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip javascript2.editor/external/js-domstubs.zip || die
-	ln -s "${DISTDIR}"/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip javascript2.editor/external/js-reststubs.zip || die
-	ln -s "${DISTDIR}"/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.core-0.0.7.jar || die
-	ln -s "${DISTDIR}"/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.sshagent-0.0.7.jar || die
-	ln -s "${DISTDIR}"/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.pageant-0.0.7.jar || die
-	ln -s "${DISTDIR}"/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.usocket-jna-0.0.7.jar || die
-	ln -s "${DISTDIR}"/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}"/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar libs.nashorn/external/nashorn-02f810c26ff9-patched.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}"/5C322A10E13FADE0451263035B7AA26B63AAFA47-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 --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	popd >/dev/null || die
-
-	java-pkg_jar-from --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.53.jar
-	java-pkg_jar-from --into 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 --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.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
-
-	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 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 556857a..792e0b9 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -43,8 +43,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-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
-DIST netbeans-trunk-nightly-201606030002-src.zip 213220744 SHA256 c90867dac6486f399b74933e9a771646dd5a288b94f41cf0b5c44f9cb9c911a7 SHA512 00cb8987fba28724277b070a177d3b008eff889cca0a98517b799a573dd79e8af083c19ca3243c079ff2c8e50a65c6649cdd0a8a5f282a756feb7e7b347791d4 WHIRLPOOL a8f2a23e4f1a92cb2305d7fdbe533173f8d66b5caaf0e7b63ef7427295b821301ac44d55bc0603cc5f4572d2cddd110e7ef35eb15600951468f67ff532730d27
 DIST netbeans-trunk-nightly-201606060002-src.zip 213364709 SHA256 1a79c71748ce658072b147847154a7c22df4666d3f5a7969d144e17e261a3a56 SHA512 024afad41bea8bdd4e8c557a46f836f0826bf5c2fe28bd5ac794c77825e9acc16c694fd823c2295a727c52710028b077c9436ecc7d97c97e20a894a80ff4b84c WHIRLPOOL eaa6191b5d80b7671045fd1f46b3fefd32382354d49e370eb1b590b2d8110cb4136e9a06b7fbc4b5d56d49d633266e23994860e96a2625980a26a1416dfabf47
 DIST netbeans-trunk-nightly-201606070002-src.zip 213362540 SHA256 c75366669710c7a350710285f5fe420a60739fd03fb00b1a1c597c604917a6ee SHA512 72e0b0bc2e387e9d3d5fff28dbd04c6a9ca4d857b9fa65a001b717913d5cf7d1fc2d37e7a270a5b3a7839a9ade61ffacbbbec406709da133639c819dda71e9aa WHIRLPOOL bdd02855a99902180a54981e24012c66357f739679046757e81d811052704a2ab2cf68f3da2c963aaf360c621e4d816ddff1dfe14d3034151d296adf0803251f
 DIST netbeans-trunk-nightly-201606080002-src.zip 216271844 SHA256 d4a75eb5aa2b3b0abc7efc2bbaffd105ea0002b00b2b4d87b2c1b563c8804f88 SHA512 96ad8c01d3323a1ce22eb18fb3b66e5b0bd6467a2fbafcb213af1bb4e19de7c3aa8ded83bd877b408fb883d7f2b0c228f0f56253f1941435d82920f59961e889 WHIRLPOOL ead7f333cd600b2c334021f21ccb1b808be6afbac4d024f11ba173d5feab44fae87516cd7d19794e1fd429121d78f39663b14ea04bbbf4150338467feef8de88
@@ -68,8 +66,6 @@ DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b89
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 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_p20160602.ebuild 15656 SHA256 715f83188a6c730b16e539731b5c2a0d12c34993bde2c708dec8e0949e6c5d15 SHA512 8adcf8e3b54e7ad64f4a24895880dd5d2edf4c8d0190f7225bf45f28ba8d17ff98f2127dc9a8d3aa9bd7859e31f09344707dc3d8d7bb4c9019bc86884a061572 WHIRLPOOL 5d067335f78e519aa35cdc4fe768df198e9ce0958aea849fe74f21e78731dba5d420a68061e343e7d017794a131046b81cb2c5215691b9471bf50291425d7b99
-EBUILD netbeans-java-9999_p20160603.ebuild 15656 SHA256 1497c4c62ff3ee65817e8eaf90381519dad151d07f5247a8d8d8de91f3a68eb9 SHA512 1a6fe6034e814351d4aa06d240d9fbea835f3bb11c0f3df3f42b9c8c0a3abb3b5bef98598bd320047df31731a70ec4acb000cb219a63a0d551e637b9a8ae093a WHIRLPOOL e284d38b3d80a050ced28f819763466053056f02f2a717f50b76f94483a04bbf0eecdefaf95d7275af2357c75b2dd16b26e96074c2aecd957fcac20a86f46ac7
 EBUILD netbeans-java-9999_p20160606.ebuild 15656 SHA256 8151a2aa93a3ff2b85ff81bc3c32d8f1ea246ef79db2d4d1baba50947a9bf92b SHA512 8db63e9607e14374a58026ea5f6bc65427f497882a246cf1aca39fecec3db29fab50ff293d19eec67c57471fc9495b55516a11b73a177d7b3ad4d8e4a3bd3f19 WHIRLPOOL 2b54787bbfe8137293daf93df1250a206eb4fc83d91f29fe57a577ad88ae32db2d1ce58aef6f4e4364bc72341077ccb9a2e76feb6fce050a1d8773393f74fb38
 EBUILD netbeans-java-9999_p20160607.ebuild 15656 SHA256 250dc479b22824123fd7a2f4ad920f9643507e3095deedd81fe210ce80125011 SHA512 5cb64bfc95efe6630fb6a86cff361017eb921f0583b4867ad5d6558be1ea451005a9c1105e557f36a1132af7954cb51c0d6fb1f99455a2b949f8a2ab4e090512 WHIRLPOOL 733c75aad9b3d2f8eecb2ea7775223ed609ddda431ea5146d930c820421314801f0905e04a56f03a0098ce955dc239ede2914f3b939ca40259561d1123d9d924
 EBUILD netbeans-java-9999_p20160608.ebuild 15656 SHA256 9fc58bb0920b73d4cc3a99da4f711a317d271d2a506f927774f7ed0e5bd1b867 SHA512 9ce1fa75ce42be6adc4cf4df6254aa616096b6135eb6c4b0a0abf527979d9fdf57889eb2f2698cdf6c288e06b5653ad05f6c8825d02ec12819f035185815e5ea WHIRLPOOL 468316c7b728fd1d5d6a711ec35bbd92d430309dc489d30a9e200eb6474dcd375cfebe6c717e0e0b900f420fafb91834e367c1f448fb433354f059a87bf3105e

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160602.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160602.ebuild
deleted file mode 100644
index 047847f..0000000
--- a/dev-java/netbeans-java/netbeans-java-9999_p20160602.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-06-02_00-02-33/zip/netbeans-trunk-nightly-201606020002-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/36B0D7C5BEE763A87DFE07D1C4DC03337D25E208-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}"/36B0D7C5BEE763A87DFE07D1C4DC03337D25E208-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-java/netbeans-java-9999_p20160603.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160603.ebuild
deleted file mode 100644
index 93209dc..0000000
--- a/dev-java/netbeans-java/netbeans-java-9999_p20160603.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-06-03_00-02-33/zip/netbeans-trunk-nightly-201606030002-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/36B0D7C5BEE763A87DFE07D1C4DC03337D25E208-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}"/36B0D7C5BEE763A87DFE07D1C4DC03337D25E208-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 0a58a03..bf32447 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -6,8 +6,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-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-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
-DIST netbeans-trunk-nightly-201606030002-src.zip 213220744 SHA256 c90867dac6486f399b74933e9a771646dd5a288b94f41cf0b5c44f9cb9c911a7 SHA512 00cb8987fba28724277b070a177d3b008eff889cca0a98517b799a573dd79e8af083c19ca3243c079ff2c8e50a65c6649cdd0a8a5f282a756feb7e7b347791d4 WHIRLPOOL a8f2a23e4f1a92cb2305d7fdbe533173f8d66b5caaf0e7b63ef7427295b821301ac44d55bc0603cc5f4572d2cddd110e7ef35eb15600951468f67ff532730d27
 DIST netbeans-trunk-nightly-201606060002-src.zip 213364709 SHA256 1a79c71748ce658072b147847154a7c22df4666d3f5a7969d144e17e261a3a56 SHA512 024afad41bea8bdd4e8c557a46f836f0826bf5c2fe28bd5ac794c77825e9acc16c694fd823c2295a727c52710028b077c9436ecc7d97c97e20a894a80ff4b84c WHIRLPOOL eaa6191b5d80b7671045fd1f46b3fefd32382354d49e370eb1b590b2d8110cb4136e9a06b7fbc4b5d56d49d633266e23994860e96a2625980a26a1416dfabf47
 DIST netbeans-trunk-nightly-201606070002-src.zip 213362540 SHA256 c75366669710c7a350710285f5fe420a60739fd03fb00b1a1c597c604917a6ee SHA512 72e0b0bc2e387e9d3d5fff28dbd04c6a9ca4d857b9fa65a001b717913d5cf7d1fc2d37e7a270a5b3a7839a9ade61ffacbbbec406709da133639c819dda71e9aa WHIRLPOOL bdd02855a99902180a54981e24012c66357f739679046757e81d811052704a2ab2cf68f3da2c963aaf360c621e4d816ddff1dfe14d3034151d296adf0803251f
 DIST netbeans-trunk-nightly-201606080002-src.zip 216271844 SHA256 d4a75eb5aa2b3b0abc7efc2bbaffd105ea0002b00b2b4d87b2c1b563c8804f88 SHA512 96ad8c01d3323a1ce22eb18fb3b66e5b0bd6467a2fbafcb213af1bb4e19de7c3aa8ded83bd877b408fb883d7f2b0c228f0f56253f1941435d82920f59961e889 WHIRLPOOL ead7f333cd600b2c334021f21ccb1b808be6afbac4d024f11ba173d5feab44fae87516cd7d19794e1fd429121d78f39663b14ea04bbbf4150338467feef8de88
@@ -31,8 +29,6 @@ DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b89
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 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_p20160602.ebuild 4971 SHA256 67b31d9bb98c525975409e54c96f560b6bd92e42fc6d4148ac42ab2e901fdad2 SHA512 68dee96fdaa012292287767287de8c4747a943090218bc8ce300368811cd8e776140643c958da14d6b0e4aab85c6fbc9034e696583317b51ca5062f42bed5233 WHIRLPOOL 001ac8bed54aec01902838857505e350a2da67ca190c88232c0b58ca03a10dd7fc6559a7776bf0ee06470e6158f6f8ac827623b1aeb11f797ed6ab2f71045353
-EBUILD netbeans-javacard-9999_p20160603.ebuild 4971 SHA256 1310df9672d4137b24cd7ae87e07af1110a8ed112957cb3a30e4873b88d4695e SHA512 734e1f6ecb7de71ed25025b391e350816cb0ba10b437269ca811e4f8254d0a25678b7762a0f537db4ba2a442e0e7cebd6cd4133b7b8fe91fa3359e53ec498fcf WHIRLPOOL 61a67a355acca170168a605331287f174d50d5354f93961f25faacb821f112efb3810e647a3cfb9972975340fef35b51f9ade1742adc596ff44e6d8ce98ac40c
 EBUILD netbeans-javacard-9999_p20160606.ebuild 4971 SHA256 beceef4ac87abbcba45128f7294fac9307b266562b6068407e0ad4dd502c07d0 SHA512 b408ebb34f66a02cfd884b588e7913429fd8a77b182649c05bbde5c275b6e5211703787c024f3e61764b87c5b7d920f3301dde494a1def17e4ded9ed289e5fa2 WHIRLPOOL b382e352d546d903b60a0dfc9a80cbf18b0caa31d48b49b8685047405bfc6e347ad805413f23c84a5013b974d211d6eb306a81dc9c6c2304add3b28b15530af8
 EBUILD netbeans-javacard-9999_p20160607.ebuild 4971 SHA256 c066732f3240d2dd656cee6ce57ea0cceac5433baab9bbff37ce9e3a694eb187 SHA512 b55edd85c13c746bf9776f51ddd363eaba51936231cb7469e22aa66be757afac5bce02552b7229d3160c71c700d9039cf8d2852cfb0cb88e627e733caf1dd446 WHIRLPOOL 5d187dd790657851e2760c2cb585558fa54a1aaef99c6f99cc268bff65a480e5683c81016f8c698e383b30818061c6e32b2ca2f5876aacf9974dd500ba104610
 EBUILD netbeans-javacard-9999_p20160608.ebuild 4971 SHA256 c076552cba7074a1a1c76c76e55a29c3516431dd3c487a415aa5c27f4cfb861e SHA512 4d7ede906e49eb917d673343c00b737298328ecf2c28e6fe2c3ff4c934cfe74ef7f0a11d4a09679fd5ec5ec03be07284c9b6e1a2b875242d4b649732d446f399 WHIRLPOOL 00b0a0a8a5237ccd9bbfd3a821734ac0a1736999154b8aad4d7201428fe7416347524a6c02792fea89a9464c56f35bd1ab085978e15120ef8b37876a64ee4991

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160602.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160602.ebuild
deleted file mode 100644
index 2d42046..0000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160602.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-06-02_00-02-33/zip/netbeans-trunk-nightly-201606020002-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-javacard/netbeans-javacard-9999_p20160603.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160603.ebuild
deleted file mode 100644
index bb1d553..0000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160603.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-06-03_00-02-33/zip/netbeans-trunk-nightly-201606030002-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 3b81d2b..7519eeb 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -5,8 +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-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
-DIST netbeans-trunk-nightly-201606030002-src.zip 213220744 SHA256 c90867dac6486f399b74933e9a771646dd5a288b94f41cf0b5c44f9cb9c911a7 SHA512 00cb8987fba28724277b070a177d3b008eff889cca0a98517b799a573dd79e8af083c19ca3243c079ff2c8e50a65c6649cdd0a8a5f282a756feb7e7b347791d4 WHIRLPOOL a8f2a23e4f1a92cb2305d7fdbe533173f8d66b5caaf0e7b63ef7427295b821301ac44d55bc0603cc5f4572d2cddd110e7ef35eb15600951468f67ff532730d27
 DIST netbeans-trunk-nightly-201606060002-src.zip 213364709 SHA256 1a79c71748ce658072b147847154a7c22df4666d3f5a7969d144e17e261a3a56 SHA512 024afad41bea8bdd4e8c557a46f836f0826bf5c2fe28bd5ac794c77825e9acc16c694fd823c2295a727c52710028b077c9436ecc7d97c97e20a894a80ff4b84c WHIRLPOOL eaa6191b5d80b7671045fd1f46b3fefd32382354d49e370eb1b590b2d8110cb4136e9a06b7fbc4b5d56d49d633266e23994860e96a2625980a26a1416dfabf47
 DIST netbeans-trunk-nightly-201606070002-src.zip 213362540 SHA256 c75366669710c7a350710285f5fe420a60739fd03fb00b1a1c597c604917a6ee SHA512 72e0b0bc2e387e9d3d5fff28dbd04c6a9ca4d857b9fa65a001b717913d5cf7d1fc2d37e7a270a5b3a7839a9ade61ffacbbbec406709da133639c819dda71e9aa WHIRLPOOL bdd02855a99902180a54981e24012c66357f739679046757e81d811052704a2ab2cf68f3da2c963aaf360c621e4d816ddff1dfe14d3034151d296adf0803251f
 DIST netbeans-trunk-nightly-201606080002-src.zip 216271844 SHA256 d4a75eb5aa2b3b0abc7efc2bbaffd105ea0002b00b2b4d87b2c1b563c8804f88 SHA512 96ad8c01d3323a1ce22eb18fb3b66e5b0bd6467a2fbafcb213af1bb4e19de7c3aa8ded83bd877b408fb883d7f2b0c228f0f56253f1941435d82920f59961e889 WHIRLPOOL ead7f333cd600b2c334021f21ccb1b808be6afbac4d024f11ba173d5feab44fae87516cd7d19794e1fd429121d78f39663b14ea04bbbf4150338467feef8de88
@@ -30,8 +28,6 @@ DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b89
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 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_p20160602.ebuild 6293 SHA256 d05f5bab2b691dcbb6b8da3d4fbda78564cb88864d9c118c8b6173d7635313f0 SHA512 b9f4424343e5a867e066499439e7291fd2e0b7495a60a0dbfa161367a166c950ed6e49d9ff30cd5e693bd8e4afc78393ff95f6d897ca2a275310e86e67f2c7e7 WHIRLPOOL 20a6430a8809bfa43b6635d913bdb3b31a0ed8530c3fb2806b4d497fb74592e96526e4f8ca02cfa501b1d63ad1f7492741b9fbf4dc87b5120afbe57abb222243
-EBUILD netbeans-javadoc-9999_p20160603.ebuild 6293 SHA256 2b612d74602bbf5a87146e3ac51e4553961e311f01d14c78b1a8be2828bb1482 SHA512 4a19ad31a472b82a089d3c6220b054d68de3d53357abb3aa48b3b86e8f7a8ff53b9c04b1fc1bfff42a752a8b60ad8d581b3d87d703be453fd7b503e1e33f84f3 WHIRLPOOL 626ff895e6e14eda79fb585b0a4e9a2ae1ec06fc6320717e4ddf84a0eeb7b8ef47df1aed39cb0e225f676a64251f8d7af0fb9fce4e1304ecf940479ce4a50cf2
 EBUILD netbeans-javadoc-9999_p20160606.ebuild 6293 SHA256 e64e678fe3060c2ffbb9c0bca362a47b2369091cf9c1a72aca14c29f7678ef5a SHA512 c725dce07d30be36cf628287b1b9f6850ca8bca63bb0896be4376303c6f8583d887baa4f8ecc6dbd8748b8ec272af182ec34a79dc217be6a044b1adc77c6e0b1 WHIRLPOOL e42566df691b3ee4afa2cdf1fc0387ee1617e856a8eaa52a7a6179d17df4b824d6cfaffdf8488eeaf77f801260db4bc5f2e7a73f8d1f042cd4b90563b2865fd3
 EBUILD netbeans-javadoc-9999_p20160607.ebuild 6293 SHA256 faf677db7fbc870acf80d9a0d50adff44124478698d483d13047b0d3c806752e SHA512 e01d2b4261822fdf6c5a4b332b9bd9bae4ceeca839366265e8b2be6f8b0e62ac53abb67a85e7612eb4fb32d9b1a9c240d7922081af1b5480e1352635c7c0de40 WHIRLPOOL 25403bef32e526249374753c34d27e886eae7e7c457616d3e2dbac58493579ecfd6dbb41eea979864e06058228969d886424181799beaf24f8d156547f5081ef
 EBUILD netbeans-javadoc-9999_p20160608.ebuild 6293 SHA256 5c1d3a89916aca94e9fec74a0fb81dcee57af794ab857cea0d3d3255b92f1c44 SHA512 9f5d93e4bececcf9c64fcc6ea088cf1656cfd340a0cb52e57ca7214cedf12470a6439a1a84c06ece72c15f6f6219160ca35025465b86255cdb527599a050877c WHIRLPOOL 41d6481800fc9fc8c76e38a0da88a851b820e7841ba46d867686500a0757fcbae3883e6bdbeabf5a51a5651a9ad5c98628506d30c1542dd05036bb5bc71d3991

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160602.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160602.ebuild
deleted file mode 100644
index 7fdeed8..0000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160602.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-06-02_00-02-33/zip/netbeans-trunk-nightly-201606020002-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-javadoc/netbeans-javadoc-9999_p20160603.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160603.ebuild
deleted file mode 100644
index 0447e8c..0000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160603.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-06-03_00-02-33/zip/netbeans-trunk-nightly-201606030002-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 61dd6af..e20fc58 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -11,8 +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-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
-DIST netbeans-trunk-nightly-201606030002-src.zip 213220744 SHA256 c90867dac6486f399b74933e9a771646dd5a288b94f41cf0b5c44f9cb9c911a7 SHA512 00cb8987fba28724277b070a177d3b008eff889cca0a98517b799a573dd79e8af083c19ca3243c079ff2c8e50a65c6649cdd0a8a5f282a756feb7e7b347791d4 WHIRLPOOL a8f2a23e4f1a92cb2305d7fdbe533173f8d66b5caaf0e7b63ef7427295b821301ac44d55bc0603cc5f4572d2cddd110e7ef35eb15600951468f67ff532730d27
 DIST netbeans-trunk-nightly-201606060002-src.zip 213364709 SHA256 1a79c71748ce658072b147847154a7c22df4666d3f5a7969d144e17e261a3a56 SHA512 024afad41bea8bdd4e8c557a46f836f0826bf5c2fe28bd5ac794c77825e9acc16c694fd823c2295a727c52710028b077c9436ecc7d97c97e20a894a80ff4b84c WHIRLPOOL eaa6191b5d80b7671045fd1f46b3fefd32382354d49e370eb1b590b2d8110cb4136e9a06b7fbc4b5d56d49d633266e23994860e96a2625980a26a1416dfabf47
 DIST netbeans-trunk-nightly-201606070002-src.zip 213362540 SHA256 c75366669710c7a350710285f5fe420a60739fd03fb00b1a1c597c604917a6ee SHA512 72e0b0bc2e387e9d3d5fff28dbd04c6a9ca4d857b9fa65a001b717913d5cf7d1fc2d37e7a270a5b3a7839a9ade61ffacbbbec406709da133639c819dda71e9aa WHIRLPOOL bdd02855a99902180a54981e24012c66357f739679046757e81d811052704a2ab2cf68f3da2c963aaf360c621e4d816ddff1dfe14d3034151d296adf0803251f
 DIST netbeans-trunk-nightly-201606080002-src.zip 216271844 SHA256 d4a75eb5aa2b3b0abc7efc2bbaffd105ea0002b00b2b4d87b2c1b563c8804f88 SHA512 96ad8c01d3323a1ce22eb18fb3b66e5b0bd6467a2fbafcb213af1bb4e19de7c3aa8ded83bd877b408fb883d7f2b0c228f0f56253f1941435d82920f59961e889 WHIRLPOOL ead7f333cd600b2c334021f21ccb1b808be6afbac4d024f11ba173d5feab44fae87516cd7d19794e1fd429121d78f39663b14ea04bbbf4150338467feef8de88
@@ -36,8 +34,6 @@ DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b89
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 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_p20160602.ebuild 4717 SHA256 7df344cc9d7a9b5b3f1d8322a4c8d5fc126858c4d27a5e09421b9d80b2dda9e3 SHA512 21ec266d8c4b5cd1d397363504ef3e7ba96a5a724e1167dea35f2c861f5328cd4998ba26f7f487a1933d0a90f9225a4fb88a39836d5a6dfd5df2c8077901ef52 WHIRLPOOL 926805c7df2f92351b2f179489b2ed12e78543800d962d4117a1cc038fd1a0240b10c03a8474d51912d41d81cbffd5bd8671821f4ca1193a12e16ea0a4eaf408
-EBUILD netbeans-javafx-9999_p20160603.ebuild 4717 SHA256 ab20d26451be5be774aa0217219c8b78899887da151c300a23f762548830460f SHA512 1051f4c454732bbadd9fc1b0cbcdd31fa5c97619b33475fc41206a2ef00b4de1d20aa96b8a57872df0bdd55cb47813536eb5909f2afc18d770dfce13dbf6d23e WHIRLPOOL f06d21976c6c4ea93860d9a314061d5b47a4e1c2b10f3efac68f604d11316a017f027eeb2307cb62ab7b130fb85eef1812224db9c8fc6a47582578e35f4d22e9
 EBUILD netbeans-javafx-9999_p20160606.ebuild 4717 SHA256 654924b3685971f7acc5a59206e8f7f3d0ab8553ed7d2c061a06a99950e431af SHA512 61418be02ef17789176484606ab42a664529780fee1f05b06436a14a7817496d68677e1825771356b00b1e6e92114e60291efcee3efaba3f8223328fb667cf5d WHIRLPOOL d81cbddcb1df0504a09c3ac24ea05a75cce22f56062ca099cb73183470c041556fb00618972b91f8810e41a28e35d9f02610145f780f130957d2385414d48600
 EBUILD netbeans-javafx-9999_p20160607.ebuild 4717 SHA256 674118c62ee8bf9101a2982c73bb216135780d2533229eb7ae45ed8d18a30cdc SHA512 dde35268e052151da313a879bb1664f30448564fca03170e053d85a3a4505cda21c2be12d45752215a705f88e0db3944d804e21f992b2c3a481eac534e408d62 WHIRLPOOL b47c3d8f67fd9f8686af0db5521379831c4bf19e426a1bad06a6f6f7e3fb0e05c53b757090f372d6b22cc516d62709f64b1b8caf811ce47bda3e7dca84ccf2b6
 EBUILD netbeans-javafx-9999_p20160608.ebuild 4717 SHA256 7f90ba3d7cabd3c2e0e9fcd8a44bdc1cf1218976715c01b48b9bcf7bcd99a84c SHA512 621ce463a504088f1f4c607852b2e17046fbf3ccef351807e33d69bbdc7e015591ef483ab83073075be612473312b5a5f3451650f2d22f8c1ada56f7f587e9fc WHIRLPOOL 104d18baaab7a119aba34c0006787d9f2e9876e0bf387911ee7fb9ad336d4cb484aa3ff79656270863ef99d334a325294e4a4f6227c672f2d3ea452c008dbcc9

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160602.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160602.ebuild
deleted file mode 100644
index 9de746e..0000000
--- a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160602.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-06-02_00-02-33/zip/netbeans-trunk-nightly-201606020002-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-javafx/netbeans-javafx-9999_p20160603.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160603.ebuild
deleted file mode 100644
index 34dfee9..0000000
--- a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160603.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-06-03_00-02-33/zip/netbeans-trunk-nightly-201606030002-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 f5dbe7e..566d84b 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -3,8 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-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-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
-DIST netbeans-trunk-nightly-201606030002-src.zip 213220744 SHA256 c90867dac6486f399b74933e9a771646dd5a288b94f41cf0b5c44f9cb9c911a7 SHA512 00cb8987fba28724277b070a177d3b008eff889cca0a98517b799a573dd79e8af083c19ca3243c079ff2c8e50a65c6649cdd0a8a5f282a756feb7e7b347791d4 WHIRLPOOL a8f2a23e4f1a92cb2305d7fdbe533173f8d66b5caaf0e7b63ef7427295b821301ac44d55bc0603cc5f4572d2cddd110e7ef35eb15600951468f67ff532730d27
 DIST netbeans-trunk-nightly-201606060002-src.zip 213364709 SHA256 1a79c71748ce658072b147847154a7c22df4666d3f5a7969d144e17e261a3a56 SHA512 024afad41bea8bdd4e8c557a46f836f0826bf5c2fe28bd5ac794c77825e9acc16c694fd823c2295a727c52710028b077c9436ecc7d97c97e20a894a80ff4b84c WHIRLPOOL eaa6191b5d80b7671045fd1f46b3fefd32382354d49e370eb1b590b2d8110cb4136e9a06b7fbc4b5d56d49d633266e23994860e96a2625980a26a1416dfabf47
 DIST netbeans-trunk-nightly-201606070002-src.zip 213362540 SHA256 c75366669710c7a350710285f5fe420a60739fd03fb00b1a1c597c604917a6ee SHA512 72e0b0bc2e387e9d3d5fff28dbd04c6a9ca4d857b9fa65a001b717913d5cf7d1fc2d37e7a270a5b3a7839a9ade61ffacbbbec406709da133639c819dda71e9aa WHIRLPOOL bdd02855a99902180a54981e24012c66357f739679046757e81d811052704a2ab2cf68f3da2c963aaf360c621e4d816ddff1dfe14d3034151d296adf0803251f
 DIST netbeans-trunk-nightly-201606080002-src.zip 216271844 SHA256 d4a75eb5aa2b3b0abc7efc2bbaffd105ea0002b00b2b4d87b2c1b563c8804f88 SHA512 96ad8c01d3323a1ce22eb18fb3b66e5b0bd6467a2fbafcb213af1bb4e19de7c3aa8ded83bd877b408fb883d7f2b0c228f0f56253f1941435d82920f59961e889 WHIRLPOOL ead7f333cd600b2c334021f21ccb1b808be6afbac4d024f11ba173d5feab44fae87516cd7d19794e1fd429121d78f39663b14ea04bbbf4150338467feef8de88
@@ -28,8 +26,6 @@ DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b89
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 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_p20160602.ebuild 4412 SHA256 9cab13f457b62c8879c3af8b6b261fabcc78fb5352ad23e876f17d16becc6b0c SHA512 18af0983b9ca44ce014225becc8e2ed4e986c6497517033eea29616bc3ae398a83ef0c76415ffb74cc8d08cb3b30e7047a5959ac1b5ef39b682c1654dd949006 WHIRLPOOL 16dac895c75d51d5b3c0e711d55eebcedb09c852f1670b297081ca81d311a38455ef5eabc5c4c90e0ad05c4a13ce93cc32e5825d8855bfc26279f78c3645fad4
-EBUILD netbeans-mobility-9999_p20160603.ebuild 4412 SHA256 640d6b27f3664c2851c6b2fa8ccc7a6a1f204f3af940123284e6f90007e68d37 SHA512 9e3e0aff5b332e982b58046415d25caf47a6a3b4f25de34b94a402358c5bff69024d8f6a5b9292609605337709f29ea7ba9801e4eedb57ed8d6ca7f893fca6d5 WHIRLPOOL 3aead76a02d3a89b6372ccc59403a9cb3d65e2a4863145ad8bcc4c5baf0fe22ec11d30a4b0956787b867c3d67b94da755932e162868e5067313819df57010eb7
 EBUILD netbeans-mobility-9999_p20160606.ebuild 4412 SHA256 e1ca74ce252f1feba95a8b88d262ae1eb577b0f8586e27f657306e0d7bd2f2bf SHA512 896307af7e958ff257322f1f65e5f1ffdd999ea24be7458df22d68e868e18052854059a65bd56ed541b9bf9fbcf5372e92365cfd887e846308bd9c0e08f36f4f WHIRLPOOL 166ac944fb10a1c753696e68f03d0c4f34709792b9bfaffbbf6124d0583d7c1c0b5aa35998480e96b43b6982684676e3df8e8813a1f9bd2b409c46c120e0b3f1
 EBUILD netbeans-mobility-9999_p20160607.ebuild 4412 SHA256 b67f72bfa569961ab80ea9cad5fbddec5e865f3e7e91ff048df8399266305a1f SHA512 c125a8b698e9ab712494870e943789a6a2ea9dee7b8fdf10a862f7e4b3d3ce4bb599f51732b98436d542d282487dcf15ffbadee1e14f9edadba36ac2dbf49380 WHIRLPOOL 948c2dfefdcbd1d26590971275f1b8da8a2fa790ac170863d70975c181db1b19fd8199484ad5bf47e1c6411c055fffabc8d48f2db2a509a1d2df9a51e3391f83
 EBUILD netbeans-mobility-9999_p20160608.ebuild 4412 SHA256 3d19fdcc7ed73784253915553d3eb23bcbd19905c1cc1527548211e3a70098ca SHA512 59f25d1d66f2103efc0ded92c829fb20651b04ea3d70457fe23736014e5c29e9d05cea603ee0d808305b2351e3f607ebee2d01349cb7a79c238f025d2961b2c6 WHIRLPOOL d6303dff540a67a187afc3cdc3f938f1b11439f13aea24312d36bc60206121b60dfd531d8417945b928753b1c5896e5215cfe198f854428ce6eb155e2e42a12a

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160602.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160602.ebuild
deleted file mode 100644
index 3e96290..0000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160602.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-06-02_00-02-33/zip/netbeans-trunk-nightly-201606020002-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-mobility/netbeans-mobility-9999_p20160603.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160603.ebuild
deleted file mode 100644
index 6fbab0d..0000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160603.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-06-03_00-02-33/zip/netbeans-trunk-nightly-201606030002-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 575d444..1e614f1 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -6,8 +6,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-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-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
-DIST netbeans-trunk-nightly-201606030002-src.zip 213220744 SHA256 c90867dac6486f399b74933e9a771646dd5a288b94f41cf0b5c44f9cb9c911a7 SHA512 00cb8987fba28724277b070a177d3b008eff889cca0a98517b799a573dd79e8af083c19ca3243c079ff2c8e50a65c6649cdd0a8a5f282a756feb7e7b347791d4 WHIRLPOOL a8f2a23e4f1a92cb2305d7fdbe533173f8d66b5caaf0e7b63ef7427295b821301ac44d55bc0603cc5f4572d2cddd110e7ef35eb15600951468f67ff532730d27
 DIST netbeans-trunk-nightly-201606060002-src.zip 213364709 SHA256 1a79c71748ce658072b147847154a7c22df4666d3f5a7969d144e17e261a3a56 SHA512 024afad41bea8bdd4e8c557a46f836f0826bf5c2fe28bd5ac794c77825e9acc16c694fd823c2295a727c52710028b077c9436ecc7d97c97e20a894a80ff4b84c WHIRLPOOL eaa6191b5d80b7671045fd1f46b3fefd32382354d49e370eb1b590b2d8110cb4136e9a06b7fbc4b5d56d49d633266e23994860e96a2625980a26a1416dfabf47
 DIST netbeans-trunk-nightly-201606070002-src.zip 213362540 SHA256 c75366669710c7a350710285f5fe420a60739fd03fb00b1a1c597c604917a6ee SHA512 72e0b0bc2e387e9d3d5fff28dbd04c6a9ca4d857b9fa65a001b717913d5cf7d1fc2d37e7a270a5b3a7839a9ade61ffacbbbec406709da133639c819dda71e9aa WHIRLPOOL bdd02855a99902180a54981e24012c66357f739679046757e81d811052704a2ab2cf68f3da2c963aaf360c621e4d816ddff1dfe14d3034151d296adf0803251f
 DIST netbeans-trunk-nightly-201606080002-src.zip 216271844 SHA256 d4a75eb5aa2b3b0abc7efc2bbaffd105ea0002b00b2b4d87b2c1b563c8804f88 SHA512 96ad8c01d3323a1ce22eb18fb3b66e5b0bd6467a2fbafcb213af1bb4e19de7c3aa8ded83bd877b408fb883d7f2b0c228f0f56253f1941435d82920f59961e889 WHIRLPOOL ead7f333cd600b2c334021f21ccb1b808be6afbac4d024f11ba173d5feab44fae87516cd7d19794e1fd429121d78f39663b14ea04bbbf4150338467feef8de88
@@ -31,8 +29,6 @@ DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b89
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 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_p20160602.ebuild 4111 SHA256 7f4ce60bf8856117c7540eb74b3cec16e9b9895908e545192ed2dff7172e5b00 SHA512 43561ecdade3bc16fcbcbd7368721841014e3928823f6ebac6e3a36ef0bd21ff8fc083cdc22cd7745ad470a30fa41624146cd015f80ff172eeb91fe2097237f2 WHIRLPOOL d505738ec13725696e6e7ed1136ff5d5e7dd7dcb7857d42e9fd989489d476d04552474318f1b7b497d9ae7038fc6c2dba22d888d88fe83596585f5fb0671a394
-EBUILD netbeans-nb-9999_p20160603.ebuild 4111 SHA256 a1cea0ba15b462dc5f2639d434e71c9bc12444b588f57e91c3d7ee5902479ad7 SHA512 a9e80a95a241e48f6b50c0e42511886518456ce7e4f5c71099158f91b0ba48c633db934310d5c15e08333b4fe1840f92022a6006c8dd6135b74f9c061fd856b0 WHIRLPOOL 3cca997c01c81b13c7286ede54e12c429891c0e5edbd96d13f6154acdea696d146e6a1a862f167d30250e1289e573e1de881f669214d2e4b720dab74cfed0c3a
 EBUILD netbeans-nb-9999_p20160606.ebuild 4111 SHA256 70b15b899bc4fd8e8add5cc0d2bfaa48cdddf360a0efb399d504fd5c86926451 SHA512 b4330dd0bc0c907e55c2b00e5d4722b664d833d66c408d60b76c9f35dc6ce896b418271ed95fd8c2b83c9c4c6df759fea438bab7e203f99e7127810356490375 WHIRLPOOL baa1a26dbc6499b96349dadd33467ec2752be83a8458d95cf0894b750601edd36acddee6141bbbe8eb1e95d4ada17ff3900273cf45b2cb02b7b8e95c89455620
 EBUILD netbeans-nb-9999_p20160607.ebuild 4111 SHA256 988e90a1f6c89f7fd2e830065871a1ee90e728180fa04502bab5738facfc39bf SHA512 70306777829fbefbf0b2fe9de32ca9615a43e49681abdad838cce801553eda4673331abe8105731e3364343d42609e0800a48294e646264ed13896d33edcf00d WHIRLPOOL 39bb1ffcebb41908154bb3e9a9188775460798f6ec316c82e7efc386dde068543476f03b35dfb267bb3a39306dc9273585c2f8526c3e7261f63d39d51b268e16
 EBUILD netbeans-nb-9999_p20160608.ebuild 4111 SHA256 5fd3119be3cadb3a5d672145fbca1810838e3b79142412f49d5742466d5a5b7d SHA512 53a15b3837ff7e45a1213a9ab848b1dad33e3835bc2b7ebff0745ef07cb0fa37fe34976bc2f6ae47973529fd96f026b3b3590db067bd447d6cdaf01e687ac5e3 WHIRLPOOL 199f19719588961950db54da73c3fae2433d2fb67e9158a33276298b5553e8f574cf498bd1f9c130b653b9932d65a3eee6701fde7fdd07453dd6509d02fb7b6b

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160602.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160602.ebuild
deleted file mode 100644
index 067e76d..0000000
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20160602.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-06-02_00-02-33/zip/netbeans-trunk-nightly-201606020002-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-nb/netbeans-nb-9999_p20160603.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160603.ebuild
deleted file mode 100644
index 29de680..0000000
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20160603.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-06-03_00-02-33/zip/netbeans-trunk-nightly-201606030002-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 b49da5d..e129fa2 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -8,8 +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-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
-DIST netbeans-trunk-nightly-201606030002-src.zip 213220744 SHA256 c90867dac6486f399b74933e9a771646dd5a288b94f41cf0b5c44f9cb9c911a7 SHA512 00cb8987fba28724277b070a177d3b008eff889cca0a98517b799a573dd79e8af083c19ca3243c079ff2c8e50a65c6649cdd0a8a5f282a756feb7e7b347791d4 WHIRLPOOL a8f2a23e4f1a92cb2305d7fdbe533173f8d66b5caaf0e7b63ef7427295b821301ac44d55bc0603cc5f4572d2cddd110e7ef35eb15600951468f67ff532730d27
 DIST netbeans-trunk-nightly-201606060002-src.zip 213364709 SHA256 1a79c71748ce658072b147847154a7c22df4666d3f5a7969d144e17e261a3a56 SHA512 024afad41bea8bdd4e8c557a46f836f0826bf5c2fe28bd5ac794c77825e9acc16c694fd823c2295a727c52710028b077c9436ecc7d97c97e20a894a80ff4b84c WHIRLPOOL eaa6191b5d80b7671045fd1f46b3fefd32382354d49e370eb1b590b2d8110cb4136e9a06b7fbc4b5d56d49d633266e23994860e96a2625980a26a1416dfabf47
 DIST netbeans-trunk-nightly-201606070002-src.zip 213362540 SHA256 c75366669710c7a350710285f5fe420a60739fd03fb00b1a1c597c604917a6ee SHA512 72e0b0bc2e387e9d3d5fff28dbd04c6a9ca4d857b9fa65a001b717913d5cf7d1fc2d37e7a270a5b3a7839a9ade61ffacbbbec406709da133639c819dda71e9aa WHIRLPOOL bdd02855a99902180a54981e24012c66357f739679046757e81d811052704a2ab2cf68f3da2c963aaf360c621e4d816ddff1dfe14d3034151d296adf0803251f
 DIST netbeans-trunk-nightly-201606080002-src.zip 216271844 SHA256 d4a75eb5aa2b3b0abc7efc2bbaffd105ea0002b00b2b4d87b2c1b563c8804f88 SHA512 96ad8c01d3323a1ce22eb18fb3b66e5b0bd6467a2fbafcb213af1bb4e19de7c3aa8ded83bd877b408fb883d7f2b0c228f0f56253f1941435d82920f59961e889 WHIRLPOOL ead7f333cd600b2c334021f21ccb1b808be6afbac4d024f11ba173d5feab44fae87516cd7d19794e1fd429121d78f39663b14ea04bbbf4150338467feef8de88
@@ -33,8 +31,6 @@ DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b89
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 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_p20160602.ebuild 4418 SHA256 c651c0408d6fa0b9cee0fde33975d4b94ee24cba36ec0dd1e03221d962185c8c SHA512 5afab0cd329177c51dde78ba2eb6e90a15df8759add25a1b19bed90f9ed6dea30e0c3a62474ecbce67f1199c8ee0f4c1ce028b5ca13097a52b7afaab666f96df WHIRLPOOL 6f1f4b1578531338867502381aa6dc898cabfebf4cad40f0ee0e103ed80780f0cde7ce4da3ccb49a52ac48235deefdef73a1dd6a7ce7f728963a71dd52bb0f97
-EBUILD netbeans-php-9999_p20160603.ebuild 4418 SHA256 93fbf55773dad79c113d8f272f89611f32d973fd55c79058ebfdc8fe3a7bb302 SHA512 15da6d30984e9425aaa0a95b08950a0513a4bdaf890ae6a20979dd5da4f069490b88661b6e8bdc6315aeeb1fa5a3156afc01f09ce8dff9087db2ed09a739fb63 WHIRLPOOL ff21e35964a987b2ab6bd2461caaf24adbba1800d9bdd6f6d2fbaf13e5fe1fed379051b3646d89843c52fe6f533825ea57c535cf4000ab3c4e0c5262b02568be
 EBUILD netbeans-php-9999_p20160606.ebuild 4418 SHA256 bfb5b207aee5d8c75f0343bbbc674270b99d38a2cb740625c3378bda3d4ea3dc SHA512 7635ea777cd143f8b57aeca840939f6636cf34ac8ecaca0866db7f14e25de554190b780dbfa336bf43979e9c2dc57d74341491a2697ae7e54682f81cb251d2b0 WHIRLPOOL c3f786e48e55978b6637b49710973efe12481cb7082d9693d351d06f4f7df91eaf4fd0fc5dbec5484189d506cdca5795b2d812f241943ddde6c3f744db9feb08
 EBUILD netbeans-php-9999_p20160607.ebuild 4418 SHA256 03ebfc4a3120e56781c7256a3df228787d2ff80869c1082a7936ef5d89f79c02 SHA512 fca3971a0f510f4496b016205185f360471152cb35bc67c0c1c97ca377db54b93127c40679f98ed6df3c105630b0d30a6b3648c6d751e9586af9d6afc7d9769e WHIRLPOOL ad849124d624c0934e21458e3e489226d0f1d4b598b4f1d54c64e81f9724d5749050bab03bc6e805fe43d729abe5bb9b8f1be679dc79dce4d65737b919b148bd
 EBUILD netbeans-php-9999_p20160608.ebuild 4418 SHA256 8d7c3e6ed933c5d6a602d72c8769b9053e68c5da97079eaca8f4da3f2ce670f7 SHA512 0131fa5880bfb5c44f3ee9901099c27fd7cf19f7378c2bcb8e4aaf84308d9ec55250e99233e1922e6d86049651ca53df88613c0db43ec0cfe40697011af6bdfa WHIRLPOOL de33340f3ede0526d21dff7ee55de0e141843f9dd15f0260711d11518dfa8e376991f2154bd8927976e58bf899ea781fa86dba30e9c72efe3395f533a27acb66

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160602.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160602.ebuild
deleted file mode 100644
index f4bbac4..0000000
--- a/dev-java/netbeans-php/netbeans-php-9999_p20160602.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-06-02_00-02-33/zip/netbeans-trunk-nightly-201606020002-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-php/netbeans-php-9999_p20160603.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160603.ebuild
deleted file mode 100644
index b5a3a14..0000000
--- a/dev-java/netbeans-php/netbeans-php-9999_p20160603.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-06-03_00-02-33/zip/netbeans-trunk-nightly-201606030002-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 d06fc15..b3ee7cc 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -29,8 +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-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
-DIST netbeans-trunk-nightly-201606030002-src.zip 213220744 SHA256 c90867dac6486f399b74933e9a771646dd5a288b94f41cf0b5c44f9cb9c911a7 SHA512 00cb8987fba28724277b070a177d3b008eff889cca0a98517b799a573dd79e8af083c19ca3243c079ff2c8e50a65c6649cdd0a8a5f282a756feb7e7b347791d4 WHIRLPOOL a8f2a23e4f1a92cb2305d7fdbe533173f8d66b5caaf0e7b63ef7427295b821301ac44d55bc0603cc5f4572d2cddd110e7ef35eb15600951468f67ff532730d27
 DIST netbeans-trunk-nightly-201606060002-src.zip 213364709 SHA256 1a79c71748ce658072b147847154a7c22df4666d3f5a7969d144e17e261a3a56 SHA512 024afad41bea8bdd4e8c557a46f836f0826bf5c2fe28bd5ac794c77825e9acc16c694fd823c2295a727c52710028b077c9436ecc7d97c97e20a894a80ff4b84c WHIRLPOOL eaa6191b5d80b7671045fd1f46b3fefd32382354d49e370eb1b590b2d8110cb4136e9a06b7fbc4b5d56d49d633266e23994860e96a2625980a26a1416dfabf47
 DIST netbeans-trunk-nightly-201606070002-src.zip 213362540 SHA256 c75366669710c7a350710285f5fe420a60739fd03fb00b1a1c597c604917a6ee SHA512 72e0b0bc2e387e9d3d5fff28dbd04c6a9ca4d857b9fa65a001b717913d5cf7d1fc2d37e7a270a5b3a7839a9ade61ffacbbbec406709da133639c819dda71e9aa WHIRLPOOL bdd02855a99902180a54981e24012c66357f739679046757e81d811052704a2ab2cf68f3da2c963aaf360c621e4d816ddff1dfe14d3034151d296adf0803251f
 DIST netbeans-trunk-nightly-201606080002-src.zip 216271844 SHA256 d4a75eb5aa2b3b0abc7efc2bbaffd105ea0002b00b2b4d87b2c1b563c8804f88 SHA512 96ad8c01d3323a1ce22eb18fb3b66e5b0bd6467a2fbafcb213af1bb4e19de7c3aa8ded83bd877b408fb883d7f2b0c228f0f56253f1941435d82920f59961e889 WHIRLPOOL ead7f333cd600b2c334021f21ccb1b808be6afbac4d024f11ba173d5feab44fae87516cd7d19794e1fd429121d78f39663b14ea04bbbf4150338467feef8de88
@@ -54,8 +52,6 @@ DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b89
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 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_p20160602.ebuild 9520 SHA256 04e640511e43fafd79faf71c2603422e283da09e715d6b70658d157b2ea65352 SHA512 3903d54f86fa9c692468e0ed33a5120932abb2ba6a3b9ef7ba1c7a730226f11304d2139d780c9b35b8a1258fd108ca4caad9c04b166586eabbcb542ee15981a2 WHIRLPOOL c866345f84cef66a97a31262f286fb59f228e948f752d013c1747b20ee2e7c5d054486c0b18a1bc435c311d107b54fd3bd976f48a8194be373b820d00cec8d85
-EBUILD netbeans-platform-9999_p20160603.ebuild 9520 SHA256 66b2eac4b37c99c2c878372bcec818c08f3e51046c0f466502e5a9f798414ced SHA512 ff9df7ce2e6c73aeb653bebaedf42c1a17f410f60b33fc3e0d1b503eaa47b426f4e107a8b8fe622010f8bf843c4499d8cd8299e18e17013117a6ad718544e974 WHIRLPOOL 8259bbd9e943d098e61529b3961ad4efea2517e2035aed273411234cf805ccb8c997cab1169170fdaccc94cc1522d124c397ee7667eb95688f7ae6e798d3cc55
 EBUILD netbeans-platform-9999_p20160606.ebuild 9520 SHA256 044800ebb01df778ead5d4e05e05e6c0dd5faf3a172d3c7b0681ab12d9dd7eb6 SHA512 e4cd8819042ab15906ebda8e92314091e09ef7b0a3f1b538310af34739c94217033a76707a71def3debdb0b45f832b2b107357a443be4e2b00b103990a9256b5 WHIRLPOOL 80d65b32865a339937332ba0afe75c2b481bcde562f7ec40ace207d39b007e2eda423afb0de34a24237cd10182d06b027d1ac91f3e65bb0ba12e581557655f8f
 EBUILD netbeans-platform-9999_p20160607.ebuild 9520 SHA256 938f64d952797879990b4c055e3710a27958b9c598f7e81d465412657ba522bd SHA512 37c74817cb369ce70ff73654503cd68b605847e789bef7371b8e7adbf0f952bb5910a5cf78c1782a47a28abd6687355b5100535da1454313d06ac75f27c1d8b5 WHIRLPOOL 374db230d02e437af1f42a75643b5f6eb2b8b56a83a5fd5b157645d776466f075fa2f2b59a8c218a7a5916cacdb9df448268b95eef46947c358908bfbf6f6d8c
 EBUILD netbeans-platform-9999_p20160608.ebuild 9520 SHA256 ae0d07628ba99b8640d78f42e66aee6cc7918104fae579ce73189bdc42005eac SHA512 d839c53e0c0e5e84069446b7c2a3f869f680e790a443c70c6a66faea06e82a7999b68eee481fbaba7e3efebd7c0ee02118f379c660720e76943ba8c5a6f96237 WHIRLPOOL 26e606a846807e790a03d71b844ba5c76551f7417cd9c0ac62bc3007918c2d6c4da06b7395dd24cc175092a36e69374048156ca29397adb97719864deed798fb

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160602.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160602.ebuild
deleted file mode 100644
index a14cdd7..0000000
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20160602.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-06-02_00-02-33/zip/netbeans-trunk-nightly-201606020002-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-platform/netbeans-platform-9999_p20160603.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160603.ebuild
deleted file mode 100644
index 0972707..0000000
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20160603.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-06-03_00-02-33/zip/netbeans-trunk-nightly-201606030002-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 15041ac..7327f71 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -3,8 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-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-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
-DIST netbeans-trunk-nightly-201606030002-src.zip 213220744 SHA256 c90867dac6486f399b74933e9a771646dd5a288b94f41cf0b5c44f9cb9c911a7 SHA512 00cb8987fba28724277b070a177d3b008eff889cca0a98517b799a573dd79e8af083c19ca3243c079ff2c8e50a65c6649cdd0a8a5f282a756feb7e7b347791d4 WHIRLPOOL a8f2a23e4f1a92cb2305d7fdbe533173f8d66b5caaf0e7b63ef7427295b821301ac44d55bc0603cc5f4572d2cddd110e7ef35eb15600951468f67ff532730d27
 DIST netbeans-trunk-nightly-201606060002-src.zip 213364709 SHA256 1a79c71748ce658072b147847154a7c22df4666d3f5a7969d144e17e261a3a56 SHA512 024afad41bea8bdd4e8c557a46f836f0826bf5c2fe28bd5ac794c77825e9acc16c694fd823c2295a727c52710028b077c9436ecc7d97c97e20a894a80ff4b84c WHIRLPOOL eaa6191b5d80b7671045fd1f46b3fefd32382354d49e370eb1b590b2d8110cb4136e9a06b7fbc4b5d56d49d633266e23994860e96a2625980a26a1416dfabf47
 DIST netbeans-trunk-nightly-201606070002-src.zip 213362540 SHA256 c75366669710c7a350710285f5fe420a60739fd03fb00b1a1c597c604917a6ee SHA512 72e0b0bc2e387e9d3d5fff28dbd04c6a9ca4d857b9fa65a001b717913d5cf7d1fc2d37e7a270a5b3a7839a9ade61ffacbbbec406709da133639c819dda71e9aa WHIRLPOOL bdd02855a99902180a54981e24012c66357f739679046757e81d811052704a2ab2cf68f3da2c963aaf360c621e4d816ddff1dfe14d3034151d296adf0803251f
 DIST netbeans-trunk-nightly-201606080002-src.zip 216271844 SHA256 d4a75eb5aa2b3b0abc7efc2bbaffd105ea0002b00b2b4d87b2c1b563c8804f88 SHA512 96ad8c01d3323a1ce22eb18fb3b66e5b0bd6467a2fbafcb213af1bb4e19de7c3aa8ded83bd877b408fb883d7f2b0c228f0f56253f1941435d82920f59961e889 WHIRLPOOL ead7f333cd600b2c334021f21ccb1b808be6afbac4d024f11ba173d5feab44fae87516cd7d19794e1fd429121d78f39663b14ea04bbbf4150338467feef8de88
@@ -28,8 +26,6 @@ DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b89
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 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_p20160602.ebuild 3472 SHA256 b246204a0d12311afb9c026fd7e541c25a95fcf468a73a14702afa4a214c21da SHA512 24ec9f99d1543d907b49041b0b5d8fa193c49e9c7cb31d08b35fdf2688f6d6c670f073045bde18e313b67ef41188cafea0a050fb25b2bf0a844d62992866255b WHIRLPOOL 28881dc2f67f104704ef73536d5c76794a0e32a9660188b61aa7edd2be7ced51fd10f2e866c59f57b434379bbd6bf0b901cbf2dca6a8116bf45e5fad496baf2b
-EBUILD netbeans-profiler-9999_p20160603.ebuild 3472 SHA256 4270ae5e55a178e2188f887957670f0cdcaed12a755d2928eb0bef03312806ef SHA512 b5882595fb70c0ba57be45a5bded4c2cdc82193c5c5dff1dbdda550a56f13432cdb67ee8579f1d6088d819df5d0f83c9b5e3dd7fe5d6169248f9bdac719fd8af WHIRLPOOL 32b5b0008ce2c78aeecd9fb8b4b0aa2a6a508d9290586389e46463b9d7bf9a08e72f35dbf5675b318fa3de2b79b0be1032371603b8be2eb651a2c70f1c411ed6
 EBUILD netbeans-profiler-9999_p20160606.ebuild 3472 SHA256 ab6942ae90acf230d05a564c4d33730cdf4feeae669729bb0bf50743e27f0383 SHA512 38c96a84403b45a52f1a7b7844447376a0dec6d36ffc36485a802e26bd17611c38ce855e08ce69e350b7b45b2945e2821b5cc5bf5a66615a81be07147c927982 WHIRLPOOL 8ab6257be14ecefb7dad28ad6803917dc44ff7f0c2f4ebb31aa848fdb076210de11e585e58060326c4f16fdc2f7c555f220168572a999e04da279e9213e350ab
 EBUILD netbeans-profiler-9999_p20160607.ebuild 3472 SHA256 51e2f8c3766a0ad240b91bd097bb50106daf30b2067ac57d11d49f49290c806e SHA512 48ab5457387ce1179dea5cc6a7c924136dce9ac3c9454b830bb1271f06ac1708c1437d8d270c07a4b4e80d0d60cbfe81b5be8d4cd60354e66c4dd1abf5b724d8 WHIRLPOOL ae235a7ff0b7ac168b783bc8574dbab916e25d69a8253501c2d92075b8e0c4b2274a1f302d951438bfe41b36c8ea7ad00e82c8c805ade87d0247e323228997c3
 EBUILD netbeans-profiler-9999_p20160608.ebuild 3472 SHA256 2d23aeb9efa1887cc8a6f4e066f2fcdd62d074a791d3e7c004e8e76735f84a8a SHA512 2d0826939aa3a2287b4a8302e8853eec41fd4381670f011f77fd96ac509114a1f4d5e1efc66da74c77dbe799edf052bc4b34d4ab8cfdb2386c86c9d7743236c2 WHIRLPOOL ef43378f42efdd607bf202c36ab914791e8734a96285c10f53a64c6098909853dddb9d57be8e243d5ce41ffcb85357490729f67deed0e25ee8268ab6949eeed6

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160602.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160602.ebuild
deleted file mode 100644
index 2718149..0000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160602.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-06-02_00-02-33/zip/netbeans-trunk-nightly-201606020002-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-profiler/netbeans-profiler-9999_p20160603.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160603.ebuild
deleted file mode 100644
index e2734a7..0000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160603.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-06-03_00-02-33/zip/netbeans-trunk-nightly-201606030002-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 8a3e6d6..b9b0657 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -27,8 +27,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-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
-DIST netbeans-trunk-nightly-201606030002-src.zip 213220744 SHA256 c90867dac6486f399b74933e9a771646dd5a288b94f41cf0b5c44f9cb9c911a7 SHA512 00cb8987fba28724277b070a177d3b008eff889cca0a98517b799a573dd79e8af083c19ca3243c079ff2c8e50a65c6649cdd0a8a5f282a756feb7e7b347791d4 WHIRLPOOL a8f2a23e4f1a92cb2305d7fdbe533173f8d66b5caaf0e7b63ef7427295b821301ac44d55bc0603cc5f4572d2cddd110e7ef35eb15600951468f67ff532730d27
 DIST netbeans-trunk-nightly-201606060002-src.zip 213364709 SHA256 1a79c71748ce658072b147847154a7c22df4666d3f5a7969d144e17e261a3a56 SHA512 024afad41bea8bdd4e8c557a46f836f0826bf5c2fe28bd5ac794c77825e9acc16c694fd823c2295a727c52710028b077c9436ecc7d97c97e20a894a80ff4b84c WHIRLPOOL eaa6191b5d80b7671045fd1f46b3fefd32382354d49e370eb1b590b2d8110cb4136e9a06b7fbc4b5d56d49d633266e23994860e96a2625980a26a1416dfabf47
 DIST netbeans-trunk-nightly-201606070002-src.zip 213362540 SHA256 c75366669710c7a350710285f5fe420a60739fd03fb00b1a1c597c604917a6ee SHA512 72e0b0bc2e387e9d3d5fff28dbd04c6a9ca4d857b9fa65a001b717913d5cf7d1fc2d37e7a270a5b3a7839a9ade61ffacbbbec406709da133639c819dda71e9aa WHIRLPOOL bdd02855a99902180a54981e24012c66357f739679046757e81d811052704a2ab2cf68f3da2c963aaf360c621e4d816ddff1dfe14d3034151d296adf0803251f
 DIST netbeans-trunk-nightly-201606080002-src.zip 216271844 SHA256 d4a75eb5aa2b3b0abc7efc2bbaffd105ea0002b00b2b4d87b2c1b563c8804f88 SHA512 96ad8c01d3323a1ce22eb18fb3b66e5b0bd6467a2fbafcb213af1bb4e19de7c3aa8ded83bd877b408fb883d7f2b0c228f0f56253f1941435d82920f59961e889 WHIRLPOOL ead7f333cd600b2c334021f21ccb1b808be6afbac4d024f11ba173d5feab44fae87516cd7d19794e1fd429121d78f39663b14ea04bbbf4150338467feef8de88
@@ -52,8 +50,6 @@ DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b89
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 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_p20160602.ebuild 5343 SHA256 9c1c1ac6b16eaaf3b856278abd1d37da33d43526f16845594b6d38b87e4bc6fb SHA512 afc034ab72d4874c1794136e1b868692d327940984ee8e0a1020be63982049e6780054e1aaa54e22b8824c79187b37123594737ac6dfa26e72e604665ab1150e WHIRLPOOL 87dd5858be45af4cf3c87255c7640f47eaf727b40223d0b15e3994d5fac6f15be74e3ec390f06fde23f94f79abe77993df9a748b4de08ea5837754b0bf36e28d
-EBUILD netbeans-webcommon-9999_p20160603.ebuild 5343 SHA256 f801ad849a76e95efb96794ba00c2bd1db2a52fa3ed3e324e693770a7459d717 SHA512 b929a0d322ea62667202853a32e0b7c5c07182d7e6c83909cb812d5eb9fbf82b7e895abcba0f7ab9c2c1cce76baf467409cc50466ab3a6885961e27f039777f4 WHIRLPOOL 42b123be43194dca9c5edb00ff0d9c70abeed6f90c15747cd2e325cb7467b602526430f9dd6fcf477b9cd9e734a0ccf12f6393fc3159ab958851220d70fc3c60
 EBUILD netbeans-webcommon-9999_p20160606.ebuild 5343 SHA256 3a18ef09edf6901a4e4c54d71341ab236c4f0711bce63bfc9e13997bf2a40eee SHA512 4fd4540fb289084b81c4ba7350c028afdb2178ed02734b948fd15ef2be8ee4c0b7a8b60d7717c0fd8d65fde44f8b69fa0925520b2867302d9a09e32af5181315 WHIRLPOOL f43a4287a80324b01c4b191b390c040b4bf4ae66ab6ddafe3c3dc8f35ea4ad357789cba9fb243010b8cc3769377342d32be0106eebebdda8744d070008653b3c
 EBUILD netbeans-webcommon-9999_p20160607.ebuild 5343 SHA256 c6b3d63e25622a9707a70656860e259d312ee39c5b9b7955d7a315a74f537f29 SHA512 1f9d2d74c72402db3126bafff002926730b012efb3145238d4676fedac190746e4fa621b4a8d28d6c00a7ae27a67f10e31b23357809ce161b92ecd41183c8db5 WHIRLPOOL 5b6a96c1758c8462b576e38ed6f2ca93ee7423646c7e745df19f404251faa1fb6decf0f13d2daa149a08851063c41405eb44a61acd2af1b9ae97226ad9b39f44
 EBUILD netbeans-webcommon-9999_p20160608.ebuild 5343 SHA256 88ff1007a330fe6bcb7d6b7c87b13a475abb7f7e399eef825177db11f005d889 SHA512 c01bbf7e3283d4c8800a944a0199723bd4b3a189170ccd1afcaab0a37c8760a91169e2a4c912fa07c259ce8c400fce5b23b547d0fdbf069d8f2561439d6b13da WHIRLPOOL c6dddaa233bd7112c834fb640078c1c2d1491b57cae29bc8ceed6438980a74bfac3e6cd180cc0c9e814a5ee481af1b16feb114354187372f292f2b9116ec9c4a

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160602.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160602.ebuild
deleted file mode 100644
index 22d669f..0000000
--- a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160602.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 Web Services Cluster"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-02_00-02-33/zip/netbeans-trunk-nightly-201606020002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar
-	http://hg.netbeans.org/binaries/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim
-	http://hg.netbeans.org/binaries/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}"/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}"/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-webcommon/netbeans-webcommon-9999_p20160603.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160603.ebuild
deleted file mode 100644
index 3871115..0000000
--- a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160603.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 Web Services Cluster"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-03_00-02-33/zip/netbeans-trunk-nightly-201606030002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar
-	http://hg.netbeans.org/binaries/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim
-	http://hg.netbeans.org/binaries/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}"/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}"/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 903a6dd..ace43ce 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -3,8 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-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-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
-DIST netbeans-trunk-nightly-201606030002-src.zip 213220744 SHA256 c90867dac6486f399b74933e9a771646dd5a288b94f41cf0b5c44f9cb9c911a7 SHA512 00cb8987fba28724277b070a177d3b008eff889cca0a98517b799a573dd79e8af083c19ca3243c079ff2c8e50a65c6649cdd0a8a5f282a756feb7e7b347791d4 WHIRLPOOL a8f2a23e4f1a92cb2305d7fdbe533173f8d66b5caaf0e7b63ef7427295b821301ac44d55bc0603cc5f4572d2cddd110e7ef35eb15600951468f67ff532730d27
 DIST netbeans-trunk-nightly-201606060002-src.zip 213364709 SHA256 1a79c71748ce658072b147847154a7c22df4666d3f5a7969d144e17e261a3a56 SHA512 024afad41bea8bdd4e8c557a46f836f0826bf5c2fe28bd5ac794c77825e9acc16c694fd823c2295a727c52710028b077c9436ecc7d97c97e20a894a80ff4b84c WHIRLPOOL eaa6191b5d80b7671045fd1f46b3fefd32382354d49e370eb1b590b2d8110cb4136e9a06b7fbc4b5d56d49d633266e23994860e96a2625980a26a1416dfabf47
 DIST netbeans-trunk-nightly-201606070002-src.zip 213362540 SHA256 c75366669710c7a350710285f5fe420a60739fd03fb00b1a1c597c604917a6ee SHA512 72e0b0bc2e387e9d3d5fff28dbd04c6a9ca4d857b9fa65a001b717913d5cf7d1fc2d37e7a270a5b3a7839a9ade61ffacbbbec406709da133639c819dda71e9aa WHIRLPOOL bdd02855a99902180a54981e24012c66357f739679046757e81d811052704a2ab2cf68f3da2c963aaf360c621e4d816ddff1dfe14d3034151d296adf0803251f
 DIST netbeans-trunk-nightly-201606080002-src.zip 216271844 SHA256 d4a75eb5aa2b3b0abc7efc2bbaffd105ea0002b00b2b4d87b2c1b563c8804f88 SHA512 96ad8c01d3323a1ce22eb18fb3b66e5b0bd6467a2fbafcb213af1bb4e19de7c3aa8ded83bd877b408fb883d7f2b0c228f0f56253f1941435d82920f59961e889 WHIRLPOOL ead7f333cd600b2c334021f21ccb1b808be6afbac4d024f11ba173d5feab44fae87516cd7d19794e1fd429121d78f39663b14ea04bbbf4150338467feef8de88
@@ -28,8 +26,6 @@ DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b89
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 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_p20160602.ebuild 2721 SHA256 58e30da932c32e95754f0450b4afee41836ea8551411ea54205906b663263243 SHA512 dbfa90ffac9fc2bf28f1d9ae32f0699c3d5d56560766c2438fbd477d2a45bfb0774e690ddc9609d43f686c1faf26e8fffc660522478b2bc5afdac886243d2887 WHIRLPOOL 1ba0796772b3f1a22a1160d51a7c1f2b38f0d36b70cbef12e1c2cbe547236e5b15314edbfd4650d67614b44ec5c86f69bfef22ad04100705dfd2d64d068b3fa7
-EBUILD netbeans-websvccommon-9999_p20160603.ebuild 2721 SHA256 7bbd9106569ba0e12a3c230f68c6d48c5758fc8c57b74b0bda37c394b0953bb9 SHA512 77a0b6718ea6fa8df5a94f1250e9adeee06ab457b71db37ebba5e0dee765356c81c9496fc874d312f962baf9ba501c29839242f6a30c5fb49671b979538134e5 WHIRLPOOL 96122ba8b2dc773dc8e2dfd482878f6316077e2988e235cc28ad608bdf28bf87cff5a95e317f07f852691e4903210280f6db52ae16d2c7da88ac21a9c757e6c9
 EBUILD netbeans-websvccommon-9999_p20160606.ebuild 2721 SHA256 ecfeb506a4a1d704063d16534434eaaacd7380ec250448001f26b8ae03660be9 SHA512 525662a4f3e748a56dc65f9523d1aad183121b9a43d574cb5f721af320efde68ea685dcfac8866be22eae29890937b2cd9ce7a9ec03ca77b92a465a31009da9f WHIRLPOOL a350856c30916841b819c5317e6413f68572377ec17742910153b93a5e24aed297862031b5fc1e7656d1563affefffdd31213dd47bae2b01849e430f1e3fa9b1
 EBUILD netbeans-websvccommon-9999_p20160607.ebuild 2721 SHA256 979912485a5cd878fcb4dae04a5adc7a2705006704448daa7a2de3257524fb26 SHA512 f0bc633f6d9c62e5773ae9839f3bbe581b5c8c725e6fe64f7d955683c2567574c391b7a82778cacd02102a8a9fafb1aed8cd7b60053881a6e085519c7c610859 WHIRLPOOL 9e7154669f0a46cc8045550e22ab66d4496c66a7a66ef66ec9a096696ab4ea26e0c4b49792b3b90a2659d6f282885b0a9862c6200fd57f73e78e725e50734d20
 EBUILD netbeans-websvccommon-9999_p20160608.ebuild 2721 SHA256 3b7dd70b61c735180212ff44d2d882c04dc5784d45fc9146fd4aa0c1be587d00 SHA512 045d5aac47d3d3154f9bcde5236ce8c16528d6c30fd5ba414d0fda812855ad1bcc8f64350cc2064d302cdb33d61635f479ab94c184bd444a3912d30fe0c3022c WHIRLPOOL 61a4c1a0bbc3164fae0cb524904912ea5c3091bdb8e738270bc179a8cbe5c019ed0dd0bb32f43fb309895954a229efb5e727d069d50fe8b32ff15a40095134e1

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160602.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160602.ebuild
deleted file mode 100644
index 09bb191..0000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160602.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-06-02_00-02-33/zip/netbeans-trunk-nightly-201606020002-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-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160603.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160603.ebuild
deleted file mode 100644
index 72c090b..0000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160603.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-06-03_00-02-33/zip/netbeans-trunk-nightly-201606030002-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 a019ff0..e58cfa3 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -6,8 +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-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
-DIST netbeans-trunk-nightly-201606030002-src.zip 213220744 SHA256 c90867dac6486f399b74933e9a771646dd5a288b94f41cf0b5c44f9cb9c911a7 SHA512 00cb8987fba28724277b070a177d3b008eff889cca0a98517b799a573dd79e8af083c19ca3243c079ff2c8e50a65c6649cdd0a8a5f282a756feb7e7b347791d4 WHIRLPOOL a8f2a23e4f1a92cb2305d7fdbe533173f8d66b5caaf0e7b63ef7427295b821301ac44d55bc0603cc5f4572d2cddd110e7ef35eb15600951468f67ff532730d27
 DIST netbeans-trunk-nightly-201606060002-src.zip 213364709 SHA256 1a79c71748ce658072b147847154a7c22df4666d3f5a7969d144e17e261a3a56 SHA512 024afad41bea8bdd4e8c557a46f836f0826bf5c2fe28bd5ac794c77825e9acc16c694fd823c2295a727c52710028b077c9436ecc7d97c97e20a894a80ff4b84c WHIRLPOOL eaa6191b5d80b7671045fd1f46b3fefd32382354d49e370eb1b590b2d8110cb4136e9a06b7fbc4b5d56d49d633266e23994860e96a2625980a26a1416dfabf47
 DIST netbeans-trunk-nightly-201606070002-src.zip 213362540 SHA256 c75366669710c7a350710285f5fe420a60739fd03fb00b1a1c597c604917a6ee SHA512 72e0b0bc2e387e9d3d5fff28dbd04c6a9ca4d857b9fa65a001b717913d5cf7d1fc2d37e7a270a5b3a7839a9ade61ffacbbbec406709da133639c819dda71e9aa WHIRLPOOL bdd02855a99902180a54981e24012c66357f739679046757e81d811052704a2ab2cf68f3da2c963aaf360c621e4d816ddff1dfe14d3034151d296adf0803251f
 DIST netbeans-trunk-nightly-201606080002-src.zip 216271844 SHA256 d4a75eb5aa2b3b0abc7efc2bbaffd105ea0002b00b2b4d87b2c1b563c8804f88 SHA512 96ad8c01d3323a1ce22eb18fb3b66e5b0bd6467a2fbafcb213af1bb4e19de7c3aa8ded83bd877b408fb883d7f2b0c228f0f56253f1941435d82920f59961e889 WHIRLPOOL ead7f333cd600b2c334021f21ccb1b808be6afbac4d024f11ba173d5feab44fae87516cd7d19794e1fd429121d78f39663b14ea04bbbf4150338467feef8de88
@@ -31,8 +29,6 @@ DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b89
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 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_p20160602.ebuild 6939 SHA256 f815fb67bbefbcbad1a172661cae04b9548af39ce47890de00e04b0305357776 SHA512 4431c6fc931d5ec013eb8a8dbcbd2b084cd8e33974a79d0c1c6d2de58353f90476ec1f26c25ce3aa1e60f0bcf48a0f072e8d98d4c0b28034017430214a84b598 WHIRLPOOL ad33acabac5768259067b75f1236d580b5bbeb036de6cbc9c921a9ff2ed1fdf3d2893c7be6b593ebd9d73596a5a5bc6fcc9649fa26cbb0c350c4b85792c2b6bb
-EBUILD netbeans-9999_p20160603.ebuild 6939 SHA256 4bf817bf61d4c60562235ad02c7b9632c43aeb4ebb15be28afda198f7bf82666 SHA512 15816fcb207400229499bdde8738c25e130824651e5e1b75dae08f1715a365fe154c4048bc36232503af450700a1fcefcb09b6cf27e2a5467e54d3f1da848326 WHIRLPOOL fccfb4011188b88b03fde5351ca7e7cd1c862d111d19bd2ee8eecb3588e6ea63c5358d8113eb196558b9518fb34a2b47a767c67b0981c81a6375047532d45aee
 EBUILD netbeans-9999_p20160606.ebuild 6939 SHA256 24f08ce080db26b4b6c53547e843a8314879ff51d2480cd98e3ef1d9c1b273d9 SHA512 56f9fceed1491c48e02a9da8860a756fc7f38af248b293bb749a462b89b24be9b425acd575def82ff4999473b8137e7d61733fc2e5dae9736c87e5a390aba031 WHIRLPOOL 02e2ab66cf4d7cd75c18475b5ee5edffb29909f1f57950526385abb4310b8bcb5293b1dc8a35a5b3d746903beb7b4c88b2823524d9926f09ef82748a3081c456
 EBUILD netbeans-9999_p20160607.ebuild 6939 SHA256 47f312b3890500ab0eeff1f96d4b60d19317804ce7bed4a9fc812431289fe6e7 SHA512 06fe94e8b443816f0f31d7d8fb795760326acfa04797855e6ae788ca325276d8a13a401e9c256667bc332cafb52a57b23eff34b217276fc249d8937c1b8a9e98 WHIRLPOOL 704564843cf97d81b8370f312c2af9008ee24f6c8bded0e37b63c3371d5b7276ecf6ad34315ddeae770b778745cde0464b212b71aa91c6d1baa12670064fb220
 EBUILD netbeans-9999_p20160608.ebuild 6939 SHA256 36ac229d579e5354ab92d0504eeed8b49c7e96228b4300fb1670666f7206b0d8 SHA512 23c2ac195ec9d7f65a2b57a0950979df44061c3dd35903cf7e3960484cfa210fe22d51456763c7a32308d2c5c2ec91c862088063418fa8c03229950e324b89d9 WHIRLPOOL fd47013b386e7f303a23bb72745ae0a78c89a4511e0ce2eab778ba85d9b6f222d532376afcc88137ff67bb7fbab9c922f65d0d6ba30a663b4a94500785d9e084

diff --git a/dev-util/netbeans/netbeans-9999_p20160602.ebuild b/dev-util/netbeans/netbeans-9999_p20160602.ebuild
deleted file mode 100644
index 62ef65f..0000000
--- a/dev-util/netbeans/netbeans-9999_p20160602.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-06-02_00-02-33/zip/netbeans-trunk-nightly-201606020002-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
-}

diff --git a/dev-util/netbeans/netbeans-9999_p20160603.ebuild b/dev-util/netbeans/netbeans-9999_p20160603.ebuild
deleted file mode 100644
index cb0ec72..0000000
--- a/dev-util/netbeans/netbeans-9999_p20160603.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-06-03_00-02-33/zip/netbeans-trunk-nightly-201606030002-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
-}


                 reply	other threads:[~2016-07-03 14:44 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1467548109.f57f0261ca85ed09e6a809b31b9d8377118e361a.fordfrog@gentoo \
    --to=fordfrog@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox