public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-dlight/, dev-java/netbeans-profiler/, ...
@ 2016-07-17 21:58 Miroslav Šulc
  0 siblings, 0 replies; only message in thread
From: Miroslav Šulc @ 2016-07-17 21:58 UTC (permalink / raw
  To: gentoo-commits

commit:     f494ebae7af08f35f11c92d7092e91b6f02b8988
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 17 12:24:51 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Jul 17 12:24:51 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=f494ebae

netbeans: removed obsolete ebuilds

Package-Manager: portage-2.3.0

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 8454b12..5197752 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
@@ -31,7 +30,6 @@ DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6d
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
 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_p20160615.ebuild 3384 SHA256 de31ccbcdeeba9d8d40a157baa24b6dd6ca5225e548bea0a8cbe266f6d55d2f7 SHA512 22c669ec757606e538630f99d779c2bb36bc72776352a64a53446ab5cbad913851996e72edd770d58e5657a5805ea5a1b49c29bf4b3359c4c7085dbec3d229be WHIRLPOOL 3c9998371f14697acdc37052ab4b2046e2d9b25e2db3860fd4f901bef2c2f44c45ceeb01fc927bd0fe6d0a5f82423c9c713a10bfec73954e09e0d962f1713f9e
 EBUILD netbeans-apisupport-9999_p20160616.ebuild 3384 SHA256 bc49b6a8adc59bad429c2eb36d051e35f84001396efc0f0f408e283c74ed3a40 SHA512 90f065ec7fb3b165c2fde3a74a75a403e484fce94e1a06b1fedb213955177c8ef405289f6f9a4fa9b082ad00ac8ff3918c4c5c7eb2cd6e0789cc72db844bbc78 WHIRLPOOL 5d754d206a00ea0688b06d70711d91a9e4a3f342f27f846e46810c8cb5c1af60a2956bc0c838b84c9ecdc1f36d0bc897f2a5f811897290a5ada6f8298ab38129
 EBUILD netbeans-apisupport-9999_p20160617.ebuild 3384 SHA256 a5b5da4b2f4bbac2539b0c0ef9f57e8a7db48468102979be697a9e73573570da SHA512 9d57fdb21863821bc5115d8dffb776045e752f2f74ecbd1db29cc377e21f29ed5a3c7b8e469e0b7532d1218eb75e7d25ed1f95cc680785cee64486ed1e7cb60b WHIRLPOOL be4d9ea7fb35426d8a00fff91dd1f9c8ec6906b9b2ed4e49e23ab592cb3345a066541b58f3b8b4bfe5b26907096253a6a08b977b13c82ade9cacab05126215e4
 EBUILD netbeans-apisupport-9999_p20160618.ebuild 3384 SHA256 653f6024a84998bac9ac3d9a9d6bbec0553361eb662a34a7b775e0ee8e1797cb SHA512 7915f179c34c6eac6a5234d4e7d8705470717281733ff4ac9082fb29127bb6355c9797c844f0d5e49bc7ee83b3212852d8572cacb530f4469409c15fa90f6240 WHIRLPOOL 6791903b7f2b437f8e6122c2b2f3db855ecb918abc9eb14501afb128667201ed803dc748015e3d0d5ed344d7420b98b459dc1d9c8010ea02241c8db552f0c334

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160615.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160615.ebuild
deleted file mode 100644
index b4a1ec7..0000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160615.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-15_00-02-33/zip/netbeans-trunk-nightly-201606150002-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 12f7a05..f34f5cc 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -16,7 +16,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
@@ -44,7 +43,6 @@ DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6d
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
 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_p20160615.ebuild 4790 SHA256 38f8572e229753c2eabed5ff296b679373810d8e323042e8d49e24085cbd3bb6 SHA512 415b919ee8c2b67260497f46ff2ab743651869cdef9ca572c1560b6a18e8cd5593b96c72c501d235817231e575dcb5c90e6073cf6a645396e334acf39b210779 WHIRLPOOL 65a20532a537e9d5901188a73797c14f554437c113ce0c2e1ea9d20862bc1eb13df54110c395c03d2d003d0acf364cad0e4578ff69da0f7548ad5197475840d8
 EBUILD netbeans-cnd-9999_p20160616.ebuild 4790 SHA256 8e81c1d6df927f8e816c79073c2d50464893b359e1fa7353f81f9d29817544dd SHA512 07297874102c79c5c1e5d7e5d7f52ac3f9964912a937a5b0294656a13f0c93b5757ad684b688960b6b795439bd4cc3bf5ea69b56cc2b1b685a73035f083a646c WHIRLPOOL e03629cd10ec0ff49252650cc82046d95f90e54178a1cc74ffd116000f55deb4a84cc96491d68bf11781f9b1f0ed9c819c7cc7544ce607b591265ad916b30fb8
 EBUILD netbeans-cnd-9999_p20160617.ebuild 4790 SHA256 6f942202ab23b8565f06d1c53671d371ed9c41d106507746e3632255b1832e22 SHA512 975cefa161f05caa12a81afeeb413969351e73d43b207e8a1920302baed8e3cd65c6a3b7839c8955153538e04d8f5bb9ff7d5f7bfc022491d405bd415aef6761 WHIRLPOOL ea58a42c90e4050eebc95891602bb07b7c0c212318c9bbf773e69c8e84bd9ba459e2875fc7c3e68e56764d3e7fb336abab1e26a373940a6f2ab89b2e3f79b912
 EBUILD netbeans-cnd-9999_p20160618.ebuild 4790 SHA256 5da83ad7908207f88eb4f8e426a08d5d9f262b502fa3ce43b4a007eb5a071523 SHA512 c5e3c2e204927de2a6aecf8177a65ea026e56c31f1e42cc210efc2347b9926ff85a3d049a2c249bff377c1b9adcd8e8aad8cfdafe89cbaa29afd6377dc212036 WHIRLPOOL 47ba2893a13b8d09214508ef8896285826c5d11dc4ced55b19af1ac029821198a6a543d17669ec6a328cc492a304bfe1a5500f6fa94a785beeeb2f4fc7794efc

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

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 7af01b4..f5884f4 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6d
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
 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_p20160615.ebuild 2968 SHA256 13d25ae9bbe7ad583f2ce72c81401572196e7c1815e938d7cee740af7b2a9d03 SHA512 e2c9882371a4213af2b9a21c406e8cb2a466fdae19a2d009e21a5d87e1aea4f3acaea75feb0be54c7d4c9ddc0a865c21331385ec0a0cf016b88b234e4e7ec8fb WHIRLPOOL ec3edc855681661988eb21a0a5ef3f1a5eeeb556b63fff360e20f494a8f52a8753e7bb1724a9c45e87a3ec2ea9c3dc347039e7172c0b9361c3b75cc489cb2d10
 EBUILD netbeans-dlight-9999_p20160616.ebuild 2968 SHA256 97e12ba216fa4cc3724ae0ecd226dd8193562c10109bef67d11ab13f25bf772c SHA512 dff90f1f42c224a0118393227edc0cf29b6c46bc8dbe8a147c30f66a6b7bcf3913387f4b3bf563a52de2f1a2e26677e6ade96bf3286bd5cce08b20430ff54047 WHIRLPOOL 91c2a62d695a76d9fef57c9cc0fe4aeaf2c911aab4114a62f7f9bad1bd40d5871608c00fb0eef449bdaee32feee39ec847f69b9e0cf98cd1e49315a88299c318
 EBUILD netbeans-dlight-9999_p20160617.ebuild 2968 SHA256 62289c46af8720570469a22d8bcfa34f84504175a00cf3f95c2f603e28f1774c SHA512 b58ead7b51fc5c991d221438b13ba3980b0097b3663c3b8067198f591906dcedcab594dce486cd3908fb3b62b54e4e471361ceab70b4034249025b9593b2505c WHIRLPOOL 4e26a77ad6964911923c11556b86552bbbcbb87676dc6bfa6a6858ab77bd06e3b1ddc47143085b559dd52e1662d2643f760eec8cd5a79268e79d47c023150bf2
 EBUILD netbeans-dlight-9999_p20160618.ebuild 2968 SHA256 9507130be7074091b9005a2dbaee302eee5782575cebbded01a7f68762df0b67 SHA512 1c89e27252fc78c83369c7cc90fa4deae216c13f9491c3bb9fcfa29f961647b474de92a12458947b0017b84f93821f8f0fe7687403883cb2297e78243b1c0705 WHIRLPOOL 8b3bc81f75a1f3548b2b2523a38e6c5cb496f9bf8a0f0599456e1dc76d49bcc845f114d9370e2d0215aef129047188061b7754148b289fd31363e1d34d7ed041

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160615.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160615.ebuild
deleted file mode 100644
index 6ad332f..0000000
--- a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160615.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-15_00-02-33/zip/netbeans-trunk-nightly-201606150002-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 ffbd5a9..babb5f8 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -35,7 +35,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
@@ -63,7 +62,6 @@ DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6d
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
 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_p20160615.ebuild 15825 SHA256 77130d68e119327f47c3e16278b052ac6e00ddc71921fe1908239d257bc08e4c SHA512 e075f331c8fa7e4b571b55a3b0fe38bc6a22936c427e4b021202c2b988636480afefe02a3090b8e674db16e7e2f6977fea8b71298a91d735ec801edf1607129a WHIRLPOOL de35a519d1ce77e7250d09db059f605bf056b43e8826309160f171c03f2c26131fc8cbcd653c20a157a57d993363853461c9dab68b3dad8bc5466d975e267992
 EBUILD netbeans-enterprise-9999_p20160616.ebuild 15825 SHA256 67dc65afc49bae33892ba44c72db823f25ec47f1334f36dadaf31b979d9b601d SHA512 33f20491ea4b39b6f82a6ff0c2df31d58b4b462aa0c3c9b151ea1bad1854ca3653a4f9369bf926d7368b33c88cbb42b696ecfe099d6ac7b165a4c61e56eab5e9 WHIRLPOOL e6c6ccf8b36c2ad1f4349cd37a08c0b656e9204617d8b8b94ae29e2ea37ab6bfb8fab9c8c6421783a51db36d6a25e33d9e3dd3ed78060224e6a5c14b9fe32a4f
 EBUILD netbeans-enterprise-9999_p20160617.ebuild 15825 SHA256 56780f670a4888f18674202b112a3edc91e7787b20c32d56eb4674ec628202e4 SHA512 80c5ee109a86bd4602e78595465fbe6c7bb90eb68a6a37fd56a7555524edd9119c9f9a5e429ba26c6889355f736822b6b8c66b7ce6e05424743c1931f791d372 WHIRLPOOL 933df05eee623d68126fcca4d3cfb503edc2f9934e9e1edfb36bd0b9a189b1b46e39dc6f771dc00ee1d03b12122fa1dfadcaea46d3ce8c86dc6a9757b81a52f9
 EBUILD netbeans-enterprise-9999_p20160618.ebuild 15825 SHA256 86aaa2168888a50c259e778aa3fc0f7fb89f33fbf5d97b134f40bca5f7285b48 SHA512 27b2b2dacf37b6871a1ae1620c2135f9fdf3678da175074671a548aac3b34222a7384cb07200f170c328f1a8010227bf4e33cd0ae99d04a59b0cbde895644ff4 WHIRLPOOL 96cab73b30091d39104fee7102b661b4d4958856a663e2727cf948f0aab39f1734e7c9bb90c9be6aefb8ab6dd7c24e40f4051f55277146465398111c9a55d577

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160615.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160615.ebuild
deleted file mode 100644
index d64b0b8..0000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160615.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-15_00-02-33/zip/netbeans-trunk-nightly-201606150002-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 8d3498f..f522d52 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
@@ -31,7 +30,6 @@ DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6d
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
 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_p20160615.ebuild 2913 SHA256 3c42247c47f213d0c42462475abd5af56ec3f9613cf6644ce22568b14f16bce3 SHA512 a0447f785548e62ff069fb34ad869e9ae6b215a297106bddc92c8fc730e89b1ede3c89aa826f6dc241d055a930b633036f59824a1a625cd5df0f2159fcaaf9ca WHIRLPOOL f69500e7df23bdd63a1de8b8f857ab285ff6c209e07cf0c212cd98758030c375bc23059a782c6ab6d65134007835a47a4f2350567a12890e2ab37c0f7d185f27
 EBUILD netbeans-ergonomics-9999_p20160616.ebuild 2913 SHA256 fce9bb6e0222b4c2fc245c634bd247addb6268179796cf6811c5db1a12f5d31f SHA512 4111d7b14ef8c95dace4acb4cea3ae38b1bdde6d99ec2f86d44c96ba17fcf4edbf6414bc0937785571eebd9c3ed1fdf077845d8e6a7efafd9417afd3b2365563 WHIRLPOOL 85b439aac7d6ca7415407c8d5d43a39c7cdbcdd3796d712eb7a4d21d256ef584b045c47c49c80ce11ea068a1598df7874c81595054836d6e9b897c123d01fc24
 EBUILD netbeans-ergonomics-9999_p20160617.ebuild 2913 SHA256 c46bb6c3ff85b87c2a108179e3769a714563e11aedf9bff5ae40aee92ef79cce SHA512 4ebc0b801d5893ace81523940ccd7346e83c6c72ee042ab3d9456ca79a7270e808df1e79208dc2f17a9812572788406ed1cd855e00b3392c2a30c60d90fbe9a0 WHIRLPOOL ee4d9e994d314909b195c20c87f4e27d850d98f45bd70e77d78c425bd6a68fe20ba7857c59ea235e8bab371bd3e9a77efb0974c461431ba94f20e8ddcb58c360
 EBUILD netbeans-ergonomics-9999_p20160618.ebuild 2913 SHA256 51abcc43a1da22812105d97b46765c303c30b77921914a9f6fc39016df64c628 SHA512 9e807590dd855c39bbd3e5060eb3103e67393d5c5d45ae7c4abedd120d8088a04492b350100b58009bf2433550bdbacb715e4a3f2c5e996e135819ec301d7af8 WHIRLPOOL f08a3145cb2d6c146a53307d57c695afdbdb1798c70c25d3cf2a47a2b8d1391d4afe86ade356b3b505f8b39b9c5b61ca53ed942492bb7c8ec928e4a6c4fcdaa1

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160615.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160615.ebuild
deleted file mode 100644
index e9e5daf..0000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160615.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-15_00-02-33/zip/netbeans-trunk-nightly-201606150002-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 af360e8..25b08c9 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -7,7 +7,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
@@ -35,7 +34,6 @@ DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6d
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
 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_p20160615.ebuild 3377 SHA256 8d94127171b624564fd15690bf330653ab9776df1870ae3bf93ddbe7fd0574a7 SHA512 b76381372c6c69d566550314e9874d31022bcd45cbceb7ba92b9545fcd4a2d33d283d9a49cf96da87ef944f5d986da7e9eede27b65fa01fa283aea3ab592696f WHIRLPOOL 665d893795540a46647b7617287abfdf494e30ab2d0bf17d60dd1b38cbcc3411701ffa0de858f17bf7d18a161e9505531eab6f0366e47b7fd1d0a0040a972cee
 EBUILD netbeans-extide-9999_p20160616.ebuild 3377 SHA256 447b2b78d1f38e712a2c7d503718b2dd0e3cbe8b4d541519b4be7e4c483403db SHA512 f83bd4312fbeeec6d9c092372338f5d26006b4c4b751912a1ceeccb0f9c9775cc6aa4492d7cdd7fe4437a980a02a404ddc0c7c820e4a20b09bc73a65e3073d96 WHIRLPOOL 906bb9f17627a4c7a65fb3d3dd6b4a40db770f3af0dac7d4a999c9ef08b925e39a03d147eece3ba98b23f79e1a488e4a3f2a7aafc8794de22bbc9bf359e1825f
 EBUILD netbeans-extide-9999_p20160617.ebuild 3377 SHA256 650a3c69d5596d9f9267c7bef4ba1c4828f29d5844034cd53c5a56ba62764808 SHA512 f289b63b0acb3ca9bb0b6a0a62e7f59c0d785abde50e4956d852cd3e96b4fa48c70aa527f3a51f66f1d7873126e47e5020869974d477c3fabb8040a28a226c48 WHIRLPOOL 69eb2225d12d239a936ac012fade59ab8c0ca1db87598b15bb4697ad2bb1c18a9caeb0b2e0cc629a2321f432a417808599941ba184ea19a1f494b8d9b6e8450e
 EBUILD netbeans-extide-9999_p20160618.ebuild 3377 SHA256 0b89a7a67e28521b8429075d00b0a9b85ab6c1a765bf405901bd9b7a131f5794 SHA512 118708e266fc7341513444f9514ed311b9177a71d2de79dfcedc4a526e81028486f6fc40d5b85d914fddac123eb33a946853c68d485d0a0772eaa47db85ce7d4 WHIRLPOOL 975bdcd0a9ddab72b094ef1a1341e120e349e8cdb1d791075c7dbfac1efa7ec9946711dbb26110716f4cf014411ae9c7132d84eb36ae7a24cea4a0479864db5f

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160615.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160615.ebuild
deleted file mode 100644
index 09f3a40..0000000
--- a/dev-java/netbeans-extide/netbeans-extide-9999_p20160615.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-15_00-02-33/zip/netbeans-trunk-nightly-201606150002-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 e9b6fa1..373f9b6 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -5,7 +5,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
@@ -33,7 +32,6 @@ DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6d
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
 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_p20160615.ebuild 3416 SHA256 9ad41132854e17cae83f0c6cc0ec2604bb4d368ed9b195efa27ccc5b7b961b27 SHA512 de54af5750d40b878cff37bd4348be7f3cc28d7eb5bb0893cc337e42e0a53aff96f74b7890e49dab89e848f3ce2f1bd59d634732c9765361b022d85530942a23 WHIRLPOOL 2a8be1c11da9c54ce93d646a7a4bb51470c04f4fe708ec07196fa25d81691bbe1d09466b611021b876804af1acc57bd51caab06d81ae6de37736ed200ed2d4fa
 EBUILD netbeans-groovy-9999_p20160616.ebuild 3416 SHA256 42300c18c16b927900009b2318221ea59ce65006f0b4e99198fa587cfb3a24e6 SHA512 2701a9599d82a38687a322ab46269314d6048c763e85f0f51baa4401c6cdc46543e61555ab50899e9fab0685b34f0a5ea5028bb55bf228771bf586043882b5f6 WHIRLPOOL e0a9fc0909903b0bb78f98981f99c1cf49816ef9f0848f6bc0837378651805e43b3b5bd649def230421215663aa0491c704e5975828e190e52e0b79997232af7
 EBUILD netbeans-groovy-9999_p20160617.ebuild 3416 SHA256 2cce6a5f1d074a83eacba1e5bf12d0ed5fd9d0edf2f194942e0774da0df25067 SHA512 9783839e20b93290f354823135874a736dcee8fe48eac63819dfaa13d1dc05f10f2be1e663dc4b6120408adae3ff994e7d443897ed8fe280062e0b21908824d6 WHIRLPOOL c8d6418b606dca59de0bb60606fb182d69ba9829731276a42201d612c4537338ef19b75c837fbd3c916204701f7a7c179786fc35048a4c76063947725d04ba67
 EBUILD netbeans-groovy-9999_p20160618.ebuild 3416 SHA256 1520a2c04fb828d423e531479d79a367b550acbd4f180f3ad1f2c60d44143271 SHA512 d5be892dae22077a07622f9338822ff4118ca8009da4947be99ce289cd7cbdfc49589453bc8e12d6e5f03601176ac683dc444530366d9fdf4b07b556b194e573 WHIRLPOOL a5353a0543c341f6bfc2c4cb1763ad7e5a6393596d9c28fcbda81bc37edf4f32e017f06879d8fb0739445a6ab692737693005783cad9d3e8a6f16151e67229aa

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160615.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160615.ebuild
deleted file mode 100644
index 5c6bdd4..0000000
--- a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160615.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-15_00-02-33/zip/netbeans-trunk-nightly-201606150002-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 57871e1..8712d27 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -8,7 +8,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
@@ -36,7 +35,6 @@ DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6d
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
 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_p20160615.ebuild 4126 SHA256 45d0d3cd6ef47cbe49111aa6cb0d58b0514fa0c13e0a2225b25153042a52b1fc SHA512 bc058ad6920b0e7eaaa4e55fe0174a450b6eb92e5b1602ed18bddedf5a90f62d231bf8d9651296fe92d97c6a4565a47130ac139d54fceed2f6ba4ff71328ec1a WHIRLPOOL f0c579b1403ad36e660b6f7759b231067163a3cd268b927457b2903daadb33c2c38801cc9775a750d6d39662b7afe2c56acd590a072138787fd4ab1dda023438
 EBUILD netbeans-harness-9999_p20160616.ebuild 4126 SHA256 ba685f70140f5011e7cfb66445933d498b4686d1cc897a52fb32d69cead6c63c SHA512 24f7d1debcbe39415a24d1adf8caca164eb1f8e83db091b67b169b8651ac72d16f5e3e32f7bad1b90e21bb80e533c0c7ce9da42255afec1813244a251746d428 WHIRLPOOL 45a2272c65a31ecf8762970c943c173272857b9529d2e18180fac419a58125bdb248a14bbd7cca38efa64cdcc4d50d927efa45f0f1a5f3223964bf0b51a77082
 EBUILD netbeans-harness-9999_p20160617.ebuild 4126 SHA256 54c77b47df014cdd74a352e0884110d11db27744e0725b26ad90c408d748ff5f SHA512 c4389f5c8c005b220f27e7fc7f4f607a92780f476946cfcf6e8108f44b263c73c48fcd30dcafb87e801e1c7ce5365d3888591ed170b85550cabc0086511a2036 WHIRLPOOL 8925bae5a670d7ebb456e15614d74e548ae37728039541cf8242ccc151ab2c4dc729ba01179ed68d21d447d229acba1b2f77312fec119a7940a91264c4706408
 EBUILD netbeans-harness-9999_p20160618.ebuild 4126 SHA256 78c646271692572f5f2ee7955d01147f3494279156ebd01aaf185f014937075f SHA512 c3851f73072dbf358970f524bd150acd10a7dd9da4a95d9d237ae6e4b89518bc2becea4d0049202bdb7d7baeddc9461d6b7d2d9bb84448df8b67a81566dc5f30 WHIRLPOOL 93e91bb9a47850a72943bc0bf9aea25e2e51eb293be7c52f58b016bf98710120fb039ebefc452a2681402b71e06cde8ada423541bae611b5b8b4ec46e88e19ac

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160615.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160615.ebuild
deleted file mode 100644
index 147abb5..0000000
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20160615.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-15_00-02-33/zip/netbeans-trunk-nightly-201606150002-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 c35f53e..dc4da3d 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -142,7 +142,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
@@ -170,7 +169,6 @@ DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6d
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
 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_p20160615.ebuild 29867 SHA256 deefa732a92c591d90b9f66e4fe8b45d5271fe7bfded15548739333d1e38dfef SHA512 37585bd9ab2835d224d7bc29dcb94f507ade86bce65252e392fce238a43e9f599c8f0cb5b20d417cdc472b52454b7beee2c8787eacc265d83ff9640860c36b94 WHIRLPOOL 629899b8ad623ea8f2106e4cfe35dd8c1b29c8ca0e302bf71f7193eeeb6030a4bc3ab3ad224f0334478ddd02adb16419075f818d8e67f3a42261462bf6650b09
 EBUILD netbeans-ide-9999_p20160616.ebuild 29867 SHA256 8b9b24d96cfb1fdbcb17529ba0a216216a7ce3dde5bc7e76415fb10990696e1f SHA512 d96b51929d51e09d911d60a847313e1b06769985ce8490a7fc43cd83ceab0fee33b3e86836c9752585e5b2334d8b5db5501f3a50bee4b4a357ca6ab33f55b8ed WHIRLPOOL febf90375b1aa59cbaa5747b03973cda730f8826c36eb6528dc6491a0ef029bad1b40b5ad3e486edf1cbfd76ffbbfe7294a9ea7a41cdf378045e7b1687d5d70d
 EBUILD netbeans-ide-9999_p20160617.ebuild 29867 SHA256 53d1bb1a38af2096acc8bcac092971c9ebd87550525700a860154b2bcfc09544 SHA512 c49056bf2adeac686404a08dfc22b73016c74ea5318358c4e43f890f8ebd8ec3d7c97f1727706b39a7a9c17ee8a2869b42f4beba95dcb2f57a314d85f7da31c3 WHIRLPOOL 99eb56bea610a3694210d633255efaaca9e6511d7ac1045a2e161875e347220bd0222baeb46772d1fa2252303b99af92f5240977fbfeb84b7280bd707c221f45
 EBUILD netbeans-ide-9999_p20160618.ebuild 29867 SHA256 0ee16b306ed43c6046e732889a414601d54d0c9d3f0bfbcb7e991390cac2acee SHA512 d1866d8d43925d4d4e15918edd8507dd2e464d5e4ca3060b5bde092d4e382a60a99f6caa75a5998d29e5f20e5c1a8353a461083ac4c6c50395c101d40ab9f3cf WHIRLPOOL 13d7d144d301659be57474188e2ef5c2ea824818a248c64a981296f88f93e1437f54ec5a8c2325b8594d407ec3d357b5cfb307aadfebac8989c1ed7540d5e300

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

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 141d0d1..ef6b22f 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -20,7 +20,6 @@ DIST 9F1D66620CEDD0F3DD73E0D1295DD10CF98770F8-nb-javac-impl.jar 3037120 SHA256 9
 DIST A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip 675425 SHA256 088464e2a7e6650b6f57434087ebe8f48947a3d343986741d79ca6bb23624b67 SHA512 bff8f89e96ae7b5cf22bbdbcbf95c1b6c789626a4f3f972a7216c3a545b3f85a67950c022f19c36edefb8e3fa605968b31e267166922dfb46fdd56bc16e4bd7e WHIRLPOOL 13cc312ba143fed133394d054d8a2b4f086d0dc9f5a5da3bebd83a62c30109bd16c6da5619ee6f0c4d66160280f6659685730f98e46063686aca4d4df8ef9fdb
 DIST A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar 89171 SHA256 377b2ddcb7c902daf5dd3d22a1ff5b8da4ad6f7fd6c5e5da4731d17a8d935534 SHA512 b66922bb86a5eb787a76714a6bf2c2adfd8469ea9c3031d9b5970373f71a2349b1e8156213397b9119cc9510e48905b181388744bf2189e04e18922023dacb12 WHIRLPOOL 9a5c93989dd79f803e050189d5cf1e741f0a2a1514b848fcbd51ee868125533a816525738f491da1f0915050343b73f7f8b58e4fe35230610a20b13475143663
 DIST A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip 19717645 SHA256 618aa42390667bd4cf2343edfe134f5665d9815379ec311c3c776c9dbd21831d SHA512 160fa0353baa9b31090432053a2d602fdffa663fe1f83ad79de4788ed74d3e5938d0bba0ef28ff4a946e6bc99c3a629b3fc8ff7d44ada98348fee816cb39b42e WHIRLPOOL 23408ae921b1712584eef8d51678547cf24ce3db75743524cbb046511cac60f162ab46e4c3b65e639d9c8b3f2463b674791f491d6e377ef69207ef701b7dbc09
-DIST AA575D7D97D3261048FD3E4ECC1B3F9DAA3E707E-nb-javac-impl.jar 3036152 SHA256 707ea8fa93e21a3fae0bfa4f2956e579e3e16d4c39c5cb67cbc7bd72f3458a66 SHA512 9fe7e10e574d983cf1fe4d1d3ef6c548dcd62f3f346ce5f2c7ea21cb8d62c1153981df3fe1e087af07a418b16546b86c1c635e4aacede5962a9bb2b50b53e9fd WHIRLPOOL 7c5d266ae902dcd199b066eb409c04865599bf5f2a527d5f8336ef3d855583c826da262136e5032b055e65c205be5d9a35f04015b8119b460821e0776ff48a33
 DIST B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar 173819 SHA256 4f2dbc36ec77519df339846cf5333e874d6f147f5d46ccdfabb18af34ee3bd5b SHA512 ccd48f9fe445b669763428dace1a02d5820a33d872c952d3a74608f868ca225c017999ae15857ed544799d467068b759d216121ba79d3288f323aa2cffb95fa8 WHIRLPOOL 02e8556df81839b0b90c912b9e22c22c9f10c54ee0aabda4768eaf6956f7e3e29c9b24a46e20bb264f2ea186c1642ec7baeb375b2a8951737543ac16e73f9260
 DIST B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.jar 2259343 SHA256 551a7c1bfacb60eebe7eb5b004b69f546840cc3fca82f44431e4ac6215163f39 SHA512 67b973d2a3d52fba14ec2d285f4c2f0b0490be04d73c38918c2657f7fc257656f793e1e4eaa9221579ed93cd3ec1ce0c120f5b4fbc86582b95308c1f8b64fb79 WHIRLPOOL ae6e765a49e0cf8284a3496005a571f96ba730133c220ea77b8d19520a8579e4ac4879f1218ec38c0210c56add19ead8b3a4d104613c9788387213ce8561c8cf
 DIST BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar 56032 SHA256 817762baeabb24daf8a41a9716e31f85a7659147d09264a499f4d35b0fe04115 SHA512 c84d4066b9519cf2c00d5d4f054865693cd1665e5db3b30f6e77b44a7c0d3055cc40a1641b805ea38d2294e2cab1a27fab85035950ff0d94960a4de185bcc76b WHIRLPOOL aae6bc05d3b441443b9f0d80e65fde81614b0206eee5714f4e51ceaa0adb778758a5d65efb3a4963111f3b258753e0154447914a5586251883d22b0c1e09f9f3
@@ -40,7 +39,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-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
@@ -68,7 +66,6 @@ DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6d
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
 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_p20160615.ebuild 15656 SHA256 a0ea8d9fc4cf1291523171539a231d4cbd07648322e17581a7d791c6445b2f0d SHA512 ff9e71cd78220f7bdb3d4e440df486ab9ed9098d0fc9b0fabfc16e72d7ccc8c854220f8f5a398d7b0bf72bdeba3217371159e5b8341be7b8cdddee2efd0bbff2 WHIRLPOOL 8c466b554976cfc879fa45bfa2c2b92e60351fae6956d1b6ed3937d1899cb5c36b2c6d00e50adca89c3b69a97f4fe361b3c2f6de3e9aed14b8706442b56d95a8
 EBUILD netbeans-java-9999_p20160616.ebuild 15656 SHA256 08c0f6f91c18424f71499886f549d99a9f4f21e83864a1211adcc7001376140e SHA512 911161fedfb54ac9de79add222f1aa548907163cdb845302c8f720ec68009485c1b1c042c36e92dac1246b645d3c5c6bb4a7ba694c3dfb66b1374e257ace34e3 WHIRLPOOL 951e258428cbe2c789709c064c5bbd1bd8fed80551b0b37ce31749cdc13c10a618a16d89196123e18147f53a0cbb2714961fae0f48affe122089a000728df34e
 EBUILD netbeans-java-9999_p20160617.ebuild 15656 SHA256 f1ba76130306bd36c5597fc7c8740a77a8c0e1fa792ec156d09bf6f9f10c2d5d SHA512 b939e5395a6dd40732b6c3cb77ea268d85b2b8d770b51c548c338199bcb465da3f62d61dc5be92b6334407caffad7eb38b78a6ac4a949903f4b5a44d821aaebc WHIRLPOOL 511e61adb044b844b4b94d77b688805542a56183e8246033a98209e3da291101c7b0d0327f3aaef9c3d5e490647f2d43bd99a1bc3db7edbaa4458d01136b3e21
 EBUILD netbeans-java-9999_p20160618.ebuild 15656 SHA256 13adf4d265715f0bb5b5c5e79f54dbec9614b10fc45e8319383ab144845b38b8 SHA512 84dccd5265065aa22b9341c1a1250298aeea60f729620e8b6e0024a594a846f98014691555c830f0e18c927081975d401210e545d64359a0d1849e04e01089ba WHIRLPOOL b51a03a19924419ddeb089a55f6ceef3ae15cc3153edcabd2eaa527a10d282aed3d5020115d2c9a0361d54ab5293b91ce2e459d6732ae6d11a3d80808379f404

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160615.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160615.ebuild
deleted file mode 100644
index 0273691..0000000
--- a/dev-java/netbeans-java/netbeans-java-9999_p20160615.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-15_00-02-33/zip/netbeans-trunk-nightly-201606150002-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/AA575D7D97D3261048FD3E4ECC1B3F9DAA3E707E-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}"/AA575D7D97D3261048FD3E4ECC1B3F9DAA3E707E-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 318616e..9a624a3 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6d
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
 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_p20160615.ebuild 4971 SHA256 ec2ef842558671cca4b85256ba7691093d68be09be62cb83961a6916c3ea64a9 SHA512 29f73d3b8f17bb7aedd4a53aa835c32f9a9cb121b421b770bd120bfba565bf27a2f056ce774ca49a6304943cff4f5bc3c4f59fae2208aa1d16fb7f89537a858a WHIRLPOOL ef4f09d20f2578209cf02d5409b04a70a3c6a9b60ce41c63c409e0cc13cccddd52f792e70329ae1daa44eb32c53e45472fdb8260e88cb5a748deec33c269e1a0
 EBUILD netbeans-javacard-9999_p20160616.ebuild 4971 SHA256 07f957fa622b72df3ad275babb74f734076fb2a83c6a5b5329ba29ca80743f1c SHA512 ebb4663e2e49a6966d4bc4cc83a9d34f689e857504e096f834c5b6d63379427d2860e2c14f668e528fc1f5a4d1818524a0e62f07c4231acb38bf0c1bdf3e9ec8 WHIRLPOOL 94ad39967a7f66f3bef4f6a14233f3729a1cfd356ee2a533e3f519bf3d1bbf87f574d19fdec4ae284ea2798a1a78b21092058637b93a56389a6475d232a8486c
 EBUILD netbeans-javacard-9999_p20160617.ebuild 4971 SHA256 7a35bfa0469c5816d703c6257b7709a94cec814e9de015fc4a28784853450f2b SHA512 0d5b689b13a8411fe202633106f1cd01c9256aaff08830f02fea57a71d74c2b7fbf0fa5149cac6981b15d6e8e9249f67866112caf82d711d3842509f22e19126 WHIRLPOOL ff6ada3f72944ae39de506eb7408fcbe8e856301660e9dcb463d66223b031462693690d8de8bc63d1330eebc5fdab921c708244b9d77292012f3606bed342b6b
 EBUILD netbeans-javacard-9999_p20160618.ebuild 4971 SHA256 6164ef9dca6e4ed2cb6ea614cc1cc6fccb82195381066debae97721167521e2c SHA512 beb6a099d330493b054f5bcfd719946769f7f70d86c2fbd105192c0ab0b195409fee4612e29c02e826faa7ee779ff42cbc42b927551d4a81498ad0e8a3de91f4 WHIRLPOOL a6f6406df960c4fd20c0ddf2a94f6e1e3aa881bfb08b7ac8c16bd4e85b3b46c809d6de299e7ca9f2d1802a4b73cc5a597b451b61422e7df3908490b5456b1bc3

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160615.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160615.ebuild
deleted file mode 100644
index 414aade..0000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160615.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-15_00-02-33/zip/netbeans-trunk-nightly-201606150002-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 e0cfe17..7645140 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -5,7 +5,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
@@ -33,7 +32,6 @@ DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6d
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
 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_p20160615.ebuild 6293 SHA256 e663d34186e5722da7122ab2e9f9c663e79c3852c279722f87e824fc5d83ddf0 SHA512 0bc4681fe0e5a4235123854ca7cffb8ae4b61293efe4a91037ac070db05b6c457daffe525db4e0b3a92ecb11afc430057e9b9fde24ec4ad15e113928286dc6a4 WHIRLPOOL 3fd1e201f5b55b95156f1fbdc109320547fb7fc6973ecf935d274d456fea07deb54a2d894d5e7116a4e21c4f2353bdcdf59fb4e64fdf43fd9b7e0ced39696877
 EBUILD netbeans-javadoc-9999_p20160616.ebuild 6293 SHA256 2c773464b6cd2f9afd9556359c8867d46da873a0d451c14b9b7ded53bba33c0f SHA512 9a960a89b1cc5e6057cdc1e4e4c61b563221aa08321c5465a10883315d4d5b57b07cc3b6baeda3725489ae8f2bc776492003f73218327d2559000c31a3d71593 WHIRLPOOL 25a47193598296e46ba636bd2025ff31fcb9a9f24b6c54c1237710d641485024b7c807b5c6b6d2a8c7010c138b5494f0dc0766ccd3fb0470ff8cef05321f6110
 EBUILD netbeans-javadoc-9999_p20160617.ebuild 6293 SHA256 504582e3479edad515e71f6b756148a2395a200c29afd83421ae0d6dbf16de7e SHA512 c3d760188110a73276340eec8fd34325f1534643eab08b204aa0e2ed3499f6b7c24380748e6f954f7e3c256e32308b4b2c89205af9e293518ef8017942c99f39 WHIRLPOOL 3627b38ebb65fb3026d78047d7237907c25812d61af56a251b4c18ac83904c3fd69e2a83f26cba47f0b8db42fa28a4ae2e7a3f79863ad85710e10d9116fa7313
 EBUILD netbeans-javadoc-9999_p20160618.ebuild 6293 SHA256 77a9eeecc11fdb8a1c1f6df2a4caa5830c9b0bb5b1794927dcade36c7ab5780a SHA512 65a1f8bbb00c4958007ccc600deb304cd2414958829f858653516ca96acc8c5538e6bd81526f3bc3f284425c5d56f0068f5f6e14533e39fae003a79640622a6c WHIRLPOOL b4a11cba5e873dabd84b5904435c0b87404c570fc9192dda6aa08ec1373135a0784d8cdfc57891e97d86afa00235e4978c144b680b71491f6fd1ff68f14e835c

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160615.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160615.ebuild
deleted file mode 100644
index 3b474a9..0000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160615.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-15_00-02-33/zip/netbeans-trunk-nightly-201606150002-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 9790233..4d2c27a 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -11,7 +11,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
@@ -39,7 +38,6 @@ DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6d
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
 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_p20160615.ebuild 4717 SHA256 7c25503a4f1a7cfeed68365182858e64c56d3a0d637edd767d014d29479ba363 SHA512 a162349dc2231c53afe41b0423d9a43234546e85a4b65197d3dd10dd21e802d3fb82bb125dac7bd09855e87ba016eb0b5b34fc27f546e631ab19257434fc5700 WHIRLPOOL 4df48ff0bf2c2b4c6abd11a92e42b32542cebb8aa3eb3bea9ced715f8226917bc5e97b5be5e23b5ee70b586ad1465e96840b123388a1804d83dd458748a41fb3
 EBUILD netbeans-javafx-9999_p20160616.ebuild 4717 SHA256 e628c45fab98d8ca675391b8e46fce8c880eef550762477ee056bfef8a79f02f SHA512 6fb2fec0939dcbca63afca2983ea2112abfe87664cd79c82c66e6a9c8d3a0f25494674818b11c8462c6a0a1e3b8a4ba9320f34f885aa80d374cb40059110ea7f WHIRLPOOL 716244f2d572cd2426fa104e85b70ba6540ad49e4b26dbede8520fb3f0c233d2fe7239df61bbfaddc75f36ce1f5bf142542629ae96192a480924ae70b8379ef1
 EBUILD netbeans-javafx-9999_p20160617.ebuild 4717 SHA256 bec98089dd32623bb722f0e5fae1d1093eed93c6328724890acc3840721ff82b SHA512 943cb92b0edc45a56437fb965548f23459a01d566dcb770a6447abacea000006239383e18762e02350d3a0d82dea58c8cd28c495f04ff5410f44dafa6c9ce31b WHIRLPOOL 2014ca5abde56477180de6eea17d521304da913e46fa85b149bdb58d856b435235a8a142110cff3c3632b20846f064b340622b657d52f6c420e6d02394cd2cbe
 EBUILD netbeans-javafx-9999_p20160618.ebuild 4717 SHA256 daa849216b3d786b7549c4e1cf9a7327e234a9e760a9172cfa09a5e006214ef4 SHA512 e43cf9518b97e144c41f32fdec62f09e5c44f31a8223e7f25ad13221c2c09c865a1f7bc5c715f03123ece908a666f42d04b05f9d670ceeeff0d967496e43678a WHIRLPOOL 468bda70a15ad5b812dd83afd453b540dc759006af5fe8893ca68fdfc18c4c87ddef05b945c588b5e90bd30879d284b4e8f31c4d1d89aa3d9add0bf251f19865

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160615.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160615.ebuild
deleted file mode 100644
index a86d888..0000000
--- a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160615.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-15_00-02-33/zip/netbeans-trunk-nightly-201606150002-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 4906ec9..329379a 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
@@ -31,7 +30,6 @@ DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6d
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
 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_p20160615.ebuild 4412 SHA256 2b9b9dfcb8549b1d1d8032067c58c92638f1a7213b79c19a134bf0ccb519beab SHA512 06499a42dcdccc30faf8c54bbd76571c25002cf604471098cde9895c6a910d0fa78a2ca685280de1df9c50731c5798acf25e536651bad72a354c7387f9e5740b WHIRLPOOL 2c60b0549f413c6336ad5f05c13e0dc69111f0e0f68eac72c8e87f99b184e53d429ae7afabbf106086fab21e116d9a550ae14786089bbce3d8b423b194a5fb5b
 EBUILD netbeans-mobility-9999_p20160616.ebuild 4412 SHA256 7d70a21c94bfbe2ac070fef47455ef64eecf7c40149c5ea98bc8ab092c761dd6 SHA512 8fdfbc149f0623305cf695524c9df1be32f719e88cdfd2b8e962ae0509f38e1d42830f2c3b21c9975857beee640f0002fa783913c4718225cbb889fe17e63592 WHIRLPOOL 8803909f1ae5ce69df65943aefb944a58fd5cdccc4bc38b2da98eabfd5d66b0239a288b874903ca461cafb133f48caef7b362b846dd91bff5af1fd0eb66dde8a
 EBUILD netbeans-mobility-9999_p20160617.ebuild 4412 SHA256 0d0804132eda64caaf465327c65f1e8de1e775a0f976c66a22578cb9c9189751 SHA512 27af844d92d75ae3ebc7687986962cc540e7ae54fcb9c2652e59ed97e9c1733c5f403bdcae6574264e3b697244389240c38b12f6497119ce262cec0270bb4a1d WHIRLPOOL 06d75b57a0038cd40d309888cec18f6c599b5efe9f386d8965527c169013470ac77940372195dc1f38bfa31940be23925d5e661f5cf4d267a48cf012b561ace7
 EBUILD netbeans-mobility-9999_p20160618.ebuild 4412 SHA256 8c5d5d6ed13d9d190c8c88adcbd1db60970f8146c22795eb25ccd63bf84f7576 SHA512 b639cc11e906fd525c5bd1bb6b21979961473cc6cb0f807ab92843700459e83553e68c54f12864240ab065a28b65855ed35db2ec6df7e8c328c168c12f379cd4 WHIRLPOOL b285f04364c855a623deecba8fa0062a4964a68b80327dbdaaffba42f9d170f18fb4b4e5d9eb45187b3655d85295ce81777c6521e00de6638cad7186c416090e

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160615.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160615.ebuild
deleted file mode 100644
index 758aec9..0000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160615.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-15_00-02-33/zip/netbeans-trunk-nightly-201606150002-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 51eb185..441d2fd 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6d
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
 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_p20160615.ebuild 4111 SHA256 cbd3ccf2f982bd007679f72177c71708d3e4affff56b5caf182d230678a39268 SHA512 617801fe4c79ca5b04f1c3c789006cc7abcf60bc941a89aab9199ef6c748659f671facea943daccdadef98e60b5bd9fffb924370388e4ec249c5857c5a29074d WHIRLPOOL 0bb78210d9985dc2381c61d247db93ee31af441f7a6dd835efbb787836673ae3492f8447ed4a8ea6f52786cf38c83b9a19198de405698aeda7054fc1344339a3
 EBUILD netbeans-nb-9999_p20160616.ebuild 4111 SHA256 9c0a7c74d266bb8aa461bfed36528139ac313badb56474aef83def63b132e2fa SHA512 da8ccb62f620a11f03eb5328963fbc4ba0d27da3b804571153e972ed764c6c074db06d0716a36864de29dfad096417324ef2bc90f191d302a3dfad4b0f0c36e7 WHIRLPOOL dc8c22b7a0eaf9d1d39cfee2d3c309b9670728a0c70bb791ac7de88c9a62d67c47a5ae581e1f6cfcded486d906953b968523a6a5ba95963165159c6aca8f86f7
 EBUILD netbeans-nb-9999_p20160617.ebuild 4111 SHA256 58aecc413430db5e6e3b57a4df8c5a41df696e8ee65a02d47b3b47bd5d7dbc36 SHA512 b1f801278966dd6dca307bfdcd1869fe3ea0bf57b6d659796a5b621dc45383f494169fe4720385bea686fdac25b79d66b7d340cff24b2e913ac4b0f324c99374 WHIRLPOOL aac34438f88088635720a759f8e52d313f226a6ab6d4b7b048504122e3db0dd8e8dfd85c124bb8005edc81b89b8b5c337ed2b093222b82240010cf6b8c47b08f
 EBUILD netbeans-nb-9999_p20160618.ebuild 4111 SHA256 7b78f15bff2355ae9d2cdd4afb1978acf599c8e17b4f356d22821c53ae9df9bd SHA512 fc5a11eb4d2d1eca9ac072c3d2385be03683eb9454139c10f73e5fc741bc902ab4b31075e5527838820cd7761cd687ac0f7e1b01e169966df68c1224f33ef478 WHIRLPOOL 2ba1cbc43820231c4963123a3fb23ec8c2d4e5035bbc92b4096c079d43ded251a8e496d6da3fedcf336a4e1e49f8f63336ae8c5cc615086317b08e6d0edc9ace

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160615.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160615.ebuild
deleted file mode 100644
index a7beae1..0000000
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20160615.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-15_00-02-33/zip/netbeans-trunk-nightly-201606150002-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 1c6c0ae..e505f73 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -8,7 +8,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
@@ -36,7 +35,6 @@ DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6d
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
 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_p20160615.ebuild 4418 SHA256 51ea0af18c35dfdc1290c76c2445def40a5922a7190c6a227ed9551e848815b8 SHA512 74e8867810f6e532ee878a89084093945300be7be7017f59ef12e117bb78c9b95a8b0a87094b9336e655553e8343d907228aefcb54984c79f3168463c339637f WHIRLPOOL 7d649f3a2c96d096debd7d5d388d48b3c69e599d4ae6e391e0beff2aef6d548780335975b976a9a6f50c4f64a8297f1951f62547bc0a9c2df23952cd17bb19c5
 EBUILD netbeans-php-9999_p20160616.ebuild 4418 SHA256 be0e2c81d9c13822532e29b2affdb4aeffc939c1ec71b4fcdf370cd4b02a5906 SHA512 70f69ca728886934fab8b04c42313811bbd816cd61ae44e37fee858ee12340ba58aa04a6fd279013fb98cd6ecf76d4a9b01fb57420cbbfc9bcbd4e3718576748 WHIRLPOOL eacc775c4342a397bcbbd735fd96c7077ac9a7681ac0bbcd26c982cc878cd042bc952a24fdf15d5077563571a9bf83563fe606839bca4460423b77166ceb4bf4
 EBUILD netbeans-php-9999_p20160617.ebuild 4418 SHA256 4f6fac16dfa6338a6c58f16b8bd57d0c3db7d4367e3f40c4d1b45fd7fa7c3c96 SHA512 e986bdc678f578913778b2de557e7699813260e63995b85924ac86a5e51d89cada43ae73e0c84be88d564359d37b65d609d9a4bcb5eb25d06ccb3ac68ec82d7b WHIRLPOOL b4f901927295c97ece9b6488b3db7023fc173fdebb371eff84943ac7b008daabcf2885350e0efa26c9a9faea28570d6324eda75bc5abf42169ac6548e970f195
 EBUILD netbeans-php-9999_p20160618.ebuild 4418 SHA256 de42362981145792e82ba982195d079844dffb942f0695b7aa6dfdba1f56abe7 SHA512 816b47ab6b259a3c5633852833415ba25bbb906b75b7ab92fb21d17f912755a7bb3f5dfbb04c34ae3d8ae67551ffaf29d52aa2db671b50d4a5d26dbf8a62f0c8 WHIRLPOOL f059d2115d3e0f1ff8ebac72face5534ecf9b34f6c6165cda0358628075cd6249425a0d6acbd9cf5a2a0374bfa4e8995240d0441a76bc20c85431317ff45b19b

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160615.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160615.ebuild
deleted file mode 100644
index fc0834e..0000000
--- a/dev-java/netbeans-php/netbeans-php-9999_p20160615.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-15_00-02-33/zip/netbeans-trunk-nightly-201606150002-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 901ae91..1f80b2e 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -29,7 +29,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
@@ -57,7 +56,6 @@ DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6d
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
 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_p20160615.ebuild 9520 SHA256 1d1ed4c8dce312810a9e608d5ab1b7f77e69f34a74a65baa6d85e39a50ba46ee SHA512 49874508e382242f2a795978cf9f53eb1f727bf57e3d7d8f1a9cf30bbc4664b62fc50126c95a8ebc92a006b3319be04631ba98d3d51073d817542efb2baa0c5a WHIRLPOOL 22c4f8f6910c84eff5e90740429f249af9d71d5353dfedadffeb18e2c71e6c1739192bd301b36bbb5677e0ed3d10a5671056715aa15bde6955a21ab920944fb2
 EBUILD netbeans-platform-9999_p20160616.ebuild 9520 SHA256 f83b9f7c44432d294cf8560514c6280f9df7a22a64fca6a3f69157a1273716ae SHA512 930a7cb047b4b92df4aff7510c2893f9e99071f716533aef2c3b8d56335788b16f6d1d3840fff4f76972aeddbc92a28ccf0cf55432216cb0e38e88017194c353 WHIRLPOOL 9cf1d9a31d4509ded199cf19ba04f237421d2b5c8cd14d209db9bc1e02d9dc3e6548c167be1569c058d40aa64982742ee65bdc5bf8cdb3bcad14aef45bed9e3c
 EBUILD netbeans-platform-9999_p20160617.ebuild 9520 SHA256 ff87e2a2d5058688522f5c1106ba3628ec611e76fb4da967f593b4a867ac0026 SHA512 fc57543271cfbf583fc9308570bd7e9a851567228f13a5b8cb088f65a3678758e6da91394a9a9b16f511fe12656350b3e3dfd13f664e5455ae637947cb5bcb8d WHIRLPOOL 14443637c8b536d3adc1ca73b9efcf10f4cdb52caa884f0aeb2645779ec0c14a60e9e18ed6b070f3d6151bdedde8b08a34cf18bfb32c6c1dd1d49ffbb3841b1c
 EBUILD netbeans-platform-9999_p20160618.ebuild 9520 SHA256 9652f01d9264a93f13fa8f4883463888d62e915bb686e6a94ec72916b1d711f2 SHA512 98024f0152fb694b9137e8c98ef47bf73195f4824102ac9a50b2ac9924410998385c0362f208e13183f09391eb7bcccedb4f2312c21ccd324f5fc1c9a9072258 WHIRLPOOL 0c1c39bfe455f2a92d0ba3d31e8c9fb1dae528a653dcbc3feca755fd810f218495ce5088f8d0600f10f28f4bcacc2c6d64b36bd2101bf7a9fb56a2d357e1c598

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160615.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160615.ebuild
deleted file mode 100644
index f825276..0000000
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20160615.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-15_00-02-33/zip/netbeans-trunk-nightly-201606150002-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 451d913..86fe0a1 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
@@ -31,7 +30,6 @@ DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6d
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
 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_p20160615.ebuild 3472 SHA256 b62578b82c4f0349d88f66fbc2b80aa3e63fbaddb6df027ece9faaa5ecf4d8de SHA512 b2aa116ca625e88af4d40480c58279d9a95db1b59429ecf77b51bef4e77bcef90ea9e61caa5e914f7fcfdec2d95305009aa465c1229ace5013340bc2a505b62a WHIRLPOOL 87778ff56273c20f89e8823bd9af1f73937dac33f2f1d8c36d9ed0f8f63a676059b87940893604e0c2c523b73f17e6812a40c66552b3b626651b1c82c0ab6a32
 EBUILD netbeans-profiler-9999_p20160616.ebuild 3472 SHA256 0a79f7add54314b7297739d89959b9ef694a02b25cc05fbd58d1ecabc897c478 SHA512 7da2bdc3361d044e5598b39620afb5e3f0ae819704a9f216a1e976898acdfdf780ab4b3665d0de2ccc63cd07cc8def0c893d55341d4f2c0e80bdf597d2ebc0a2 WHIRLPOOL 3fffc019f02cdb1f7bf7e95e5535e880d0734387225f51c8254ec10aa5c1a30faa8fee470d77b99519552347c585ff033aa9adeec583c9025396c82a50aa6b30
 EBUILD netbeans-profiler-9999_p20160617.ebuild 3472 SHA256 164f0b9ed984dc7e5151268f12e5870b162da4a943b97c06b7a1de70b78926bd SHA512 7dc16e0c9aa0bde8a5b412fe12b075ca0dc540f8e032041cc4ccf0bb8e372138cd6079efaf492da9c7944ad013283dedc2ac68c9c4f567de62a7b3e719f8af8f WHIRLPOOL 0d8bddb982b919887499350d7c1233b1d7aa4987ac3b5b5cd51291e8200e3a24916058036898fb73a270c27be0aab70b60237d482cc8ceb4b3521bfbf800ac9c
 EBUILD netbeans-profiler-9999_p20160618.ebuild 3472 SHA256 068ea21c8310f9cb3ba14844998c483e7eb3913779e86591a5ffd6aded6ed223 SHA512 c9070398f317594bddc982896f1112c46ea63434a80a66dfa906c0e5c6475a41b087b4a073895fab308a9b805cec0adf72757f2875888f8e3263a4707e6617e6 WHIRLPOOL 3c2eba6a28fc2d81d98583d3a0b60a0fa2392a4fe3a38978eeb2cca72e524fd12071d99c34583d4d10cbbbd56f2c72464c244504782eb48f6374b97a4c5e1ea6

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160615.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160615.ebuild
deleted file mode 100644
index 5a83151..0000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160615.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-15_00-02-33/zip/netbeans-trunk-nightly-201606150002-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 20ed483..8e3f0f3 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -28,7 +28,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-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
@@ -56,7 +55,6 @@ DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6d
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
 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_p20160615.ebuild 6242 SHA256 4029ad34c29e02d5318199b04385bdc4b7422dc64be5be72ce201ec564b24b84 SHA512 a66ed0318446484412dae4f8e68fa09e68ce88d5a5c2ca61947922db72c17374f15298466642eceb519ba57cbdde32763554c0f75b0561105146e46f98dea8cc WHIRLPOOL 9c1a7ea661c1fed670b08ca4366f2b7f7204a78964b9fc7429aabad70b4c08784190ce17caa9fd74ce447bc0d606a74182af16aad1fb443d59cef855aed4fb93
 EBUILD netbeans-webcommon-9999_p20160616.ebuild 6242 SHA256 97916f4e9a9fdec59e7b691d3bfd060cdd27ad063603917748f4633600d3bf22 SHA512 eb0c50d2b5d5c9ef0b7c5eebf65f1b49f47fd3b5c7993c58edc6ddebb311a6786cbd106a22ee3a3d0f2f09d511e50fd8f57373fbee6f6131695d6a414d6f21b9 WHIRLPOOL 8dc26451a04a6e954adafd15eb1e0da5684964ce603ca59806df7e88141d439c52dc224ca83019ed4146781e9ad0089a9c1729ec9144abe308a2c88a349b54ce
 EBUILD netbeans-webcommon-9999_p20160617.ebuild 6242 SHA256 5f72901783a18ff4ed6b3fac43340f96891e0ceaa356b5789326f5750f451b91 SHA512 3c839a28bfea0387458fc11fb519f295b16af57a3cdb9f7697dc421740d51deb0e2741682a20d48857f145d84b061a4a9caad636eaa5c1935ed0694e3ac9e02c WHIRLPOOL 0668921f14ca28ef06d4e242f5b2703b6c6f948dc0a4e923cd4976c06b5f6b62723e57b8170aa9dcd5739fa774da250129aa06e3d277a84b297cc12cf20c6632
 EBUILD netbeans-webcommon-9999_p20160618.ebuild 6242 SHA256 4c6a8e293a215d95438690e10906451ba65722879839b8cac25841bbeda15052 SHA512 56732c679fe0aed2736d18b80d5b02732ca6bd1bc2bbdccda9fb69efd8fac177b99fef7af0394d21454caae00aa0db3a42b5162eb7c17d6afe7f83c5ff079781 WHIRLPOOL 3ddb3fd896dd1f9b7cbd9b1b0704de566654de9b602da19bfbfced50e2a491d6b9a55c8c00b4e321468b1729df591c3a241ef8aba034604aca7ecd824c5f82e8

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

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 5a9ea8e..12ccb9e 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
@@ -31,7 +30,6 @@ DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6d
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
 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_p20160615.ebuild 2721 SHA256 21d8538d3d06d7b2ace4ec26f90c713af219f8deedf537c553d08093e540c140 SHA512 0c457d3d4894878dc046c1b0f1d463189749397370fbbe82d1f117d7b8cbb5467f4648c792f0b3165e57df40c43beead1e1e408a897ea69b4b98e67a7e1b4b85 WHIRLPOOL 0f9d06a4122427fa3674b2c43d7078adc57580ab1bca2011a3053402ab8aa39bd2e2c788c05bb90a3005f490ed7a2da59016218d0fe4e9ef73b645b669bf503f
 EBUILD netbeans-websvccommon-9999_p20160616.ebuild 2721 SHA256 81077dd1a92ffef3a8c864094861350ddc3229ffd21168d8b74220047368ee6f SHA512 4a854355fac57d38b25fcd580a31fbda039cbb56265b39f2302773c13063be0df4d26140a9c3f8182488a8e8263ccba4cd495ccdb6fa9a9e2281cef5e0a0c1e2 WHIRLPOOL a04413646aeef0b1ec4f5f4434db18da805a1e1a970081797e94882cd58b8de1457911b134422e09f108098d4c2f66e7995024434fb1b5fbea5a3e430f378cbd
 EBUILD netbeans-websvccommon-9999_p20160617.ebuild 2721 SHA256 186fef19c7a144fa1510325c057f4cab763b4ea4621c262a158427137cddab11 SHA512 95a2e8994cf1b1edd76b4edba9f7fd097847c01e05be8c6ac4fabb4542784f4fc9717c6d1792387d88d62f9c4b1db5df08c28199c174e328942a247735b37657 WHIRLPOOL 6b1ae669c3ba7bd5bd912edc957f85b878f1d7674978313e9d58462ef554d605062d1523f359380d73069ada48b9705325a69e231773c2bf5db693d597381838
 EBUILD netbeans-websvccommon-9999_p20160618.ebuild 2721 SHA256 816eeeaeefd9971b1c732002cf4aef4b57268a19531062079efaa4ba061821dd SHA512 e306d2913fa902117784b9fc751a5bc2797df99da151fc7040f0c1f7b4e82543fe6ba78efa9c7e760c8f8f23c0c155f178139462da6bf0fdc74848b809d4b657 WHIRLPOOL 47fb5927886c92149008b8628a85bb5411d8f65b0841a7b4f544f40ff203d795b159d5586d511cc7a2cee075bb9264587c617e8fda61696782080603ef4a4da1

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160615.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160615.ebuild
deleted file mode 100644
index ef70215..0000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160615.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-15_00-02-33/zip/netbeans-trunk-nightly-201606150002-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 9d27d62..14cf75c 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99e
 DIST netbeans-l10n-8.0.1-20141110.tar.bz2 12065358 SHA256 542d325cbc6e0e617f6076e964e37803ec322b6d0ee4724a6d2127f2f480fb24 SHA512 28242dcbe7bcbc6a9abce15dfe6fd6140a275a417d96ff28228315bdc0ce8110ede899a1815e2fdf9115b48221d50cd3ff5b71a15d36316d04d81f66e9c0cac4 WHIRLPOOL 0318caea3463d3f7bb8876774b1cc9467dadd9bc36497a9304ed12900e2fabdc4dcdfec0b9eaee27bb36c39e9caff3743c5a42ad4c3a432205a716832688c4d6
 DIST netbeans-l10n-8.1-20151105.tar.bz2 11945028 SHA256 33e86aa7315021d28fdb64790233327d7599c98bcf3ab9d936b6fe924884325a SHA512 eb3163eaa8add417a0e8ac3ed4923a6e4992a80eaac00a01eed24e0e1ceb8a5cbd308659bcf0e5e1192ac8e84a79ea36744ad6b2589d60891b03b37102e9435d WHIRLPOOL f214a865bfd8c54341fb9d538da6db4d9b24906b0d94b3ee6cbf4a525e8842d28e852febb2f34c4c31f989d1b6baf750480bc2f04d94bcd7a8bdb8c9553ef590
 DIST netbeans-l10n-9999-20131010.tar.bz2 12440242 SHA256 64c48605820ec1f35e38c34b48cc16cd40c053d085d50819d4b4e9a80453dfa9 SHA512 7d4d61fa61710186fefd90721598ec635db7c6249ce6fc484fd5813636220f163b60230349c984c398c87e083d2d629c531fe5b4cea3752ebbcaa9823b701a02 WHIRLPOOL 10506e3a3004d6c0ab17b05507f72db2c25d2713c3233a7f5478da27d3b1261b5fb6d5f71cbf369858668ca2d1219dad1900c6c42d3f250adcc935e846e56b09
-DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6d
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
 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_p20160615.ebuild 6939 SHA256 4e9b67afb9bedbbdeaeb62ddd37ec86c7835b355ce8d4bd5c6b83168ad579a66 SHA512 ee04262337546be1262b1681c06b0b3a6bd3e14cca8a1302e9c893692cbaa89fba8aa987e1b2b486c975c3bafa752ba058d3778859a66549706fba3c13e17972 WHIRLPOOL 08104a8ee13a828a46627c9b65d2d73fa7ad4c75d86d9e88594dfd8c14ca8296c00d3c69832aa703d92949039f8e1283aae71c5ef5b87208a5382d121f8d0866
 EBUILD netbeans-9999_p20160616.ebuild 6939 SHA256 d9ed9644003dfe397e89f927b0377b4b22a64925bb0d020b468bd8ccc9022a8c SHA512 ad6e3c3edb1895a91803a3f4d4c778db104e639d599cc454efbca25b9290dd47e0b1a7ddf8a5b727518482a7013030fdeaa0664d3da4f7ddfe144d75a3c3fb17 WHIRLPOOL 2bc6c33a2bfa39f3194590bfcc4e187bf0e1cc0c36b4a17e9a8cc82512f44c051690b411ef270d8ddc7bc63cf6688c0ecb83ecaf8da68ae7a760675c326fa6b5
 EBUILD netbeans-9999_p20160617.ebuild 6939 SHA256 9ec68f98e1a55cbdbef4c612cb04ceb415be5a934090bff531861141cab85511 SHA512 526c74f5d20aafdd5aa2c52bb5915608c4d9c89be5c3b1db37b29602ca8dc2ae8a6012c14ff13099e63a5b2356dd04b5d185f2eda68c6ac182c1c7e014db7482 WHIRLPOOL 8479fda2e78eb352c65d9618a5f9b0abf70e40c186010530d275d72df9a031b5591483fffdbfa108759c7de3134e162bae814e34be1b62a63b948f553124bd4d
 EBUILD netbeans-9999_p20160618.ebuild 6939 SHA256 115c177d4137f3b54438b94d1ea5c2a374a1bcb8b851589c699bebfcf2ead4a7 SHA512 0a4190e0dd4210ea6ac423669cc550028b43ec4e2112238788904f7458506cf4d050a6b0152c4855d7632fde76980e7ad4ceb2b34c2f2c49b9a3a63099ea6436 WHIRLPOOL a81bee366bab0a973e741a09bc315656cd34c9e175c4d6af541f08c7a71d04f4c18634fae2a8efb0e8384924b7c922d00f490dafc20628d8ccd4428717d8eb69

diff --git a/dev-util/netbeans/netbeans-9999_p20160615.ebuild b/dev-util/netbeans/netbeans-9999_p20160615.ebuild
deleted file mode 100644
index 3959cea..0000000
--- a/dev-util/netbeans/netbeans-9999_p20160615.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-15_00-02-33/zip/netbeans-trunk-nightly-201606150002-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
-}


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2016-07-17 21:58 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-17 21:58 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-dlight/, dev-java/netbeans-profiler/, Miroslav Šulc

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox