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

commit:     59b68b18069f885623649044f469861122ce36dd
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 21 11:55:51 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Aug 21 11:55:51 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=59b68b18

netbeans: removed obsolete ebuilds

Package-Manager: portage-2.3.0

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 4ff7a20..e31110f 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-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f07ffe990b3f8c5bdcefe7279f17a100fb3b184dabe6b5a9baed SHA512 ec01e8bb2fde13c2381c50417e3d4a1fee51aef86df1dc2806737a1cf69af0a65b11dad723dc8449b0034130e833cf33709dd401917b4e3beee5077cb1846821 WHIRLPOOL 24fd958875a23da7208a861bea1b5bf2d89b942ac37d864f3c29753989f513cea0ece0c0cbf1cbb47f761a5cfa4919435470ebb26c725adc313d5ef0fe9f0682
 DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201608190002-src.zip 217183203 SHA256 f6713dea080556
 DIST netbeans-trunk-nightly-201608200002-src.zip 217192695 SHA256 58c11bc929ec29edace69c12ba7fd0c71b5d4386c20ab02e7f9dab0962d7752f SHA512 0ec2bc6e3298c1bf38f4217db43cc7a8221dd360cdac72b012d65aa924ff69f81a41267d58d207e80ff6a875a196064a29f6bde41ee6ce1ef1b04da238ae4185 WHIRLPOOL f64160c449ad5a19d7975f5b5d1694149d3f3afa2614adaedaebc5f2f7c490ff35be196ce287ff244936061b10b53868ddf31cf28e9ac50cdcc95b491a01c8fb
 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_p20160711.ebuild 3384 SHA256 5f841fa7b363550223d65b0f59719a548fefd90e9d3b72f5b4fd31134fd3fa47 SHA512 4c4252332fac461504f5d376e4d1c279f8699dbcf0b479f83182f39a2c133c9b386a48d04fdecb279480c7942159842864fc78c326288e55af16aa20dac6ffca WHIRLPOOL d42c9d8dfcb277b9ff409dc64b11c4934f8673fc327ab54fb27a5552d43eb9ad21d84618024f57fe5e064329f42c259202238f5ed8cf687ad58cabbf94e4ab89
 EBUILD netbeans-apisupport-9999_p20160712.ebuild 3384 SHA256 fcba3576425563b77cb98cea3e7a7fa6ca7d54db80d89bfe3d7e7ed54dbb4b0e SHA512 48081299c301df33239dbf7f47345d0467df61435f3cd8532c96b67e96164870d697fb59c31d1ffb446b97cb9fa77015a134ca901354973f62a86fd58c42d9d7 WHIRLPOOL 4b3a64a19d4a8164f46858c5586723fd82e532c78821d301a5835cf0f9033c799d818ec4f13eddd0e30708ad4c84829694a871856da592741c24206375a7f2f4
 EBUILD netbeans-apisupport-9999_p20160714.ebuild 3384 SHA256 837eac1f734cbfabf21e730aba428c0a2ce38f0de22867310663927d08fb2375 SHA512 6f0f6e9b7392d72b49a5a0eb663ce073ca38f9a7efb0b5eae760fd075e0ad55b962f7cb35963bc0ffe85903e87b331b075236a7c6c26bfddac4b54d54c340c0d WHIRLPOOL b2d7575ab01a541b60cc613df4d0f2edf85f15cdf17e7ab85f91ee3cd824abbe9c97ef9e10c0322e4de8d215486ccd536b1d523f2490792d19ceabf5ff652868
 EBUILD netbeans-apisupport-9999_p20160715.ebuild 3384 SHA256 3ae82894d8af5f8cfd05141d8487e2c26104eaaa7f3de1c58fa0a748364ca799 SHA512 5838e3373ffb2f2219ef917b2114b5411e645cdb6670024ca030ba917b6e98b7d13058e23ed56c68b519b238a55473cf1f8ac63e98a381760a8a7867ebee21db WHIRLPOOL 80b7127af19ea83c9acec46a94ceeceea56ad273c9e5fe570e539574543ec93e1159d964254f20cb18c98cf205aa6d573d754dd50ba114b233baea9cbc9a40e6

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160711.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160711.ebuild
deleted file mode 100644
index 1f23d00..0000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160711.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans API Support Cluster"
-HOMEPAGE="http://netbeans.org/projects/apisupport"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-11_00-02-33/zip/netbeans-trunk-nightly-201607110002-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 5a7622a..f51e8b3 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -15,7 +15,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f07ffe990b3f8c5bdcefe7279f17a100fb3b184dabe6b5a9baed SHA512 ec01e8bb2fde13c2381c50417e3d4a1fee51aef86df1dc2806737a1cf69af0a65b11dad723dc8449b0034130e833cf33709dd401917b4e3beee5077cb1846821 WHIRLPOOL 24fd958875a23da7208a861bea1b5bf2d89b942ac37d864f3c29753989f513cea0ece0c0cbf1cbb47f761a5cfa4919435470ebb26c725adc313d5ef0fe9f0682
 DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
@@ -44,7 +43,6 @@ DIST netbeans-trunk-nightly-201608190002-src.zip 217183203 SHA256 f6713dea080556
 DIST netbeans-trunk-nightly-201608200002-src.zip 217192695 SHA256 58c11bc929ec29edace69c12ba7fd0c71b5d4386c20ab02e7f9dab0962d7752f SHA512 0ec2bc6e3298c1bf38f4217db43cc7a8221dd360cdac72b012d65aa924ff69f81a41267d58d207e80ff6a875a196064a29f6bde41ee6ce1ef1b04da238ae4185 WHIRLPOOL f64160c449ad5a19d7975f5b5d1694149d3f3afa2614adaedaebc5f2f7c490ff35be196ce287ff244936061b10b53868ddf31cf28e9ac50cdcc95b491a01c8fb
 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_p20160711.ebuild 4790 SHA256 fb23bf76dc0d505e2aec98737ebee4b6b000d63dcee5f19a86e4973758312965 SHA512 0ba017ee8da5d4630dfc6e2e0b4f5881c3d9f1e81879d0c70b22755ee91b4efcbc902d98e12680cd3b4147be46193337777303214bbffd4946d74e4a8d3989a9 WHIRLPOOL 8f29699a9c512ee03aed9b825d62ef5e315dc95ce7591c0d7df2cfe79c1b4921ee7f75be0fef872aa6f3ea04c00bc2cd9b47afa4bb25753d518aa2886253279c
 EBUILD netbeans-cnd-9999_p20160712.ebuild 4790 SHA256 9fe3e94c5795580417c4a392da3507d489f908cc8176b2f0af273d2ea4b51f33 SHA512 9c198ee39aeb4e868a867867d30fe10de2f7e031a9165bcd6c7a9c0bd1312dc295cc6747794343fdc7ccbf144dd62b63c723ad472d6b41a9c33a69a0dc213444 WHIRLPOOL 9fe494be159aa840eb47b6000baef453ae3298289624928cfb6beea190ac2ebf9df9f380e6ab296f5599153a059ac7496dd905fdcdd129c0a36002988206035a
 EBUILD netbeans-cnd-9999_p20160714.ebuild 4790 SHA256 2eee5026bdede204985cbf858cf62005092e0777cbe6e2ce80102b2c773b7307 SHA512 5bde5f619a6127851f259636ab1d6a21abaa51f90913fc4d1f85a0a60f98a54fa8788992abcd27d9d157f38e6d3bf3bc0597dd6094c2c6af2e7e1bdf438beb8f WHIRLPOOL 3764855b3dba15f00173fb7dc1dc0947188dd881d0df4f346c4305e48bacc3a4587f2013c50636314b4f500f1f7a0692a1a9ebfd10f04eb5d1375bbcb3a1143c
 EBUILD netbeans-cnd-9999_p20160715.ebuild 4790 SHA256 681eac8ab30074f02b4fb6cf096a01187f75673aade1368ba3e4ba0fa421506a SHA512 98df3dca11e1aa7da5276666c92420a4af221d6fd42afc9b22e1a4e2081c3fc4a07f842247b2c7390530fcc46e7e197c503d641bd9dd309b135c2ed867981ebe WHIRLPOOL c4e3deb7b999451f3ae141b1b34504580063ecf7e5d068032e8bf4d2f6e08e0af87ad43fbdd8541777d3a035f14bea764019a866b6bc18be0d50ea078b715f8b

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160711.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160711.ebuild
deleted file mode 100644
index 1ff07da..0000000
--- a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160711.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans CND Cluster"
-HOMEPAGE="http://netbeans.org/projects/cnd"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-11_00-02-33/zip/netbeans-trunk-nightly-201607110002-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/5F62670605D036468D158D3D02FDCC6FBAB5D20F-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}"/5F62670605D036468D158D3D02FDCC6FBAB5D20F-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 3626403..f6934b2 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-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f07ffe990b3f8c5bdcefe7279f17a100fb3b184dabe6b5a9baed SHA512 ec01e8bb2fde13c2381c50417e3d4a1fee51aef86df1dc2806737a1cf69af0a65b11dad723dc8449b0034130e833cf33709dd401917b4e3beee5077cb1846821 WHIRLPOOL 24fd958875a23da7208a861bea1b5bf2d89b942ac37d864f3c29753989f513cea0ece0c0cbf1cbb47f761a5cfa4919435470ebb26c725adc313d5ef0fe9f0682
 DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
@@ -35,7 +34,6 @@ DIST netbeans-trunk-nightly-201608190002-src.zip 217183203 SHA256 f6713dea080556
 DIST netbeans-trunk-nightly-201608200002-src.zip 217192695 SHA256 58c11bc929ec29edace69c12ba7fd0c71b5d4386c20ab02e7f9dab0962d7752f SHA512 0ec2bc6e3298c1bf38f4217db43cc7a8221dd360cdac72b012d65aa924ff69f81a41267d58d207e80ff6a875a196064a29f6bde41ee6ce1ef1b04da238ae4185 WHIRLPOOL f64160c449ad5a19d7975f5b5d1694149d3f3afa2614adaedaebc5f2f7c490ff35be196ce287ff244936061b10b53868ddf31cf28e9ac50cdcc95b491a01c8fb
 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_p20160711.ebuild 2968 SHA256 0e535a82b19a9bede37914e9e5b5dfa01685553b67d2aa43fa9c9aa2da0a31d9 SHA512 88e45c6f6daf4ab0c135811da402edf848fa2b4f4bda8a17678571e61263623e878bb133b57d8c9e5b83858da6978fce06021efa9441b90acf6189376841634d WHIRLPOOL c4481d43930a9ea99b310e230f1bc1598b67ccbac4d044c79d7670c9f31f48ffc93b2ee1c89634756cfcd807cc0c568bc56398276d45815272104edf62ef8fb0
 EBUILD netbeans-dlight-9999_p20160712.ebuild 2968 SHA256 33a6b4e50e10d7978289a377b9a5836490707d40ff5d91c014ed10d406e1f1e4 SHA512 7a869482c1e0523346207b84c8bc6ffa276484b7f99b6ff9143c15ef55016e40d3ff57c417f243bf88509b04507b670af10c5ec30e3d3b2cf02a0188f6da450d WHIRLPOOL d048ff91b01ab289634231c99e947fb1572cc16d5b665ac9b4254cb696b032c946cac6b37270ef9bfbb441f06e2ade26923d6c52061c9ee29e4da3d3b18db6b9
 EBUILD netbeans-dlight-9999_p20160714.ebuild 2968 SHA256 e4bd881e5a0edb900650b93198ef90eef955da49e5982b57cdfafdf146edb1e9 SHA512 c8eec6690a975909746b122915674aacecd15379d8152b7de740de14e4e916f0403756897fb97f4b827461e6fa5fa1af7c7f0d7735fb1fb5ddc0995ff5966f94 WHIRLPOOL f657db3d1267c93b870c0633617ec0bab5ccdd35a1ccaa786708ef17cc57056c1cb3b77801e04bb117f0bd37390dec9bf0913e546a1432251fdc64f4ebd9214e
 EBUILD netbeans-dlight-9999_p20160715.ebuild 2968 SHA256 146b73a492e29a60bf968b2fb13654fb1487dee1ac8a5ae7c713005cefcc5456 SHA512 666c18b364aeb632bf6e506a44f9af732ffc13f3d4479c3df07aa92b0249f00e788a018dd670fcc474eeaefb73dcbe29676636cc551a8ba9480d6ec1039042dc WHIRLPOOL d494213db3a03d0a0e45321308fd3b7478eeb0f32dd20441b20068b0e11a612b0cdb15394abf355c2657c7d4e386e384a88b550d15c114d002acc0f76fa29d8d

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160711.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160711.ebuild
deleted file mode 100644
index c0a6071..0000000
--- a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160711.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans D-Light Cluster"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-11_00-02-33/zip/netbeans-trunk-nightly-201607110002-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 c71bcda..8e63971 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-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f07ffe990b3f8c5bdcefe7279f17a100fb3b184dabe6b5a9baed SHA512 ec01e8bb2fde13c2381c50417e3d4a1fee51aef86df1dc2806737a1cf69af0a65b11dad723dc8449b0034130e833cf33709dd401917b4e3beee5077cb1846821 WHIRLPOOL 24fd958875a23da7208a861bea1b5bf2d89b942ac37d864f3c29753989f513cea0ece0c0cbf1cbb47f761a5cfa4919435470ebb26c725adc313d5ef0fe9f0682
 DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
@@ -64,7 +63,6 @@ DIST netbeans-trunk-nightly-201608190002-src.zip 217183203 SHA256 f6713dea080556
 DIST netbeans-trunk-nightly-201608200002-src.zip 217192695 SHA256 58c11bc929ec29edace69c12ba7fd0c71b5d4386c20ab02e7f9dab0962d7752f SHA512 0ec2bc6e3298c1bf38f4217db43cc7a8221dd360cdac72b012d65aa924ff69f81a41267d58d207e80ff6a875a196064a29f6bde41ee6ce1ef1b04da238ae4185 WHIRLPOOL f64160c449ad5a19d7975f5b5d1694149d3f3afa2614adaedaebc5f2f7c490ff35be196ce287ff244936061b10b53868ddf31cf28e9ac50cdcc95b491a01c8fb
 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_p20160711.ebuild 15825 SHA256 7451df7d091835ba79f2aaecab576d1524f14d5a65fcbf094e4a2d3a88a2692b SHA512 85dbf8aac0907adfe51948a2f6dfeddede8f8552ac1d31df93aaedf64e20a5d09c65814959e5f4c773b43a9f1ffc6ba28171b451d0465f5c4739337bbf055e6a WHIRLPOOL 4d77fb21c4ac2407c6d0fe784c5bab17e1f9c0729d1ae28da3827843a8961de210d4d8f9b27edc502f90a82142cbdd358b3aad0b5ef94bf3f68c1377ed1282ad
 EBUILD netbeans-enterprise-9999_p20160712.ebuild 15825 SHA256 7c62bb4e274dc45b32fc8c8e548f908d860ebbd41114b4cd6c4df33f3de717a6 SHA512 0ed3924b765cc03ef2f7c3cfde557e57d242380ae9d8081c52372d3c6d51de95d3e330ab991b236db0f754ebc9d31c33cf5003f3a18eaff6bfb6dc41789160e9 WHIRLPOOL b40dc556e189bbf1e34abcde879d73ac26e7644d61b5fa0155205629b2a105d2409dba4c1b3c41fa17b33dc72fa95060733d84f7592c78e6975debe8898eef0a
 EBUILD netbeans-enterprise-9999_p20160714.ebuild 15825 SHA256 9a5c9d3b1183b11b1d5550fb4520d5023f42d6bf0f89aa5d085ce63ead9536ad SHA512 fca857f0e31c220d0b4730181e07c0ac3f16eddd80e93dbc000ffc8c2269e7e5729ebb9ed6f8270c4516e779ace88958c3585e06e56ed137b50e376badfb6cf2 WHIRLPOOL 0b59979e921bc5ba3243e3330e19fe989e23ab5c3b2234ff0d9a0b2e786da938c858fcb57498c89e539af3fcc373bea34a185e1da37affbb16c8adaea624b451
 EBUILD netbeans-enterprise-9999_p20160715.ebuild 15825 SHA256 b739e863158005b3e9b8c199d649a1a201feef8a5ac3c2d28730bc0f7fe41fbb SHA512 20b1af88ab9e44130e08b79c2c7a914432edbbf96aac914f12b3baa13592841ded88c439a7a5210db387b1c8912d3495d9fab12258cc681bb22af7b66781f303 WHIRLPOOL 5283ef5dbb15402da9bc05cda178ab1e51efa457904e95073213b64869dd9adb94bf44619dfa4b1a263bced83de3dc83f725951062c6ed5b9e1c1a10a4cbb564

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160711.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160711.ebuild
deleted file mode 100644
index 532b5ee..0000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160711.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Enterprise cluster"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-11_00-02-33/zip/netbeans-trunk-nightly-201607110002-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 fc9c4a9..6d4dd79 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-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f07ffe990b3f8c5bdcefe7279f17a100fb3b184dabe6b5a9baed SHA512 ec01e8bb2fde13c2381c50417e3d4a1fee51aef86df1dc2806737a1cf69af0a65b11dad723dc8449b0034130e833cf33709dd401917b4e3beee5077cb1846821 WHIRLPOOL 24fd958875a23da7208a861bea1b5bf2d89b942ac37d864f3c29753989f513cea0ece0c0cbf1cbb47f761a5cfa4919435470ebb26c725adc313d5ef0fe9f0682
 DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201608190002-src.zip 217183203 SHA256 f6713dea080556
 DIST netbeans-trunk-nightly-201608200002-src.zip 217192695 SHA256 58c11bc929ec29edace69c12ba7fd0c71b5d4386c20ab02e7f9dab0962d7752f SHA512 0ec2bc6e3298c1bf38f4217db43cc7a8221dd360cdac72b012d65aa924ff69f81a41267d58d207e80ff6a875a196064a29f6bde41ee6ce1ef1b04da238ae4185 WHIRLPOOL f64160c449ad5a19d7975f5b5d1694149d3f3afa2614adaedaebc5f2f7c490ff35be196ce287ff244936061b10b53868ddf31cf28e9ac50cdcc95b491a01c8fb
 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_p20160711.ebuild 2913 SHA256 718c727e901597f25b86eb504724838767612441a47b593419a4865df75dd1fd SHA512 b161dcb6326cbc10d9533794883be2583ee0e8ad3da39eba86c31ca4c0b9fee9505caa80155cce1555447f1b67a431d8d781325811bc087dc587e5668cca8739 WHIRLPOOL 11d7dc3cb91cf64abfda2b65054f32f1f89e2a5d3cbab85591e918f73bff29706123c11bada3d2af721250fec83a27d5e21be21cbe3f29261599a043afcb83f5
 EBUILD netbeans-ergonomics-9999_p20160712.ebuild 2913 SHA256 c861144edf651e86b2d4891b8ccfb7b4f8f1e3f9a6590b1d0153c6d971fb94eb SHA512 dbcef6bda36566271840ad762e85a2b1616250e9153af8ca81597c7fd9006e1d9149981e3e20c1b254c5bc0080878e9df53159d8c3a2bf0059f385ec10c85748 WHIRLPOOL 9362bffd616e41ae8232131b427f5652319138df99ad85535a79816a25a9a81dc5dcee47c695075d4b59aed3d6fe7d6bd222a52c6331cd9cffe2101e8fa1e8bb
 EBUILD netbeans-ergonomics-9999_p20160714.ebuild 2913 SHA256 109819e4303720b3686e458af604ef65da28e0fcbd1c41d0e934084c4f0d1600 SHA512 290ab44bc7fec8a29ae7f0dbc5938a1d51524453055932d065129503b2d0cbb1f58129da64a57794b67c1eae34fe37e130ffb8ed4ff603e12274df03f7a69c14 WHIRLPOOL b5038c12667bcb52688276111f187360f144622b09e64767ae6f92540373a7a16af179210bdf45a4acbb595152aff09f4bcc047da56c4ca78a88074dba358062
 EBUILD netbeans-ergonomics-9999_p20160715.ebuild 2913 SHA256 9f4440176eb7116e8fafe44e0e0aa1bf332d2965d578d406fd8909240d1dbff9 SHA512 d035a940cc58b0b7cc7ba3bea371249e40fcce54c89409871d683da7aeadd76396f7f0ea36dd177917b42eb924a98e568f1cabcd1cac94c33acaa880c3d9730a WHIRLPOOL c6b2aa71666994dae05aa081bfcbc86904577fd7668fe27ff37f8ac5ebc8897ba653b26a72201342fdf434f8e841718424f8921fb5ec8f92bb14482cd1cc5317

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160711.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160711.ebuild
deleted file mode 100644
index ff7cc4c..0000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160711.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Ergonomics Cluster"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-11_00-02-33/zip/netbeans-trunk-nightly-201607110002-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 65ca451..1c2c9f9 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-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f07ffe990b3f8c5bdcefe7279f17a100fb3b184dabe6b5a9baed SHA512 ec01e8bb2fde13c2381c50417e3d4a1fee51aef86df1dc2806737a1cf69af0a65b11dad723dc8449b0034130e833cf33709dd401917b4e3beee5077cb1846821 WHIRLPOOL 24fd958875a23da7208a861bea1b5bf2d89b942ac37d864f3c29753989f513cea0ece0c0cbf1cbb47f761a5cfa4919435470ebb26c725adc313d5ef0fe9f0682
 DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
@@ -36,7 +35,6 @@ DIST netbeans-trunk-nightly-201608190002-src.zip 217183203 SHA256 f6713dea080556
 DIST netbeans-trunk-nightly-201608200002-src.zip 217192695 SHA256 58c11bc929ec29edace69c12ba7fd0c71b5d4386c20ab02e7f9dab0962d7752f SHA512 0ec2bc6e3298c1bf38f4217db43cc7a8221dd360cdac72b012d65aa924ff69f81a41267d58d207e80ff6a875a196064a29f6bde41ee6ce1ef1b04da238ae4185 WHIRLPOOL f64160c449ad5a19d7975f5b5d1694149d3f3afa2614adaedaebc5f2f7c490ff35be196ce287ff244936061b10b53868ddf31cf28e9ac50cdcc95b491a01c8fb
 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_p20160711.ebuild 3377 SHA256 22280e55838e12a7852ef56a51c6e3c4a070ff1b35af46298d0b2d4d069771ac SHA512 98baba49dac86642a7dc884b1bc7c5e6f4d478eeb41ce9551c72c540005de1f514edff07eb44e0bf692f50af47436fefa3dbb2a7ce8c345c42dd9d4d022288c4 WHIRLPOOL 1281c30d522494389978ed8e4a19b1dee21bcfb2143f0028eb8a93c94596b790e765b6c3e5860357ec0c2084c1b7988400a054a7a313c09b6414cacbd01e21e6
 EBUILD netbeans-extide-9999_p20160712.ebuild 3377 SHA256 130f06d602288a3332031e6bbae381caf5040b1356b50393489d7175793dd639 SHA512 b01b9a2188a651bc51c6e32853b39c0ec8ebebddc337690e249b56517e8e08a40b019d49daba8f32a498ee105e73b1c947c468deffa13223882e93e35a35d5a7 WHIRLPOOL 6f06ca772d294407580d06fe38b3b49bb6c9bc3c286027c35134c2f65f25b97b1d15b1425038d456a7ea03c6a1a80db2f0fcf76e46eed1883d7a0a11adae0d12
 EBUILD netbeans-extide-9999_p20160714.ebuild 3377 SHA256 2e016dccd68d836434b2ee24a15cfc04904084b7fd82a28c965a88c4adb673a1 SHA512 1bcdd0ba2cf76cab1d886a8ed20cf40adcef2703623994c4b270927104f9d67412768a35712d3f87a7dda7eb56f41870479f5b48a1cba6189ad23c484a30bdc4 WHIRLPOOL 8dbc1d0b61126c2236dbe7ac1d1f7a1f521252cf17ecd35fe4909540f3734430f59d1b6c56b691ebcd9c1ab464a2766e89ca18f4e80f683e2dad1e794a2c236c
 EBUILD netbeans-extide-9999_p20160715.ebuild 3377 SHA256 002505862a979c1801612c829bf8f57fb63b2c95ad6ba8c67074bbb5d6288018 SHA512 473bc212d4602ad51a49078c46d83809cecad10a8a11290127d2c22a992e9956b30fccc228d1d1d716b824a97019aa7a4e77eef636cd22611f9e28d760fb3fc5 WHIRLPOOL c254628bad589e6f1b86f711cd5ccba1a959c49790dd3502c897a7da01b38228edfeadd3e58619e9d76039d7577ca417b51e9b9237cb587806a55c5b33d605ab

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160711.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160711.ebuild
deleted file mode 100644
index 2efcead..0000000
--- a/dev-java/netbeans-extide/netbeans-extide-9999_p20160711.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans ExtIDE Cluster"
-HOMEPAGE="http://netbeans.org/projects/ide"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-11_00-02-33/zip/netbeans-trunk-nightly-201607110002-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 1c672c6..fb0c2f0 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-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f07ffe990b3f8c5bdcefe7279f17a100fb3b184dabe6b5a9baed SHA512 ec01e8bb2fde13c2381c50417e3d4a1fee51aef86df1dc2806737a1cf69af0a65b11dad723dc8449b0034130e833cf33709dd401917b4e3beee5077cb1846821 WHIRLPOOL 24fd958875a23da7208a861bea1b5bf2d89b942ac37d864f3c29753989f513cea0ece0c0cbf1cbb47f761a5cfa4919435470ebb26c725adc313d5ef0fe9f0682
 DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201608190002-src.zip 217183203 SHA256 f6713dea080556
 DIST netbeans-trunk-nightly-201608200002-src.zip 217192695 SHA256 58c11bc929ec29edace69c12ba7fd0c71b5d4386c20ab02e7f9dab0962d7752f SHA512 0ec2bc6e3298c1bf38f4217db43cc7a8221dd360cdac72b012d65aa924ff69f81a41267d58d207e80ff6a875a196064a29f6bde41ee6ce1ef1b04da238ae4185 WHIRLPOOL f64160c449ad5a19d7975f5b5d1694149d3f3afa2614adaedaebc5f2f7c490ff35be196ce287ff244936061b10b53868ddf31cf28e9ac50cdcc95b491a01c8fb
 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_p20160711.ebuild 3416 SHA256 0f70a9bf417bc1cf1b72147a11459f060c9e25a2c72eab37349c0c12ac4254cf SHA512 3e1b62b4a95df8f7ba6ba40a3fe10882ff266c90db82e57567e2b50653ccd81639c25ffd9ba572cd22101e09a0c45da6c9a5d6599e5cc83b8d7593d67e73fd6c WHIRLPOOL c5c5482353e72b72cebd23665d1ff2f59c3403f7ccb9632dfc9053f4dc0dab290da1e99a24193b6cbab2884fa6be21b3ed1aebf4d83f3d0b48d2dd90adb8a211
 EBUILD netbeans-groovy-9999_p20160712.ebuild 3416 SHA256 1b552e16fe46de929d14a5c32054504dc36e5560cadc1017ff1ac22e7afc7aef SHA512 97e37367d94cc0bab0a2ae071eb0f5d0c7d509d1a71befd6ab4f55c528902c58305fa2fbafa277f488864261bebf3120d2079cbbacb7ad0764d1434d9cf5358f WHIRLPOOL 27e5b3abcaadfab2075ece31bcb2aabca0e5d57d89a442f8de6a0bbd6703a63371a96ffa5f8d582a94b8e5b52bcdccef65130376502fecc291cde1a386cafa20
 EBUILD netbeans-groovy-9999_p20160714.ebuild 3416 SHA256 4198e02fe9c0dc7ad95306a57b7bf8a3eae0df6ef39549cde7a4a3ef56fc2947 SHA512 abb29366c9bc7483a5eaac509c9f2277997a2fda2096a68d51f3ed9d730e761275262f3c1ac5b3c8dddf434017ffef40da2447948adca47366d449c2013df4da WHIRLPOOL e11bb167bf2d5b7c56d0d7c791ba55b2b0bb3aa891f3c5f7ebfb54d1b326a44d7329a639ba68c857df31f671b9545207cfe5102bd8498dfa2ca5245000c1e404
 EBUILD netbeans-groovy-9999_p20160715.ebuild 3416 SHA256 b6c360cfd4a698b5c22babff3279bb5eab2a361ad0ba1cc68713f4f3b3f8e6e7 SHA512 a4b7f892221cc7cd95d4193b180b375f2abb513fbbd681b7781368f8320551aa565ce265e94059052192d94fd44d644fedc0a09be12e8d0751b4fb63f261ecd5 WHIRLPOOL e0e877ee2be3e5b8aabcc9b5ae325367b81c26ba41b322b79a879be826693add2898acbdd54d43d730c11c89ca3f766fa8bca47e603426f07e424f1c8d1fd770

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160711.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160711.ebuild
deleted file mode 100644
index 9e2af89..0000000
--- a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160711.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Groovy Cluster"
-HOMEPAGE="http://netbeans.org/projects/groovy"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-11_00-02-33/zip/netbeans-trunk-nightly-201607110002-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 b58f77c..82f9c4c 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-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f07ffe990b3f8c5bdcefe7279f17a100fb3b184dabe6b5a9baed SHA512 ec01e8bb2fde13c2381c50417e3d4a1fee51aef86df1dc2806737a1cf69af0a65b11dad723dc8449b0034130e833cf33709dd401917b4e3beee5077cb1846821 WHIRLPOOL 24fd958875a23da7208a861bea1b5bf2d89b942ac37d864f3c29753989f513cea0ece0c0cbf1cbb47f761a5cfa4919435470ebb26c725adc313d5ef0fe9f0682
 DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
@@ -37,7 +36,6 @@ DIST netbeans-trunk-nightly-201608190002-src.zip 217183203 SHA256 f6713dea080556
 DIST netbeans-trunk-nightly-201608200002-src.zip 217192695 SHA256 58c11bc929ec29edace69c12ba7fd0c71b5d4386c20ab02e7f9dab0962d7752f SHA512 0ec2bc6e3298c1bf38f4217db43cc7a8221dd360cdac72b012d65aa924ff69f81a41267d58d207e80ff6a875a196064a29f6bde41ee6ce1ef1b04da238ae4185 WHIRLPOOL f64160c449ad5a19d7975f5b5d1694149d3f3afa2614adaedaebc5f2f7c490ff35be196ce287ff244936061b10b53868ddf31cf28e9ac50cdcc95b491a01c8fb
 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_p20160711.ebuild 4126 SHA256 8bdc2fb87f9042f86c8a12971a8c63c8694075298fbf1f036e22e6e33c2be8e3 SHA512 4412e347167376a92b5c4a4aa2c8a1c2cbaff22e31898b974510f7fdc4ed8676220f10e309efab500adc0524838af68cb3fb51e957523f581f9a1f6edc22e9ab WHIRLPOOL 31dac19fdc9ebbec4879fab96acf8738c2765c097c8b4a7fc7e706cda3a407f5950f0f035b3b1a44aaf0ad785fc511d8e1aad872dd0f555143c9e0ff7640f064
 EBUILD netbeans-harness-9999_p20160712.ebuild 4126 SHA256 74a7dc8ae1b872aeed7469ec6d45810dfda915f17e9e6c580454ea9a8e1c1179 SHA512 df4e7e13dc45718118462f650f19688447c9d32d9b7839ad04d46a5dbbbb975a47f626385a9e5b34e438faf7f72ff9d51eda0f391fedada9443f4925a1c1940c WHIRLPOOL 57ac87057f795cf6bedecd86cc22c0b8153a433e2b0c23ee7f260f3c8c540615ae9f93cfde787957cc060ad879340e32aa81acfa18f996ee94b623e7e9a3d212
 EBUILD netbeans-harness-9999_p20160714.ebuild 4126 SHA256 e7bb52061c190d9d3073df61b570507203158a241cd3f0d9b3ecfa4ba9c2c5e1 SHA512 aa121aafe325dea54073341de56853f1199579e55917c6966246708f4359555b74182ccaf1d7395499c8772e648f7f88f84edea50b75755e78749bca60748844 WHIRLPOOL 0f9a57978400e4c42cb8837a5f24d490ec9d8143d2e7be1be776b045a5d068cecb989070387165f63ad4ba70c7719b9972eac2cd8b988708f6febc51d178748a
 EBUILD netbeans-harness-9999_p20160715.ebuild 4126 SHA256 4975d85f01f7d3affb5c5c2dea2368d291936fe4d02f69b68fb2da1541ae39fb SHA512 c02fff0e78f689416e6541d32af0158c8c9bb475320e042404395af421134f63fa823691e8cfc971642e5ce4d9360f3e5c5ebb2a69fcad7aabc54be37a896f39 WHIRLPOOL 05d2f529643fcf7c7c8e7afae9483d5de0b2f22bdb0069d932016785f0fca4a6d0e1bf8f5d1ff999fefa4b526ba2dca522ce443210927c3f9bb2e522011dc345

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160711.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160711.ebuild
deleted file mode 100644
index f9c7a21..0000000
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20160711.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Harness"
-HOMEPAGE="http://netbeans.org/features/platform/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-11_00-02-33/zip/netbeans-trunk-nightly-201607110002-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 907ea7b..da52aaa 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-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f07ffe990b3f8c5bdcefe7279f17a100fb3b184dabe6b5a9baed SHA512 ec01e8bb2fde13c2381c50417e3d4a1fee51aef86df1dc2806737a1cf69af0a65b11dad723dc8449b0034130e833cf33709dd401917b4e3beee5077cb1846821 WHIRLPOOL 24fd958875a23da7208a861bea1b5bf2d89b942ac37d864f3c29753989f513cea0ece0c0cbf1cbb47f761a5cfa4919435470ebb26c725adc313d5ef0fe9f0682
 DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
@@ -171,7 +170,6 @@ DIST netbeans-trunk-nightly-201608190002-src.zip 217183203 SHA256 f6713dea080556
 DIST netbeans-trunk-nightly-201608200002-src.zip 217192695 SHA256 58c11bc929ec29edace69c12ba7fd0c71b5d4386c20ab02e7f9dab0962d7752f SHA512 0ec2bc6e3298c1bf38f4217db43cc7a8221dd360cdac72b012d65aa924ff69f81a41267d58d207e80ff6a875a196064a29f6bde41ee6ce1ef1b04da238ae4185 WHIRLPOOL f64160c449ad5a19d7975f5b5d1694149d3f3afa2614adaedaebc5f2f7c490ff35be196ce287ff244936061b10b53868ddf31cf28e9ac50cdcc95b491a01c8fb
 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_p20160711.ebuild 29867 SHA256 b22b6f5d05a0b193cf86e10adfec890ae34521e3ad44ee71abcf0610653848ef SHA512 111ac1c6dc69da73a579ca1bfa3626d226d243e73439fc5acd82a26ee8be3f982a9a1607fe36f3626c427dd8c30a218a84060cfe7214169fbb4b62db3c32c720 WHIRLPOOL d7ac218b64f862f9c703fcd32838089048534907d801d78dc00f5ed1c4cfef3d7a128444cc5fa67008dc707ca6c60c54a2ce76ba7b970550905f5852d27426e8
 EBUILD netbeans-ide-9999_p20160712.ebuild 29867 SHA256 85b6bda9470fdcd1d2bf4b74d08bbe29d52e993c4d4f38cecc404f9d1bc93306 SHA512 ae40d71c4d95c3f5bdb4ebb877c42aa2e44e62a1907a2ce159f0d2d5a80b44d728c2696cdb4b695846ec0b83d51947910078e51a559c205f84c6d14c2f2c34a5 WHIRLPOOL 65b089ea712f1ab840e7a40059388c01c686bf7ee64e9f2cafd63796fb59a31d5293216f250aa9378ec6f813e785b85e8a59b0f5ecb4492a66a27afdfb14da51
 EBUILD netbeans-ide-9999_p20160714.ebuild 29867 SHA256 fd68f477e76398c46654bcc5a9e6a9199e66ea8752cf808cd20bedcc7b8703e3 SHA512 9bbe660125f0463c26f3bacc4bea97e2cb63015d419ebf789ee6142ce8142ab1caafdb0eec71918f53c045be70a58fadc978712210402f0938f6b10acff4c1ce WHIRLPOOL d2ba44aae7e1fe8e66dcbbb4bd204fc3d9c629435e3ffc2ae0ff46082817c6e77a97089b91ecc23b3516368b919cb8948769c661a82983848885eac041fc1c1a
 EBUILD netbeans-ide-9999_p20160715.ebuild 29867 SHA256 65fc09d4924b4f14cf9f0625745a2b859fc7effbbb21851403ee9c1b13fd82eb SHA512 b4c7d97d08b46730acb48354d11d076ac924d454bd8be40ed4871457bd45286b7815fb61531e8e51e00aa1554316cc4392c2178c675fd0bc5cef164154dd9f30 WHIRLPOOL 1ebf005aac3b07456bac82e952ff8a11dc80b4e29b865d4ba3be747ab86670bccef667a93be976fb675d9715468da106793bce56f5bf0fa45867f8d43fe4a79a

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160711.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160711.ebuild
deleted file mode 100644
index 04c96f2..0000000
--- a/dev-java/netbeans-ide/netbeans-ide-9999_p20160711.ebuild
+++ /dev/null
@@ -1,374 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans IDE Cluster"
-HOMEPAGE="http://netbeans.org/projects/ide"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-11_00-02-33/zip/netbeans-trunk-nightly-201607110002-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 8edd5b0..1a4c105 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -37,7 +37,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f07ffe990b3f8c5bdcefe7279f17a100fb3b184dabe6b5a9baed SHA512 ec01e8bb2fde13c2381c50417e3d4a1fee51aef86df1dc2806737a1cf69af0a65b11dad723dc8449b0034130e833cf33709dd401917b4e3beee5077cb1846821 WHIRLPOOL 24fd958875a23da7208a861bea1b5bf2d89b942ac37d864f3c29753989f513cea0ece0c0cbf1cbb47f761a5cfa4919435470ebb26c725adc313d5ef0fe9f0682
 DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
@@ -66,7 +65,6 @@ DIST netbeans-trunk-nightly-201608190002-src.zip 217183203 SHA256 f6713dea080556
 DIST netbeans-trunk-nightly-201608200002-src.zip 217192695 SHA256 58c11bc929ec29edace69c12ba7fd0c71b5d4386c20ab02e7f9dab0962d7752f SHA512 0ec2bc6e3298c1bf38f4217db43cc7a8221dd360cdac72b012d65aa924ff69f81a41267d58d207e80ff6a875a196064a29f6bde41ee6ce1ef1b04da238ae4185 WHIRLPOOL f64160c449ad5a19d7975f5b5d1694149d3f3afa2614adaedaebc5f2f7c490ff35be196ce287ff244936061b10b53868ddf31cf28e9ac50cdcc95b491a01c8fb
 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_p20160711.ebuild 15656 SHA256 0c5a06b6ea2d5e22bf1693da05a12d04c74db19c6797d57ccb84970fde3d6796 SHA512 dd2dd7ec7959fa0bfe865c39869547b2cf10b99c84abd78854f37c2a3182f250bc013af82fb95530fca51dada7f579b986261552a9d2509f446a72c50cbae394 WHIRLPOOL f80a146f0ab9c7326eacb96f69e30f5d4870fd1d184a5fbe6c11b2d996edb8dc2d33c1e98b85eafdeb0520779e056c080841f8bf8af433383c976b054a936fa8
 EBUILD netbeans-java-9999_p20160712.ebuild 15656 SHA256 3820fac9f920771610b240f33cc4dd9e80e615268f5811747633fb875796fcb7 SHA512 18ce7562d294e151f66780d4adddbde1312e83c5e99ffcaa91510d566a6bf3a920a6357ea398b7e8abd5b11a41edf86bac6617b7864759dbb681801030998c41 WHIRLPOOL 1af6aa04e53a57a5a7583c2ea67b57ccca0f20efcdb362310101efa364b8fb3ec19b695860c5a3341ef585cb840a1f4d21703e4ea2578edbd7852fd6c377bc46
 EBUILD netbeans-java-9999_p20160714.ebuild 15656 SHA256 e0daff95e9a907f92c867223b7fd2704698cb344f474131a7d3ba0f1268911ab SHA512 bf8b36115e47da27fd59202a1993bd07f477ae6fcae02b3146cb488c054b9fc8ef1651f27ecb516a185b24cbd36d160fe50cbe1d812e43c1205172b15a393828 WHIRLPOOL a137c764f0975a27c48babe20f4b5c02da5cbbfdbe329d9d3f8d68c64a4226d13ac69c00cdf4665edd6797691ce41666858e469145ee899147fd90f58a55ebc3
 EBUILD netbeans-java-9999_p20160715.ebuild 15656 SHA256 c945bcf64cc7320255cb48effb27e45466e19704d63735dac2900c8496740d45 SHA512 b355b605f733200edeeb92d53394a48076afa0225c7d69fdc7386634d14428e4c3a2ced53dcbad65e61514ccf26c3b93e16af14e9ac95caea3e4196a1afde253 WHIRLPOOL dd0edf7c8f2b10d4e1f06e211d04b8495c99d6f0047638922060b6d9c18f141852c097b4b9ff98deebaa7b5f8a9ea359801e391f5594638b163042e8e50c6a03

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160711.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160711.ebuild
deleted file mode 100644
index 9783fb2..0000000
--- a/dev-java/netbeans-java/netbeans-java-9999_p20160711.ebuild
+++ /dev/null
@@ -1,280 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-# Maven cannot be unbundled because it depends on exact maven version and exact content of maven directory
-
-DESCRIPTION="Netbeans Java Cluster"
-HOMEPAGE="http://netbeans.org/projects/java"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-11_00-02-33/zip/netbeans-trunk-nightly-201607110002-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/D803BEB75E912EB3C2F2E042B808AC0263C066DC-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}"/D803BEB75E912EB3C2F2E042B808AC0263C066DC-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 eb4be3b..ff6bf46 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-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f07ffe990b3f8c5bdcefe7279f17a100fb3b184dabe6b5a9baed SHA512 ec01e8bb2fde13c2381c50417e3d4a1fee51aef86df1dc2806737a1cf69af0a65b11dad723dc8449b0034130e833cf33709dd401917b4e3beee5077cb1846821 WHIRLPOOL 24fd958875a23da7208a861bea1b5bf2d89b942ac37d864f3c29753989f513cea0ece0c0cbf1cbb47f761a5cfa4919435470ebb26c725adc313d5ef0fe9f0682
 DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
@@ -35,7 +34,6 @@ DIST netbeans-trunk-nightly-201608190002-src.zip 217183203 SHA256 f6713dea080556
 DIST netbeans-trunk-nightly-201608200002-src.zip 217192695 SHA256 58c11bc929ec29edace69c12ba7fd0c71b5d4386c20ab02e7f9dab0962d7752f SHA512 0ec2bc6e3298c1bf38f4217db43cc7a8221dd360cdac72b012d65aa924ff69f81a41267d58d207e80ff6a875a196064a29f6bde41ee6ce1ef1b04da238ae4185 WHIRLPOOL f64160c449ad5a19d7975f5b5d1694149d3f3afa2614adaedaebc5f2f7c490ff35be196ce287ff244936061b10b53868ddf31cf28e9ac50cdcc95b491a01c8fb
 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_p20160711.ebuild 4971 SHA256 2c1a6b579053e905bd02edcbce8c43dbca157ac8233f9a9def84a648f64f1d6e SHA512 fdaa65d0e81933c8d43a792b48e5a0931b9bdcc86bf6d5d2be9ce0b41d91c77ac9123326fa4f590d67b42bdf3d6bd2760b0265901cdd45f3c9c43a57c3daed0c WHIRLPOOL 9a599ee5e0ab5634dd79e9115d214aeaa9e3f79c2bd95a81459b1af156e99fd53b1d7fb072d2c70aef9980c6c05be5901f72965d4e38f976dd40ec4df7a259cb
 EBUILD netbeans-javacard-9999_p20160712.ebuild 4971 SHA256 300af673ed75d66106555ca008895fd08599e7d671df64ebaf772bb9a7b13047 SHA512 c9dd445c80d0c75722039a33e5ee69299c0a156644fe41d6bdf7c0966f53362fc77ee055401d69b9c5016191a529a12d985f5841cb58b46bca7dd6a1923c6e5a WHIRLPOOL 7873911e21343b6d1d196990aba2bc0fcc45efee4f79ac5c50b3a9f3170b9f1b437aa05a20a62418a23288bc70154e78d71221ed6ea332972582f9999c80676e
 EBUILD netbeans-javacard-9999_p20160714.ebuild 4971 SHA256 1939e85d24e271167fabb8729a6eaca2f7b6370df12177e7ceb72a64349194e4 SHA512 5eda28e523f64b1a5678ffbcefb365af60af65d3e6e78eecab70d5fdd74b67cca4896950c38b054cafaf88ab372c06bb473e946ef24d7cadf50f6542d9bfba4b WHIRLPOOL 65f7ccef9299bc705d46fec9d39fc4958f118aa8794acad48f0834db1b935bf2e144aa21f0750ae89fa156bb08337540baa6bcce6054d683bfef9f9328a4e1bf
 EBUILD netbeans-javacard-9999_p20160715.ebuild 4971 SHA256 baa7a568f77a14b239bf154c1e2c664ccfeb16936ed9b0508e4801833fe0fd65 SHA512 71dbada1a7ce6700a5bef7e21838f5acefa7e8551c64768e5695cf6c2618fa5497700e0e5bfadb69d4a857790ef4fab5bfd580ba513bc11f662c9c7bc8997142 WHIRLPOOL dbf11ad0d3d482081b6c58e274efdf9f66489d31e3c0d2001faded776a03e7e406ab55e270f78aeef815c46e00fed0bf491788c304afd31d67907ace04190d79

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160711.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160711.ebuild
deleted file mode 100644
index 4372483..0000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160711.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans JavaCard Cluster"
-HOMEPAGE="http://netbeans.org/projects/javacard"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-11_00-02-33/zip/netbeans-trunk-nightly-201607110002-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 93c48f6..fe020bd 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-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f07ffe990b3f8c5bdcefe7279f17a100fb3b184dabe6b5a9baed SHA512 ec01e8bb2fde13c2381c50417e3d4a1fee51aef86df1dc2806737a1cf69af0a65b11dad723dc8449b0034130e833cf33709dd401917b4e3beee5077cb1846821 WHIRLPOOL 24fd958875a23da7208a861bea1b5bf2d89b942ac37d864f3c29753989f513cea0ece0c0cbf1cbb47f761a5cfa4919435470ebb26c725adc313d5ef0fe9f0682
 DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201608190002-src.zip 217183203 SHA256 f6713dea080556
 DIST netbeans-trunk-nightly-201608200002-src.zip 217192695 SHA256 58c11bc929ec29edace69c12ba7fd0c71b5d4386c20ab02e7f9dab0962d7752f SHA512 0ec2bc6e3298c1bf38f4217db43cc7a8221dd360cdac72b012d65aa924ff69f81a41267d58d207e80ff6a875a196064a29f6bde41ee6ce1ef1b04da238ae4185 WHIRLPOOL f64160c449ad5a19d7975f5b5d1694149d3f3afa2614adaedaebc5f2f7c490ff35be196ce287ff244936061b10b53868ddf31cf28e9ac50cdcc95b491a01c8fb
 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_p20160711.ebuild 6293 SHA256 bfc9e984ba1ec74d85c29ece808a1bd5e520600726036020abe95d92602d958e SHA512 180cf878482ba22c207ee584c2ff46a0ff974e4b41638f12d621acf099251e6d91fb5988a20d441d47d15fa3dadce9af82c18737f09cfb3a541cbfa0d7f699f9 WHIRLPOOL cd084454b801e1f2628806efb0ca2ee95d9b984924ae9998050492afbd7f8a5149a64513c17b67a8e6c4193de0773b784c7522879c2bbad6c27e8f9542f48b94
 EBUILD netbeans-javadoc-9999_p20160712.ebuild 6293 SHA256 63b25e52b6af5b1101d7fdf7aa351d64bfacc1914c4ee76f39e52fc0b3535ca8 SHA512 9c0ca7e4b68e19ff9ac4753cc0b337c40b54e4625e97d771e4b6f7f3bc891dc0671a47e03cff5787055867b4bf0c4abd72abb067d6bfc68e38bcf6d7dc18f999 WHIRLPOOL f09ac1041819516f428a463972f880700306a4c257224b292deb5e35759d9c934e6f2402c68cb66062a375f480165df19b84978657cc25f40dba1c35716f049f
 EBUILD netbeans-javadoc-9999_p20160714.ebuild 6293 SHA256 000c5327ecb0ef470e0a47fa538a548be89f44753cd7c5888cfc8f8a821dfc62 SHA512 ca47291b23e92812bb3b7b653bef76dc5948d1428acad025ce0ed3c38dc96355a3a5ba5c441f9fe116ee25d5e3890eed24159a62a999cb4a9dbfd56dd22623a0 WHIRLPOOL 1ca47476d6e70fdd14f119fca15329ffa0e55537dcf54aefaff343ff0b0b37ec919c79708001e0a465ce4b9e6bed1f54d6b8e4d6cc4a996fdebd26c7a29cb273
 EBUILD netbeans-javadoc-9999_p20160715.ebuild 6293 SHA256 679768220db001a6e5bdea0d232e0f247ae4ffcd1fd630f0e4780c952c83ac07 SHA512 17af308168a204c733327f561ee732b7ad99d93a1ad56a230553f139dd2cbca5c914318f485cd3ad18f63c12c83d179ca9cb711058f06db09fd69853f293f267 WHIRLPOOL e2d5acfcd32e114caed6f1b8ea3bfb026a6e8f7f44ebdd25feef64845adaf82b11b723d46d926b16bb7fe476150a49e93c3f3c33c73f7979cf2df71e474b1759

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160711.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160711.ebuild
deleted file mode 100644
index 3e2b711..0000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160711.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans JavaDocs"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-11_00-02-33/zip/netbeans-trunk-nightly-201607110002-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 d9a292d..aef0b1a 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-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f07ffe990b3f8c5bdcefe7279f17a100fb3b184dabe6b5a9baed SHA512 ec01e8bb2fde13c2381c50417e3d4a1fee51aef86df1dc2806737a1cf69af0a65b11dad723dc8449b0034130e833cf33709dd401917b4e3beee5077cb1846821 WHIRLPOOL 24fd958875a23da7208a861bea1b5bf2d89b942ac37d864f3c29753989f513cea0ece0c0cbf1cbb47f761a5cfa4919435470ebb26c725adc313d5ef0fe9f0682
 DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
@@ -40,7 +39,6 @@ DIST netbeans-trunk-nightly-201608190002-src.zip 217183203 SHA256 f6713dea080556
 DIST netbeans-trunk-nightly-201608200002-src.zip 217192695 SHA256 58c11bc929ec29edace69c12ba7fd0c71b5d4386c20ab02e7f9dab0962d7752f SHA512 0ec2bc6e3298c1bf38f4217db43cc7a8221dd360cdac72b012d65aa924ff69f81a41267d58d207e80ff6a875a196064a29f6bde41ee6ce1ef1b04da238ae4185 WHIRLPOOL f64160c449ad5a19d7975f5b5d1694149d3f3afa2614adaedaebc5f2f7c490ff35be196ce287ff244936061b10b53868ddf31cf28e9ac50cdcc95b491a01c8fb
 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_p20160711.ebuild 4717 SHA256 2e35df2c784d4d2919b8393de8e503d01ce1a3dd01c870329992db24d40d6151 SHA512 bf54e6beb32b7e9516653292cbab1e9446bcdd242e2acb011a09e186bd8b7b0562e315f34237c087be163b8e119503ae4451ce65656514897da44781707c01da WHIRLPOOL 7f254f3694dd69bb2bd9d754729bcf407b7f0432c8796ef3f02d04cce94cb41cb864320208024af11794f7e4ea3335e9210368d3b66cbb98a38a6c32df0e7e1e
 EBUILD netbeans-javafx-9999_p20160712.ebuild 4717 SHA256 b15f65389820606177c39383fc7ada09b3feb77dd53f75123e6f9cfedbda6a05 SHA512 8b6956ab570f4922a4d0ad7942d741259a23fcdc53dc6f673c35f0fbcee88e1796b5b96a81fd42c5aa72e4aaf0797a178c18653d080e2dad45e1b970bc67e84b WHIRLPOOL ce8e2b610b6078887170cb63ca22bfe7c4e45456c30e3bc098a7e2b8428e077225dce2bd73214641d29608a3ee7e92fd28623914dc71d212aa02c65775cf7d6d
 EBUILD netbeans-javafx-9999_p20160714.ebuild 4717 SHA256 79a5b09192620b7495ca7ba435701029d1d6d6b0fa9024a906a61e463256d8f2 SHA512 56a1d2937e4de529dcaa7b80037be3150f6d6d657b926ef56a9fd4e0a407c2648ef1abeb4ff6936f1cfd78787d72e6434b3f1cd58d548a8d89c7b6930459f8d8 WHIRLPOOL 04932d01999aa65f377168e039904d6c3c2d5f9e0048e0b0309aa7daeecb71195a4d4650546beede69e0339cb349ca8c02f3111c78512913ab49939d7d041788
 EBUILD netbeans-javafx-9999_p20160715.ebuild 4717 SHA256 39c6744a8e6b61dda6be4546fb4235d870c0ec330bdd171359274bc3f74fb86a SHA512 18a67072723595d506d56e4c652777485deaf1a320a32a74df0be27dfc0ef8e7ba21868968f7a075fb6051b2340f0c0e8756938cafea60c100f3ba858941dd26 WHIRLPOOL 135a12fb0acd5cd27553e109ef21c7392993befad892c0f3e3a5ef05f9738ef13d1e66dedb521796697015c98156aa7f869bb9a9998c2f9334c68b312d99ef37

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160711.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160711.ebuild
deleted file mode 100644
index 1cef8fd..0000000
--- a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160711.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans JavaFX Cluster"
-HOMEPAGE="http://netbeans.org/projects/javafx"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-11_00-02-33/zip/netbeans-trunk-nightly-201607110002-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 2622534..aebdb46 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-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f07ffe990b3f8c5bdcefe7279f17a100fb3b184dabe6b5a9baed SHA512 ec01e8bb2fde13c2381c50417e3d4a1fee51aef86df1dc2806737a1cf69af0a65b11dad723dc8449b0034130e833cf33709dd401917b4e3beee5077cb1846821 WHIRLPOOL 24fd958875a23da7208a861bea1b5bf2d89b942ac37d864f3c29753989f513cea0ece0c0cbf1cbb47f761a5cfa4919435470ebb26c725adc313d5ef0fe9f0682
 DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201608190002-src.zip 217183203 SHA256 f6713dea080556
 DIST netbeans-trunk-nightly-201608200002-src.zip 217192695 SHA256 58c11bc929ec29edace69c12ba7fd0c71b5d4386c20ab02e7f9dab0962d7752f SHA512 0ec2bc6e3298c1bf38f4217db43cc7a8221dd360cdac72b012d65aa924ff69f81a41267d58d207e80ff6a875a196064a29f6bde41ee6ce1ef1b04da238ae4185 WHIRLPOOL f64160c449ad5a19d7975f5b5d1694149d3f3afa2614adaedaebc5f2f7c490ff35be196ce287ff244936061b10b53868ddf31cf28e9ac50cdcc95b491a01c8fb
 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_p20160711.ebuild 4412 SHA256 d9f1267ba1361912cbc06651159d178b9b75807e7484502d0043b582a74d6492 SHA512 ec6f5ec1ce6644bcf63a3698fae293caf788632969dc83bb22653789fe505883dd07ddc026b8bffe6d14876cedd6c0b20862a946ba5c2618ed43025f491addd4 WHIRLPOOL 09886a51d38848e4f1ced067de61ef162339b2676fdfbeb152ccad37e07fdb653ff3c2b6db5c175190b57f413c13d2a968dd7884ac6cb8990cdcc36982da0da6
 EBUILD netbeans-mobility-9999_p20160712.ebuild 4412 SHA256 f27ec67bde63dd71ac3eeda11dcc3ce149ff48a71321b89c70ad18fb08a52c04 SHA512 7379b118a9fa44e6d179f478798a72b3da1a700c2f6d27a7ad4c342649d76f3ddb0c4614fd7c429eca10b67d2678fe97a3b0cd3c0eac5eb21cdd712027665812 WHIRLPOOL daefa5847cf528c5f6b34525e68d0a3a201c1b12ebf604f8bae9fe1c04435d1c5e186d4c37f6e951ddbdc39564d787af7853913e65c21f7d76051eeaf8c87a02
 EBUILD netbeans-mobility-9999_p20160714.ebuild 4412 SHA256 b1c95899d7e6a463241c007bc638f295bdabfcdd871f67e8e878371b498a26e7 SHA512 061fe34302e287ad1ceeff8e2647d4fcd419ba4799e65dae7ef7fb6d8217c829624ebe8ee72e926b2cef77567849a77ba9b71ecb7ba324ed68eed3b19b51e17a WHIRLPOOL 0549aa617b3efd4845eeade84162a6a1f0cc5addbb192fff351087c8850da7d30540031b4f721dc41deec511c5422bee3956a2db28dc6706000f62228499fa38
 EBUILD netbeans-mobility-9999_p20160715.ebuild 4412 SHA256 4565630b7f89f2ea344275e800dfe331aaafa79fa87f169a8618398f14ae5f93 SHA512 64fda2531573cdb9d829c0d96d4b95c30e707893925dd9818942de979fea396178c386c2053a1492aada9aa231d1715ebf813ef6de6e678135984732368dd90c WHIRLPOOL b94d195b64832db30c528916850fd73bc2e9ea6393b7b960a4b1541ad347213ad967ffa4c842a793fe496e0888179bdbc4abc79c2dd6965dbb564dd81294e327

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160711.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160711.ebuild
deleted file mode 100644
index 898c4ad..0000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160711.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Mobility Cluster"
-HOMEPAGE="http://netbeans.org/features/platform/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-11_00-02-33/zip/netbeans-trunk-nightly-201607110002-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 771c7df..05b0e2c 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-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f07ffe990b3f8c5bdcefe7279f17a100fb3b184dabe6b5a9baed SHA512 ec01e8bb2fde13c2381c50417e3d4a1fee51aef86df1dc2806737a1cf69af0a65b11dad723dc8449b0034130e833cf33709dd401917b4e3beee5077cb1846821 WHIRLPOOL 24fd958875a23da7208a861bea1b5bf2d89b942ac37d864f3c29753989f513cea0ece0c0cbf1cbb47f761a5cfa4919435470ebb26c725adc313d5ef0fe9f0682
 DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
@@ -35,7 +34,6 @@ DIST netbeans-trunk-nightly-201608190002-src.zip 217183203 SHA256 f6713dea080556
 DIST netbeans-trunk-nightly-201608200002-src.zip 217192695 SHA256 58c11bc929ec29edace69c12ba7fd0c71b5d4386c20ab02e7f9dab0962d7752f SHA512 0ec2bc6e3298c1bf38f4217db43cc7a8221dd360cdac72b012d65aa924ff69f81a41267d58d207e80ff6a875a196064a29f6bde41ee6ce1ef1b04da238ae4185 WHIRLPOOL f64160c449ad5a19d7975f5b5d1694149d3f3afa2614adaedaebc5f2f7c490ff35be196ce287ff244936061b10b53868ddf31cf28e9ac50cdcc95b491a01c8fb
 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_p20160711.ebuild 4111 SHA256 ba86487964a5e5cbca82a26d082142632f17c9aa6abd22b040b4d57c0ad0760a SHA512 d90a02987aeeb665f70ab5a0139a6fdc663429f64f5de47ad83df2d5fb10654590ee036fce3da45511eb276e136700cd823935f603787ac34acea5c2e5c18e6a WHIRLPOOL 1b3288fbf1b73b1be0d7d8ee6a2faecd182693c9d14f894b0c99d723a58f8cb951ba143537e2a40a7106a920aef8833f35014b1ab83682c73de3226a45bf13eb
 EBUILD netbeans-nb-9999_p20160712.ebuild 4111 SHA256 7451d65493aeea8cf2235c4bf362ff32eabeb6059d5424da3246edd046891b26 SHA512 42084498a52ae5db4773b1e8cffa7e1744aeea8999500b82ddb80f0cfecb877f23f7e864c9db4fb1e08807e22d374c034a4f0050d2be8fabf2fdd180838c94d2 WHIRLPOOL a2b76a4bd7319c39df03c023200c4df4b110601c7ea666b8a2b3098143ac6e6cd3660f9b65c9425d5c6f0ed8a1c04e777ba17494d223e08d7ddb3d68d1d50a57
 EBUILD netbeans-nb-9999_p20160714.ebuild 4111 SHA256 4baf4e282f2742165c53b78dc8987ef4e910f73c14b0cc43ba956bdb981f1622 SHA512 7238a5b2c4e5a1538f79e5247a3408a15ef5b431ea3f35bd9fd0fb449621bc559e17b52c31cece1b05244c2fb71263485bf3f681ffa2bebdee22b0b6692ed938 WHIRLPOOL db9c7f2a4f48dd0de80a6510dc41b68e678236e692ebd5ec14ca5bd50f3b68a0a9c4c87a4f9cb888b3dcc8fc7d49d8ae847935b3e0285a014cf363c71853b687
 EBUILD netbeans-nb-9999_p20160715.ebuild 4111 SHA256 3b32c1f634e83025c1f9f274648e87ecb8ab12c30c143e26821e350743e311f4 SHA512 9cc0f04c0e510f14efc8598081cd38ea05c5ee0b5fea3b64a55e626d9a8b039f691f5352fbedb69864b8849f5f6ea9991d5144ae8d33b65fda6759b607635955 WHIRLPOOL 1c415614d6cef3b8f34d66a66205cea74011d13f3946d8963011c727738e312962f471bab1e72d84ad90721b4c0c9cd42fcc583d34b442636582d79259b11dc7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160711.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160711.ebuild
deleted file mode 100644
index fa7654b..0000000
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20160711.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans IDE Branding"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-11_00-02-33/zip/netbeans-trunk-nightly-201607110002-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 273d198..975b8c2 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-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f07ffe990b3f8c5bdcefe7279f17a100fb3b184dabe6b5a9baed SHA512 ec01e8bb2fde13c2381c50417e3d4a1fee51aef86df1dc2806737a1cf69af0a65b11dad723dc8449b0034130e833cf33709dd401917b4e3beee5077cb1846821 WHIRLPOOL 24fd958875a23da7208a861bea1b5bf2d89b942ac37d864f3c29753989f513cea0ece0c0cbf1cbb47f761a5cfa4919435470ebb26c725adc313d5ef0fe9f0682
 DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
@@ -37,7 +36,6 @@ DIST netbeans-trunk-nightly-201608190002-src.zip 217183203 SHA256 f6713dea080556
 DIST netbeans-trunk-nightly-201608200002-src.zip 217192695 SHA256 58c11bc929ec29edace69c12ba7fd0c71b5d4386c20ab02e7f9dab0962d7752f SHA512 0ec2bc6e3298c1bf38f4217db43cc7a8221dd360cdac72b012d65aa924ff69f81a41267d58d207e80ff6a875a196064a29f6bde41ee6ce1ef1b04da238ae4185 WHIRLPOOL f64160c449ad5a19d7975f5b5d1694149d3f3afa2614adaedaebc5f2f7c490ff35be196ce287ff244936061b10b53868ddf31cf28e9ac50cdcc95b491a01c8fb
 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_p20160711.ebuild 4418 SHA256 5474ef3a0e0d0e39fb122aafc49a731b8cc5b09c28b1b125686682c98251ada7 SHA512 9ab5dd7c33b7869f3a298b06ff9accfa50f5269bf9f4167eaa70ac0ba42c5b3735cbdc4e2686d05108908f166597f02be3be69927565e1433623a442a06bd97a WHIRLPOOL 65986488565ac9ddb5c9813405ea938d39d71ae89e5f519c0a1226d35f94d777841d573f93f3db63c837f6b5b37e6d7158a42194e1207b28bcfd005788721afc
 EBUILD netbeans-php-9999_p20160712.ebuild 4418 SHA256 9e3905f62ef3860be0aff89a7f96ef069db27899053ce22e46c2f9de666f3697 SHA512 dfb281de24b80694bf612f7da1f7d1e48763151d00ae9ceb227b9b621f860b79908000b166becd96f6e5cee475e88094d33e4a47a90f790ef4ebcd36048679a2 WHIRLPOOL b2f7de1c0c3a5d1ceb2047d42c9a01226d7866629d0a46906cb0efea86cffcc1488c15b833e036a384d5493a8edd6ba3d55c4803260406d57717194817102709
 EBUILD netbeans-php-9999_p20160714.ebuild 4418 SHA256 151fa7bd00a9fc0da71e1af780e3469234755cc55a9dc29fa6fd59f8eaf73399 SHA512 9e9a74d11c6275ee14a56be85f4caf6d7f5f3651bd46563bff27d6feffa3dbd378db7430694e6550a14b2cbac0069dd03d8e5bf88c1f734a1b1286ade9aa6366 WHIRLPOOL 3cb2690a7ae699252cc9c51794ffa3d287486945034150b55f1ced736eab63f74d19d9855cd7ac4d7bf49d51f785e2a6eb1578250a3802c6ec4fd167ffe7539f
 EBUILD netbeans-php-9999_p20160715.ebuild 4418 SHA256 030451623ea9bb0f748b15514f923473d6936b9a3db22af98b580f712a9ef845 SHA512 e31b987c71b71084cc309febab5c6f642d501b289277c356c57822cd3b49365a79a0db0d40e741bf2678e2f4ae253be2a2644b7d5c08ccc3fce0dfed71e32f53 WHIRLPOOL 1d8df726130832bc665c9b0a7f921265cb75f69a12425a0d8a1b86b8e7701c3732ab8517f15d414e4e9b5aea54010cf63d4eb42c27fc5e0be39f064578ddc6ca

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160711.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160711.ebuild
deleted file mode 100644
index aa06aed..0000000
--- a/dev-java/netbeans-php/netbeans-php-9999_p20160711.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans PHP Cluster"
-HOMEPAGE="http://netbeans.org/projects/php"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-11_00-02-33/zip/netbeans-trunk-nightly-201607110002-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 bcbd33a..a70d4c9 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-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f07ffe990b3f8c5bdcefe7279f17a100fb3b184dabe6b5a9baed SHA512 ec01e8bb2fde13c2381c50417e3d4a1fee51aef86df1dc2806737a1cf69af0a65b11dad723dc8449b0034130e833cf33709dd401917b4e3beee5077cb1846821 WHIRLPOOL 24fd958875a23da7208a861bea1b5bf2d89b942ac37d864f3c29753989f513cea0ece0c0cbf1cbb47f761a5cfa4919435470ebb26c725adc313d5ef0fe9f0682
 DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
@@ -58,7 +57,6 @@ DIST netbeans-trunk-nightly-201608190002-src.zip 217183203 SHA256 f6713dea080556
 DIST netbeans-trunk-nightly-201608200002-src.zip 217192695 SHA256 58c11bc929ec29edace69c12ba7fd0c71b5d4386c20ab02e7f9dab0962d7752f SHA512 0ec2bc6e3298c1bf38f4217db43cc7a8221dd360cdac72b012d65aa924ff69f81a41267d58d207e80ff6a875a196064a29f6bde41ee6ce1ef1b04da238ae4185 WHIRLPOOL f64160c449ad5a19d7975f5b5d1694149d3f3afa2614adaedaebc5f2f7c490ff35be196ce287ff244936061b10b53868ddf31cf28e9ac50cdcc95b491a01c8fb
 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_p20160711.ebuild 9520 SHA256 6f6b4ec6ca0d3c7fb631532aa0f11556f486219e370dc63dbf0a9db12439f2da SHA512 a9419c3d7e7ee450e5fe1fa2f11fbf3a5403f8681c224c357a461cc400c719b07f16562d804124650b071b0fcb1328c422fc03687c4081262891972591360e3c WHIRLPOOL 90c4a1e0a1e871669f3b6d2c50a677b1ba1d8be47823be4742a1ae43f9dcd843c62b3e2a8cda54f35f522c07799cdcbf3c26ec9be85002775218f9df7fe12322
 EBUILD netbeans-platform-9999_p20160712.ebuild 9520 SHA256 7cfcc2b2e2086957cdb698c644ae579da758f6a5566ba9b69ec4ef8660546b05 SHA512 819e910a08de36911d1b02d77989d66dedb12478b9452cfd53d31e4999c0846376524b8597456585a8dd15145cae917614bf3d1d94a792f0e42aa921879b4613 WHIRLPOOL e20a2f539c1011a24aa35ad21b6558110c49cf53d164cd16aac158511f65947c41f2fcbfa2103cc61f85233e26b28b16de87915cf29994228aded12cc903fc89
 EBUILD netbeans-platform-9999_p20160714.ebuild 9520 SHA256 31e86905caca10d6b09b36127348f48524447c67a3c5d90bf2eb98142b63546d SHA512 f44e53ac7f345ad655dd945a63c66b956ef2511ac2abf4bde5607671dae264f282658c403f5e218888e86aa263161ad96a8f3e42c9817d6f7384960d69bc16c3 WHIRLPOOL 72481c75de16731e75b900e9d940754b86b1ae8c4019e89581478d539114d7094e05c0a8516ab069f722bcadf70bd72042a9c5757f6b859e29cab3497b825210
 EBUILD netbeans-platform-9999_p20160715.ebuild 9520 SHA256 9c6be49e7be03745de2b951be958697755fed986823aee3b7ddd932ba3c138b2 SHA512 5d992a259238d3585a57cb40e1958693f52aba72dbaa98da52452d3d1849f1fc5f52eb903d13748f379ccf4101c6d93d33eb0c1e193d5032d49d2a93280def62 WHIRLPOOL 32d029610e5ecb3d76197ba2304840845fe0c4fd81174dae7d9f06c5e33ffe00902ece070beec522be3185884db1336fbb5b8e278b3432ccf5e4e7c8ffce9a5a

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160711.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160711.ebuild
deleted file mode 100644
index 5b96f50..0000000
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20160711.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Platform"
-HOMEPAGE="http://netbeans.org/features/platform/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-11_00-02-33/zip/netbeans-trunk-nightly-201607110002-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 bd093bf..364c9d9 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-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f07ffe990b3f8c5bdcefe7279f17a100fb3b184dabe6b5a9baed SHA512 ec01e8bb2fde13c2381c50417e3d4a1fee51aef86df1dc2806737a1cf69af0a65b11dad723dc8449b0034130e833cf33709dd401917b4e3beee5077cb1846821 WHIRLPOOL 24fd958875a23da7208a861bea1b5bf2d89b942ac37d864f3c29753989f513cea0ece0c0cbf1cbb47f761a5cfa4919435470ebb26c725adc313d5ef0fe9f0682
 DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201608190002-src.zip 217183203 SHA256 f6713dea080556
 DIST netbeans-trunk-nightly-201608200002-src.zip 217192695 SHA256 58c11bc929ec29edace69c12ba7fd0c71b5d4386c20ab02e7f9dab0962d7752f SHA512 0ec2bc6e3298c1bf38f4217db43cc7a8221dd360cdac72b012d65aa924ff69f81a41267d58d207e80ff6a875a196064a29f6bde41ee6ce1ef1b04da238ae4185 WHIRLPOOL f64160c449ad5a19d7975f5b5d1694149d3f3afa2614adaedaebc5f2f7c490ff35be196ce287ff244936061b10b53868ddf31cf28e9ac50cdcc95b491a01c8fb
 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_p20160711.ebuild 3472 SHA256 77cf2cb6948a3350bc5c4816cd215ec85c8b8295bd663b271b5de0d3b873d1e4 SHA512 6779b941453292904e7c80e9f297d6faf034a1cc29ed0ee84860b567990e0c6b000602b1e5f1bfd0b923e2b780c3d14c4e2f786187454234a85b37dedd4fd37e WHIRLPOOL 08be3bfc8aaa71c037cfe784e1a6061f04cac329564daefcbd0428ee54b3ad6a80e5a09c4a6e254990df66bcf2934c56e35dd03ec525cd58ab64190a68780c4a
 EBUILD netbeans-profiler-9999_p20160712.ebuild 3472 SHA256 a66b34f5f6cb6d1097d4da7fd61709268323940eea64fb2bf3c154085cd9e7d4 SHA512 4d9f6d9ac919aba70e245afcaf061b22b4a24b9c4e040886f0b30c7f383537c73297ab5716a49514415ee890321bcc5a712b915da5d1ce8893573a9b2e39e4e1 WHIRLPOOL aca83edd85d1b429b6e325804074702d041976a151035a96a1eeef3870156fdf15c1b9ed8bea5364405dfe9278380ede89815fcd42fe8d529e4405fb410bf64b
 EBUILD netbeans-profiler-9999_p20160714.ebuild 3472 SHA256 1dfed7f18bdc70763ec83b1470ed7d5b0e0993b31ef59b60ed19481f57e6ef77 SHA512 e7cb4e0ffa5bdccc14b617dd1642bdaf133a276ea04612540de8c9a179091a873cbf2399367fc8508fc40e102a86df711088902fa231866e77b6002db175487f WHIRLPOOL de5812b4ed794c0b0b63cf212f247e3a3627fadd7727dc752330ab5b265ba1c9bd508bdf92c57046b657ccd5a9d6208d65651a25bff96a659dcf0b38e0962c4f
 EBUILD netbeans-profiler-9999_p20160715.ebuild 3472 SHA256 2822a260dcc2b29514bbfe8a1387c45257f23ed8aca503c619369b56ff491be6 SHA512 74064cb38322cb0f8ff5a2151b7341c2d9d926816455e949a3b4d82e6b52b1959d9605bb16731c9dde9b81c67f75001d5d715719bc8a6f24ac76851ad5a0cc1d WHIRLPOOL 2bd5a03eb1bb56bfc4c5cc0de9f38b7d10a43fae2113b924938ec02a13e15804ec944d24debc27a0d0dfd1cee9dbcc90a48167c1b2a396de04ed14c545aa85f0

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160711.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160711.ebuild
deleted file mode 100644
index 031ce9f..0000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160711.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Profiler Cluster"
-HOMEPAGE="http://netbeans.org/projects/profiler"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-11_00-02-33/zip/netbeans-trunk-nightly-201607110002-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 e15c44b..ae1d65f 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -24,7 +24,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-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f07ffe990b3f8c5bdcefe7279f17a100fb3b184dabe6b5a9baed SHA512 ec01e8bb2fde13c2381c50417e3d4a1fee51aef86df1dc2806737a1cf69af0a65b11dad723dc8449b0034130e833cf33709dd401917b4e3beee5077cb1846821 WHIRLPOOL 24fd958875a23da7208a861bea1b5bf2d89b942ac37d864f3c29753989f513cea0ece0c0cbf1cbb47f761a5cfa4919435470ebb26c725adc313d5ef0fe9f0682
 DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
@@ -53,7 +52,6 @@ DIST netbeans-trunk-nightly-201608190002-src.zip 217183203 SHA256 f6713dea080556
 DIST netbeans-trunk-nightly-201608200002-src.zip 217192695 SHA256 58c11bc929ec29edace69c12ba7fd0c71b5d4386c20ab02e7f9dab0962d7752f SHA512 0ec2bc6e3298c1bf38f4217db43cc7a8221dd360cdac72b012d65aa924ff69f81a41267d58d207e80ff6a875a196064a29f6bde41ee6ce1ef1b04da238ae4185 WHIRLPOOL f64160c449ad5a19d7975f5b5d1694149d3f3afa2614adaedaebc5f2f7c490ff35be196ce287ff244936061b10b53868ddf31cf28e9ac50cdcc95b491a01c8fb
 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_p20160711.ebuild 6242 SHA256 cc24a6be2c157a3089d860b8815433967aada686660e1b5f6f47ffc38d6038f5 SHA512 6b9ec6faff6dddeb4510b393595bbdf2875099736711e1da1a55f70a85c5e07613081a8ddd302eab527f5fe95bbeff7450189a9a81d3e4639599cb5ab86e45a1 WHIRLPOOL cb6124dd5a9928dd2709004f4d5846eff6937520a09284ab2421ec383b793e778e5d921f04826a70885be429d951a5786d128ffc45dfcd468bf705324ee4500f
 EBUILD netbeans-webcommon-9999_p20160712.ebuild 6242 SHA256 3fb03a8463284271659640030a3c2d0622f23989c5aa2337f848497bf6d170d4 SHA512 13bf8f6bc672cf1ed4c54e82eff713587abc3f40f56229edf02fef1bd471bbc8b60c434396344ad1af68dfe32b7dfc29acfb6b7778c895af0c4669b33c3a4263 WHIRLPOOL f5be2abb1bbe959d0c93947362b7a81e2f16384ede41cd429e893b3cecb0a178d04f9bd9d4175ee4815ecc05828330d324471632d6c10758d30f110101db3511
 EBUILD netbeans-webcommon-9999_p20160714.ebuild 6242 SHA256 3418a62049f63b85ad79e5e2357168d735929ff4653368d519293a6ab0230611 SHA512 29bb9f84ae57687286d461fee7716f50b0180f2db560d97a9e9d9b509a2b82f8d0cf8cfe0dc34db91db42880e1985ddd9bed76cf12d840925ce69e4b917c919a WHIRLPOOL 92e3b0bfd97b14b4de071e9a8b3f54d6b93701a48e6290851071fd81c2fd488c2354a9ac3bfa282fac088e0775794e21040429cd6a29fdf62343e5a6804bcd60
 EBUILD netbeans-webcommon-9999_p20160715.ebuild 6242 SHA256 9bb795db0d5d42b159aa1ea570612f519fa4a80b31fa9ad0d8c1827dcf2b8ce8 SHA512 91ceadcc633d325a2d90b4f79d683fd21de13d76a2114d380ec40022dfd506e3621eb379ff64e14491548ec31e51a8143088cea2d76f054461cb04cd2d76d5e4 WHIRLPOOL eb7f3f28d22c771e8a4847256582da07fd36a5744d05efd5456d940dfad79f504b6f4e3ba969b1b824989b693d82f52ee16847735c3bf1dccd839340df0c264d

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

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 3ed58b6..794ae43 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-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f07ffe990b3f8c5bdcefe7279f17a100fb3b184dabe6b5a9baed SHA512 ec01e8bb2fde13c2381c50417e3d4a1fee51aef86df1dc2806737a1cf69af0a65b11dad723dc8449b0034130e833cf33709dd401917b4e3beee5077cb1846821 WHIRLPOOL 24fd958875a23da7208a861bea1b5bf2d89b942ac37d864f3c29753989f513cea0ece0c0cbf1cbb47f761a5cfa4919435470ebb26c725adc313d5ef0fe9f0682
 DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201608190002-src.zip 217183203 SHA256 f6713dea080556
 DIST netbeans-trunk-nightly-201608200002-src.zip 217192695 SHA256 58c11bc929ec29edace69c12ba7fd0c71b5d4386c20ab02e7f9dab0962d7752f SHA512 0ec2bc6e3298c1bf38f4217db43cc7a8221dd360cdac72b012d65aa924ff69f81a41267d58d207e80ff6a875a196064a29f6bde41ee6ce1ef1b04da238ae4185 WHIRLPOOL f64160c449ad5a19d7975f5b5d1694149d3f3afa2614adaedaebc5f2f7c490ff35be196ce287ff244936061b10b53868ddf31cf28e9ac50cdcc95b491a01c8fb
 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_p20160711.ebuild 2721 SHA256 cea1ff09427eee21f47d9937481aaebb047ea8c547cebdf37d7afc58b792db3d SHA512 2566a73ffe720f414cb3d37c5511517c3d43dccf2b9f3411d5f09b2fb55f4d1e66413110dc0d847c63381bd855eae33068e1bd0baf9bc3c2f9e17938fafa4f42 WHIRLPOOL 34ff368c84c9565d8906ec7aee6ac32b34d9a3a4b6440554c5519558f9d1164bd771b772bfbb36e7906a33863194c4041e9da63f56080e59e58d20c88703b576
 EBUILD netbeans-websvccommon-9999_p20160712.ebuild 2721 SHA256 254fa6d0c415ecaa4225c8832b97458847c241e604d5599ede133291c043a57e SHA512 56d4368e49b1a7f0ec241703257b271382ceba0f05544d2842169aaf2616445a70fb2150ad6a76e4a2b925869b06ffe680184a6ab8a1858b3651ad23219c23da WHIRLPOOL 9a96f652fc457c48fe58cfa4b83804a7a02eb457e32475fb7537a61056bd880bc58b4d41909892b240b8c1cd41d009dfcb0ee0499ed0e632576c407e93cda73d
 EBUILD netbeans-websvccommon-9999_p20160714.ebuild 2721 SHA256 a2779614839fbc7f3f990cb2d3b5b5c32d6598325c38a0bbab24ec2b6ec3af28 SHA512 0e30cc9ca5cb167597eb924712280d3d0fec53fe681d66aa1488097332cf41715a0a68a6ba15db9093e16091d261d68db9fad598da7d6f4244e69b06042dda01 WHIRLPOOL ffe86291db3ad1ffbcfbfd000853127f5ba82030fd865d5036d1955ab5e74e365be28c65cfe1b96bf92af58b7500833e95e62912e613911211b75e537fdb267f
 EBUILD netbeans-websvccommon-9999_p20160715.ebuild 2721 SHA256 4d7c7c0b55b2aac43fc078b408791958ea5b8157ae295b4d3da20a4f4939030e SHA512 8155022da527ec33a0ac10d1a4251e83f992a908970c12dc30fa8c0191fca4d64c60ff8be1a74c4b65dab7beb5d10b0788f2df6bb71e14340d66a9741bc87a6e WHIRLPOOL 1bb18bfe762d28ae5e629090e14dde541eaab61146c3651d14432ce238f4609e531f6a46a2ca81c770dfbe1b0d7c208b6231f7988426fb00dfcfbd80bbd86834

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160711.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160711.ebuild
deleted file mode 100644
index e2bffb6..0000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160711.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Web Services Common Cluster"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-11_00-02-33/zip/netbeans-trunk-nightly-201607110002-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 e0e1d60..06d2437 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-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f07ffe990b3f8c5bdcefe7279f17a100fb3b184dabe6b5a9baed SHA512 ec01e8bb2fde13c2381c50417e3d4a1fee51aef86df1dc2806737a1cf69af0a65b11dad723dc8449b0034130e833cf33709dd401917b4e3beee5077cb1846821 WHIRLPOOL 24fd958875a23da7208a861bea1b5bf2d89b942ac37d864f3c29753989f513cea0ece0c0cbf1cbb47f761a5cfa4919435470ebb26c725adc313d5ef0fe9f0682
 DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
@@ -35,7 +34,6 @@ DIST netbeans-trunk-nightly-201608190002-src.zip 217183203 SHA256 f6713dea080556
 DIST netbeans-trunk-nightly-201608200002-src.zip 217192695 SHA256 58c11bc929ec29edace69c12ba7fd0c71b5d4386c20ab02e7f9dab0962d7752f SHA512 0ec2bc6e3298c1bf38f4217db43cc7a8221dd360cdac72b012d65aa924ff69f81a41267d58d207e80ff6a875a196064a29f6bde41ee6ce1ef1b04da238ae4185 WHIRLPOOL f64160c449ad5a19d7975f5b5d1694149d3f3afa2614adaedaebc5f2f7c490ff35be196ce287ff244936061b10b53868ddf31cf28e9ac50cdcc95b491a01c8fb
 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_p20160711.ebuild 6939 SHA256 3984c53de0a417dc679d6decea66fc1ba65fa7e21a15aca4151787a1108d7bc7 SHA512 92d5f2dec966fd5abe9c028266a7fe1e14e90cb9f3f18e4b5d2f3615b101e9f6e29bd2c202f8e771ce9a46f06d7a62cdd9d54fe6992e3447a4dcd0247806aaa6 WHIRLPOOL 3e53745cae04d951d4993f52663e21f57b74f909232b3cf4f1448963aa2662891c525719aa61965fe40a435a609cebdd9273eaae6c37ee84103861318ba88cb2
 EBUILD netbeans-9999_p20160712.ebuild 6939 SHA256 4161f911f67da50af615e89e97c49aef15d89e23f3628bb1162ef4e547bda95a SHA512 18ca9d825f6756ed4b9721327a10135aca49346f1a288b2ad7d7203465c5be92de3a6f2320d74bde520bc5809b3a521955e99b71b389fbf96ef90a84474bd3de WHIRLPOOL 4c43c67dc6adecfb24a73173e0130f3026f09d34ee04af389273f961bc09816fd956ac421b453807593327605b1c99235f9977d56e10cbf090bff6aeaf11cecf
 EBUILD netbeans-9999_p20160714.ebuild 6939 SHA256 e5311bfc054c29ee55e8b47aca99541782178147ebe0d04ef84fcc7ae3939c7c SHA512 c04c20a9f6b319bc308e44665e1bdaff83344dba33efadc0c345c67e5867257a6d566ea933cf234c26cefe4a1b65f819799f537ceea617017940b4a284b4eac7 WHIRLPOOL 2426e16425125679933140033b89770cb1fbc2fa3fafc133385d024ccfa81fd6e4ebed299cd32933a5128cbcea27662780964fe6f2f60664017085530273b545
 EBUILD netbeans-9999_p20160715.ebuild 6939 SHA256 8190f340cbb3d9a257ccdf78226871fcddfe0b17b5e557a4da97a711cb96c342 SHA512 4f90c9e9420d84df5cd036319168ea777aa295966e79036d576f6f129be41c0d7d130ed4c1fba2c6d38e695b921d5a595c54271e38ecdd04ad4d856f8f65a524 WHIRLPOOL 4c8b5b4f44cfd55cfe114508c345ee7da90b9571f1a5d525609a843daa0485449c8e061e45099f005ce1bf7a7bb0636b5060893b602dbbbae21a3a647ff5c4dd

diff --git a/dev-util/netbeans/netbeans-9999_p20160711.ebuild b/dev-util/netbeans/netbeans-9999_p20160711.ebuild
deleted file mode 100644
index f6d4b00..0000000
--- a/dev-util/netbeans/netbeans-9999_p20160711.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans IDE"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-11_00-02-33/zip/netbeans-trunk-nightly-201607110002-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-08-21 15:35 UTC | newest]

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

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