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

[Miroslav Šulc]

commit:     e1255eede4657bab3c4cd76dca9e292903ce3437
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  2 08:17:33 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Mar  2 08:17:33 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=e1255eed

netbeans: removed obsolete ebuilds

Package-Manager: portage-2.2.27

 dev-java/netbeans-apisupport/Manifest              |   2 -
 .../netbeans-apisupport-9999_p20160129.ebuild      | 111 ------
 dev-java/netbeans-cnd/Manifest                     |   2 -
 .../netbeans-cnd-9999_p20160129.ebuild             | 127 -------
 dev-java/netbeans-dlight/Manifest                  |   2 -
 .../netbeans-dlight-9999_p20160129.ebuild          | 101 ------
 dev-java/netbeans-enterprise/Manifest              |   2 -
 .../netbeans-enterprise-9999_p20160129.ebuild      | 266 ---------------
 dev-java/netbeans-ergonomics/Manifest              |   2 -
 .../netbeans-ergonomics-9999_p20160129.ebuild      | 101 ------
 dev-java/netbeans-extide/Manifest                  |   2 -
 .../netbeans-extide-9999_p20160129.ebuild          | 108 ------
 dev-java/netbeans-groovy/Manifest                  |   2 -
 .../netbeans-groovy-9999_p20160129.ebuild          | 111 ------
 dev-java/netbeans-harness/Manifest                 |   2 -
 .../netbeans-harness-9999_p20160129.ebuild         | 114 -------
 dev-java/netbeans-ide/Manifest                     |   2 -
 .../netbeans-ide-9999_p20160129.ebuild             | 378 ---------------------
 dev-java/netbeans-java/Manifest                    |   2 -
 .../netbeans-java-9999_p20160129.ebuild            | 274 ---------------
 dev-java/netbeans-javacard/Manifest                |   2 -
 .../netbeans-javacard-9999_p20160129.ebuild        | 134 --------
 dev-java/netbeans-javadoc/Manifest                 |   2 -
 .../netbeans-javadoc-9999_p20160129.ebuild         | 168 ---------
 dev-java/netbeans-javafx/Manifest                  |   2 -
 .../netbeans-javafx-9999_p20160129.ebuild          | 124 -------
 dev-java/netbeans-mobility/Manifest                |   2 -
 .../netbeans-mobility-9999_p20160129.ebuild        | 126 -------
 dev-java/netbeans-nb/Manifest                      |   2 -
 .../netbeans-nb/netbeans-nb-9999_p20160129.ebuild  | 128 -------
 dev-java/netbeans-php/Manifest                     |   2 -
 .../netbeans-php-9999_p20160129.ebuild             | 127 -------
 dev-java/netbeans-platform/Manifest                |   2 -
 .../netbeans-platform-9999_p20160129.ebuild        | 165 ---------
 dev-java/netbeans-profiler/Manifest                |   2 -
 .../netbeans-profiler-9999_p20160129.ebuild        | 121 -------
 dev-java/netbeans-webcommon/Manifest               |   2 -
 .../netbeans-webcommon-9999_p20160129.ebuild       | 122 -------
 dev-java/netbeans-websvccommon/Manifest            |   2 -
 .../netbeans-websvccommon-9999_p20160129.ebuild    |  94 -----
 dev-util/netbeans/Manifest                         |   2 -
 dev-util/netbeans/netbeans-9999_p20160129.ebuild   | 253 --------------
 42 files changed, 3295 deletions(-)

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index a331da7..69df734 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-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b4317e2cb4cac3810a1ad2ef0267f0ce546438e1ef8ad7a97870d6 SHA512 be81d583e4f78c66f67037917188f189ebd13615c61b1afe373a9a39d7d0bcc33e70495c2ca3642b8e224e52ea214b80f3b2cb7fe6fa2868885af061c978add5 WHIRLPOOL 2ce1abe1c1f6043eea13c4432ffa72143b335bcececf2df63b2ef18f9700fc42d69bbfec9d4895912dea17283abe451dab3de2665bfb4cfef9a9790919523eba
 DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9ad56f46f55c48f6f2f29be561f35efd97b4b2ed5a80336045a6 SHA512 9b3a14aa58c3796257278d867e180c6dac24a9f8e9d3cf8ea2e8b639f8947e8514c6fa93c1ee8764fd854eeaa2e5239ac1febda6b53cf173525e99fa5328d58a WHIRLPOOL 4cb3842a6a99c9b80ecfd455912df8fea23339a432a3e5e9b36ba551c630efebef1211fe60edaec55fae0261c0f4cfafda626edcc27d867cb0a6aeee755ecb3e
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 DIST netbeans-trunk-nightly-201602020002-src.zip 209598146 SHA256 0b1707c46f0d9b52a61c0d0a840213bdfc9563292000dbcb6cfe6e6d1a9bb3e4 SHA512 56ee9d5767fd100de66463c57319e47b52a6769bcbbc9520fc5db4ff5b034c1f8f49bf190c39e1b082e343760aac87a03510c841f4699c6252fc27e4433b7382 WHIRLPOOL ac231e536c9adb590ffff69fdb218631b800a571dfce433b55f2e33e427494e3af9f35acee8621af5cc6c59df6f04303d6dd602bd6c6a549546c3c1797651f45
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf770
 DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
 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_p20160129.ebuild 3384 SHA256 9890b1fb66a753a27a0a9b074b96312919ad16c9e9723d730022093648f4c5f2 SHA512 492d280abed8fdda1439921da9e8e9a7debe1be4d2166b778d411aa0bdd5160f6be82e6b3d2f70937d60ad37ed4e99b7a06aa421daf8c98e33c065e96dd06c5b WHIRLPOOL d2334241c23fdcd54fb9e436b9fa0f2eb4adf94fdd8ee1c7f52a55340913f762bdef385c74d0040794dc8064ace86cd8262b867fd906b0f2952458f1e1ad425d
 EBUILD netbeans-apisupport-9999_p20160131.ebuild 3384 SHA256 6ce06ae6c5c0fc9b990d7726c3d29ce44188ea288f7962c50a1f6886a3b30b76 SHA512 40bb82b5d136e86c38b0baa4b094da8fb840bd8f725d6dd477718e2ff6d06baa892945207c698e1aa0e040a3dbb52100e105ca728580cb0ac4bb0eb1a5e40fcc WHIRLPOOL e866b87e4c2b2d4830cd7d6cab8bc5c0bb19be7a086a1655d140ee5408bc57e5a81376fbda8387be073ce8474a4e27bc892699bfa479a6f37048f6665d14448c
 EBUILD netbeans-apisupport-9999_p20160201.ebuild 3384 SHA256 3da8efb61f147030982dd9c938117968c813a541fa01a430ba3124e5b08b83c9 SHA512 d8c3f7e4813d0ceebcfb6932cce02d091c9f634ae58d3e4851dc8a60c7a1ffc5bcadc5d4e92515e392fb74ccc8f350249a94c48ec5f7daad6bbfdb8154aa2d14 WHIRLPOOL b5e43b962438de6d3cd0d7125808dea5b67cd4c4e10bfadb7995ee3409ab12afe77de3ff65c5738b6da9b05de929e574e7213b1b4c6ad8fc97ffecd27a52d388
 EBUILD netbeans-apisupport-9999_p20160202.ebuild 3384 SHA256 f1bb8534e0d531e856188c29f56e105a5b31c200639c3e5cab2a7bd626c49f70 SHA512 0cd7f180bd9172b2e2324f42079e69bc89916e5fa30e67d48ac29bf5ab1492d04ac96a190b9ec9d2643eeb785afdb7805dff769eeaa2ae9041da64cea268d774 WHIRLPOOL 63819eea4049f6a246c30e83f6c7456df9dc57e8a62668ffed32540a0f5077efdb6f05ecaad8d4410b973ffa02e60e91f607004c5d4d3a0aa6f86daaa8e3aa83

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160129.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160129.ebuild
deleted file mode 100644
index d7a2c20..0000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160129.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-01-29_00-02-15/zip/netbeans-trunk-nightly-201601290002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r14-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 e44dd7f..43fa297 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-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b4317e2cb4cac3810a1ad2ef0267f0ce546438e1ef8ad7a97870d6 SHA512 be81d583e4f78c66f67037917188f189ebd13615c61b1afe373a9a39d7d0bcc33e70495c2ca3642b8e224e52ea214b80f3b2cb7fe6fa2868885af061c978add5 WHIRLPOOL 2ce1abe1c1f6043eea13c4432ffa72143b335bcececf2df63b2ef18f9700fc42d69bbfec9d4895912dea17283abe451dab3de2665bfb4cfef9a9790919523eba
 DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9ad56f46f55c48f6f2f29be561f35efd97b4b2ed5a80336045a6 SHA512 9b3a14aa58c3796257278d867e180c6dac24a9f8e9d3cf8ea2e8b639f8947e8514c6fa93c1ee8764fd854eeaa2e5239ac1febda6b53cf173525e99fa5328d58a WHIRLPOOL 4cb3842a6a99c9b80ecfd455912df8fea23339a432a3e5e9b36ba551c630efebef1211fe60edaec55fae0261c0f4cfafda626edcc27d867cb0a6aeee755ecb3e
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 DIST netbeans-trunk-nightly-201602020002-src.zip 209598146 SHA256 0b1707c46f0d9b52a61c0d0a840213bdfc9563292000dbcb6cfe6e6d1a9bb3e4 SHA512 56ee9d5767fd100de66463c57319e47b52a6769bcbbc9520fc5db4ff5b034c1f8f49bf190c39e1b082e343760aac87a03510c841f4699c6252fc27e4433b7382 WHIRLPOOL ac231e536c9adb590ffff69fdb218631b800a571dfce433b55f2e33e427494e3af9f35acee8621af5cc6c59df6f04303d6dd602bd6c6a549546c3c1797651f45
@@ -44,7 +43,6 @@ DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf770
 DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
 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_p20160129.ebuild 4790 SHA256 bde95da79ff2390d97a08cacd904acb99d86308259a8fdd6f5b26838f6c8568d SHA512 76d117b16bf36a22633b6ff9949a83b71dd2fb60010ecc994404c2bcbc5c2547833bb65f42f3d8cf182e9ffa8ce8aa743e2f5c00a1ce8522aa3909364f0d38dd WHIRLPOOL c41e0350be94b9cf48928a75365ed17718d369c61c5fecdeda04b83fc4b7f0f1d6bc6a222cfc3b48f1c8966def5bd427738bb72679724886aa2a9b019cfe1941
 EBUILD netbeans-cnd-9999_p20160131.ebuild 4790 SHA256 1ea104fd415abc4d1c0449aa616d1430d603b7d1c76670ad0bda30fac03d1871 SHA512 2b5a99eeb58977ae285987ccbba56d9a394ece55a3d5ecf6daa4791a274cedc1a3e0d577e713a705e012c1c941953ce14ed3b40383ec16a2753ff6c45aa0adce WHIRLPOOL 54cfcd1e3227f08f7168c7b18caaeca68682a58d77582a5b62e497722d58c8dd5770fc8d58cd29095e33c48dbd8f54b7ae42f88c59e5a90aca69a6003a79f835
 EBUILD netbeans-cnd-9999_p20160201.ebuild 4790 SHA256 a8a03d247ae7db1afae0e7363a1e81c68e32b024a18c749bae4dc8e1b8d98c73 SHA512 b09f0cb14436faf11a7ff7077d2f935a809438154513df589a8851bf0b20bfc838e6293c513436d7287a7d3f53ae7e7c5a931d33772cebe5a631d180029123f5 WHIRLPOOL f2fa7c994417b7ca5890570ec65342c4ce0f9d0be2f900a9650dc53baf7cc84d595022aa6f0e0183e4309bb9f2b95d910cf71f10b64084ecb3df3090b7b0aebc
 EBUILD netbeans-cnd-9999_p20160202.ebuild 4790 SHA256 7b9f26149811aa0c929756f1f74ef314567b1a3ec7dd1ab0d09df8ee224d275e SHA512 247d432ec8ae89f09df176476fb9cb6f0af98c2ed62d934cff350441d5b4734dd76a14f72d0d6dc109115a2e64e77a21aa80761a302e7e0170b8f4f0f4338d2d WHIRLPOOL 0de120fcddf0d02b3a228bbc5b6eeefbd585d3bb913f3ebcaca6d34f7d07c9bf259cd6aa397607122a98ff8e65a03f2bab3a0905363e7759a82d4a4d07417e56

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160129.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160129.ebuild
deleted file mode 100644
index 79ad691..0000000
--- a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160129.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-01-29_00-02-15/zip/netbeans-trunk-nightly-201601290002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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/147687C3E91A8E448305A946A9D585F0DB544465-clank_0.3.6.zip
-	http://hg.netbeans.org/binaries/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-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-r14-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}"/147687C3E91A8E448305A946A9D585F0DB544465-clank_0.3.6.zip libs.clank/external/clank_0.3.6.zip || die
-	ln -s "${DISTDIR}"/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-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-r14-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.1.0.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 02f106d..f293a05 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-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b4317e2cb4cac3810a1ad2ef0267f0ce546438e1ef8ad7a97870d6 SHA512 be81d583e4f78c66f67037917188f189ebd13615c61b1afe373a9a39d7d0bcc33e70495c2ca3642b8e224e52ea214b80f3b2cb7fe6fa2868885af061c978add5 WHIRLPOOL 2ce1abe1c1f6043eea13c4432ffa72143b335bcececf2df63b2ef18f9700fc42d69bbfec9d4895912dea17283abe451dab3de2665bfb4cfef9a9790919523eba
 DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9ad56f46f55c48f6f2f29be561f35efd97b4b2ed5a80336045a6 SHA512 9b3a14aa58c3796257278d867e180c6dac24a9f8e9d3cf8ea2e8b639f8947e8514c6fa93c1ee8764fd854eeaa2e5239ac1febda6b53cf173525e99fa5328d58a WHIRLPOOL 4cb3842a6a99c9b80ecfd455912df8fea23339a432a3e5e9b36ba551c630efebef1211fe60edaec55fae0261c0f4cfafda626edcc27d867cb0a6aeee755ecb3e
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 DIST netbeans-trunk-nightly-201602020002-src.zip 209598146 SHA256 0b1707c46f0d9b52a61c0d0a840213bdfc9563292000dbcb6cfe6e6d1a9bb3e4 SHA512 56ee9d5767fd100de66463c57319e47b52a6769bcbbc9520fc5db4ff5b034c1f8f49bf190c39e1b082e343760aac87a03510c841f4699c6252fc27e4433b7382 WHIRLPOOL ac231e536c9adb590ffff69fdb218631b800a571dfce433b55f2e33e427494e3af9f35acee8621af5cc6c59df6f04303d6dd602bd6c6a549546c3c1797651f45
@@ -35,7 +34,6 @@ DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf770
 DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
 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_p20160129.ebuild 2968 SHA256 cde3f9619c4a8083df8bc61014023d0e18f21676ae27dbd4a5f554930f4c69ea SHA512 1a47deed637e81a65f3deb2bd596693dafe97b128ef32ea410f95660fea5a3a9cd6eb8339c42411baee73014d45ffeb7e7108d39ba8419e2c34d36d300a7ee19 WHIRLPOOL 8e8ca7ed81a569ef438604899fcf2d70a47277dccde854c06001214a21494a1d38f8047e908f4382ed3a519b37d566ba88faf71cc7b3e3acad19147681d764c6
 EBUILD netbeans-dlight-9999_p20160131.ebuild 2968 SHA256 c16bd6d76364ebb45c88e08df4e95c4b8855948e94e4c90d2c44f9b696424ac9 SHA512 b5bab0f36ea0377162ca8f25ed0ac7d9050cdb201f3be0ef7d4771cbec83b88574f91848370f52eb6ec30aca8703ddb3c9bfd76d5d2b1a922b8837e466216d03 WHIRLPOOL bea04887129ca67eab6b26dfe8e3768a2be815eeb85d9c3b19c9cbcbf80cef8ef76ca419d01df8bc3dd18258311ade88244bc29d8ac036d6aaf0ccb1c0767d36
 EBUILD netbeans-dlight-9999_p20160201.ebuild 2968 SHA256 1927308a3aa418f625077718d43f668d0aa437b9d011fe72c88f80d11819512a SHA512 ebe239a7382ce190bc1815d1b07a47df0eaa4bfca50580111b26bfd1b39dc775e486f34118328bf876665f872564eeed6985a5cecdba1e0b2cfeec08a476fc51 WHIRLPOOL f97808abcb8a0236d49e2900b3bb25e0a3bec0e1c481aa2a908beaf7a14de1da3a706a5d92c30b895c1c4879024e5a3d220746c886264a182c7d318bd055b4f5
 EBUILD netbeans-dlight-9999_p20160202.ebuild 2968 SHA256 aae7f714a3a843422a2f3b97beb8defe914f00f3cf406e4120a353902fb53d31 SHA512 df28b5ab8794e7087c33b73988c24fd0d16dfe53ca17c4b631aea088a9fc722f60631c5abbf5dd76e7a4e8a812e2399d52feb4f2bfc9faf95fc70bc04bda189e WHIRLPOOL 65f314137e394af052dd25b28c4d8953d20cedc57ea6137465229918eceedcccc218679fb6d5af3751c8438839861eb724427619208ac939148c90327d20cb20

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160129.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160129.ebuild
deleted file mode 100644
index 6ec80e7..0000000
--- a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160129.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-01-29_00-02-15/zip/netbeans-trunk-nightly-201601290002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-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-r14-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 3873e0c..63aea18 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-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b4317e2cb4cac3810a1ad2ef0267f0ce546438e1ef8ad7a97870d6 SHA512 be81d583e4f78c66f67037917188f189ebd13615c61b1afe373a9a39d7d0bcc33e70495c2ca3642b8e224e52ea214b80f3b2cb7fe6fa2868885af061c978add5 WHIRLPOOL 2ce1abe1c1f6043eea13c4432ffa72143b335bcececf2df63b2ef18f9700fc42d69bbfec9d4895912dea17283abe451dab3de2665bfb4cfef9a9790919523eba
 DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9ad56f46f55c48f6f2f29be561f35efd97b4b2ed5a80336045a6 SHA512 9b3a14aa58c3796257278d867e180c6dac24a9f8e9d3cf8ea2e8b639f8947e8514c6fa93c1ee8764fd854eeaa2e5239ac1febda6b53cf173525e99fa5328d58a WHIRLPOOL 4cb3842a6a99c9b80ecfd455912df8fea23339a432a3e5e9b36ba551c630efebef1211fe60edaec55fae0261c0f4cfafda626edcc27d867cb0a6aeee755ecb3e
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 DIST netbeans-trunk-nightly-201602020002-src.zip 209598146 SHA256 0b1707c46f0d9b52a61c0d0a840213bdfc9563292000dbcb6cfe6e6d1a9bb3e4 SHA512 56ee9d5767fd100de66463c57319e47b52a6769bcbbc9520fc5db4ff5b034c1f8f49bf190c39e1b082e343760aac87a03510c841f4699c6252fc27e4433b7382 WHIRLPOOL ac231e536c9adb590ffff69fdb218631b800a571dfce433b55f2e33e427494e3af9f35acee8621af5cc6c59df6f04303d6dd602bd6c6a549546c3c1797651f45
@@ -64,7 +63,6 @@ DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf770
 DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
 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_p20160129.ebuild 15825 SHA256 11ac5af569d12ae7a164e2aa4c0eb0652215b1e209bee5b94f8b8de409b8d9ad SHA512 a7048b99b1e5d612ca0d112305a487db887ad326894b58b95be57fda80abf8992b9ec562cf28183699129cf87ccdef3c7b51f7ba3fde4c39f7708ca98ee4a153 WHIRLPOOL 0e3a8e58007ab8e966396a49bb44ebadb08f08d935a1b7a690feb8748fd1368986b6967b570460bcdd3d686dc5eb19a7ee20005db7416a3e9fb5c3187a2e235e
 EBUILD netbeans-enterprise-9999_p20160131.ebuild 15825 SHA256 39a6119cf0f9a174e8cedce132e34ea5d54c03a1ad37303b0202d338af2766f5 SHA512 23e342a112fcfad052ad26cb18f2038571f34e9f7a20caf73139ca951deef4557dedba4f2d1dac046fb28854809a3414fcdd0c467fc2ff6a71857279347b9efc WHIRLPOOL 02a4b226915d7eed3c50350a131b0626978ebd6daab8b1f26527f0a711fd3382c9861605af2d77247cf7742faeecfa8141a14420ab0be46573d60fe05b5cb203
 EBUILD netbeans-enterprise-9999_p20160201.ebuild 15825 SHA256 9055385e8e57726d552e8dfaeea3ec40c847734f195a9e7d57d93b4c60a79f6e SHA512 17a3d3b9d4f09511f6cfc93f011c8349787c82f95531214df9ef7621f1706548bcdb061670c6ab17279e8c1e066f6e9875df0b4606dadc73fca100f76beaa027 WHIRLPOOL bb33ec2ad93f82abf7bbaf50f4b676cdf94110ec29a183f8948466b6ceb9e4c813b516244672e946e8026717c190a432e915439d20425b32fbacfe34ff0755d9
 EBUILD netbeans-enterprise-9999_p20160202.ebuild 15825 SHA256 f9991dee022215a40b65da2c26a2b776609592d5abeee4d101f7ca4137ecc1cc SHA512 5b4a4e906b77cde924c5f5484675e74190e3007f189664590b238c66b3f68b14e5bfe32888cb579f9e355e24a46e15b976cc379719158b7e6b0bf78c310983d1 WHIRLPOOL 94dee48bf436cdd05169ea454563fee2ef88e8cd39866903c48dea285603f31581e1a419c3b681a32911141ebc9246353017865e77e9c05716ab79796833b97b

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160129.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160129.ebuild
deleted file mode 100644
index 69756ae..0000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160129.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-01-29_00-02-15/zip/netbeans-trunk-nightly-201601290002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-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-r14-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 095340f..53ee9ae 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-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b4317e2cb4cac3810a1ad2ef0267f0ce546438e1ef8ad7a97870d6 SHA512 be81d583e4f78c66f67037917188f189ebd13615c61b1afe373a9a39d7d0bcc33e70495c2ca3642b8e224e52ea214b80f3b2cb7fe6fa2868885af061c978add5 WHIRLPOOL 2ce1abe1c1f6043eea13c4432ffa72143b335bcececf2df63b2ef18f9700fc42d69bbfec9d4895912dea17283abe451dab3de2665bfb4cfef9a9790919523eba
 DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9ad56f46f55c48f6f2f29be561f35efd97b4b2ed5a80336045a6 SHA512 9b3a14aa58c3796257278d867e180c6dac24a9f8e9d3cf8ea2e8b639f8947e8514c6fa93c1ee8764fd854eeaa2e5239ac1febda6b53cf173525e99fa5328d58a WHIRLPOOL 4cb3842a6a99c9b80ecfd455912df8fea23339a432a3e5e9b36ba551c630efebef1211fe60edaec55fae0261c0f4cfafda626edcc27d867cb0a6aeee755ecb3e
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 DIST netbeans-trunk-nightly-201602020002-src.zip 209598146 SHA256 0b1707c46f0d9b52a61c0d0a840213bdfc9563292000dbcb6cfe6e6d1a9bb3e4 SHA512 56ee9d5767fd100de66463c57319e47b52a6769bcbbc9520fc5db4ff5b034c1f8f49bf190c39e1b082e343760aac87a03510c841f4699c6252fc27e4433b7382 WHIRLPOOL ac231e536c9adb590ffff69fdb218631b800a571dfce433b55f2e33e427494e3af9f35acee8621af5cc6c59df6f04303d6dd602bd6c6a549546c3c1797651f45
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf770
 DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
 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_p20160129.ebuild 2913 SHA256 69365d476dc57889d9bedeacd496e9d9eaff09788b022c7aaec8625b4bc85939 SHA512 bbbc2946db4e95374cabeef608d31454261143422e7910ac44eb837b1365cda9c9a0205d791a15f660a123f28a9b721db608cf2fa86be1bf2d86ad4e8d160d08 WHIRLPOOL 47ef0a7188b0697e8be4a6a41d394afa9b048b4a31b3bbd369dec63de9294bbf08e1baaad6c4254c106e057de8b2dea3b4606b39f144b2ac4c8ef84613d50144
 EBUILD netbeans-ergonomics-9999_p20160131.ebuild 2913 SHA256 5cfa54f1831365fda034264e4ffd366e94bac16dc4645de9056dcca947f66112 SHA512 57211541d9c154399a90ae37ece1af1a34c9de2a3ef9a3ce4ad2634c717588b8cc18357ba45ed30c25f9594d4ac0ac50518dd5754d148d3c10a538d37e75e38c WHIRLPOOL 69d4358d6c29a33cb7977de8a28a1eccdab217fb8d44d81fbddc69a61046e73b62ea24a802e65dcdc207310e7deb2581319b7b9c6941d75ca69ba02a8065fa3f
 EBUILD netbeans-ergonomics-9999_p20160201.ebuild 2913 SHA256 0de8a020451b1cd1db94ab54fad1a7dc237b485efe83ab8ac681c10a4df0ef62 SHA512 94027d37a88c629974509a4635f8d7b9310186d41d312a342d2467dfc6bd27f510d16aeeed8b194223191041af34f3cf432cf4da63f7a09fc1a1f082a386baa4 WHIRLPOOL b3afd6c63574afd8894b50e40ca7dc8b36638465e73d807a5bb96352b56a9ce39e6d40e9efcdf1aafa95ad67002f19bf63d803530413cd3ab3420f90c8661a06
 EBUILD netbeans-ergonomics-9999_p20160202.ebuild 2913 SHA256 1889b61cb3189753c38d2005778fecf650fc04e6cad46d73c608e7ffcf8c819f SHA512 bc77b758e5fd4675ed343a8fa6b5071709975c6140fa2eb86505362606988354488acb34c63f595b627ece0f3f753d6e3b36cddd308ca1baf46d312d54d096fc WHIRLPOOL 5d1a6dccd66f3b1c5eda7072028677e2fecd9255016430a38dea96c0ed2426d5c1c6e2d35d2467c0938c57968610ff1726ec9db36371edb8a3d760a1e429e249

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160129.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160129.ebuild
deleted file mode 100644
index 77cabea..0000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160129.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-01-29_00-02-15/zip/netbeans-trunk-nightly-201601290002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r14-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 31d6df6..9789e73 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/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-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b4317e2cb4cac3810a1ad2ef0267f0ce546438e1ef8ad7a97870d6 SHA512 be81d583e4f78c66f67037917188f189ebd13615c61b1afe373a9a39d7d0bcc33e70495c2ca3642b8e224e52ea214b80f3b2cb7fe6fa2868885af061c978add5 WHIRLPOOL 2ce1abe1c1f6043eea13c4432ffa72143b335bcececf2df63b2ef18f9700fc42d69bbfec9d4895912dea17283abe451dab3de2665bfb4cfef9a9790919523eba
 DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9ad56f46f55c48f6f2f29be561f35efd97b4b2ed5a80336045a6 SHA512 9b3a14aa58c3796257278d867e180c6dac24a9f8e9d3cf8ea2e8b639f8947e8514c6fa93c1ee8764fd854eeaa2e5239ac1febda6b53cf173525e99fa5328d58a WHIRLPOOL 4cb3842a6a99c9b80ecfd455912df8fea23339a432a3e5e9b36ba551c630efebef1211fe60edaec55fae0261c0f4cfafda626edcc27d867cb0a6aeee755ecb3e
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 DIST netbeans-trunk-nightly-201602020002-src.zip 209598146 SHA256 0b1707c46f0d9b52a61c0d0a840213bdfc9563292000dbcb6cfe6e6d1a9bb3e4 SHA512 56ee9d5767fd100de66463c57319e47b52a6769bcbbc9520fc5db4ff5b034c1f8f49bf190c39e1b082e343760aac87a03510c841f4699c6252fc27e4433b7382 WHIRLPOOL ac231e536c9adb590ffff69fdb218631b800a571dfce433b55f2e33e427494e3af9f35acee8621af5cc6c59df6f04303d6dd602bd6c6a549546c3c1797651f45
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf770
 DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
 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_p20160129.ebuild 3377 SHA256 444f74315b5c815af87442a43d6e20ceb2ca03114525c6834bbbffca339d4004 SHA512 802147deee41e61d1298eb4c9c39a867853d22d5e6d8837dc36780261c14b9546cf391a26cb9d8443ed0b4233c61cd8a36ce636a79ddf73c88216024c9ab69e4 WHIRLPOOL 0cf78cf59ec428af8d76f3ff4bfbd883683e77cc01869e539144c4b4f40f6f5a589ce61fba09e27383effee8e0f1e5e9e5eeb1730cfb9122c2fa94d824bcbfeb
 EBUILD netbeans-extide-9999_p20160131.ebuild 3377 SHA256 68594e9939d5ac7e950d44a02c32c4554f78b18572a50039d2e9fd48f9b1ab21 SHA512 fe9317fd8a0f94748db66dbfc6f287dc2f0b9abadc25bfece9bab451183e7dceed808a897e70cef1e7fcc223113c54b8e076e8e58a90ce2de423f1b779d439d9 WHIRLPOOL 8a9b275995657c62379c9f87dedb4e730abca75d14a21fc0923eccc63f8510a099e3d4a30eb80d9b6ddf4663fc42ce0645cae9fe490e9d5191e63693c13e2650
 EBUILD netbeans-extide-9999_p20160201.ebuild 3377 SHA256 9dfbd09f28f6253ac99fcda06744a7767c1e20b2e94e6a55312bfab203e829f6 SHA512 0dda18c51aea08ca6c588fca92d90d01523b6ddd7654bdef553b90720bd431ed9cb350a6e7691e2bd4c7626fe2a2754f2ac6040de014cea426a3516d353464f1 WHIRLPOOL 8d57fac4d346887d1012c3fd67ba61c4fd9b3659378244d7419a2f277b092f0355351744f9d65624b2afa13a6898d78a5e6b56ad5e04fb6c7efa6737550fb7fc
 EBUILD netbeans-extide-9999_p20160202.ebuild 3377 SHA256 668d7fdc82a52c51bc550a2e7b6ab03c0bc4f0437743e2ad46e9cabb6ead404e SHA512 4de31461964ba71924e53e5e5dd381327e2d060f4512fdfd0f230d12d1f6e00309882fc77a08a9b6ce7eb37deb89bce63d9b930eab308130bcc6be20da953b43 WHIRLPOOL 3fd3fdf021718dac37a4445fb14dc57d36b18a7a264325c3e31f6686887a1a36d0ac9a5d4d838d53ff58eb527300af18b54e2ca8b9d145eab29e383279bb9e07

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160129.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160129.ebuild
deleted file mode 100644
index f1a1fbf..0000000
--- a/dev-java/netbeans-extide/netbeans-extide-9999_p20160129.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-01-29_00-02-15/zip/netbeans-trunk-nightly-201601290002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip
-	http://hg.netbeans.org/binaries/95CCE237B1E9390FBED0440B601822813DB220E6-ant-misc-1.9.4.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-r14-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip o.apache.tools.ant.module/external/ant-libs-1.9.4.zip || die
-	ln -s "${DISTDIR}"/95CCE237B1E9390FBED0440B601822813DB220E6-ant-misc-1.9.4.zip o.apache.tools.ant.module/external/ant-misc-1.9.4.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r14-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 5e4e0e8..311a444 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-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b4317e2cb4cac3810a1ad2ef0267f0ce546438e1ef8ad7a97870d6 SHA512 be81d583e4f78c66f67037917188f189ebd13615c61b1afe373a9a39d7d0bcc33e70495c2ca3642b8e224e52ea214b80f3b2cb7fe6fa2868885af061c978add5 WHIRLPOOL 2ce1abe1c1f6043eea13c4432ffa72143b335bcececf2df63b2ef18f9700fc42d69bbfec9d4895912dea17283abe451dab3de2665bfb4cfef9a9790919523eba
 DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9ad56f46f55c48f6f2f29be561f35efd97b4b2ed5a80336045a6 SHA512 9b3a14aa58c3796257278d867e180c6dac24a9f8e9d3cf8ea2e8b639f8947e8514c6fa93c1ee8764fd854eeaa2e5239ac1febda6b53cf173525e99fa5328d58a WHIRLPOOL 4cb3842a6a99c9b80ecfd455912df8fea23339a432a3e5e9b36ba551c630efebef1211fe60edaec55fae0261c0f4cfafda626edcc27d867cb0a6aeee755ecb3e
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 DIST netbeans-trunk-nightly-201602020002-src.zip 209598146 SHA256 0b1707c46f0d9b52a61c0d0a840213bdfc9563292000dbcb6cfe6e6d1a9bb3e4 SHA512 56ee9d5767fd100de66463c57319e47b52a6769bcbbc9520fc5db4ff5b034c1f8f49bf190c39e1b082e343760aac87a03510c841f4699c6252fc27e4433b7382 WHIRLPOOL ac231e536c9adb590ffff69fdb218631b800a571dfce433b55f2e33e427494e3af9f35acee8621af5cc6c59df6f04303d6dd602bd6c6a549546c3c1797651f45
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf770
 DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
 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_p20160129.ebuild 3416 SHA256 6e2e45cd825c6f334e848a862a765f18efe7355d3eee27cfc6a886e83bea5db2 SHA512 b400a4c6b0a8ef603316971f6307b926d12963cc40f8227c1f3e9c407ef461becd6204554fdf94417d05d0ab00bd603b62d19edcc7e4399945f22fa8543a7958 WHIRLPOOL 1edf622031799dc8796325c3be952d099f549423aba76d968e6fc12b4c47ae332015692a89686e2ca3e834c1d6137aca481a075856e6589b98e501ef1b5fd688
 EBUILD netbeans-groovy-9999_p20160131.ebuild 3416 SHA256 24e021ac4abbc3b29b6213c2c06518b4da3ff6777ba8b7aa6b2c3039b0dd4751 SHA512 4f814e8aa51bf698ca5138c06135774b453bf428c58dd88b578bb9bf70371d20508533d1252aeec1875fd3b63af04b69f05512e5affe90648a67c1cd6451db74 WHIRLPOOL 5c1fe109bd1a338f3e2a73638c3b41baa63bcf90fa47f80d561b5ce4b87ce8e308c73fabe5c51877ab5dd39d7f0232462b3869a5c3284a2598bf59cdcce00df0
 EBUILD netbeans-groovy-9999_p20160201.ebuild 3416 SHA256 f998020504c30ba49d879af47c55322d484d65cf1e02adb2d478e6a9a62b33e9 SHA512 86f522e1465fbc5d54296f9e085c74c40aef5655f6bab4e36adea9cc2852e2ec3339dd039028ee95965d014ed21345f9987b0ec2a1ef0df6a9c084aa1d9fba51 WHIRLPOOL e0ebfe2fe52aca344bdd92e76728f346df3213c00cfade32df5d6d28221c01140963976ddacee4f6b1e0fc90392b2bc8e6f4a443ed33f440c35847d74412fda5
 EBUILD netbeans-groovy-9999_p20160202.ebuild 3416 SHA256 0de5f39ee5d07794ad1937bf0cb6911693a744ca00caf41818d06eb6f7f00541 SHA512 15c67aad8089b63faafa056e130b942f9c8980ba316ba60685e06ad780355450162b2db9c5d59effcb066591e63c24a397cd92aa12897dd27d9a3e047a6d4916 WHIRLPOOL 19a011482b6c358bde3192dcd7992e48bade9435240cc48888f3370577226d4091a749378092f9cd1320294f2f8039e1e31ed05808e1a97565dbeb37cc9fe025

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160129.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160129.ebuild
deleted file mode 100644
index d2ebf56..0000000
--- a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160129.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-01-29_00-02-15/zip/netbeans-trunk-nightly-201601290002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-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-r14-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 8160830..7e6043f 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-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b4317e2cb4cac3810a1ad2ef0267f0ce546438e1ef8ad7a97870d6 SHA512 be81d583e4f78c66f67037917188f189ebd13615c61b1afe373a9a39d7d0bcc33e70495c2ca3642b8e224e52ea214b80f3b2cb7fe6fa2868885af061c978add5 WHIRLPOOL 2ce1abe1c1f6043eea13c4432ffa72143b335bcececf2df63b2ef18f9700fc42d69bbfec9d4895912dea17283abe451dab3de2665bfb4cfef9a9790919523eba
 DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9ad56f46f55c48f6f2f29be561f35efd97b4b2ed5a80336045a6 SHA512 9b3a14aa58c3796257278d867e180c6dac24a9f8e9d3cf8ea2e8b639f8947e8514c6fa93c1ee8764fd854eeaa2e5239ac1febda6b53cf173525e99fa5328d58a WHIRLPOOL 4cb3842a6a99c9b80ecfd455912df8fea23339a432a3e5e9b36ba551c630efebef1211fe60edaec55fae0261c0f4cfafda626edcc27d867cb0a6aeee755ecb3e
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 DIST netbeans-trunk-nightly-201602020002-src.zip 209598146 SHA256 0b1707c46f0d9b52a61c0d0a840213bdfc9563292000dbcb6cfe6e6d1a9bb3e4 SHA512 56ee9d5767fd100de66463c57319e47b52a6769bcbbc9520fc5db4ff5b034c1f8f49bf190c39e1b082e343760aac87a03510c841f4699c6252fc27e4433b7382 WHIRLPOOL ac231e536c9adb590ffff69fdb218631b800a571dfce433b55f2e33e427494e3af9f35acee8621af5cc6c59df6f04303d6dd602bd6c6a549546c3c1797651f45
@@ -37,7 +36,6 @@ DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf770
 DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
 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_p20160129.ebuild 4126 SHA256 bfb690f231d6d06959ecf694bfc7c45b202c9be0ff08c430e3b2003e21680d6f SHA512 0de734d9e7acba11539ae2dc00ba34e9ea09f59e8897a49ee4aa1fe336343b844713d5df25cf472ec6ef9af698de0674a9cd21189d25ee2ce0ebba705366c0a3 WHIRLPOOL b6e86e710904426bd6b5d38cfb4020eee5abd9df8dd7b68c90cd26d5285ccacc31ebf98f599517404e503b3d7ff738c5a0d471536b5de1ced817b196574a3e8c
 EBUILD netbeans-harness-9999_p20160131.ebuild 4126 SHA256 c83fb523282aa3ff4e0b97a8347b78962f083ed42ffd5692dd83678780349fd7 SHA512 fea1215eea56be58da53060cbdc5bf6f2d61ad69101352f1ba813ebe6db2bd9bcf3beadca6ee7a8a2a4b30975810be5fede587751b30bfb2949a406a7480abf8 WHIRLPOOL 075c885864ee756c85c63675d9cc4ae76926b676a2dca2dc84f45d35b65bd1b1c23c9428974dc7db9bbc4d17e8202784734f789cb4e6b48f7ea7fc43da1c0289
 EBUILD netbeans-harness-9999_p20160201.ebuild 4126 SHA256 419d0bc19a89566f09eac788b47f6dc8f98c3a5c78ca937d61b6d7956a578c94 SHA512 06267c04686fee57f6db65f89d6de82ed8ef5235b1417b01780dc399fee950ad8c0e3b2a8d84db5826f236ed80cade2622630a990274a2c527ac3d2c2c8e3704 WHIRLPOOL 490beb7c43f63bf17fa8787980b67d4bbc9c64528886fdba3f84c6c3929505dcdeb43f3e8df99b436c2d75c0f2e680ba8a0cbcbfc977bde01c60d1ebdd52938a
 EBUILD netbeans-harness-9999_p20160202.ebuild 4126 SHA256 97de1490febd34da2a72a2ed621b7cdddc59a93bf88e82608d99c9029f2c601b SHA512 b806d05b4d3edb616c062ae89048c52b9b17dc09a9a206231ecd2c158fa3e118e06b5ae2052603b71df96c59d8295a15e2ed1f4b8ead0192c2c1e03bc657e3d8 WHIRLPOOL 844fc5ca0c44ad3c4c4660d28edaae713c9a924d7fb26d62af6b0d46f83cf83b832ffe015880cfbdf198b56d1f9da0863229c22131f2a6361414ad83541536ee

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160129.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160129.ebuild
deleted file mode 100644
index c447ecf..0000000
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20160129.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-01-29_00-02-15/zip/netbeans-trunk-nightly-201601290002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-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-r14-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 c5de4bf..f076395 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -135,7 +135,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-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b4317e2cb4cac3810a1ad2ef0267f0ce546438e1ef8ad7a97870d6 SHA512 be81d583e4f78c66f67037917188f189ebd13615c61b1afe373a9a39d7d0bcc33e70495c2ca3642b8e224e52ea214b80f3b2cb7fe6fa2868885af061c978add5 WHIRLPOOL 2ce1abe1c1f6043eea13c4432ffa72143b335bcececf2df63b2ef18f9700fc42d69bbfec9d4895912dea17283abe451dab3de2665bfb4cfef9a9790919523eba
 DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9ad56f46f55c48f6f2f29be561f35efd97b4b2ed5a80336045a6 SHA512 9b3a14aa58c3796257278d867e180c6dac24a9f8e9d3cf8ea2e8b639f8947e8514c6fa93c1ee8764fd854eeaa2e5239ac1febda6b53cf173525e99fa5328d58a WHIRLPOOL 4cb3842a6a99c9b80ecfd455912df8fea23339a432a3e5e9b36ba551c630efebef1211fe60edaec55fae0261c0f4cfafda626edcc27d867cb0a6aeee755ecb3e
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 DIST netbeans-trunk-nightly-201602020002-src.zip 209598146 SHA256 0b1707c46f0d9b52a61c0d0a840213bdfc9563292000dbcb6cfe6e6d1a9bb3e4 SHA512 56ee9d5767fd100de66463c57319e47b52a6769bcbbc9520fc5db4ff5b034c1f8f49bf190c39e1b082e343760aac87a03510c841f4699c6252fc27e4433b7382 WHIRLPOOL ac231e536c9adb590ffff69fdb218631b800a571dfce433b55f2e33e427494e3af9f35acee8621af5cc6c59df6f04303d6dd602bd6c6a549546c3c1797651f45
@@ -164,7 +163,6 @@ DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf770
 DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
 EBUILD netbeans-ide-8.0.2-r1.ebuild 29314 SHA256 365d4077009861319e587dd898eed753e66756aaabaf114a5af2028342928bd8 SHA512 2a186b6ec5591f59f825dc27a6440ffeb1b96f35fcaed0a9783218d867b5a9f95378ec095b8697927fb244280c039b2afdc71d2bce2da0d7af2b06ebe1ce5cd9 WHIRLPOOL bf9a36b20188c86f70b4bd84ab6fdd7a5fcb25bf0d4793f0b8e44c10538c05ce085a29fa44673a3d78424d2276c2de6dca345e38b51887098c13a8929dc30634
 EBUILD netbeans-ide-8.1-r1.ebuild 30285 SHA256 6e42dd3e0e8d546d3187f2e894244951f93f2060b187f156ed7b97d7d23b9b9e SHA512 6219b1d4d6ffb0183cfa781b87d34c01cdff4f73d09811218c5390879ccf9281b23fa7c9c884da8877a3fb8181f660130687de942782db600da90fb7b709772d WHIRLPOOL e8ec3da7e2ee059b912094f704e1abfdec936117cf34beaaee1be9fd1659727c0c5330123dc33c959cbe08e45248f82b8418afa9ffcc18a0f3ca044f997ccbe1
-EBUILD netbeans-ide-9999_p20160129.ebuild 30238 SHA256 52ee72461891f54998b175db329c274d3de3c01d000a2b5197a2274ff00a8475 SHA512 8bc7b091db09a6f4cd625de0c10710addefc76b77780a60b8d1287641a663ff56ee35c22aec0437b27e3b6e4f112c397e3e7c195a1f9e4682a1b0d6e3ac68953 WHIRLPOOL dc63e87a596e9f0b420bcb1e90abc9716c9bbd1db65522dec2880ae14b0274cf00ef32d4c66603f7d4646db0a876a47ef60370b65573819b44d97c74c0d12e5d
 EBUILD netbeans-ide-9999_p20160131.ebuild 30238 SHA256 5767b7d8fb6e6d9c9bdee95789f1f46e48655be007aef2a277c8b5ecd5814539 SHA512 7b77ca43f29e52944d72a26a47d1ad763c940a385a3d6ee72193309448783cf5bd556ce3d7f82b90149f4f37a177c9c64710ea387871607f99bcb6b0b368a3ac WHIRLPOOL e1745f191603cf5ad95a9698e68cf24744c2dd810007d264346618495effe0ef0efbe558d3c24992fc66ee3e749d1d4ccaaa4ec94a7d6e0d16d965020da8e07d
 EBUILD netbeans-ide-9999_p20160201.ebuild 30238 SHA256 7b432d436cdc5e49c0ef9df25059e0ff1fcfce826dce433a4791dc96cedf52b2 SHA512 68f1a508eba13eec6cec3329fc3e623a8cedb4db5cfefaf00a6205cbb5409a7308dcf3026c9a176d4ed4ea41b54c9c6d03a47adb9882fcba071e176bbaf480e7 WHIRLPOOL 9fa9eb244c6e136f34e949d34785cc47f3154b8218b51d4594750b6e028a7cf944e08524dffaccd3249c3c306f6780cae0764f50663e31a1aa459a1244313966
 EBUILD netbeans-ide-9999_p20160202.ebuild 30238 SHA256 cddccda31e664f611582c30cb2333489191928ff17a4d6c769e372a4ddfeffc7 SHA512 be3dbee1610ae08957a07d00de7d2072a739318a5d2eef138edd828b0c5d9237d74113582f8471576e2fef60bd6b9d8addf954c4a3081c39b67b6765c95ab7d3 WHIRLPOOL 206a639b7b96acaed1a2530ae5cdcd2f5615e754699c0aff46b3674bd75e805110d42b94f927522a78164fd826d867a9bcf649c9ea1ef476a59b2b8fbb4c0eeb

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160129.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160129.ebuild
deleted file mode 100644
index 424b542..0000000
--- a/dev-java/netbeans-ide/netbeans-ide-9999_p20160129.ebuild
+++ /dev/null
@@ -1,378 +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-01-29_00-02-15/zip/netbeans-trunk-nightly-201601290002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
-	http://hg.netbeans.org/binaries/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar
-	http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
-	http://hg.netbeans.org/binaries/ACAB7C860DF78C4A528FD8A64F2C62A0A96639E5-com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar
-	http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar
-	http://hg.netbeans.org/binaries/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar
-	http://hg.netbeans.org/binaries/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar
-	http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip
-	http://hg.netbeans.org/binaries/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip
-	http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
-	http://hg.netbeans.org/binaries/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip
-	http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar
-	http://hg.netbeans.org/binaries/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar
-	http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
-	http://hg.netbeans.org/binaries/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip
-	http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar
-	http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar
-	http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar
-	http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip
-	http://hg.netbeans.org/binaries/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar
-	http://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar
-	http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
-	http://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar
-	http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar
-	http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar
-	http://hg.netbeans.org/binaries/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar
-	http://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar
-	http://hg.netbeans.org/binaries/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip
-	http://hg.netbeans.org/binaries/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip
-	http://hg.netbeans.org/binaries/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip
-	http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar
-	http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar
-	http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar
-	http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar
-	http://hg.netbeans.org/binaries/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar
-	http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
-	http://hg.netbeans.org/binaries/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar
-	http://hg.netbeans.org/binaries/AA2671239EBB762FEEE8B908E9F35473A72AFE1B-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar
-	http://hg.netbeans.org/binaries/1605B38BB28EAE32C11EAB8F9E238A497754A5B8-org.eclipse.core.jobs-3.5.101_nosignature.jar
-	http://hg.netbeans.org/binaries/20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar
-	http://hg.netbeans.org/binaries/D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-org.eclipse.core.runtime-3.7.0_nosignature.jar
-	http://hg.netbeans.org/binaries/16507EAFDC2B95121AA718895BDB54D616EE4B0F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar
-	http://hg.netbeans.org/binaries/BD55836AABD558DC643A7844B78866AD990544BC-org.eclipse.equinox.app-1.3.100_nosignature.jar
-	http://hg.netbeans.org/binaries/4EE275AE73A140A403903D7E4DBA68C8FBB07001-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar
-	http://hg.netbeans.org/binaries/B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-org.eclipse.equinox.preferences-3.4.2_nosignature.jar
-	http://hg.netbeans.org/binaries/C647079E36A4EB7A24AED2C545E4F0F94194C4D1-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar
-	http://hg.netbeans.org/binaries/9267CF311F979078211A70C1B19AF8A8EE71DC8E-org.eclipse.equinox.security-1.1.1_nosignature.jar
-	http://hg.netbeans.org/binaries/B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar
-	http://hg.netbeans.org/binaries/244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar
-	http://hg.netbeans.org/binaries/8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar
-	http://hg.netbeans.org/binaries/D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar
-	http://hg.netbeans.org/binaries/4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar
-	http://hg.netbeans.org/binaries/8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar
-	http://hg.netbeans.org/binaries/50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar
-	http://hg.netbeans.org/binaries/4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar
-	http://hg.netbeans.org/binaries/11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar
-	http://hg.netbeans.org/binaries/A3FEF6144ED1622E4CDD506B9D745527CC675D8D-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar
-	http://hg.netbeans.org/binaries/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar
-	http://hg.netbeans.org/binaries/8307A44D3F150F1BB317532097A0C7D125C00F2D-org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.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/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar
-	http://hg.netbeans.org/binaries/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar
-	http://hg.netbeans.org/binaries/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar
-	http://hg.netbeans.org/binaries/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.jar
-	http://hg.netbeans.org/binaries/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar
-	http://hg.netbeans.org/binaries/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar
-	http://hg.netbeans.org/binaries/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar
-	http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar
-	http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar
-	http://hg.netbeans.org/binaries/5C322A10E13FADE0451263035B7AA26B63AAFA47-validator.jar
-	http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar
-	http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar
-	http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar
-	http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-platform-${PV}
-	dev-java/commons-compress:0
-	dev-java/commons-httpclient:3
-	dev-java/commons-logging:0
-	dev-java/icu4j:4.4
-	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"
-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-r14-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
-	ln -s "${DISTDIR}"/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar libs.nashorn/external/asm-all-4.0.jar || die
-	ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
-	ln -s "${DISTDIR}"/ACAB7C860DF78C4A528FD8A64F2C62A0A96639E5-com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar || die
-	ln -s "${DISTDIR}"/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar o.apache.commons.io/external/commons-io-1.4.jar || die
-	ln -s "${DISTDIR}"/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar o.apache.commons.lang/external/commons-lang-2.6.jar || die
-	ln -s "${DISTDIR}"/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar libs.commons_net/external/commons-net-3.3.jar || die
-	ln -s "${DISTDIR}"/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip css.editor/external/css21-spec.zip || die
-	ln -s "${DISTDIR}"/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip css.editor/external/css3-spec.zip || die
-	ln -s "${DISTDIR}"/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip derby/external/derbysampledb.zip || die
-	ln -s "${DISTDIR}"/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip dlight.nativeexecution/external/exechlp-1.0.zip || die
-	ln -s "${DISTDIR}"/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar libs.freemarker/external/freemarker-2.3.19.jar || die
-	ln -s "${DISTDIR}"/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar c.google.guava/external/guava-15.0.jar || die
-	ln -s "${DISTDIR}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
-	ln -s "${DISTDIR}"/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip html.parser/external/html5doc.zip || die
-	ln -s "${DISTDIR}"/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar html.parser/external/htmlparser-1.2.1.jar || die
-	ln -s "${DISTDIR}"/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar libs.ini4j/external/ini4j-0.5.1.jar || die
-	ln -s "${DISTDIR}"/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar html.validation/external/iri.jar || die
-	ln -s "${DISTDIR}"/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip spellchecker.dictionary_en/external/ispell-enwl-3.1.20.zip || die
-	ln -s "${DISTDIR}"/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar c.googlecode.javaewah.JavaEWAH/external/JavaEWAH-0.7.9.jar || die
-	ln -s "${DISTDIR}"/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar xml.jaxb.api/external/jaxb-api.jar || die
-	ln -s "${DISTDIR}"/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip libs.jaxb/external/jaxb-api-doc.zip || die
-	ln -s "${DISTDIR}"/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar libs.jaxb/external/jaxb-impl.jar || die
-	ln -s "${DISTDIR}"/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar libs.jaxb/external/jaxb-xjc.jar || die
-	ln -s "${DISTDIR}"/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar libs.jaxb/external/jaxb1-impl.jar || die
-	ln -s "${DISTDIR}"/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar libs.javafx/external/jfxrt.jar || die
-	ln -s "${DISTDIR}"/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar html.validation/external/jing.jar || die
-	ln -s "${DISTDIR}"/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip javascript2.editor/external/js-corestubs.zip || die
-	ln -s "${DISTDIR}"/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip javascript2.editor/external/js-domstubs.zip || die
-	ln -s "${DISTDIR}"/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip javascript2.editor/external/js-reststubs.zip || die
-	ln -s "${DISTDIR}"/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.core-0.0.7.jar || die
-	ln -s "${DISTDIR}"/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.sshagent-0.0.7.jar || die
-	ln -s "${DISTDIR}"/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.pageant-0.0.7.jar || die
-	ln -s "${DISTDIR}"/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.usocket-jna-0.0.7.jar || die
-	ln -s "${DISTDIR}"/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar c.jcraft.jzlib/external/jzlib-1.0.7.jar || die
-	ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.process/external/libpam4j-1.1.jar || die
-	ln -s "${DISTDIR}"/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar libs.nashorn/external/nashorn-02f810c26ff9-patched.jar || die
-	ln -s "${DISTDIR}"/AA2671239EBB762FEEE8B908E9F35473A72AFE1B-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar o.eclipse.core.contenttype/external/org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar || die
-	ln -s "${DISTDIR}"/1605B38BB28EAE32C11EAB8F9E238A497754A5B8-org.eclipse.core.jobs-3.5.101_nosignature.jar o.eclipse.core.jobs/external/org.eclipse.core.jobs-3.5.101_nosignature.jar || die
-	ln -s "${DISTDIR}"/20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar o.eclipse.core.net/external/org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar || die
-	ln -s "${DISTDIR}"/D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-org.eclipse.core.runtime-3.7.0_nosignature.jar o.eclipse.core.runtime/external/org.eclipse.core.runtime-3.7.0_nosignature.jar || die
-	ln -s "${DISTDIR}"/16507EAFDC2B95121AA718895BDB54D616EE4B0F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar o.eclipse.core.runtime.compatibility.auth/external/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar || die
-	ln -s "${DISTDIR}"/BD55836AABD558DC643A7844B78866AD990544BC-org.eclipse.equinox.app-1.3.100_nosignature.jar o.eclipse.equinox.app/external/org.eclipse.equinox.app-1.3.100_nosignature.jar || die
-	ln -s "${DISTDIR}"/4EE275AE73A140A403903D7E4DBA68C8FBB07001-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar o.eclipse.equinox.common/external/org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar || die
-	ln -s "${DISTDIR}"/B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-org.eclipse.equinox.preferences-3.4.2_nosignature.jar o.eclipse.equinox.preferences/external/org.eclipse.equinox.preferences-3.4.2_nosignature.jar || die
-	ln -s "${DISTDIR}"/C647079E36A4EB7A24AED2C545E4F0F94194C4D1-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar o.eclipse.equinox.registry/external/org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar || die
-	ln -s "${DISTDIR}"/9267CF311F979078211A70C1B19AF8A8EE71DC8E-org.eclipse.equinox.security-1.1.1_nosignature.jar o.eclipse.equinox.security/external/org.eclipse.equinox.security-1.1.1_nosignature.jar || die
-	ln -s "${DISTDIR}"/B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit/external/org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar || die
-	ln -s "${DISTDIR}"/244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit.java7/external/org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar || die
-	ln -s "${DISTDIR}"/8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar || die
-	ln -s "${DISTDIR}"/D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar || die
-	ln -s "${DISTDIR}"/4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar || die
-	ln -s "${DISTDIR}"/8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar || die
-	ln -s "${DISTDIR}"/50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar || die
-	ln -s "${DISTDIR}"/4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar || die
-	ln -s "${DISTDIR}"/11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar || die
-	ln -s "${DISTDIR}"/A3FEF6144ED1622E4CDD506B9D745527CC675D8D-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar || die
-	ln -s "${DISTDIR}"/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}"/8307A44D3F150F1BB317532097A0C7D125C00F2D-org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.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}"/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.10.3.jar || die
-	ln -s "${DISTDIR}"/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.10.3.jar || die
-	ln -s "${DISTDIR}"/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.10.3.jar || die
-	ln -s "${DISTDIR}"/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.jar libs.svnClientAdapter.javahl/external/svnjavahl-1.8.4.jar || die
-	ln -s "${DISTDIR}"/3B91269E9055504778F57744D24F505856698602-svnkit-1.7.0-beta4-20120316.233307-1.jar libs.svnClientAdapter.svnkit/external/svnkit-1.7.0-beta4-20120316.233307-1.jar || die
-	ln -s "${DISTDIR}"/015525209A02BD74254930FF844C7C13498B7FB9-svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar libs.svnClientAdapter.svnkit/external/svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar || die
-	ln -s "${DISTDIR}"/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar libs.swingx/external/swingx-all-1.6.4.jar || die
-	ln -s "${DISTDIR}"/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar httpserver/external/tomcat-webserver-3.2.jar || die
-	ln -s "${DISTDIR}"/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar swing.validation/external/ValidationAPI.jar || die
-	ln -s "${DISTDIR}"/5C322A10E13FADE0451263035B7AA26B63AAFA47-validator.jar html.validation/external/validator.jar || die
-	ln -s "${DISTDIR}"/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar extexecution.process/external/winp-1.14-patched.jar || die
-	ln -s "${DISTDIR}"/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar o.apache.xmlrpc/external/xmlrpc-client-3.0.jar || die
-	ln -s "${DISTDIR}"/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar o.apache.xmlrpc/external/xmlrpc-common-3.0.jar || die
-	ln -s "${DISTDIR}"/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar o.apache.xmlrpc/external/xmlrpc-server-3.0.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r14-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	popd >/dev/null || die
-
-	java-pkg_jar-from --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.53.jar
-	java-pkg_jar-from --into db.drivers/external jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
-	java-pkg_jar-from --into db.drivers/external jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
-	java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar
-	java-pkg_jar-from --into html.parser/external icu4j-4.4 icu4j.jar icu4j-4_4_2.jar
-	java-pkg_jar-from --into html.validation/external iso-relax isorelax.jar isorelax.jar
-	java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
-	java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
-	java-pkg_jar-from --into libs.commons_compress/external commons-compress commons-compress.jar commons-compress-1.8.1.jar
-	# java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.19.jar
-	java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
-	java-pkg_jar-from --into libs.lucene/external lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
-	java-pkg_jar-from --into libs.smack/external smack-2.2 smack.jar smack.jar
-	java-pkg_jar-from --into libs.smack/external smack-2.2 smackx.jar smackx.jar
-	# java-pkg_jar-from --into libs.svnClientAdapter.javahl/external subversion svn-javahl.jar svnjavahl-1.8.4.jar
-	java-pkg_jar-from --into libs.xerces/external xerces-2 xercesImpl.jar xerces-2.8.0.jar
-	java-pkg_jar-from --build-only --into o.apache.commons.codec/external commons-codec commons-codec.jar apache-commons-codec-1.3.jar
-	java-pkg_jar-from --into o.apache.commons.httpclient/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.1.jar
-	java-pkg_jar-from --into o.apache.commons.logging/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
-	java-pkg_jar-from --into o.apache.ws.commons.util/external ws-commons-util ws-commons-util.jar ws-commons-util-1.0.1.jar
-	java-pkg_jar-from --into servletapi/external tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
-	java-pkg_jar-from --into xml.jaxb.api/external sun-jaf activation.jar activation.jar
-	java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_1.0_api.jar
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	unset DISPLAY
-	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
-}
-
-src_install() {
-	pushd nbbuild/netbeans/ide >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/ide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	rm -fr "${D}"/${INSTALL_DIR}/bin/nativeexecution || die
-	rm -fr "${D}"/${INSTALL_DIR}/modules/lib || die
-
-	insinto ${INSTALL_DIR}/bin/nativeexecution
-	doins bin/nativeexecution/*
-
-	pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution >/dev/null || die
-	for file in *.sh ; do
-		fperms 755 ${file}
-	done
-	popd >/dev/null || die
-
-	if use x86 ; then
-		doins -r bin/nativeexecution/Linux-x86
-		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86 >/dev/null || die
-		for file in * ; do
-			fperms 755 ${file}
-		done
-		popd >/dev/null || die
-	elif use amd64 ; then
-		doins -r bin/nativeexecution/Linux-x86_64
-		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86_64 >/dev/null || die
-		for file in * ; do
-			fperms 755 ${file}
-		done
-		popd >/dev/null || die
-	fi
-
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules
-	pushd "${instdir}" >/dev/null || die
-	rm com-jcraft-jsch.jar && java-pkg_jar-from --into "${instdir}" jsch jsch.jar com-jcraft-jsch.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext
-	pushd "${instdir}" >/dev/null || die
-	rm commons-compress-1.8.1.jar && java-pkg_jar-from --into "${instdir}" commons-compress commons-compress.jar commons-compress-1.8.1.jar
-	# rm freemarker-2.3.19.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.19.jar || die
-	rm icu4j-4_4_2.jar && java-pkg_jar-from --into "${instdir}" icu4j-4.4 icu4j.jar icu4j-4_4_2.jar
-	rm isorelax.jar && java-pkg_jar-from --into "${instdir}" iso-relax 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 8f462b4..d15555a 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -32,7 +32,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-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b4317e2cb4cac3810a1ad2ef0267f0ce546438e1ef8ad7a97870d6 SHA512 be81d583e4f78c66f67037917188f189ebd13615c61b1afe373a9a39d7d0bcc33e70495c2ca3642b8e224e52ea214b80f3b2cb7fe6fa2868885af061c978add5 WHIRLPOOL 2ce1abe1c1f6043eea13c4432ffa72143b335bcececf2df63b2ef18f9700fc42d69bbfec9d4895912dea17283abe451dab3de2665bfb4cfef9a9790919523eba
 DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9ad56f46f55c48f6f2f29be561f35efd97b4b2ed5a80336045a6 SHA512 9b3a14aa58c3796257278d867e180c6dac24a9f8e9d3cf8ea2e8b639f8947e8514c6fa93c1ee8764fd854eeaa2e5239ac1febda6b53cf173525e99fa5328d58a WHIRLPOOL 4cb3842a6a99c9b80ecfd455912df8fea23339a432a3e5e9b36ba551c630efebef1211fe60edaec55fae0261c0f4cfafda626edcc27d867cb0a6aeee755ecb3e
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 DIST netbeans-trunk-nightly-201602020002-src.zip 209598146 SHA256 0b1707c46f0d9b52a61c0d0a840213bdfc9563292000dbcb6cfe6e6d1a9bb3e4 SHA512 56ee9d5767fd100de66463c57319e47b52a6769bcbbc9520fc5db4ff5b034c1f8f49bf190c39e1b082e343760aac87a03510c841f4699c6252fc27e4433b7382 WHIRLPOOL ac231e536c9adb590ffff69fdb218631b800a571dfce433b55f2e33e427494e3af9f35acee8621af5cc6c59df6f04303d6dd602bd6c6a549546c3c1797651f45
@@ -61,7 +60,6 @@ DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf770
 DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
 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_p20160129.ebuild 14930 SHA256 067f7168197ccce48c3f005ce9709450e7d93ec4141fbc38ecf03f37a935fdf9 SHA512 1975c14bf537b80d6bb93f1a54c4fb3d54fd2988c1ef438ec39a62db8ea4ae004c29b8b108baa0d08bd81cf562881b49da68e2537391a60643e28c39723ca389 WHIRLPOOL 0a8abfde7fb1b0f0d785da0d0ffdb4839a26271b83f53e954d6b5ad465d37aeaeb3a49c546d72885451fb98514416b392ac1b990f84d8189444a68f8ae7222c8
 EBUILD netbeans-java-9999_p20160131.ebuild 14930 SHA256 35b978bd0650407a3a994838b82fb16f9be704c0a76a94f653b1bf246b9e5d4f SHA512 e00f61fd157e46b7b905cced903471ced453edd87c26b4c3f4a5d8bddfb64572c8e821e8747e66ab129e41d3f47b6a8c2b46a9afdd7c2289bd80915bab885554 WHIRLPOOL f704b7736323c071a04a7b10e8f34b9a910a20e4527f0113c8a828730b2f50119e927555f721ed94ceff99bf6dbd2bbb09b330d1771e2d7dd4cc8f1f2926065b
 EBUILD netbeans-java-9999_p20160201.ebuild 14930 SHA256 3211dd29533064f7f8a7dae8c895cea048b69cd49556de4e7783af28dbb87f36 SHA512 6238e816fc31c1aca8bc6e3f8ae4cbef9f970d597811ff1cf52b4a6ff602ae1ba97267e94c2195df7c2fadc5f2407c00191478283cedde42cb5a59e0ec53de6b WHIRLPOOL 5e6523d943949f4b5d94c36c55b11dab8c909341d26edb55edb6bdbd5f75e0637ec281d73aedf838d39341663c6b580845aa764121437353550fd310f4e7f5de
 EBUILD netbeans-java-9999_p20160202.ebuild 14930 SHA256 38a72a1cbd9d2f3c94a62b526aa44f1974715900a41bd2c7dbe36bfb27ff0b75 SHA512 36957959fa7bbf4a6c05952b6a2d24737e256e5c92c08ec0524094313d4ac19898cc4d8afdf8b0d84a7532c578da3021dc92be1f150d7a50e2fc1df7ff70e19d WHIRLPOOL b048975beb4a9e9e0907f78fdb8e48ca6546003c1ee6257a45df6f2f2bdf26f0c34d71ff948c46866771c20ca4a96585756948121073cf76d95b6c09943129b3

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160129.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160129.ebuild
deleted file mode 100644
index b910394..0000000
--- a/dev-java/netbeans-java/netbeans-java-9999_p20160129.ebuild
+++ /dev/null
@@ -1,274 +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-01-29_00-02-15/zip/netbeans-trunk-nightly-201601290002-src.zip"
-# jarjar-1.4 contains also asm libraries
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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/37781101C4BAF40437CA4D1A16149647B4082F3B-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/B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.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-r14-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}"/37781101C4BAF40437CA4D1A16149647B4082F3B-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}"/B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.jar maven.embedder/external/wagon-http-2.8-shaded.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r14-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 4df80aa..d5d29f4 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-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b4317e2cb4cac3810a1ad2ef0267f0ce546438e1ef8ad7a97870d6 SHA512 be81d583e4f78c66f67037917188f189ebd13615c61b1afe373a9a39d7d0bcc33e70495c2ca3642b8e224e52ea214b80f3b2cb7fe6fa2868885af061c978add5 WHIRLPOOL 2ce1abe1c1f6043eea13c4432ffa72143b335bcececf2df63b2ef18f9700fc42d69bbfec9d4895912dea17283abe451dab3de2665bfb4cfef9a9790919523eba
 DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9ad56f46f55c48f6f2f29be561f35efd97b4b2ed5a80336045a6 SHA512 9b3a14aa58c3796257278d867e180c6dac24a9f8e9d3cf8ea2e8b639f8947e8514c6fa93c1ee8764fd854eeaa2e5239ac1febda6b53cf173525e99fa5328d58a WHIRLPOOL 4cb3842a6a99c9b80ecfd455912df8fea23339a432a3e5e9b36ba551c630efebef1211fe60edaec55fae0261c0f4cfafda626edcc27d867cb0a6aeee755ecb3e
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 DIST netbeans-trunk-nightly-201602020002-src.zip 209598146 SHA256 0b1707c46f0d9b52a61c0d0a840213bdfc9563292000dbcb6cfe6e6d1a9bb3e4 SHA512 56ee9d5767fd100de66463c57319e47b52a6769bcbbc9520fc5db4ff5b034c1f8f49bf190c39e1b082e343760aac87a03510c841f4699c6252fc27e4433b7382 WHIRLPOOL ac231e536c9adb590ffff69fdb218631b800a571dfce433b55f2e33e427494e3af9f35acee8621af5cc6c59df6f04303d6dd602bd6c6a549546c3c1797651f45
@@ -35,7 +34,6 @@ DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf770
 DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
 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_p20160129.ebuild 4971 SHA256 210fcdbef8c1124a203608de6cd3396f43469dbf1904aa02901e16cfbe676422 SHA512 b9e992483af23ff78bf131398b00b26d34781000f643632df0f1f24410163a771ca59655970c2fd1ecfd71b3a120015231365c2edc93dfdf0310b7d73e72df6e WHIRLPOOL cb42f24122635a4f6686cfa87a85b5e7c23c0d31636dde12a01c7506ea8410ee557689751631a574fb36eb5674943068cf9371d265cc317ee2577de17cb00b32
 EBUILD netbeans-javacard-9999_p20160131.ebuild 4971 SHA256 90bf1461c8940f6c456a04b4432544ceb40957306fec5a626cd6a043d60d32df SHA512 05a5cf8395ddac9406e1ece1cd982946568c8e894cdaf70c393f4f4ca2b8d3af19b34071dabd877673a501fc4e1269785a2c992442010b0227329fded79a19ed WHIRLPOOL e7a97a83660123a69ebe49e257a677ccf817b0054c70526d74ab6695a0c7399e98f75befb7e8d4ebca6e8520033c17182b7e3c752510282f342f6b5ab1a4e498
 EBUILD netbeans-javacard-9999_p20160201.ebuild 4971 SHA256 065f3fcc77ce56c49fb1caa91a7fca4b30582f278d20338999a97cdb5d16788f SHA512 dd88e123c7cf494dbea70da08d2aaedc21195417f4a61fffe1c2bb76187c201681573fd15ff31af3954a1c6035cf9f108ffb0cf608169785694a6a2b1839cb7b WHIRLPOOL 7c0ea5367c13bac6ff6f5377a198ff054deca8fadb647851ff9a45ed552210bb114e97b2eb49b65546182364ccf2969e9aff3d8a83f51fa600d249784dfaab9a
 EBUILD netbeans-javacard-9999_p20160202.ebuild 4971 SHA256 0a78b432aeb1148bab949fc02ae0209c37a1f1a3078f5caebf13eefab03616bc SHA512 e5ca2cbd98921741bfb3f082fabd1f97ec73f28034857f13aac209ad3a744d14599e945d8af8acc187ad9668a6ad7fc454aaa2ff563d520f06a110d220ec9538 WHIRLPOOL e23f9230d89ad7420a32fbd304560b0f056165a9e27480cb8e54742c890f9df738cdf23d536bbae3e1468f07bbed663bba234525afe86a0377ae47d66e9f036f

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160129.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160129.ebuild
deleted file mode 100644
index 6ebc1bd..0000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160129.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-01-29_00-02-15/zip/netbeans-trunk-nightly-201601290002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-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-r14-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 fc09ed6..3340eb8 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -4,7 +4,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-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b4317e2cb4cac3810a1ad2ef0267f0ce546438e1ef8ad7a97870d6 SHA512 be81d583e4f78c66f67037917188f189ebd13615c61b1afe373a9a39d7d0bcc33e70495c2ca3642b8e224e52ea214b80f3b2cb7fe6fa2868885af061c978add5 WHIRLPOOL 2ce1abe1c1f6043eea13c4432ffa72143b335bcececf2df63b2ef18f9700fc42d69bbfec9d4895912dea17283abe451dab3de2665bfb4cfef9a9790919523eba
 DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9ad56f46f55c48f6f2f29be561f35efd97b4b2ed5a80336045a6 SHA512 9b3a14aa58c3796257278d867e180c6dac24a9f8e9d3cf8ea2e8b639f8947e8514c6fa93c1ee8764fd854eeaa2e5239ac1febda6b53cf173525e99fa5328d58a WHIRLPOOL 4cb3842a6a99c9b80ecfd455912df8fea23339a432a3e5e9b36ba551c630efebef1211fe60edaec55fae0261c0f4cfafda626edcc27d867cb0a6aeee755ecb3e
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 DIST netbeans-trunk-nightly-201602020002-src.zip 209598146 SHA256 0b1707c46f0d9b52a61c0d0a840213bdfc9563292000dbcb6cfe6e6d1a9bb3e4 SHA512 56ee9d5767fd100de66463c57319e47b52a6769bcbbc9520fc5db4ff5b034c1f8f49bf190c39e1b082e343760aac87a03510c841f4699c6252fc27e4433b7382 WHIRLPOOL ac231e536c9adb590ffff69fdb218631b800a571dfce433b55f2e33e427494e3af9f35acee8621af5cc6c59df6f04303d6dd602bd6c6a549546c3c1797651f45
@@ -33,7 +32,6 @@ DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf770
 DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
 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_p20160129.ebuild 6293 SHA256 d60cd6e35e3a86f772f1b4ea7bb0fd329dd6eb4d903143c77d2470e3eed42d49 SHA512 11b191aa53331558c1d992b993214ca716e15d9e8753ee109508878dea9979baa024011733bd0091848ecc3aadf46e437a75c006e488f4724c232e72c5373f34 WHIRLPOOL 32ea16e15282396e8657b9a0410ad669d2a8d2afa684928e81ef90774b97e40078882bf2066ac9e4cdf4880c83c479dbe47bf26b102846b97d2a79fd00abc643
 EBUILD netbeans-javadoc-9999_p20160131.ebuild 6293 SHA256 66ec977d22d21a3e730c0d85d308d77e773492d8728607d8cc0db16fc2066316 SHA512 a8caecdee051cb4dfd55fc85ae89221e463b66ed74d96817d0f5ec43f8fd462ee30ef1aeda99b4c22590ff6fae555fd0424365456f2a4d10777154b5365805fc WHIRLPOOL 6ed29417bebb473f21405a0e3c0538b41b638fc1832787302d5d69cf4495d25c68535027551d7f667105f78cc61e27b0e5aa310e60af4b3bb36b26eb15c86a8b
 EBUILD netbeans-javadoc-9999_p20160201.ebuild 6293 SHA256 15610f1fd2ea51127f0fa657e88f94f2a4f946cfeb8ea2f0837c2adb6acff44d SHA512 6e75c7109f0ecae3966be23dcc297accb5f857e9c8df0c69ac429ff48594b9145f770583d66609002c71fdd9d77f337db940ba4e4e1e715c4d05f1d60bb3298c WHIRLPOOL bc35bb5d159fe5123e5f0de51fb530aca0e3f5b05290e2e558fded38192e8d499ce9cd91c7b9c54886065726fa6fb22b9fd8ab4c8d0dd5590d8df9ba3e0e362d
 EBUILD netbeans-javadoc-9999_p20160202.ebuild 6293 SHA256 7e31b61b47d03dc3a149331b856bdc0e2864d59ae35a9b97ce262d87b3ce902f SHA512 ce73941a2c9b2355321d8eee8fc7a32baee01d0b6b7372fe1a1b97a689ddadac20181d2c3d7cf1f380a9248b9d67dfe98b2b8c1d68f5f06f3ad5558740ef4a46 WHIRLPOOL 0c37b707aec90a1684f4fe08f39bb9d461a36813846cc7f0cb9e583b2a1a6b9ce9be6374f606ae91701c3284b264945588aa2c2e98e9d4360acf284733b9b959

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160129.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160129.ebuild
deleted file mode 100644
index d3dafcf..0000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160129.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-01-29_00-02-15/zip/netbeans-trunk-nightly-201601290002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.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-r14-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip o.apache.tools.ant.module/external/ant-libs-1.9.4.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r14-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 6d78e9f..5ebd23b 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-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b4317e2cb4cac3810a1ad2ef0267f0ce546438e1ef8ad7a97870d6 SHA512 be81d583e4f78c66f67037917188f189ebd13615c61b1afe373a9a39d7d0bcc33e70495c2ca3642b8e224e52ea214b80f3b2cb7fe6fa2868885af061c978add5 WHIRLPOOL 2ce1abe1c1f6043eea13c4432ffa72143b335bcececf2df63b2ef18f9700fc42d69bbfec9d4895912dea17283abe451dab3de2665bfb4cfef9a9790919523eba
 DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9ad56f46f55c48f6f2f29be561f35efd97b4b2ed5a80336045a6 SHA512 9b3a14aa58c3796257278d867e180c6dac24a9f8e9d3cf8ea2e8b639f8947e8514c6fa93c1ee8764fd854eeaa2e5239ac1febda6b53cf173525e99fa5328d58a WHIRLPOOL 4cb3842a6a99c9b80ecfd455912df8fea23339a432a3e5e9b36ba551c630efebef1211fe60edaec55fae0261c0f4cfafda626edcc27d867cb0a6aeee755ecb3e
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 DIST netbeans-trunk-nightly-201602020002-src.zip 209598146 SHA256 0b1707c46f0d9b52a61c0d0a840213bdfc9563292000dbcb6cfe6e6d1a9bb3e4 SHA512 56ee9d5767fd100de66463c57319e47b52a6769bcbbc9520fc5db4ff5b034c1f8f49bf190c39e1b082e343760aac87a03510c841f4699c6252fc27e4433b7382 WHIRLPOOL ac231e536c9adb590ffff69fdb218631b800a571dfce433b55f2e33e427494e3af9f35acee8621af5cc6c59df6f04303d6dd602bd6c6a549546c3c1797651f45
@@ -40,7 +39,6 @@ DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf770
 DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
 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_p20160129.ebuild 4717 SHA256 977b401552e3ff424a6256a98de6dce278f3e5bc0d96111998ac46159aed79c6 SHA512 d12821bbe6bbe7835b9ce4b043b7d31993d66b040bf694bd9f2695e46716701614a2d4fcbdfaac8d2f4f13d154e988c08861244b3445cf498ea0691355ca32fa WHIRLPOOL 75d0353b0a8cfeef8c0aa8dd3190d3499a86b56550b9e13ea751cc7742e88c8592ea34158609b667dc4e1c3940e0c8c0c21cc96e115e8e3357fb88d89cd3051d
 EBUILD netbeans-javafx-9999_p20160131.ebuild 4717 SHA256 06879d2f78d0c1caa698686d5f096491f03714f1c1b14b2384282f65a90290b8 SHA512 81a254324cd115eea6cdb9a137fbb808dca5c47fc9c4ae3e3f258364eae1ceb92c84c939347a2c1f1b01dfe07be862a8f88897832340194bc5df4bf21ffc230a WHIRLPOOL abb4149acdf298c4798ff8905f768168fad36a0ee8d2363fdcd5725084ab869ea8d1ee7083100ff43d0d49cc2f53d470bd67e0c483c6c0faa792c7c9ad8274d0
 EBUILD netbeans-javafx-9999_p20160201.ebuild 4717 SHA256 acf0915bce901dcb04b2478ea7ac31ec919781f05543b3f14fef30867565769f SHA512 bcaf9d80e88c31a969c188259224c4725ae228377110df5ada0a72f34485c7800151d760eccfe8c491da21c56c634ef0a4810ef3b293e02edaf9571311ca20a5 WHIRLPOOL ea9fb8bb37564c569b673bf76daa01f070fcbf7b55313fe0a43574396498fce6479ff5d0feea1b1237a4c929f122c296acfa9b732990ed22b24b574331a9b51d
 EBUILD netbeans-javafx-9999_p20160202.ebuild 4717 SHA256 3d43880ed47b5e7b5a2e15358bce2c676a8b8602a8c23ec037f1cb41d982b68d SHA512 4f089dee95c27418db3de341ccaebfd77068c8a2c45f9860a4d4fd76e0f2d0202231f4824f9cc6c3bdea7906e627dac5ca860286efce1d9dbb646210650808d6 WHIRLPOOL cc30d66777b2568b92dcd7cc7da7adfd8b1e766b099477740711bb43b82d7869e40c5134e53a7c707d76bbe26effd18ff01b22dd387bbc15debbba317628c02d

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160129.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160129.ebuild
deleted file mode 100644
index ef1a7c4..0000000
--- a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160129.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-01-29_00-02-15/zip/netbeans-trunk-nightly-201601290002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-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-r14-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 0ae184f..7e15d73 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-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b4317e2cb4cac3810a1ad2ef0267f0ce546438e1ef8ad7a97870d6 SHA512 be81d583e4f78c66f67037917188f189ebd13615c61b1afe373a9a39d7d0bcc33e70495c2ca3642b8e224e52ea214b80f3b2cb7fe6fa2868885af061c978add5 WHIRLPOOL 2ce1abe1c1f6043eea13c4432ffa72143b335bcececf2df63b2ef18f9700fc42d69bbfec9d4895912dea17283abe451dab3de2665bfb4cfef9a9790919523eba
 DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9ad56f46f55c48f6f2f29be561f35efd97b4b2ed5a80336045a6 SHA512 9b3a14aa58c3796257278d867e180c6dac24a9f8e9d3cf8ea2e8b639f8947e8514c6fa93c1ee8764fd854eeaa2e5239ac1febda6b53cf173525e99fa5328d58a WHIRLPOOL 4cb3842a6a99c9b80ecfd455912df8fea23339a432a3e5e9b36ba551c630efebef1211fe60edaec55fae0261c0f4cfafda626edcc27d867cb0a6aeee755ecb3e
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 DIST netbeans-trunk-nightly-201602020002-src.zip 209598146 SHA256 0b1707c46f0d9b52a61c0d0a840213bdfc9563292000dbcb6cfe6e6d1a9bb3e4 SHA512 56ee9d5767fd100de66463c57319e47b52a6769bcbbc9520fc5db4ff5b034c1f8f49bf190c39e1b082e343760aac87a03510c841f4699c6252fc27e4433b7382 WHIRLPOOL ac231e536c9adb590ffff69fdb218631b800a571dfce433b55f2e33e427494e3af9f35acee8621af5cc6c59df6f04303d6dd602bd6c6a549546c3c1797651f45
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf770
 DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
 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_p20160129.ebuild 4412 SHA256 cc73307539e6630196425bbdc2f019ade2f35351458b73d051505132d201a74d SHA512 da8fcde42d65d34f77f8c8d5c51ef616d735b2fd5386bf91bcbdd190b8b9cd35093b95bb550ecc58dd0222c31fce69b52f5cbb244cc016c1ec0eb304723ac2d6 WHIRLPOOL 3c2262b85d9f92b8f93b84e4de621aa50cf991dbcd6f112c5911812589e9d4e48b0f8b696a5b981453451e05c216a9fd3a83757c27d0b385fc130be1d6243207
 EBUILD netbeans-mobility-9999_p20160131.ebuild 4412 SHA256 e8c78bfbfeb0b126dbc1a67d81427e5712c7b7b637022e5888f411d16c73f2d2 SHA512 8bf0188b97815e7692121c0488664ae741b0fb835f949f0cb983f9ca1959057a3b18a2d4a3215d2ad00f5d5d34b9dfa718fa2446330327ca29d7f005eda6fd9c WHIRLPOOL 3fade0aa5af647569fd0dcdfc4b28d4fb0a2cb9ade4798a35a7a7181052938b0073a00994e08efd512fd20d7932e94dfcc08edc7f15d6edb689e7465f726fe43
 EBUILD netbeans-mobility-9999_p20160201.ebuild 4412 SHA256 c34713a7f6ce9050e95d8314c408fe458dd88a5b7760abc3d25d7778500174df SHA512 ef282e7f2b403479c48885413338de1e6236a14defc3d888b6b59be1ce5bb3a20be9f559b8f11799b478a468025bed86561b7b73ec52d407bbb893e528eb88fe WHIRLPOOL 0b9817902f610ac218dcbdb9a65ec50e0b9696cf6adbb1b1aa51223c255f5fcb5b86c83eb47044a4c50ef6d3d5b26fa2fb4f7fbfb218d69ff979d71c00e2efda
 EBUILD netbeans-mobility-9999_p20160202.ebuild 4412 SHA256 442d6cb306c08f5fb8486388f9f084854960e5b891dba60c81db3e45398a6089 SHA512 b1c3bb087ba8b56f919001c69c14c3ba0de371aa46d03da4601f4c15d2a32924c3bd94123c67ef6b58a430eae8edbc0d0becceafe4288b84a342fff591209ab1 WHIRLPOOL 9f3809e7e462c9f843c03ccfa86414c3cfc52b9f61ad79dc1bd5cbe2b53de6aac3184e22f09b7d10f3e88912ee5753eb0993e42c5099951666e448c2186a760e

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160129.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160129.ebuild
deleted file mode 100644
index 7b2241b..0000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160129.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-01-29_00-02-15/zip/netbeans-trunk-nightly-201601290002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r14-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 0b8a372..cd74671 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-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b4317e2cb4cac3810a1ad2ef0267f0ce546438e1ef8ad7a97870d6 SHA512 be81d583e4f78c66f67037917188f189ebd13615c61b1afe373a9a39d7d0bcc33e70495c2ca3642b8e224e52ea214b80f3b2cb7fe6fa2868885af061c978add5 WHIRLPOOL 2ce1abe1c1f6043eea13c4432ffa72143b335bcececf2df63b2ef18f9700fc42d69bbfec9d4895912dea17283abe451dab3de2665bfb4cfef9a9790919523eba
 DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9ad56f46f55c48f6f2f29be561f35efd97b4b2ed5a80336045a6 SHA512 9b3a14aa58c3796257278d867e180c6dac24a9f8e9d3cf8ea2e8b639f8947e8514c6fa93c1ee8764fd854eeaa2e5239ac1febda6b53cf173525e99fa5328d58a WHIRLPOOL 4cb3842a6a99c9b80ecfd455912df8fea23339a432a3e5e9b36ba551c630efebef1211fe60edaec55fae0261c0f4cfafda626edcc27d867cb0a6aeee755ecb3e
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 DIST netbeans-trunk-nightly-201602020002-src.zip 209598146 SHA256 0b1707c46f0d9b52a61c0d0a840213bdfc9563292000dbcb6cfe6e6d1a9bb3e4 SHA512 56ee9d5767fd100de66463c57319e47b52a6769bcbbc9520fc5db4ff5b034c1f8f49bf190c39e1b082e343760aac87a03510c841f4699c6252fc27e4433b7382 WHIRLPOOL ac231e536c9adb590ffff69fdb218631b800a571dfce433b55f2e33e427494e3af9f35acee8621af5cc6c59df6f04303d6dd602bd6c6a549546c3c1797651f45
@@ -35,7 +34,6 @@ DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf770
 DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
 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_p20160129.ebuild 4111 SHA256 03eb8e599d256249d56bdbc2d4dc7ef83b1b36a1e8a147325c10b0758e5aa9e5 SHA512 7c1197c621c83695eb195e0ed840dcd64e89bbc0cc3e647a723af761d3558a32e9b878a99349022511902ee22b20442cc13f396656c411da0a13f2b1ba8b2146 WHIRLPOOL e99fea179c269515d6dad75f20d57e99232057833edc3cf95f57afe08ea05c68c073fc410744171b389a8d331521365edd189826b17c843718c487e98e46374e
 EBUILD netbeans-nb-9999_p20160131.ebuild 4111 SHA256 467fcdfaad349af8820324f4888b52179b151888d4b8e82342c1995e20d2f4f4 SHA512 5b0718fa59766eec097506ec65186dda63be525b5936982de04eed67ab3edf6d2008e67feb320177d8c663e3f3a733657624d572b506eeacaee73b7c90f30af9 WHIRLPOOL 2fa1c9bbc0b256a7e10b76ac0c72873b8237188b48bee00529ed2914ee4e01514a37ad539cbc382e0107eb941f14468995098371428d8d17fa8bc0ec506971dd
 EBUILD netbeans-nb-9999_p20160201.ebuild 4111 SHA256 868559a57b90bd7f92b6842da19ac2ef705d40cad166668ee56fe9697af112f9 SHA512 6a50a6b8d437c9ae4a1562b81f1194c2ae034e17f038f6518894ffcc649debbe5e39c056ed9771556f4ce8c62f049fb71c047486cbe4b4cc1edd18502de586e6 WHIRLPOOL 321d8bb74f15398a5e512b4d4314a35cefab3fe01b74c182cef7c66373fff27f442908233263d58bcbc44ce7875def3bfbf6ecd08240501329d94b3211a93e31
 EBUILD netbeans-nb-9999_p20160202.ebuild 4111 SHA256 7e054ad3b03907226b6943c044baaf4319fa99423603302831c31d8cf43ce6c2 SHA512 62105512080462fa96fd661ae33c48c2cfe891ca195e6548a7ed154f78f8bb42c94164a5f127997d67a734c3ca6a65ab3189e7643ed85847b29ac4c5fa6452a6 WHIRLPOOL 197ce34f1408bd8899da3518584ee0210cb0d833d40ed469133748b0e096b9aef321c360144a7b3551663bf90b633265a6862aad4e64bc06aa14fe504446c07d

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160129.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160129.ebuild
deleted file mode 100644
index 203aeca..0000000
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20160129.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-01-29_00-02-15/zip/netbeans-trunk-nightly-201601290002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r14-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 4e58123..0be111c 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/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-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b4317e2cb4cac3810a1ad2ef0267f0ce546438e1ef8ad7a97870d6 SHA512 be81d583e4f78c66f67037917188f189ebd13615c61b1afe373a9a39d7d0bcc33e70495c2ca3642b8e224e52ea214b80f3b2cb7fe6fa2868885af061c978add5 WHIRLPOOL 2ce1abe1c1f6043eea13c4432ffa72143b335bcececf2df63b2ef18f9700fc42d69bbfec9d4895912dea17283abe451dab3de2665bfb4cfef9a9790919523eba
 DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9ad56f46f55c48f6f2f29be561f35efd97b4b2ed5a80336045a6 SHA512 9b3a14aa58c3796257278d867e180c6dac24a9f8e9d3cf8ea2e8b639f8947e8514c6fa93c1ee8764fd854eeaa2e5239ac1febda6b53cf173525e99fa5328d58a WHIRLPOOL 4cb3842a6a99c9b80ecfd455912df8fea23339a432a3e5e9b36ba551c630efebef1211fe60edaec55fae0261c0f4cfafda626edcc27d867cb0a6aeee755ecb3e
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 DIST netbeans-trunk-nightly-201602020002-src.zip 209598146 SHA256 0b1707c46f0d9b52a61c0d0a840213bdfc9563292000dbcb6cfe6e6d1a9bb3e4 SHA512 56ee9d5767fd100de66463c57319e47b52a6769bcbbc9520fc5db4ff5b034c1f8f49bf190c39e1b082e343760aac87a03510c841f4699c6252fc27e4433b7382 WHIRLPOOL ac231e536c9adb590ffff69fdb218631b800a571dfce433b55f2e33e427494e3af9f35acee8621af5cc6c59df6f04303d6dd602bd6c6a549546c3c1797651f45
@@ -36,7 +35,6 @@ DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf770
 DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
 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_p20160129.ebuild 4418 SHA256 302d16d9851c39f872be18301dd10b74a015a13088ba754828e93a0735556144 SHA512 fc9dc6b3f043ea1407c6c054839926ff56b6894f1627c227abaaa3f26a8c7a4d139ffc65fbfd2739e5733aef6fbdf03b45e96fae6abdffa760f332b4b5026d3b WHIRLPOOL e1802f2521f4c5b3a4f6c437d67d99ecfd306156acabce996e9eb8f1e7e7ff0878f08c92e527902601bc2ede5ee30e8a8d9f43e2dd3b73705e257b87fe9229ef
 EBUILD netbeans-php-9999_p20160131.ebuild 4418 SHA256 c25a3aab7d7bceb7883b1dc753cd7854dbf195be1c9e4da962ab8225174796dc SHA512 4f74825c765c5f824401fe41bc49c92b9f1f38cc62dabf665162dee33af16d1506c4376d860b94a326611169d92b09f14d7fb9520415e49ecc83d1fac20b4ddd WHIRLPOOL ee2a10b4721899b2c71a95d813922e498d19b426354bd6268614ff90a2460f78f5a09a84fa5dcfa2f4333cb878e68a8da91760849b89ed5f72b2d439eae83623
 EBUILD netbeans-php-9999_p20160201.ebuild 4418 SHA256 b9e2f1ef2db05cc44fb0143658312e78a92865fcd4d84fe4085e0463baccbd42 SHA512 2455ddcdbd1e6acbb416201303ca02d82fc4db263f0df10d1301a56819208aec4c336a4876362f8f5afc1e76f0ba07b4a3cb752625255beabe6fde441d64aefd WHIRLPOOL b84bcfac1f2582322f0a76ba9ddaf321c7b15422ca9a9493363e23bda84c718d4a212abce29bc65e6a4ecc302472d1affd95afc798fee7c73095484be15a45da
 EBUILD netbeans-php-9999_p20160202.ebuild 4418 SHA256 0239cf5f2c7ba4209529c92c3b2444441d42f117a36b2781550c43e287725861 SHA512 5b608bd0ec5cddf98bb47cfa9ab32b66172a9321e980a509dbefbeffaff6416e0e48852360048833254d0252a0cc3801d3a0461d86897daff48137a61f776916 WHIRLPOOL da75ad444f2cc49e0e7fdeeabb0a8b8c0df44b70a7587080c4543ce6eec76a19cc371efefdb8e3df98931177ae34041d1e2c27b7cc55654237451a6daaa614c0

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160129.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160129.ebuild
deleted file mode 100644
index 41982de..0000000
--- a/dev-java/netbeans-php/netbeans-php-9999_p20160129.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-01-29_00-02-15/zip/netbeans-trunk-nightly-201601290002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip
-	http://hg.netbeans.org/binaries/73E9BC8A7AF36E0C95210F61A85AFEF212AEE1A9-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-r14-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}"/73E9BC8A7AF36E0C95210F61A85AFEF212AEE1A9-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-r14-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 f83c9ec..54b3aa5 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -20,7 +20,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-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b4317e2cb4cac3810a1ad2ef0267f0ce546438e1ef8ad7a97870d6 SHA512 be81d583e4f78c66f67037917188f189ebd13615c61b1afe373a9a39d7d0bcc33e70495c2ca3642b8e224e52ea214b80f3b2cb7fe6fa2868885af061c978add5 WHIRLPOOL 2ce1abe1c1f6043eea13c4432ffa72143b335bcececf2df63b2ef18f9700fc42d69bbfec9d4895912dea17283abe451dab3de2665bfb4cfef9a9790919523eba
 DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9ad56f46f55c48f6f2f29be561f35efd97b4b2ed5a80336045a6 SHA512 9b3a14aa58c3796257278d867e180c6dac24a9f8e9d3cf8ea2e8b639f8947e8514c6fa93c1ee8764fd854eeaa2e5239ac1febda6b53cf173525e99fa5328d58a WHIRLPOOL 4cb3842a6a99c9b80ecfd455912df8fea23339a432a3e5e9b36ba551c630efebef1211fe60edaec55fae0261c0f4cfafda626edcc27d867cb0a6aeee755ecb3e
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 DIST netbeans-trunk-nightly-201602020002-src.zip 209598146 SHA256 0b1707c46f0d9b52a61c0d0a840213bdfc9563292000dbcb6cfe6e6d1a9bb3e4 SHA512 56ee9d5767fd100de66463c57319e47b52a6769bcbbc9520fc5db4ff5b034c1f8f49bf190c39e1b082e343760aac87a03510c841f4699c6252fc27e4433b7382 WHIRLPOOL ac231e536c9adb590ffff69fdb218631b800a571dfce433b55f2e33e427494e3af9f35acee8621af5cc6c59df6f04303d6dd602bd6c6a549546c3c1797651f45
@@ -49,7 +48,6 @@ DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf770
 DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
 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_p20160129.ebuild 9360 SHA256 d76978cafa723f41383c7bf58e697249f96e876d3d8ef384010f3bd15e79e18c SHA512 9f4138852d200c4449b7caa29e7916c7262f94558a92e6865be407c13b8f4db68c923e758890dcf9be237610b3ce611352cde5ea3d64a5c7e17d4a60f2054c7d WHIRLPOOL 6204751ae7dee75ff21542e5aaca95be9b38c4a883f8cc1b537a7912e77dc5b628e9df0e78c11495f8b21085625d5b11b45a0d23570f6a0bc2984823af6436bf
 EBUILD netbeans-platform-9999_p20160131.ebuild 9360 SHA256 e45e08ae69dc3c4f64c638fd9368537cd914e3cbab744e2fab2fa418d141bfcf SHA512 a549e821e95901841a363fd8f12a067467eab0f4e3b19b09f18b526d46a70337975606245fc64b7358fafa17b7c55b57c9c588b30ee6c6bcc19c0dbad56a2c21 WHIRLPOOL d3a5c516a375022798941ebb7916ce1cb65afa0d8d0abe1379a28f0548a13c3281253a7db05330a9f1a7707c0b8a59cddfd6b201aee13ad89387269c102376ef
 EBUILD netbeans-platform-9999_p20160201.ebuild 9360 SHA256 6ea3f0ce796b7786faac6feeef45e178073311997c6eaf9da182cf0dc08ccd3b SHA512 6a7e637175e3c34d2ff030b7e6e0cd7c36fcce57c241b850f6386b28ddbcb77992fa7518d465743f8a0ea04e46ad68d0befd6f590e0c3f4ec72dd74a75e2e7f7 WHIRLPOOL eee69a2418c79de597fbc1c2433bb938b63a32320b1e8a39d79b1201be76679b7a080f5f8b4f3ba1486d57a41ba94ee140bbd9b793828a1ba2a92ec1c58b5502
 EBUILD netbeans-platform-9999_p20160202.ebuild 9360 SHA256 82447df03d19e72c1842ef8d3cacceb58275bf3dff9d69ee56039db81323dff0 SHA512 603ab9c11540e04b9ca6459df88a91e905e05d3406c290b62aa7ff6b34e1454e5d54e7cd62523dffba5f1dc2c39cb97e415022fe43a36c4237f3f59e267e4c4e WHIRLPOOL d2a8daef6a2b8d243e529184d48fb52fc6b43afafb58b8df34d4e9f45724cee22fe5b91dc8750a591c265d3f56e08624fc3e53bbecb6de47480c9d6e78e02129

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160129.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160129.ebuild
deleted file mode 100644
index f71dbbb..0000000
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20160129.ebuild
+++ /dev/null
@@ -1,165 +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-01-29_00-02-15/zip/netbeans-trunk-nightly-201601290002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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/A3432F57D9B3B4AD62CB0B294EEC43D12FCF3F62-ko4j-1.2.3.jar
-	http://hg.netbeans.org/binaries/78DD1C0B4EDC348FF4DCD0616597BB809AAE248D-net.java.html-1.2.3.jar
-	http://hg.netbeans.org/binaries/7BA1E1C450BCD0AD9D0D2F6797A2EB50A4822E0E-net.java.html.boot-1.2.3.jar
-	http://hg.netbeans.org/binaries/068B9902E65F2292C9EA30E5423E41FB6B30D8AA-net.java.html.boot.fx-1.2.3.jar
-	http://hg.netbeans.org/binaries/8621531E83EC4850DA61AA2266FE41105C304F40-net.java.html.boot.script-1.2.3.jar
-	http://hg.netbeans.org/binaries/24824B1E8C2A2D3A5C471F5875BF61F27E8916DB-net.java.html.geo-1.2.3.jar
-	http://hg.netbeans.org/binaries/F41518385DA4B5682C864F19B82C3BA4AF65AE83-net.java.html.json-1.2.3.jar
-	http://hg.netbeans.org/binaries/989A81454D4FA962EB1C158FE794D2EB060AB9F6-net.java.html.sound-1.2.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"
-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-r14-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}"/A3432F57D9B3B4AD62CB0B294EEC43D12FCF3F62-ko4j-1.2.3.jar o.n.html.ko4j/external/ko4j-1.2.3.jar || die
-	ln -s "${DISTDIR}"/78DD1C0B4EDC348FF4DCD0616597BB809AAE248D-net.java.html-1.2.3.jar net.java.html/external/net.java.html-1.2.3.jar || die
-	ln -s "${DISTDIR}"/7BA1E1C450BCD0AD9D0D2F6797A2EB50A4822E0E-net.java.html.boot-1.2.3.jar net.java.html.boot/external/net.java.html.boot-1.2.3.jar || die
-	ln -s "${DISTDIR}"/068B9902E65F2292C9EA30E5423E41FB6B30D8AA-net.java.html.boot.fx-1.2.3.jar net.java.html.boot.fx/external/net.java.html.boot.fx-1.2.3.jar || die
-	ln -s "${DISTDIR}"/8621531E83EC4850DA61AA2266FE41105C304F40-net.java.html.boot.script-1.2.3.jar net.java.html.boot.script/external/net.java.html.boot.script-1.2.3.jar || die
-	ln -s "${DISTDIR}"/24824B1E8C2A2D3A5C471F5875BF61F27E8916DB-net.java.html.geo-1.2.3.jar net.java.html.geo/external/net.java.html.geo-1.2.3.jar || die
-	ln -s "${DISTDIR}"/F41518385DA4B5682C864F19B82C3BA4AF65AE83-net.java.html.json-1.2.3.jar net.java.html.json/external/net.java.html.json-1.2.3.jar || die
-	ln -s "${DISTDIR}"/989A81454D4FA962EB1C158FE794D2EB060AB9F6-net.java.html.sound-1.2.3.jar net.java.html.sound/external/net.java.html.sound-1.2.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
-	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-r14-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 libs.jna.platform/external jna platform.jar jna-platform-4.1.0.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.1.0.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.1.0.jar && java-pkg_jar-from --into "${instdir}" jna jna.jar jna-4.1.0.jar
-	rm jna-platform-4.1.0.jar && java-pkg_jar-from --into "${instdir}" jna platform.jar jna-platform-4.1.0.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 6fac7d3..c57bbf1 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-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b4317e2cb4cac3810a1ad2ef0267f0ce546438e1ef8ad7a97870d6 SHA512 be81d583e4f78c66f67037917188f189ebd13615c61b1afe373a9a39d7d0bcc33e70495c2ca3642b8e224e52ea214b80f3b2cb7fe6fa2868885af061c978add5 WHIRLPOOL 2ce1abe1c1f6043eea13c4432ffa72143b335bcececf2df63b2ef18f9700fc42d69bbfec9d4895912dea17283abe451dab3de2665bfb4cfef9a9790919523eba
 DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9ad56f46f55c48f6f2f29be561f35efd97b4b2ed5a80336045a6 SHA512 9b3a14aa58c3796257278d867e180c6dac24a9f8e9d3cf8ea2e8b639f8947e8514c6fa93c1ee8764fd854eeaa2e5239ac1febda6b53cf173525e99fa5328d58a WHIRLPOOL 4cb3842a6a99c9b80ecfd455912df8fea23339a432a3e5e9b36ba551c630efebef1211fe60edaec55fae0261c0f4cfafda626edcc27d867cb0a6aeee755ecb3e
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 DIST netbeans-trunk-nightly-201602020002-src.zip 209598146 SHA256 0b1707c46f0d9b52a61c0d0a840213bdfc9563292000dbcb6cfe6e6d1a9bb3e4 SHA512 56ee9d5767fd100de66463c57319e47b52a6769bcbbc9520fc5db4ff5b034c1f8f49bf190c39e1b082e343760aac87a03510c841f4699c6252fc27e4433b7382 WHIRLPOOL ac231e536c9adb590ffff69fdb218631b800a571dfce433b55f2e33e427494e3af9f35acee8621af5cc6c59df6f04303d6dd602bd6c6a549546c3c1797651f45
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf770
 DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
 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_p20160129.ebuild 3472 SHA256 0df50d640f1fd0a9185daa500488e0f8a1d1a9206baf747cbd392a3eb17dc24f SHA512 1835d77967e4069d36d7958daf78afe02f4810d4fe975ba4af610cd9366ac2096092daf107d8574a2aeda80b52b1f5fdb4615e751aa129b018e480f47bdfc505 WHIRLPOOL f9366d98ab835381428768ac222401abd65c9e73d189ce89dddeb901581786074b90a4638610466aed4013032b6598baafcef73d0af25cc72a02a301fd9862a7
 EBUILD netbeans-profiler-9999_p20160131.ebuild 3472 SHA256 42f578bbe357b748a4abad2471b9c944f18c5dcc150f4329ee53064cb7db7bc5 SHA512 8cf7be32614649ff130a7bf39f16f26e0f09e6247161b3bb97e1513fdf5316aef907a4a52b9bc842ec807e4c24bf17ab4660f342ecb279cad4b13d766b866d9b WHIRLPOOL 84f360321c007d815abba58aa2dc94ffdb808daf63ae937cc401a6c16ae9605b17f2f40abb01f846c204b62698f49dfbecc3fbcfe0389294edb2c929cabaa7bb
 EBUILD netbeans-profiler-9999_p20160201.ebuild 3472 SHA256 6c7df8de479ec61a636c5735ce33fd515f79dc7058a7f6b7747193fe1ef3031d SHA512 e327887dc753cf53df378f87d9b822e7bcd2b2b87e670478c2a31c744de65f4619523abfb0ff2871b0da2def80d215460a57ac4219b50378035b1090d211ac3c WHIRLPOOL 39416eb5c619ecb57a641a90055de4ad36e5919edf86a412c2cbff438ea399dd22b3253ee44ddea9be2ed86b8a30ba753b63044a2f3e5b8d2f4c9fde591f1235
 EBUILD netbeans-profiler-9999_p20160202.ebuild 3472 SHA256 dfb97d125ba0b69cba2d5fe2198c85d0a15ff563e41fd940d8f65f1d0bd94b00 SHA512 a494e263cada4db33561e7a3dfbca5d14fe73a62d86f8f9bbae4c7e38c3df603ceac1d1f87ed57ddc70723fba000091f7ae2d788d22d5c9d6d352633dfc27105 WHIRLPOOL d36f832f3a418e13f28d5ab49429d0d85594d57bb647b0ae408e1192c08c567d8dd378f0d944457faf9473505e76c51e46cf8b81088c5de66c03e05bc4926ab2

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160129.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160129.ebuild
deleted file mode 100644
index 70727b5..0000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160129.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-01-29_00-02-15/zip/netbeans-trunk-nightly-201601290002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r14-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 6826bff..854440c 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -18,7 +18,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b4317e2cb4cac3810a1ad2ef0267f0ce546438e1ef8ad7a97870d6 SHA512 be81d583e4f78c66f67037917188f189ebd13615c61b1afe373a9a39d7d0bcc33e70495c2ca3642b8e224e52ea214b80f3b2cb7fe6fa2868885af061c978add5 WHIRLPOOL 2ce1abe1c1f6043eea13c4432ffa72143b335bcececf2df63b2ef18f9700fc42d69bbfec9d4895912dea17283abe451dab3de2665bfb4cfef9a9790919523eba
 DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9ad56f46f55c48f6f2f29be561f35efd97b4b2ed5a80336045a6 SHA512 9b3a14aa58c3796257278d867e180c6dac24a9f8e9d3cf8ea2e8b639f8947e8514c6fa93c1ee8764fd854eeaa2e5239ac1febda6b53cf173525e99fa5328d58a WHIRLPOOL 4cb3842a6a99c9b80ecfd455912df8fea23339a432a3e5e9b36ba551c630efebef1211fe60edaec55fae0261c0f4cfafda626edcc27d867cb0a6aeee755ecb3e
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 DIST netbeans-trunk-nightly-201602020002-src.zip 209598146 SHA256 0b1707c46f0d9b52a61c0d0a840213bdfc9563292000dbcb6cfe6e6d1a9bb3e4 SHA512 56ee9d5767fd100de66463c57319e47b52a6769bcbbc9520fc5db4ff5b034c1f8f49bf190c39e1b082e343760aac87a03510c841f4699c6252fc27e4433b7382 WHIRLPOOL ac231e536c9adb590ffff69fdb218631b800a571dfce433b55f2e33e427494e3af9f35acee8621af5cc6c59df6f04303d6dd602bd6c6a549546c3c1797651f45
@@ -47,7 +46,6 @@ DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf770
 DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
 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_p20160129.ebuild 5280 SHA256 7b5230211a95ba0ae2d6a12b0dc4971ff757d69e1ebd3f30ccee23b8e53d2329 SHA512 ad134f7bdea7ee60dcdf25e1b554e83e39ecade3b83caed134ddc16b3a5633f57f8733f93cef3f34f08bfadc5746a1cbc2a09d2689b39d0d4dedba8481c8f749 WHIRLPOOL e347a10ff1168fc9243f718cf9818bb45737ab69ea6daa0a47057397a62138638961668f304d53a5e61a3722d68a22dcc5f4914eee9a391b45c5c1b280a2585e
 EBUILD netbeans-webcommon-9999_p20160131.ebuild 5280 SHA256 aef3a1289824593e2363eaff796db87c73af6bd02e1252a1d5635f5c2d62fb51 SHA512 4119e9d8ed2a9431ae7228ab85544d8f74c92b3817c5fc88fe37547c5a1108905a08559ca43a0f0f83cc2138cedbeedc0dc5d0cfe7cff0d552281a73e3b57d68 WHIRLPOOL 43c6d23c364cb942417d8bbc56048e9a92f98215f1038fde24aaeb8d6b7b1a6e1c5adc9fc4f30d4ee034da0339b3ac2e7df2b3c606c4f53eaa1f03818206a4e7
 EBUILD netbeans-webcommon-9999_p20160201.ebuild 5280 SHA256 a6b100edbd1c1846d655c72e371c63eb29d221c5e0093a8ef59386632a0a2b36 SHA512 873f3aeff7faa080aa6f03069419ccc983ef0857923f08bd53521e5a2e577d6519617932405a2fe44cb85d42e398e12a86411d0e55c455f6e0305a17d7982585 WHIRLPOOL adbe2c453ff709ac80b5f1a12e97b37f333daedb4e69a9e32817ed1d8e0c2fd6f72cac49770bbac8fa639289c3eacc8c1591e557762222ebfa9997232e271bd0
 EBUILD netbeans-webcommon-9999_p20160202.ebuild 5280 SHA256 e51a2f4904a2e6c4ed2cd1165b8bbe67d23190db9bfe5598f1c94a74a602cf2c SHA512 0ec249e88ca0ad287b2321c59bb03a44e9c1f71871726a54573ea40f39caed689cb51c4a057b7e2bc2e3e6eea5d85dc6c249bf5648aa8c1e2ed17a0da045263a WHIRLPOOL bd414e1033ae4b9e869825f5e80716264d4c98619a7a89020359bba88657f4e28afb668bc0452f392a153fd0cf64448fe2f1fec0e3d7920d5cebc36706053831

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160129.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160129.ebuild
deleted file mode 100644
index 80a99d0..0000000
--- a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160129.ebuild
+++ /dev/null
@@ -1,122 +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-01-29_00-02-15/zip/netbeans-trunk-nightly-201601290002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar
-	http://hg.netbeans.org/binaries/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim
-	http://hg.netbeans.org/binaries/0929AC5F40B5A8667021408748D64F30F77B3165-libiDeviceNativeBinding.dylib
-	http://hg.netbeans.org/binaries/2A38DA3DB5D36DBBDC0B03990B46810F72430D5E-libimobiledevice.4.dylib
-	http://hg.netbeans.org/binaries/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib
-	http://hg.netbeans.org/binaries/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar
-	http://hg.netbeans.org/binaries/C1BB9FF4232248B0054E5A26A33474A251EA19CB-libusbmuxd.2.dylib
-	http://hg.netbeans.org/binaries/D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip
-	http://hg.netbeans.org/binaries/1EFED55F8C442E4DB1C2338A5C35D494364F9ECD-ojetdocs-1_1_2.zip
-	http://hg.netbeans.org/binaries/456736E6988B164BFC5C740605237A76A18A963E-ojetdocs-1_2_0-Dev10192015.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"
-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-r14-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar libs.plist/external/dd-plist.jar || die
-	ln -s "${DISTDIR}"/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim cordova.platforms.ios/external/ios-sim || die
-	ln -s "${DISTDIR}"/0929AC5F40B5A8667021408748D64F30F77B3165-libiDeviceNativeBinding.dylib cordova.platforms.ios/external/libiDeviceNativeBinding.dylib || die
-	ln -s "${DISTDIR}"/2A38DA3DB5D36DBBDC0B03990B46810F72430D5E-libimobiledevice.4.dylib cordova.platforms.ios/external/libimobiledevice.4.dylib || die
-	ln -s "${DISTDIR}"/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib cordova.platforms.ios/external/libplist.1.dylib || die
-	ln -s "${DISTDIR}"/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar libs.jstestdriver/external/libs.jstestdriver-ext.jar || die
-	ln -s "${DISTDIR}"/C1BB9FF4232248B0054E5A26A33474A251EA19CB-libusbmuxd.2.dylib cordova.platforms.ios/external/libusbmuxd.2.dylib || die
-	ln -s "${DISTDIR}"/D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip html.ojet/external/ojetdocs-1_0_0.zip || die
-	ln -s "${DISTDIR}"/1EFED55F8C442E4DB1C2338A5C35D494364F9ECD-ojetdocs-1_1_2.zip html.ojet/external/ojetdocs-1_1_2.zip || die
-	ln -s "${DISTDIR}"/456736E6988B164BFC5C740605237A76A18A963E-ojetdocs-1_2_0-Dev10192015.zip html.ojet/external/ojetdocs-1_2_0-Dev10192015.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r14-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-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 44c8044..134ef0d 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-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b4317e2cb4cac3810a1ad2ef0267f0ce546438e1ef8ad7a97870d6 SHA512 be81d583e4f78c66f67037917188f189ebd13615c61b1afe373a9a39d7d0bcc33e70495c2ca3642b8e224e52ea214b80f3b2cb7fe6fa2868885af061c978add5 WHIRLPOOL 2ce1abe1c1f6043eea13c4432ffa72143b335bcececf2df63b2ef18f9700fc42d69bbfec9d4895912dea17283abe451dab3de2665bfb4cfef9a9790919523eba
 DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9ad56f46f55c48f6f2f29be561f35efd97b4b2ed5a80336045a6 SHA512 9b3a14aa58c3796257278d867e180c6dac24a9f8e9d3cf8ea2e8b639f8947e8514c6fa93c1ee8764fd854eeaa2e5239ac1febda6b53cf173525e99fa5328d58a WHIRLPOOL 4cb3842a6a99c9b80ecfd455912df8fea23339a432a3e5e9b36ba551c630efebef1211fe60edaec55fae0261c0f4cfafda626edcc27d867cb0a6aeee755ecb3e
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 DIST netbeans-trunk-nightly-201602020002-src.zip 209598146 SHA256 0b1707c46f0d9b52a61c0d0a840213bdfc9563292000dbcb6cfe6e6d1a9bb3e4 SHA512 56ee9d5767fd100de66463c57319e47b52a6769bcbbc9520fc5db4ff5b034c1f8f49bf190c39e1b082e343760aac87a03510c841f4699c6252fc27e4433b7382 WHIRLPOOL ac231e536c9adb590ffff69fdb218631b800a571dfce433b55f2e33e427494e3af9f35acee8621af5cc6c59df6f04303d6dd602bd6c6a549546c3c1797651f45
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf770
 DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
 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_p20160129.ebuild 2721 SHA256 b62f8ab2ebb4db8e62eb569fb1693b8e91f021cfebfd1ceaeaa59ab48610788b SHA512 bd626018daf04172c27fb75a01247a077ffbd8ad96b1305e4af561cb2e546a801e726244d47ae95a197dd2d90ec4b799b090dc7a2dbf28b276426c6aee4b78e8 WHIRLPOOL 3d06c1ffd8cd6082c4b8f315f3961170f4d06749cc398add1e00d7a7795b5e0c853e93d5ef50aae8bbc57b6dd35bfe841df0f1ec0537404a74f7648040b7b281
 EBUILD netbeans-websvccommon-9999_p20160131.ebuild 2721 SHA256 f8743d6d8d9778d9cb1a121ad39d6223e1a0f0a2277dc07add61a3916ab748cf SHA512 77a38f6c859ae61b7bcc12d8e83604f851d55089472cdfe9f3095c29f3c18177b4713371b6a7d8f7bc71235791f3c335b0df305ea75d24de9ce728761af198e1 WHIRLPOOL 25dca843d1d906722890bcd5a0083f7cef40621f364c71c8f32f4de962e7ad1d04465159083323b73168fe44f7788edee543e925bd3cb089cc0a5d1be2173eeb
 EBUILD netbeans-websvccommon-9999_p20160201.ebuild 2721 SHA256 4cf42fdc0ad3a1a7b5806315484878a66da8457eac73e700540f233052833cdb SHA512 5fcd0513fcb1e5f5c7d9ad209cb2d829863f47b52b4e83b87e4666bfcf11da50168b7bed2a0a46667a44f01120c54adcf1706c9bb450b48b1517fb1b6ab64828 WHIRLPOOL 745562986629db58e5f6d1d0e983318b9e6acd0d5ba9d35efa099bf6049329fc517e28de79ce0a95335ed9454505450c614ff38266fca083a9d4860adcbd4a65
 EBUILD netbeans-websvccommon-9999_p20160202.ebuild 2721 SHA256 fe533092ed87eb2c49bf78f4542753c7d96983a31661a21096e255fff46b2bd2 SHA512 11b13fd8e9fc7cfab461c8ae6afad0cbcf778773a47c8748afdecc6ff84db469d4b3ba6fa233c652a292f4a451c9327fa0bbc7b688a3020a4ecbb085bcdf85ac WHIRLPOOL c639e66e366c0d5c258a97fbccfd66817c7241f46cea0848571251f3e5638dd07b13cec7741f6016fbc992ca202c5c3a422869031ef51459a146cc6ff030286d

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160129.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160129.ebuild
deleted file mode 100644
index 5087b13..0000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160129.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-01-29_00-02-15/zip/netbeans-trunk-nightly-201601290002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r14-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 f9af90b..e22303d 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3
 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-201601290002-src.zip 209572474 SHA256 aecbabf995b4317e2cb4cac3810a1ad2ef0267f0ce546438e1ef8ad7a97870d6 SHA512 be81d583e4f78c66f67037917188f189ebd13615c61b1afe373a9a39d7d0bcc33e70495c2ca3642b8e224e52ea214b80f3b2cb7fe6fa2868885af061c978add5 WHIRLPOOL 2ce1abe1c1f6043eea13c4432ffa72143b335bcececf2df63b2ef18f9700fc42d69bbfec9d4895912dea17283abe451dab3de2665bfb4cfef9a9790919523eba
 DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9ad56f46f55c48f6f2f29be561f35efd97b4b2ed5a80336045a6 SHA512 9b3a14aa58c3796257278d867e180c6dac24a9f8e9d3cf8ea2e8b639f8947e8514c6fa93c1ee8764fd854eeaa2e5239ac1febda6b53cf173525e99fa5328d58a WHIRLPOOL 4cb3842a6a99c9b80ecfd455912df8fea23339a432a3e5e9b36ba551c630efebef1211fe60edaec55fae0261c0f4cfafda626edcc27d867cb0a6aeee755ecb3e
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 DIST netbeans-trunk-nightly-201602020002-src.zip 209598146 SHA256 0b1707c46f0d9b52a61c0d0a840213bdfc9563292000dbcb6cfe6e6d1a9bb3e4 SHA512 56ee9d5767fd100de66463c57319e47b52a6769bcbbc9520fc5db4ff5b034c1f8f49bf190c39e1b082e343760aac87a03510c841f4699c6252fc27e4433b7382 WHIRLPOOL ac231e536c9adb590ffff69fdb218631b800a571dfce433b55f2e33e427494e3af9f35acee8621af5cc6c59df6f04303d6dd602bd6c6a549546c3c1797651f45
@@ -35,7 +34,6 @@ DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf770
 DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
 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_p20160129.ebuild 6938 SHA256 39bf449ae0a9d02dbd6529eb9f6801dbd01c85bd5e0c1ca7642bba0e9867a918 SHA512 a07198a37c408ab0f8a2a7a9fca779f53bdd91c895329b51b90159a084e4707ca09bfe2f08252f6c2fbc59c75620e9f2f4e0ad012c8e6b71058ff764cf20bf65 WHIRLPOOL 70a1cae05909f5109c5f315a5e86c5a835707886a6da0a13323e1d2ef771b3d210a05b35d482fc703bb691ee0fe3d187f402805f922d3704abd3739b32d5c5f6
 EBUILD netbeans-9999_p20160131.ebuild 6939 SHA256 bef12b48a84503649a6da0ab419dcf8b663cdce3693a2c5fdb98b6fae291712c SHA512 359de8bc186f514d05dda9f46046e36e458e058e0f9b15031c4fadcb576130e8be344a9fe6595641f2550cf32c809c491c7b8c3843c27292b0d2ac0babd7db26 WHIRLPOOL df3d508c342e94d7847b4d118345afb9032787acc0998331da802543e4530e900eaf2a2b239f5f3f959720eb215303a39d21e2f050f274927f66972b4e6b50bd
 EBUILD netbeans-9999_p20160201.ebuild 6939 SHA256 c388d4471392aa25561b6eec3bb38acbf826e77ea32d494ee506300bdd797d5b SHA512 f8190fc62588077cb3b55149ce7fa6c91341bb8b98ac11d4df7e48c4dba345b3560da7c0719dd97786c686132fc74c136ab4a39032679d035aae587409f31605 WHIRLPOOL af43b43b28b2314f7c66575dd373f36c5ee5fe583374cc5e5ad52cf57c37797eff749a692401edd256a70ed81f97520f7deff8a87afd307fc654ea0a545ea877
 EBUILD netbeans-9999_p20160202.ebuild 6939 SHA256 add4eb27e204a26b2ddbf2ef6db56da44dd4935813c22aad91d284453eabd2a7 SHA512 b248709035fd31f98ad3b6f7e66cc65134264c9fb2f6b54e2c1aca199a86e7b0ba5616b0e94e9651398e22db2b953c0ff21b091fd925fc4d8819b72c5dab982e WHIRLPOOL cf6348a6f56c8bb3cce5bd22257e3d0a2d4e610f8a272355ad457607c34005b6be9ae1d0b7d0df44d5c3bd680bdc92e4197b26a3d20680a34106e3e7d1a66c5e

diff --git a/dev-util/netbeans/netbeans-9999_p20160129.ebuild b/dev-util/netbeans/netbeans-9999_p20160129.ebuild
deleted file mode 100644
index 1fbbaa2..0000000
--- a/dev-util/netbeans/netbeans-9999_p20160129.ebuild
+++ /dev/null
@@ -1,253 +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-01-29_00-02-15/zip/netbeans-trunk-nightly-201601290002-src.zip"
-PATCHES_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-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-r14-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
-}