public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-javacard/, dev-java/netbeans-apisupport/, ...
@ 2016-02-03 11:24 Miroslav Šulc
  0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2016-02-03 11:24 UTC (permalink / raw
  To: gentoo-commits

commit:     09862227397d41350dee27a942129b111665d3b9
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  3 11:24:23 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Feb  3 11:24:23 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=09862227

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.2.27

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 985dc91..ba9863b 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -18,6 +18,7 @@ DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b431
 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
+DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 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_p20160104.ebuild 3384 SHA256 1b7544b71eb8ca0b29fd04285cf3f1fd7a1b3ed24bee476e091d398e2a8af20d SHA512 f4937cd18f555b2e916f49cba0cf94ec26e0131ff840f52d61d82abb7496b74fd0693051770f6db41c2bb35bfb086cd2e63028ed77234f90669db1ed4379b883 WHIRLPOOL 13003602162a041610cc0448d4adeeef075c346b997c2f49b8084350ea63bb6ecc4e6f1c0ebaa699dd2cf5688e43d58575d39ac91d8bb717c83d41a0721b646f
@@ -35,4 +36,5 @@ EBUILD netbeans-apisupport-9999_p20160129.ebuild 3384 SHA256 9890b1fb66a753a27a0
 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
+EBUILD netbeans-apisupport-9999_p20160203.ebuild 3384 SHA256 22e7421d319eb975b86c9c848e9af668f7f7c70ffffaf7ea8596ba1ca6a06850 SHA512 bed277c8ff7f693bc834b38d80ba7f2d8aeca8917e38aae91a3dc45e2b5acab6237726eba1f4fc6e5fc95bf62f26df5778cdd44ad2eb724bb9b3dc294cf50470 WHIRLPOOL 157a2ce99f4ce71c4c9959eccab899affec8c890255d96780344568213c59aeb0c22a51afd38e4655af87689da384bd3e7be1b5a0aeaa7bc395f69eac41ce4fd
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160203.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160203.ebuild
new file mode 100644
index 0000000..e0063f5
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160203.ebuild
@@ -0,0 +1,111 @@
+# 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-02-03_00-02-15/zip/netbeans-trunk-nightly-201602030002-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 b10c7df..aeaee1b 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b431
 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
+DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 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_p20160104.ebuild 4790 SHA256 6c50d15e2cd72a6d604d038d57ebe93ece2e574d113f73d534e6048e1ec515e7 SHA512 c5ba5a6786c08dae2a90d73b8e5adc769f09212532fe65ce78a7ad8fd285d74905d19889995a65e92416fc8d58940cff7fdcec89339047a8a2ab7efe8388e8bd WHIRLPOOL bf2f4243f17b042e9f6400873a3edb7c6f9a03acab3a7bcc97c793e6267a2cc2f4bd7eab97ece26cc3502d628b728a28b90f0f000d8ad7c9786184fc31859d8c
@@ -49,4 +50,5 @@ EBUILD netbeans-cnd-9999_p20160129.ebuild 4790 SHA256 bde95da79ff2390d97a08cacd9
 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
+EBUILD netbeans-cnd-9999_p20160203.ebuild 4790 SHA256 a84980c76aab918bdef5926a687529157108e0350053ff7454ea5e3cabf1772d SHA512 8468bec6196534c2d50a35aabb195e27eec9ecd5ce865ce7c00a6c1c6e807d2ee966acb9e7545687bc2020ab0bb466a9bb125301362ec8dcfa8f1a6b4f9fd67c WHIRLPOOL 7e748cdfc61bdf26932e1957e173b4937a27df173aaa3a5b328693c717e37e2a6d634493ea08982dba5699987543dbd6d98db16adf3784a08a6877f81d55347d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160203.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160203.ebuild
new file mode 100644
index 0000000..da3dfab
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160203.ebuild
@@ -0,0 +1,127 @@
+# 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-02-03_00-02-15/zip/netbeans-trunk-nightly-201602030002-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 0c8b2fe..60f1dde 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b431
 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
+DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 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_p20160104.ebuild 2968 SHA256 0100bcc27ac6d26bbfb248f08baf151f02c4259bb0e0323bcac6aeb83e6583be SHA512 7fcda8e5abef409491dcde6b2ed7ca4244f1a4316d871a0a1dd1ce77bc1ddd9800b08ad9b22df38dc7f84850a8df0b298642f5631e7e4e799273a5254040fd93 WHIRLPOOL d18ddd21053660c3f67dcf35f47426effff0ccda85c5e72e553b22a36b342cd875d95fdab8ce41e7e91ae9684ff164cebac535c693edef3693bf3f86fa346a51
@@ -41,4 +42,5 @@ EBUILD netbeans-dlight-9999_p20160129.ebuild 2968 SHA256 cde3f9619c4a8083df8bc61
 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
+EBUILD netbeans-dlight-9999_p20160203.ebuild 2968 SHA256 271a111780f6f2d942fa13d0acaa55d5555958524ac0a36604980e6f291686f0 SHA512 1cbc553f71d7ce1fa9fce8b3a9fba90b4fe451d641cc8524a2f78de06a3ec59572ee8c9501edc8df0047c1c40eedce250e5e912d54bbdd57eeb55b5d3f04cccd WHIRLPOOL dab32fa280d1ffcc0823cf6775d34bf9d37cbccbf9997f009f4dcddffb6b5f2a7ab54f95da0d4ed3a3b966a7066af566eb9e96f9550ce84165b8e23b8372ef55
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160203.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160203.ebuild
new file mode 100644
index 0000000..3f4a3a4
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160203.ebuild
@@ -0,0 +1,101 @@
+# 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-02-03_00-02-15/zip/netbeans-trunk-nightly-201602030002-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 e6fb600..e9a61b5 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -50,6 +50,7 @@ DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b431
 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
+DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 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_p20160104.ebuild 15825 SHA256 efe232a4ee688084bfd86d70c2fed4a9fa5cb591fd9ff4237e7c8954340c52da SHA512 ab3ec93b101b8091e979bb574435dde70b22e9b87c230542486843565db6a70521dd933b4f992a13a5ad4ba93f019823130c3e61c6115a4b74519c37a0759524 WHIRLPOOL 9d53fa6b979851c4d46b27cea723ed8d22e85e4e2438e56e7fcdc57745308e98f1927800a12e432de4d6c46eafe7e4e5ba71600e67f031a0394aa42c4e5656e2
@@ -67,4 +68,5 @@ EBUILD netbeans-enterprise-9999_p20160129.ebuild 15825 SHA256 11ac5af569d12ae7a1
 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
+EBUILD netbeans-enterprise-9999_p20160203.ebuild 15825 SHA256 5af735a23461a6c42445554e7f71e30d4905ffb11b8d977bc8721da6006eafd6 SHA512 e53cf3ccecfca82558a2cbec469265cf2da610a8f292c37128099978d8a90db524d25c0548c03b4d2885a56e868d82bac16c6b02a04d8ce5db05562972baf3c5 WHIRLPOOL 2a25c2e3e22f43004589ceb111b4a9ba13e816213d431c99643e4e5c05021d08f7753a803bd8d4a39c1b93a96e67c0899d51acbac6c56e19ae46a246a5c40693
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160203.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160203.ebuild
new file mode 100644
index 0000000..cebb58b
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160203.ebuild
@@ -0,0 +1,266 @@
+# 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-02-03_00-02-15/zip/netbeans-trunk-nightly-201602030002-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 f3e0f68..55cf5ff 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -18,6 +18,7 @@ DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b431
 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
+DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 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_p20160104.ebuild 2913 SHA256 f6962ca5bad97184363417c21b385b4a4e376dfa15b86a42fbb576f281d4edc5 SHA512 5f2dec61077a3750d7feeec4b5b58765f72f4aa8ce2e8966c7140d196cf4608953a3aa00a7c8b0d11150bf134b124200115ab65d0eea107bbd14841cfc46f435 WHIRLPOOL eec826fbe490527fb017b0f9ed8ca729168030261b49c5bd1c57f3bd824b7d76f4ac8bd022b0705443d0e7b2516c36a605737c1e30a2ca429e4f4276df07fbbb
@@ -35,4 +36,5 @@ EBUILD netbeans-ergonomics-9999_p20160129.ebuild 2913 SHA256 69365d476dc57889d9b
 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
+EBUILD netbeans-ergonomics-9999_p20160203.ebuild 2913 SHA256 4882eb60280bd7fa5c0fa602ac1196ef78e9b64253e9c052ca5204de2e38fcb0 SHA512 a966390d5ba253a3c67dceb20e9b142319e83dcf2f352cff45a7bb35af04e4df85a4d926241c72c08bf12b236d2823258e36c5bdd101fd1233f97028687fb8a5 WHIRLPOOL bab60fcf209d6daa93cc11150d56396cb18d1867fc351a0b5f940d9a521e4fc1a094d063d17c151497df6aabe084c37c9237b8c93b44da6502987fe16a8ccfab
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160203.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160203.ebuild
new file mode 100644
index 0000000..99d1fb0
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160203.ebuild
@@ -0,0 +1,101 @@
+# 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-02-03_00-02-15/zip/netbeans-trunk-nightly-201602030002-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 f380a42..e893c88 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -20,6 +20,7 @@ DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b431
 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
+DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 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_p20160104.ebuild 3377 SHA256 67dab498c39d86278fec38b2a0faf691c889136520bc0692de03c19c2f94be9f SHA512 7cf6f05711df39c569228c0b62734955c8430ed981ddbbb6a7252c834bdb083f043398161b3a6b9cc3ead2666595bd27f51a9413c95ae9397f8cd4766f2c8953 WHIRLPOOL 15cb3f4ef19842935a829e24bedc9910989fc4caacd62750f46263af6c3f501c9b00985e7f7509b034f1b479341f04ed1f7a9a9d3c4a1d4b17ab99cf9785fa82
@@ -37,4 +38,5 @@ EBUILD netbeans-extide-9999_p20160129.ebuild 3377 SHA256 444f74315b5c815af87442a
 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
+EBUILD netbeans-extide-9999_p20160203.ebuild 3377 SHA256 2e4af3d79f8fe001b6f96a6eaf90baeeab1abd682f6e9ccc119601b3f40bcfd4 SHA512 3776dce886242cc3e55b263baebe58cd5e596f94d71d37dc9b0d656b9432caa69c8d4c4b8670613f54b21e85dff9445f106116a39572989a796d84c9628c6b8d WHIRLPOOL 02986f5db041f67f9f1e21daf45ea7022ac210a185b69833a7e4d3782d80db80cef1d292bc68589c3670911fe83cfe027732415abba18da06ea64baa3c40c212
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160203.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160203.ebuild
new file mode 100644
index 0000000..84e925c
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20160203.ebuild
@@ -0,0 +1,108 @@
+# 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-02-03_00-02-15/zip/netbeans-trunk-nightly-201602030002-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 fe986d9..6c815df 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -20,6 +20,7 @@ DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b431
 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
+DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 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_p20160104.ebuild 3416 SHA256 06d03b6e5ae56ee23ec7291f7499b6bbb3007c151c225c31838b41aadb901565 SHA512 e2c9fa07945e0311a5f0d5c5546c00025c5d4d44edc1c97184cd7b8c44b380f6b0303afd88f066165ba7bb4523160753b4535cee5ab820fa97adf7a4d84e9581 WHIRLPOOL 5491d208c112958027225479a6075ee47c45637696a7ab735047715ab3eef3ad1c99c86307c1ee99fa9f498875fceb318526e87f3e0f9e7ac5d495706b06d21e
@@ -37,4 +38,5 @@ EBUILD netbeans-groovy-9999_p20160129.ebuild 3416 SHA256 6e2e45cd825c6f334e848a8
 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
+EBUILD netbeans-groovy-9999_p20160203.ebuild 3416 SHA256 cbf5d747825772663fbaf4ee474ff1d90cc1531651080430f6c26a183e271607 SHA512 123e7639f80bb364710a264de4560454ebe524fde01899fff4ec84a12bdef6b0e02b2ecf2eec66381127f03b0572f2fc846e0b5f77ab1a5b5763f599a5f509ef WHIRLPOOL e2819e23c7ac314ccc695e3b38d732e57bb104854f479f740af0f1006d4721728c99870a17b1e019f00a37bbedcfa45fd89c6ef5d8bf3a789f6b1d46af8903ac
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160203.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160203.ebuild
new file mode 100644
index 0000000..c200c25
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160203.ebuild
@@ -0,0 +1,111 @@
+# 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-02-03_00-02-15/zip/netbeans-trunk-nightly-201602030002-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 5613d66..b19b77f 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b431
 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
+DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 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_p20160104.ebuild 4126 SHA256 6bf8a72b198b98472cfe603cea05f99c6aef71fd9472f3a70945a7d60c3b424b SHA512 89ebd29de70b23981c3a87bff1c5296931902e5b391a5990af381fdcbfbb27f898841b89720c4ffdc59e2a2aba556ae0f463f92d016aa18a86ce9f73bc16064d WHIRLPOOL 050f630f2b743aad37480f278fdb753db2e2f4f699f7b5abdfc5bab62d7364b5e30a9c6ab91237554fc1f01ed5ab6342ac9370959683146cef57b65d977903dd
@@ -40,4 +41,5 @@ EBUILD netbeans-harness-9999_p20160129.ebuild 4126 SHA256 bfb690f231d6d06959ecf6
 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
+EBUILD netbeans-harness-9999_p20160203.ebuild 4126 SHA256 c01600cf3c56cb0adc6830e3156ce6e20776c6d0053bd76f2965eae9746f4675 SHA512 0651f8321aafd51f7f08b4b345c90e5e90c7f1d49931dad6533b5541c847923ed6ea0fadd0722e978189bc878821097959f6f418b15a7f7908342ef47d069208 WHIRLPOOL 37030fddce70dbdbb926eb58848eb2c0e4b5c7da72db40092836e46d3713c83dd1b5c5afa14187ddeb8354e58e984b4534dff9c66b2ae777329e3bc53f6d3660
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160203.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160203.ebuild
new file mode 100644
index 0000000..eb07b7a
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20160203.ebuild
@@ -0,0 +1,114 @@
+# 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-02-03_00-02-15/zip/netbeans-trunk-nightly-201602030002-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 7b248d2..7e7f357 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -151,6 +151,7 @@ DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b431
 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
+DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 EBUILD netbeans-ide-8.0.2.ebuild 29317 SHA256 42218788ab0fc7c7cd1bb42a8b0c72a66543a3260b752aa55365833c355bcc63 SHA512 c712b66b6bee654390a45e5c616479df2be624bb770f3838d4fcce875f71a8d165703dffd55c4fd7d30e19c392784203e5fe01e2404907d88c935d439efaf578 WHIRLPOOL 67763e4a36215ac002fd321556ce2269affc15ba48ad5069d7ccc746d918179994f174e09305a9d9ddadddbea690778c2769e0ea1993eafc09e01580485e2292
 EBUILD netbeans-ide-8.1.ebuild 30288 SHA256 783332022c33a787ededc22d5250e30e1a91676508076fddc69ec64bbe5a6e7c SHA512 402d72f8b1a4e849dfe86054d466afeb0ab3987cd5ee747d3173874cd875fe3572be9e3ccd639fadf9e329db92e7543fd68dffc497805aa4d40b1d008c4a79ad WHIRLPOOL fd2cd798a1763af3fae44bb0eef0a4c4d932ffead6427e27d3483639348d969598b9c81d8949a3950ace1e68d3dfa0e08fe0c787b201b0cc9a95ea0040d156bf
 EBUILD netbeans-ide-9999_p20160104.ebuild 30832 SHA256 a8b1a0a3f049cb08ca20e2458cf0b1fc092a86803e50cda8560ab84310edd5a9 SHA512 e306444283088c8f9b4235e7570da2f7508d0b3a61578384f23150467dd873a8292608656c7129c10e3da34f413da7f9b5d045c533cc746d9685e43390f4b59c WHIRLPOOL 7c002e5145f6b07f23b214b44b390fc2ccd1c44720ac9378ad1e5be262b4d9ced1f13d8aceed181baeb5077d431136960f44783aa00009d2488882e966d0fa00
@@ -168,4 +169,5 @@ EBUILD netbeans-ide-9999_p20160129.ebuild 30238 SHA256 52ee72461891f54998b175db3
 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
+EBUILD netbeans-ide-9999_p20160203.ebuild 30238 SHA256 45b6e65b641ef76bd673f34d1805fa1ad3554b0290bd0e773e7319e268715c5d SHA512 70f1c1b72b75e91972c5537e1d3ed402e92402adf8793890b65f4f520513547dae5ebc8d634dc737d1d033d2951d91ada003d3a0e520e72eb7d4f36891dc79e2 WHIRLPOOL 6d5f2c8a46fe2b6e27c29e91f59b54d7402aa8ef4c94ff3626125f6091cb18469f975fa9ffb178020c8091838491df7c636c3777d9f0bced093437e035cc8dc6
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160203.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160203.ebuild
new file mode 100644
index 0000000..4b63893
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20160203.ebuild
@@ -0,0 +1,378 @@
+# 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-02-03_00-02-15/zip/netbeans-trunk-nightly-201602030002-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 a5bce23..2748531 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -48,6 +48,7 @@ DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b431
 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
+DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 EBUILD netbeans-java-8.0.2-r4.ebuild 13298 SHA256 d4172dfdec5afecb1cd099e18a21aa872c7822bff40b192b5f4ec4d35e6e0ef8 SHA512 48ae6f7141117fbf58123ded750d76f2e7311211a6be3b62bd491349817460da11f781ec5694da91584315547c32008f568fac3bfb406dbdb5ed7fd825ff694e WHIRLPOOL 73fb68aec003707c14b2b390c2de80f24e1e5413cf7e16cf7e661af47c908e2d559214580379e45e21d316767987ac906b5a119a61ae39f03c3d01dafad49b7c
 EBUILD netbeans-java-8.1-r1.ebuild 14775 SHA256 1bbcc19358e42931f2ebcffbc234ba4f903506bb255142f5dc8a6a3dfaac621a SHA512 9578fbd4732edfeca9d6abc6da147af8fe5bae2f740405b28bf82d403f7952a4f9302605dab07f4ad1e42b525d1562579d0b84de0b0a73c06113eaa8a617924e WHIRLPOOL 77e4d2a188b2aafb2506cc47abf98619edc783cd82c19d1c89c6278a4a3136c3f157e164354588fe6b6cc5889934380353b59e68cbe28f3e49d2c5989a7e4628
 EBUILD netbeans-java-8.1-r2.ebuild 14814 SHA256 1f49212c90fcaa9a6483f19bb60c963520f20aa08c2a509aa19cc7fda12e4564 SHA512 2d6b225f5d32f0ce1801124808b0cc2101f16a703540877c4818be06694742cfa262c3a2e7018761254f9244a7992eb7fe9bc15cdb20f6f4cb83958789c0ef42 WHIRLPOOL 8557163a46ea91a47efec3c272b8a8a0f2acbf9eaa8f6c280d0ddaac6dd8b2185f06716ab12ebf76fb87fe6c05ab1a14bfd281875ebef586f1304d2162e5f2dc
@@ -66,4 +67,5 @@ EBUILD netbeans-java-9999_p20160129.ebuild 14930 SHA256 067f7168197ccce48c3f005c
 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
+EBUILD netbeans-java-9999_p20160203.ebuild 14930 SHA256 2f751c07b663c0413bd8c1f3a81443dd0e5ffba79f50a7821563492b1cbc4321 SHA512 01b81f9d6c983e70ffdb749b194faae839e14eae49a6954bcf6a660cab6c910f37e2b3a1efe8e7ed3d9d02971fd7521922f7859116527912cbe8b23ff9b01ddf WHIRLPOOL ce6b3e5ea24ce1084a77eb0624ea20fa9f837ce39743f9b259cb25c1456ac94f6f235a0249d3480403ee3d6404adbe14d8a5d105848c77dbb48f2ddfc411ce8f
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160203.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160203.ebuild
new file mode 100644
index 0000000..78fb00a
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20160203.ebuild
@@ -0,0 +1,274 @@
+# 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-02-03_00-02-15/zip/netbeans-trunk-nightly-201602030002-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 fd8af4b..afeb56b 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -21,6 +21,7 @@ DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b431
 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
+DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 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_p20160104.ebuild 4971 SHA256 2d9b446422f5bbdae0bdfb9499f69d24199ff3f6b00d08b50cf85ffa6d92d5d3 SHA512 a5f8a1e4cd2426324c437b37c7119ccdf0826433490911b2f65124e9e37a5084c0021467057a338621f6c6dd0840e2ffc7fe425225ec10b6bc3cd2ad01be804f WHIRLPOOL 7d4c1f5ebf1b91996459f20d0b74b0a4fc18b96047cb967933435474a7c640b45bab067a18d8b86ec903e2dee7b28b59847339461a1d261f5edf677b63e42654
@@ -38,4 +39,5 @@ EBUILD netbeans-javacard-9999_p20160129.ebuild 4971 SHA256 210fcdbef8c1124a20360
 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
+EBUILD netbeans-javacard-9999_p20160203.ebuild 4971 SHA256 bcd39258455539171c15ced281e943708c02d0a4dc113de3440dc5a678e763b0 SHA512 2b95b6d11330d9dd25fc59c157bae775064606bc47a8f62d9c4c69fd21567f22a7800d66c09987761b8717839cf86c4bb56b3a07658f6496156efeb2519c29de WHIRLPOOL 1141ff929866cd1475404330adef2dffb83b76ceeae1917e2ff811dc4901617f9a264e63100350207eb38a8d4a8c5794e65166fb623655372d5b06cfd1584d8e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160203.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160203.ebuild
new file mode 100644
index 0000000..a94aad5
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160203.ebuild
@@ -0,0 +1,134 @@
+# 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-02-03_00-02-15/zip/netbeans-trunk-nightly-201602030002-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 ac85d81..b88d031 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -19,6 +19,7 @@ DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b431
 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
+DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 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_p20160104.ebuild 6293 SHA256 2d75f2091fbab033f643f1aef2b33034e5a0003846a91bc676165144f8835a7a SHA512 b159873d3cd86818f353f43d7f12b764ca42d24abd965b44513d32b0c6176255eb4ce833a5ecac9e5f1fb68a4dabb10776f6e95dbd13eedfd4b3cf3b352005ff WHIRLPOOL 73a968ce3674f5c4027371543fd286724fb3fb96b25f1d85b7311ac3d978ea13407c2457c9931e814b443349db7e23e58f62946870e38d01a954d31f28dc34a6
@@ -36,4 +37,5 @@ EBUILD netbeans-javadoc-9999_p20160129.ebuild 6293 SHA256 d60cd6e35e3a86f772f1b4
 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
+EBUILD netbeans-javadoc-9999_p20160203.ebuild 6293 SHA256 5c9c707695f13b739a022caf52bd313246b62bba71a9a8d77247106c2da40d85 SHA512 e8220e09efcbe51e97b8ec0163a979dac46e2c60fd34c6e3c23782d6d3d75fcc5fdb20286a25e1680494a995c5672d1e006068f2ed92b11294bb1c3a2b42dd4a WHIRLPOOL f7a01c6c640ffbc8ef7560cce2fab88b6ddb0d723df06b5f2164e4c3993ea2e9d2c00b35402249db474199bf86d210553e648c956fa826b4bd06595ef999e53f
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160203.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160203.ebuild
new file mode 100644
index 0000000..6f11385
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160203.ebuild
@@ -0,0 +1,168 @@
+# 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-02-03_00-02-15/zip/netbeans-trunk-nightly-201602030002-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 9245618..9cae3ee 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b431
 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
+DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 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_p20160104.ebuild 4717 SHA256 59a80e6d0bab595781c7a607913a4fdf0b9590d7d81dffa8396f84c3f13d9136 SHA512 b72ba3e52921421bf51edec7080a390df9232f62bce3b7ebfedb732599d4481bf34aecd610799768ba3449c35f8bb50e54bf47c0c78ec8585d424ca3a27a0cea WHIRLPOOL 8073288bea2a476883eb9ddf78fb1327b7b634f9245355b9d6e2490bbadd2a5328515925afa079cca9b307f3026082176027a1cfbb4a4dba70c148bc1b4daad1
@@ -43,4 +44,5 @@ EBUILD netbeans-javafx-9999_p20160129.ebuild 4717 SHA256 977b401552e3ff424a6256a
 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
+EBUILD netbeans-javafx-9999_p20160203.ebuild 4717 SHA256 a2e1b09dd033d29cd5819c422f7d3f75e3be1733c7db4534f2ddf5d69ce0304f SHA512 4436846211cacbed77b0b4ebc73533e4f3124ea980919e4e6cc6d0b9bf8a8c88950ebec5ae1f43f3591959ad565d10801341ed4e7164f7327c507624228a1534 WHIRLPOOL 2e3dbd52cdbcde1e8d457b9a28b607189b96f401b6bf17938ab557383949d2903e475b82580ed92753d6e0453e063aa956865a0249d49f9b5a9e1cadf0373db9
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160203.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160203.ebuild
new file mode 100644
index 0000000..b6687ba
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160203.ebuild
@@ -0,0 +1,124 @@
+# 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-02-03_00-02-15/zip/netbeans-trunk-nightly-201602030002-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 1866832..c8fc955 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -18,6 +18,7 @@ DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b431
 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
+DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 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_p20160104.ebuild 4412 SHA256 53139800c0b259b2bd7254d29547e225c9c31695e4b3c195e2d19fa4e65efed2 SHA512 4e0845b40fa279a700e3ca6e5f4ab221465c47c535d2405ad7432139f240a02a58c111753527c09a7de5364c3d6c7d7e83ef242d4711ef0e73109974fd689a51 WHIRLPOOL 3d6fc8ad2bb81055fb9e533265975590784091e8a3f8ff9f8f4d28f347a4c16e61c09bf70775dcdc05d13f0cd56afd391cc2336ff5cc7020eda32d7bd86a6fc6
@@ -35,4 +36,5 @@ EBUILD netbeans-mobility-9999_p20160129.ebuild 4412 SHA256 cc73307539e6630196425
 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
+EBUILD netbeans-mobility-9999_p20160203.ebuild 4412 SHA256 91d25a672c7301c9879e9d6f4ad2bccabe9f0c0d8004f013d344e5472a116bb4 SHA512 5eb22d769ee79dfdb2b79523b113c5028fe1726b8e209040df714a9e5962b5e649e58aad3593bcbeddd13cef112a3d3fa65f0c67f5ad40e96c453635ffb3897c WHIRLPOOL 49be135a04d786894b0f5424b37bf14a43d8c3aab9a62197f0fff99961dc8e15a6a51db9293e64b2df4cb2ba613cba6b6edf6938961f572e5b5e22a657dc94a3
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160203.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160203.ebuild
new file mode 100644
index 0000000..ed5f040
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160203.ebuild
@@ -0,0 +1,126 @@
+# 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-02-03_00-02-15/zip/netbeans-trunk-nightly-201602030002-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 29aa4c4..94e215d 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -21,6 +21,7 @@ DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b431
 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
+DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 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_p20160104.ebuild 4111 SHA256 37c19b6aa13fa95700d10483a58ddaba41482cfb04a7946eb4f6e698fa60a5c0 SHA512 2faff85920f5c09e2b52c7042e62585c4368cb9fa3877dd21ff0f23d3ddd91ef1323c1e669d56991c4048c7549485ad8c92842ebf5393c80ff3dbf00468a4de6 WHIRLPOOL 633e87b3dc1d067592ae1b7ee9f0bc8b6fe288457a505dc1d018007a791cd927966969afb936a340b58eabcdca04063c982a8b3e089dc05dfc33aebdbdbc27f4
@@ -38,4 +39,5 @@ EBUILD netbeans-nb-9999_p20160129.ebuild 4111 SHA256 03eb8e599d256249d56bdbc2d4d
 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
+EBUILD netbeans-nb-9999_p20160203.ebuild 4111 SHA256 ac504e5220f34cf0a0bbcfe9664ecdb9365e8f8724cc3c3c43fd4e9365bccb35 SHA512 0cc068ec1ac64b15622d946828a7fd1e13d28f6070dddd57fe5dc96a9553d3b5e42972b2c86934bf2c1f529ee1db6086bc04980bd462b8162451dd75c2c54ff2 WHIRLPOOL 804df7a65d55067e56903b4ac52a5fd488fab28be84d6c4367df53a5c38e88ec05b67082bff15c8809f389b1cb6ab194068fd31c626ed0df0878e88ef5d5824c
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160203.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160203.ebuild
new file mode 100644
index 0000000..507638e
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20160203.ebuild
@@ -0,0 +1,128 @@
+# 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-02-03_00-02-15/zip/netbeans-trunk-nightly-201602030002-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 3064ea0..3bcb7d4 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -22,6 +22,7 @@ DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b431
 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
+DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 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_p20160104.ebuild 4418 SHA256 08d408fbba6d43b353b2f53f9e16eeeeb3b449ec5da875bd1d88261f87405b7a SHA512 47aea35c7a21d931b57a75e97578a42dd4e8c34406ccff8b62c32be569618cfdaa78342202b7b0d34334b3abefd8276bd4d90d92bebf5697935dbfafe7f2ee90 WHIRLPOOL d61e370b17ab86c73d5a1087cb415cbbe925bef4ab27e5fa5ef7f3b4841a015f903d73d4796817ec2ed14856b30dc1f5db65caf3d58335707e5934cd61e10e53
@@ -39,4 +40,5 @@ EBUILD netbeans-php-9999_p20160129.ebuild 4418 SHA256 302d16d9851c39f872be18301d
 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
+EBUILD netbeans-php-9999_p20160203.ebuild 4418 SHA256 263569ba2d7f4c6cb6ff6fcc0d61f5fd511c63fad70f0a7ed35524aa144ba091 SHA512 9a0414bf34ac26a9cf35d93b9aeb3622ac979f12d814565ba8b7ba62a75d5accfc27ecab025c3372ad0ec950eee29dd5d6563598984e4134180539f49176d918 WHIRLPOOL cb746d95abee9cad2408c91b0254b879356acb48c0e18eae85063448040943d7b3cab7d26217fb66e6152ecef75badd396fe74d9490af3318db6bf1660d18e6a
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160203.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160203.ebuild
new file mode 100644
index 0000000..7a94173
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20160203.ebuild
@@ -0,0 +1,127 @@
+# 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-02-03_00-02-15/zip/netbeans-trunk-nightly-201602030002-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 9dc6d0d..ea8265d 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b431
 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
+DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 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_p20160104.ebuild 9360 SHA256 dbe0927dd378235a4e5d2c1a80e1dce1e18f2ed930f8a61886fd4fa715ec3a4d SHA512 2fa60726a78b3d387bbd3a201dc40c3c50a35a6da7e4f94a8e1e2fa22b94ef66b8b3883365c29e205c04a01c6cb3dfad235e22796d869bac335da5e757e939b2 WHIRLPOOL 6a7c552b0c82c1fd6854682f874e60beaeadacdcaf3fd22b3b1ae5009c3ef610de4bdb1433ae47d132eb15d74714f5a18ed7850ee119a7d221e6e2cffd8c2da0
@@ -52,4 +53,5 @@ EBUILD netbeans-platform-9999_p20160129.ebuild 9360 SHA256 d76978cafa723f41383c7
 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
+EBUILD netbeans-platform-9999_p20160203.ebuild 9360 SHA256 454751cf761337f1f6aec2efcc643e95f8e7dd7c317b2ecad4de6e40ae388d06 SHA512 718dd3c5cec70fb9c1dcd0fca014b6066812b8be27e351848ae1bfe95db09793144ed99e5dd0f8e47c427e14d4a96ebe879288d7155ff98546a8b87160a0241d WHIRLPOOL c5676bfaab4d35f4511e401a46f981bde4660ac655bd8bed6654bebb5856c8306b63ad7322710c6f0bf58a5c54aeebb18d334d9a9c35304a89e11b341f3beb1d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160203.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160203.ebuild
new file mode 100644
index 0000000..87014cd
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20160203.ebuild
@@ -0,0 +1,165 @@
+# 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-02-03_00-02-15/zip/netbeans-trunk-nightly-201602030002-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 87bf5ad..ae02310 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -18,6 +18,7 @@ DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b431
 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
+DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 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_p20160104.ebuild 3472 SHA256 dd029b7ae4365dfef7c8779dbea31a273118bcfa1b2e3e96f55e3a9c78caba36 SHA512 e5e44865b0d67ac5b78ac6faf95441ec7cc7ce38923048c65e07fa91c38f8739bfce78be900e887b189690b9390ca099f68add9269f11dd4d1b4e96769f65e80 WHIRLPOOL 8211c224d29751e32ae94c22c66a32f5985ec8388743c43ff8100d5a0a5295f1448eaa500deab9f891843c8220c54ee1e773fae8899d33b4c90c91e6be056a44
@@ -35,4 +36,5 @@ EBUILD netbeans-profiler-9999_p20160129.ebuild 3472 SHA256 0df50d640f1fd0a9185da
 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
+EBUILD netbeans-profiler-9999_p20160203.ebuild 3472 SHA256 c1bfca18ca82904b70eb27a91f0f175adb78ca98e8f2b65ea4caf42ea08d8c32 SHA512 2c8a9b99a0ae795d744946c5b687743f74b68eda0c7ccbfbaace37cbc4df443943e60b6fa2697b7c4d45ca17a9200fb4420307e895b32b9026d8b7fc2f9eeb07 WHIRLPOOL 6d723463b8349db5ec8ddc14cf51c9772c7544dac451fb2b52a8cf1664dbc199a694bd5e9522e26fc9d3e3ff5bb99b0cdea6dcf5040f4883b690a5e5bfadd637
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160203.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160203.ebuild
new file mode 100644
index 0000000..bbcad69
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160203.ebuild
@@ -0,0 +1,121 @@
+# 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-02-03_00-02-15/zip/netbeans-trunk-nightly-201602030002-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 c680719..5f16de0 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b431
 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
+DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 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_p20160104.ebuild 5280 SHA256 8b6cba663a851e4f552223c9cddd9beecdcb2b2ddfa873c777368e4d303f1a7b SHA512 b41607612f133ce80472864b4350e1f1bbfb8057180038cae421e1214950a201dbd69e5757ba1ea2937df68fb400dfe70443a001095db0a9446abf0cd9a5370f WHIRLPOOL de759519558037f98e171c71e8deea939a8144c035d9e21e39590a9dd512631fa22511f068be80fb71cc02d7fe1b7dc4561a73cc3376503fc662bf0c7f12557d
@@ -50,4 +51,5 @@ EBUILD netbeans-webcommon-9999_p20160129.ebuild 5280 SHA256 7b5230211a95ba0ae2d6
 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
+EBUILD netbeans-webcommon-9999_p20160203.ebuild 5280 SHA256 49240052283865eafc006568b2c9f116ca9ee62417ba9abada5435365922c1d3 SHA512 be26c27f1db8d1be500cc58c24b6ea69316bf097e3ee40da26c5e7be427cfbac28dd84ec6ef2dbe2a8fb149fa122cac64fb49af033f99bcc24d2cc6b3427c0a7 WHIRLPOOL 747f7217f3af53a9cf677de51bdc16175667b0870f83aa86814fdacde12bfa6be0b1147827cac215a2e0b7176a54139f8e4cdf36067f5ad410d920de2727f539
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160203.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160203.ebuild
new file mode 100644
index 0000000..0b70c01
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160203.ebuild
@@ -0,0 +1,122 @@
+# 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-02-03_00-02-15/zip/netbeans-trunk-nightly-201602030002-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 4d2cb63..faa64a5 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -18,6 +18,7 @@ DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b431
 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
+DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 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_p20160104.ebuild 2721 SHA256 1859840a6fe758cc115b174961d79887638a3c360e0835718151f4a800a6dbee SHA512 80d0a30a980b99bf6536a605ffbdebf7b2c2625482110006864b37a4b2d99988d58eab8c320b7010e3284a342ea11f5808e7d6c3d097460afd74d6aa118830a3 WHIRLPOOL 01e2adf818de5ee27041ccd2392797de927ed145cf2e56084ee36da19c7fd181b194f24792e26f96f5ef0244a72ee9c1b809d89d595a0f98daf8024197c93d0d
@@ -35,4 +36,5 @@ EBUILD netbeans-websvccommon-9999_p20160129.ebuild 2721 SHA256 b62f8ab2ebb4db8e6
 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
+EBUILD netbeans-websvccommon-9999_p20160203.ebuild 2721 SHA256 84c859d9f30b1712f4bb4113c7ccd025ad01ceb569674351a313082a489569ec SHA512 38269bf918bc9edc0f5858badd34db0e4166b84f7ef59dc1eed6d3d4e39beb715efaee165e2c89cb99cdaa559047ee2828b7e292673794d4a35998317010f5d7 WHIRLPOOL 20911ea5c5eef526d5573accdd2bc0a1f28d540f65b9268dd1da0671157a99438d0046dc1894600a7bc6b4dc8a36c4b35e16faac284648d8b05f2e7688d653b9
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160203.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160203.ebuild
new file mode 100644
index 0000000..fb56d8e
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160203.ebuild
@@ -0,0 +1,94 @@
+# 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-02-03_00-02-15/zip/netbeans-trunk-nightly-201602030002-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 2b8e673..01440fe 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -21,6 +21,7 @@ DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b431
 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
+DIST netbeans-trunk-nightly-201602030002-src.zip 209605820 SHA256 495c082dd3f41239a9f3ee423d6a9fb81daec9a04e08a39c95d13d91836cbe9a SHA512 9fcce1e53b577d22b79c0f6abc8e05bafb2f84da819cb0f4ef32d9832a95eead5d3aecb7b9a88a229c39bc3d73bafe176bf38b2878bf1cc93972f3318b628b95 WHIRLPOOL 4c480f2e8c267c67b3a9ddfd86a7ee253af0681256858e8b078e873c376ae82f77d7745dc611e579b7b85e1ec950221a1a96eb45fa192f3eff30ab0e743386f8
 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_p20160104.ebuild 6938 SHA256 1135be98d1f27e9b9878f3f8c3b1f45f376812992c33ef10f65f0816e8527b8b SHA512 f2c130e0a405cc12d8deac7c1fe15870f6e59228d06cfa54dc794d75b48465d97ab6b181c81bb8a1aad8634b97eacca5e1776ff767d3ec6fdfdfab2b4b299b7e WHIRLPOOL 64318e8fa604d8e307d2f5c7f01fc8a8b447d9e78af4e86ec0608b56c966c35a3654fda021a2695efe76c825ccf58fbcfc6495897c5a5e3e6a97f759e5ceab91
@@ -38,4 +39,5 @@ EBUILD netbeans-9999_p20160129.ebuild 6938 SHA256 39bf449ae0a9d02dbd6529eb9f6801
 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
+EBUILD netbeans-9999_p20160203.ebuild 6939 SHA256 263ff831228d62c03a08345b5f5a201bcf1e7f150ba2a463ece4607aa0d4b0d7 SHA512 2162d28c8b2dc586ad6e99f76ea0ee921a5c99ab269e6c160373ce7a0c918c73545e0cc5bdcc77e263a78b942f26aabea831cda5fca472c1f00df22e1e2749be WHIRLPOOL 57ae46f70efe07679a3950644839d8ccef9cd7dcd8a90a1552fdb118ee567abc40a9583a714a7b51d28f40fe45ff464ce94e4df0516075629bc27dca3c0d4105
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

diff --git a/dev-util/netbeans/netbeans-9999_p20160203.ebuild b/dev-util/netbeans/netbeans-9999_p20160203.ebuild
new file mode 100644
index 0000000..531b6fc
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20160203.ebuild
@@ -0,0 +1,254 @@
+# 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-02-03_00-02-15/zip/netbeans-trunk-nightly-201602030002-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
+}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-javacard/, dev-java/netbeans-apisupport/, ...
@ 2016-09-05  7:20 Miroslav Šulc
  0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2016-09-05  7:20 UTC (permalink / raw
  To: gentoo-commits

commit:     30b3e9eaeb86300d7df5bc187a82fb2aa9ee3e7a
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  5 06:33:32 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Sep  5 06:33:32 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=30b3e9ea

netbeans: removed obsolete ebuilds

Package-Manager: portage-2.3.0

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index b8ffe65..c0c7f2a 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0bf64eb9954902ac044869706bfb6bc6a3d6c3180db184249a94 SHA512 cf146c2b53ecf99feb93cb3ece2eb8be14b3764587d9dac5b783c5486e3f9ce1aa7bea55f3289e6aa8d4661511ed733f6bc125067ad83cff356dc46380cd8eeb WHIRLPOOL e9af0196209422a27085122ef2f2c3499f18ca82a01ee9fd4e6cd5ccf51888d26429e2dd90b705e0d2bc0c195856598f13715ae29ffa64b174e02e1617c3dd07
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 DIST netbeans-trunk-nightly-201608090002-src.zip 217056261 SHA256 f0a275e932b5948c00e24beae1eb599f8c0912fa905997b1ef7b11345fddf60c SHA512 81761482cbd5e238e1c2597a4b9bcc506b32c296e4d6c0785fa8fe69e1d1a6ddc9f4a7f6dcdb8ed816f366fb840e01a5d8003cf289bb1735be74f9906d6c7575 WHIRLPOOL 903eb7d99f8fecafca4f3a06a567a5994f0602431d29c74df1a300785b62f205e1257c1c4158cb2f7706a6c8bf70c7e3b7d7e6503a96bcaefb7411be0d701f70
@@ -30,7 +29,6 @@ DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0e
 DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 3384 SHA256 f0e45793d8d2a56949aff7f0239c9f63dcedec497450d521037281b52c699ee4 SHA512 ef21d03f27c1df2f86d7d8fd2bc08d4e98d13daa6f14d4ddff305c608901b810612d83247c737a2bd7b961c63d9c803801c29f2db67b7537a9b34cc1bebb4013 WHIRLPOOL 501c684661f3b3aea7935b3435d79566fbcab25b2320ab85e9221ce8bee620f5afc04b000de1ed0a465981f1514418e79523be9c7e807257ddc8a162e426dced
 EBUILD netbeans-apisupport-9999_p20160727.ebuild 3384 SHA256 ab73b674cb9068182e62ccea9f4df53a4f43ac984ba51af5cb352553f3ad430b SHA512 95f4f55af236556561e3ef8ebfa8aceafa04aebf3eef503ad6c3ac253eb9ada9949fa5984b77883bb43893283ec199c6c573e1eb120fbb7afbfa700c6c92d15c WHIRLPOOL af28d68e20c454b3478216d3c14bfbd7dc65a16aaff25068bc0da6377c8ab8c4968bb80d5f7adae514d65348d43f683b2fe50eba02cea26d7fedc24332435eeb
 EBUILD netbeans-apisupport-9999_p20160805.ebuild 3384 SHA256 3f5da5b7d0f77b1df1f12debe29669c3ffe94235b15c7e7870c0419f43e1411c SHA512 efc31b92392a555f9a166d236d22bd807973ff53825ff615c03e9d4482f1beca3807d2a3fe674cbda52e13ea054a484e2e75a5d66f59a14f191c9cd6c64ccfbd WHIRLPOOL f18e318f0764773213ff63bba4d4ac1df74af89b0c371a512f0606b42142dd669acc0b39ba97916e4adcff9f157e453e8868fa06e1fc5f97694f0c824c258e49
 EBUILD netbeans-apisupport-9999_p20160809.ebuild 3384 SHA256 9d7f86575797bdab5e9ef47550df786fc94f8582cb24cdb15015d679b21a1623 SHA512 05d842a5f9bacb4717c1c1e7bfc46d3a38e376b4d82c4454f301f3a44a127a57c6194dc39e7698b2e8059c27fca3c74b9ed4fde25c4e9a6f94192247094d4f68 WHIRLPOOL 8e6e9545fb98ea88baf8ce6296216ddd1a1bb1f2bd6310e7bceb81c94551a64574e930fa985a4f4baa1dc774570b2a9f30ed521c3d6ab626733fab474f9007c1

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160726.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160726.ebuild
deleted file mode 100644
index 5118ca0..0000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160726.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans API Support Cluster"
-HOMEPAGE="http://netbeans.org/projects/apisupport"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-26_00-02-33/zip/netbeans-trunk-nightly-201607260002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.apisupport -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/apisupport >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/apisupport$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/apisupport
-}

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index 516b169..7e20c5d 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -16,7 +16,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0bf64eb9954902ac044869706bfb6bc6a3d6c3180db184249a94 SHA512 cf146c2b53ecf99feb93cb3ece2eb8be14b3764587d9dac5b783c5486e3f9ce1aa7bea55f3289e6aa8d4661511ed733f6bc125067ad83cff356dc46380cd8eeb WHIRLPOOL e9af0196209422a27085122ef2f2c3499f18ca82a01ee9fd4e6cd5ccf51888d26429e2dd90b705e0d2bc0c195856598f13715ae29ffa64b174e02e1617c3dd07
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 DIST netbeans-trunk-nightly-201608090002-src.zip 217056261 SHA256 f0a275e932b5948c00e24beae1eb599f8c0912fa905997b1ef7b11345fddf60c SHA512 81761482cbd5e238e1c2597a4b9bcc506b32c296e4d6c0785fa8fe69e1d1a6ddc9f4a7f6dcdb8ed816f366fb840e01a5d8003cf289bb1735be74f9906d6c7575 WHIRLPOOL 903eb7d99f8fecafca4f3a06a567a5994f0602431d29c74df1a300785b62f205e1257c1c4158cb2f7706a6c8bf70c7e3b7d7e6503a96bcaefb7411be0d701f70
@@ -43,7 +42,6 @@ DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0e
 DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 4790 SHA256 3f49046069953d4fb2f708fe39dd5e779d94084591413fc1e14adfb1b41ae8f8 SHA512 31a7baefa4beab6f131652c482160bb97d5fe24e1ac5da2caa5d6ac665ce32a2047d140143d8f4e1a2ebf8ecd85958ad8b1057ae2aefcfc7c42aa0f10cb40430 WHIRLPOOL 1fd17c62a11782e5937093b01b327883e7ded5ae4d6e5d8df562dd1a98f69501d0ea4650da53dfdf171719aff53fb95ca84b2295f0b56fc53ad746f104097d1d
 EBUILD netbeans-cnd-9999_p20160727.ebuild 4790 SHA256 ff5c20dc59a64c25b4bc4e2576b01c702f5f6dc8224f71d1aea17b0d8eccf32d SHA512 fdb21f3596d8c9c949b4781b115b48cfa412b7f76d90c3205babf787771148938ee67d11b29d008f9c6ea54bd1fb56fe31ee93668aeafd3c887653a43e1df7a9 WHIRLPOOL 7747ed28f7e7574d206c6dc0e1afe119f90ccf5ea69e3c0b2a6ef3c020aa17b6511565cee939aa0ccd3ca8b68910385b2605da6f6ff5bb730d8b6a215a5af39d
 EBUILD netbeans-cnd-9999_p20160805.ebuild 4790 SHA256 e86abcabd7bf93bd5368f7a355879325edaa18548f1068614c4609eb4f0af4ef SHA512 7d550c1d8ff93e1b95a4b64c861d88f2be457a1120d35b0217163085cb3d0742b8cfa5a204644808932e299fc2762fac80e52c90f25c8d27a32a3f4bff309bb8 WHIRLPOOL 79c0f5b38ff5d2e0f88a4e69f880eb56ab7d71e270b99859044e06a953ccad56022f0ac4112e4de78fe9b86699ca98fea565cc8ebded5910b2991608ab73faec
 EBUILD netbeans-cnd-9999_p20160809.ebuild 4790 SHA256 f683f40acf8c74e290d7db666eff24b79c81393e5d5513e545a2a3d3c15219f9 SHA512 07da221c809e2e0adfec30a13b88274b1b799deeb28bc6fb299f8b634707c0f37eeb71537b58a2183d1ed17b1171278e0b45476bc5a3ba8e05f694aed94af3be WHIRLPOOL fbd1464a83ac991c618206141a13a3edd1af130146f9dabd52d0e73dd275f54b5f01011abd1560cba2565a9ebb88c05b2e4c699ac177cbcc52a9d2f349917ec4

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

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 42fc92f..6f1acb2 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -7,7 +7,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0bf64eb9954902ac044869706bfb6bc6a3d6c3180db184249a94 SHA512 cf146c2b53ecf99feb93cb3ece2eb8be14b3764587d9dac5b783c5486e3f9ce1aa7bea55f3289e6aa8d4661511ed733f6bc125067ad83cff356dc46380cd8eeb WHIRLPOOL e9af0196209422a27085122ef2f2c3499f18ca82a01ee9fd4e6cd5ccf51888d26429e2dd90b705e0d2bc0c195856598f13715ae29ffa64b174e02e1617c3dd07
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 DIST netbeans-trunk-nightly-201608090002-src.zip 217056261 SHA256 f0a275e932b5948c00e24beae1eb599f8c0912fa905997b1ef7b11345fddf60c SHA512 81761482cbd5e238e1c2597a4b9bcc506b32c296e4d6c0785fa8fe69e1d1a6ddc9f4a7f6dcdb8ed816f366fb840e01a5d8003cf289bb1735be74f9906d6c7575 WHIRLPOOL 903eb7d99f8fecafca4f3a06a567a5994f0602431d29c74df1a300785b62f205e1257c1c4158cb2f7706a6c8bf70c7e3b7d7e6503a96bcaefb7411be0d701f70
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0e
 DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 2968 SHA256 c4fd510f32e35649b9e5a73979905ffdd65d28a5d2d0c355f8980423a6566795 SHA512 3012d48de23e892ca1cf372d7531ee8b8a13b329de7a6890b9995d2610b9390798689233c4946f9a835fe5c5d5d31b076e953ddbce1cc82b2f1a8bcf4dcbf41f WHIRLPOOL eedd4a62f3b46c6823dc3c14f74bf90524062f7829002d563f4f7f6e8715b3f577783d74bc9c6a3bd33c1876032fe86327e0b3364627a6155af2ec51cf64ca6d
 EBUILD netbeans-dlight-9999_p20160727.ebuild 2968 SHA256 9e077fe0be9c0262e855a7be471a0653119b6e840e6b486b2848566b29c31a03 SHA512 7f63a602791192a0cec627ec55ff7858c52780c2180a54f78699988117d532c80c7a27e1694c86eda94ba3f3828f46653e0c616f30411729ae6c6a1623f87bba WHIRLPOOL 782a83f52022c14ffaa63ba195f7f0a2f76e67376f93aa3bf760c5ef639b1c04d7f7c2b94e2a7c7a6dce248642dab937557ab1f1cca5b85db5b80552c822e92c
 EBUILD netbeans-dlight-9999_p20160805.ebuild 2968 SHA256 65a63164a7a9335bf7e2b35745f4f3aaea3ca1648be100315c4e5207b0618999 SHA512 3ff43efdc879ed064625f29f496f39922715e17248dd3501aaecd2dc8848ed3c8212f0c86b4f2e6968fe2a09c1f2198fd290f1dfc81966ecf90ed87e40d9be7e WHIRLPOOL 1bca4824c17c88a4a281c1ed5045b99857920b65f86959851d21b1dae5e89ad87650ac635398949462cc32700f92d264f0144c67dd27f691a561ee8ed0a7ec19
 EBUILD netbeans-dlight-9999_p20160809.ebuild 2968 SHA256 7f9f63fc29ed563678c5ea9bccf0342b306105a878137a45c216a5005a33233a SHA512 93b53e272f359f7f137e88d7da9896f070a6719954395f6d2bd42c330c9242eeaf9d956739e241cf92d4ad50e9d7aff1c0e276d411cb65dd77e950abdc136993 WHIRLPOOL 574b4774580825c565d2028ca552c0b2700c4ac8aeef6fcf53a9fd8b16ed9f65cb5a2ad9d477a535492d6ea3caf151a24ba80b59a82fc9197c9b086382170c7d

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160726.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160726.ebuild
deleted file mode 100644
index 8218fb9..0000000
--- a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160726.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans D-Light Cluster"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-26_00-02-33/zip/netbeans-trunk-nightly-201607260002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/0F89C62CA701D20BA9A9A526D4D017888C3B5A65-fs_server-1.0.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.dlight -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/0F89C62CA701D20BA9A9A526D4D017888C3B5A65-fs_server-1.0.zip dlight.remote.impl/external/fs_server-1.0.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/dlight >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/dlight$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/dlight
-}

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index dc61ff4..b65861d 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -35,7 +35,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0bf64eb9954902ac044869706bfb6bc6a3d6c3180db184249a94 SHA512 cf146c2b53ecf99feb93cb3ece2eb8be14b3764587d9dac5b783c5486e3f9ce1aa7bea55f3289e6aa8d4661511ed733f6bc125067ad83cff356dc46380cd8eeb WHIRLPOOL e9af0196209422a27085122ef2f2c3499f18ca82a01ee9fd4e6cd5ccf51888d26429e2dd90b705e0d2bc0c195856598f13715ae29ffa64b174e02e1617c3dd07
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 DIST netbeans-trunk-nightly-201608090002-src.zip 217056261 SHA256 f0a275e932b5948c00e24beae1eb599f8c0912fa905997b1ef7b11345fddf60c SHA512 81761482cbd5e238e1c2597a4b9bcc506b32c296e4d6c0785fa8fe69e1d1a6ddc9f4a7f6dcdb8ed816f366fb840e01a5d8003cf289bb1735be74f9906d6c7575 WHIRLPOOL 903eb7d99f8fecafca4f3a06a567a5994f0602431d29c74df1a300785b62f205e1257c1c4158cb2f7706a6c8bf70c7e3b7d7e6503a96bcaefb7411be0d701f70
@@ -62,7 +61,6 @@ DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0e
 DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 15825 SHA256 e4824e152bd518440ca8e09ea452519a3888f4f5868ac466596b138c5b2f61ba SHA512 c1ef3b8c2cd54238ad1c5b77d2c0f7d530c9f2e2194a372879eef06d37a7e23df087f98a529e598270ca6bd8e3a78c5e52a08e8c1085e0a6c5b46b433f3c9496 WHIRLPOOL 2a39dfaf18a3225e2c7050573f4c38897057b11ef1e62c85aa147760a840c20442ba8e1e6901f00606ca96c50dade0713596820f1453c2cb9c826ab7bb37cb3d
 EBUILD netbeans-enterprise-9999_p20160727.ebuild 15825 SHA256 b6ef55a6c439ea4560b430a61424d45f0f2b341c9494aab0cf3a1b1164883f44 SHA512 ccc5efbfd86a93154ff936c4efa544581182d6fb8885e200d1352c61dc7d017457d93e0e3feae87e8ec8ea0054342eaebea1fb521bf50b9871bb9f292086dd77 WHIRLPOOL dc146537cdce16aa436bb43a118622bf72867a76518f76001950238ac885f3f8558fbeee2bbcd3726f49e4f6698d37c208a5bc9ff98e6f33413db42ec65cf199
 EBUILD netbeans-enterprise-9999_p20160805.ebuild 15825 SHA256 10da3ae881c0b780420c32e01ecba246f6b53e57ba8644e6635c5aeaf0f61cb0 SHA512 ace696ee8188f6b330af0d063d58090743fcfd3993a6c607f8a36ec788b25500db353fcda7e37dd427fd48e0c2d50fb67e69f64938d4a3deab4cf1c201eae7f7 WHIRLPOOL 4faf167a5a7fb6d4d162f2192762729abd2418cd41f4480d81aa746df2cafd95384bf40ee78cf063e0034b02e2271ccc7c9848b4f3e72b9ffeb427461cb5d170
 EBUILD netbeans-enterprise-9999_p20160809.ebuild 15825 SHA256 3e6bfb1e8d2316047ac43e3ead0cbfbe2e0f320979ecc37fb58812d034b130ac SHA512 f24751a2f5dc8a6079cb2acb3bf627614c260a44ee33fd179243e18feaaac8460cd2faa5f2efefe43de41e12d22f647d7b6c4a4376f368d2676e637e2ae3221f WHIRLPOOL f523a7249d8634f4a8763d59c9d5635c13bea9ac3e73d8efdd912a6b55d2a06548f32e445f863fcf2b50c3ff3fa720783e8ec1cb2e094b35160c105668ec5aae

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160726.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160726.ebuild
deleted file mode 100644
index 3cdb853..0000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160726.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Enterprise cluster"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-26_00-02-33/zip/netbeans-trunk-nightly-201607260002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar
-	http://hg.netbeans.org/binaries/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar
-	http://hg.netbeans.org/binaries/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar
-	http://hg.netbeans.org/binaries/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar
-	http://hg.netbeans.org/binaries/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar
-	http://hg.netbeans.org/binaries/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar
-	http://hg.netbeans.org/binaries/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar
-	http://hg.netbeans.org/binaries/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar
-	http://hg.netbeans.org/binaries/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar
-	http://hg.netbeans.org/binaries/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar
-	http://hg.netbeans.org/binaries/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar
-	http://hg.netbeans.org/binaries/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar
-	http://hg.netbeans.org/binaries/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar
-	http://hg.netbeans.org/binaries/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar
-	http://hg.netbeans.org/binaries/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar
-	http://hg.netbeans.org/binaries/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar
-	http://hg.netbeans.org/binaries/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip
-	http://hg.netbeans.org/binaries/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar
-	http://hg.netbeans.org/binaries/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip
-	http://hg.netbeans.org/binaries/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip
-	http://hg.netbeans.org/binaries/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip
-	http://hg.netbeans.org/binaries/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar
-	http://hg.netbeans.org/binaries/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar
-	http://hg.netbeans.org/binaries/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip
-	http://hg.netbeans.org/binaries/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip
-	http://hg.netbeans.org/binaries/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar
-	http://hg.netbeans.org/binaries/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar
-	http://hg.netbeans.org/binaries/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip
-	http://hg.netbeans.org/binaries/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip
-	http://hg.netbeans.org/binaries/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip
-	http://hg.netbeans.org/binaries/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-profiler-${PV}
-	~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-webcommon-${PV}
-	~dev-java/netbeans-websvccommon-${PV}
-	dev-java/commons-codec:0
-	dev-java/commons-fileupload:0
-	dev-java/commons-logging:0
-	dev-java/glassfish-deployment-api:1.2
-	dev-java/jsr181:0"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0
-	>=dev-java/junit-4.4:4
-	dev-java/tomcat-servlet-api:2.3"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}
-	>=dev-java/antlr-2.7.7-r7:0
-	dev-java/bsf:2.3
-	dev-java/cglib:3
-	dev-java/commons-beanutils:1.7
-	dev-java/commons-collections:0
-	dev-java/commons-digester:0
-	dev-java/commons-io:1
-	dev-java/commons-validator:0
-	dev-java/glassfish-persistence:0
-	dev-java/guava:14
-	dev-java/jakarta-oro:2.0
-	dev-java/osgi-core-api:0
-	dev-java/validation-api:1.0"
-#	dev-java/commons-chain:1.1 in overlay
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.enterprise -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar libs.amazon/external/aws-java-sdk-1.2.1.jar || die
-	ln -s "${DISTDIR}"/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar libs.elimpl/external/el-impl.jar || die
-	ln -s "${DISTDIR}"/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar web.jspparser/external/glassfish-jspparser-4.0.jar || die
-	ln -s "${DISTDIR}"/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar libs.glassfish_logging/external/glassfish-logging-2.0.jar || die
-	ln -s "${DISTDIR}"/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar libs.amazon/external/httpclient-4.1.1.jar || die
-	ln -s "${DISTDIR}"/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar libs.amazon/external/httpcore-4.1.jar || die
-	ln -s "${DISTDIR}"/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar javaee.api/external/javaee-api-6.0.jar || die
-	ln -s "${DISTDIR}"/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar javaee7.api/external/javaee-api-7.0.jar || die
-	ln -s "${DISTDIR}"/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar javaee.api/external/javaee-web-api-6.0.jar || die
-	ln -s "${DISTDIR}"/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar javaee7.api/external/javaee-web-api-7.0.jar || die
-	ln -s "${DISTDIR}"/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar j2ee.platform/external/javaee-doc-api.jar || die
-	ln -s "${DISTDIR}"/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar javaee.api/external/javax.annotation.jar || die
-	ln -s "${DISTDIR}"/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar javaee7.api/external/javax.annotation-api.jar || die
-	ln -s "${DISTDIR}"/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar javaee7.api/external/javax.xml.soap-api.jar || die
-	ln -s "${DISTDIR}"/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar javaee.api/external/jaxb-api-osgi.jar || die
-	ln -s "${DISTDIR}"/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar javaee7.api/external/jaxb-api-osgi.jar || die
-	ln -s "${DISTDIR}"/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip websvc.restlib/external/jaxrs-ri-2.5.1.zip || die
-	ln -s "${DISTDIR}"/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar javaee7.api/external/jaxws-api.jar || die
-	ln -s "${DISTDIR}"/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip web.jsf12/external/jsf-1.2.zip || die
-	ln -s "${DISTDIR}"/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip web.jsf20/external/jsf-2.2.zip || die
-	ln -s "${DISTDIR}"/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip web.jsf.editor/external/jsf-api-docs.zip || die
-	ln -s "${DISTDIR}"/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar libs.jstl/external/jstl-api.jar || die
-	ln -s "${DISTDIR}"/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar libs.jstl/external/jstl-impl.jar || die
-	ln -s "${DISTDIR}"/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip websvc.metro.lib/external/metro-1.4-doc.zip || die
-	ln -s "${DISTDIR}"/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip websvc.metro.lib/external/metro-2.0.zip || die
-	ln -s "${DISTDIR}"/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar web.primefaces/external/primefaces-5.0.jar || die
-	ln -s "${DISTDIR}"/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar servletjspapi/external/servlet3.1-jsp2.3-api.jar || die
-	ln -s "${DISTDIR}"/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip web.struts/external/struts-1.3.10-javadoc.zip || die
-	ln -s "${DISTDIR}"/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip web.struts/external/struts-1.3.10-lib.zip || die
-	ln -s "${DISTDIR}"/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip web.core.syntax/external/syntaxref20.zip || die
-	ln -s "${DISTDIR}"/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar javaee.api/external/webservices-api-osgi.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into j2eeapis/external glassfish-deployment-api-1.2 glassfish-deployment-api.jar jsr88javax.jar
-	java-pkg_jar-from --into libs.amazon/external commons-codec commons-codec.jar commons-codec-1.3.jar
-	java-pkg_jar-from --into libs.amazon/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
-	java-pkg_jar-from --into libs.commons_fileupload/external commons-fileupload commons-fileupload.jar commons-fileupload-1.3.jar
-	java-pkg_jar-from --into javaee7.api/external jsr181 jsr181.jar jsr181-api.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
-	java-pkg_jar-from --build-only --into web.monitor/external tomcat-servlet-api-2.3 servlet.jar servlet-2.3.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-profiler-${SLOT} profiler || die
-	cat /usr/share/netbeans-profiler-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.profiler.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-webcommon-${SLOT} webcommon || die
-	cat /usr/share/netbeans-webcommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.webcommon.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/enterprise >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/enterprise$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext
-	pushd "${instdir}" >/dev/null || die
-	rm commons-fileupload-1.3.jar && java-pkg_jar-from --into "${instdir}" commons-fileupload commons-fileupload.jar commons-fileupload-1.3.jar
-	rm jsr88javax.jar && java-pkg_jar-from --into "${instdir}" glassfish-deployment-api-1.2 glassfish-deployment-api.jar jsr88javax.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/aws-sdk
-	pushd "${instdir}" >/dev/null || die
-	rm commons-codec-1.3.jar && java-pkg_jar-from --into "${instdir}" commons-codec commons-codec.jar commons-codec-1.3.jar
-	rm commons-logging-1.1.1.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar commons-logging-1.1.1.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/javaee7-endorsed
-	pushd "${instdir}" >/dev/null || die
-	rm jsr181-api.jar && java-pkg_jar-from --into "${instdir}" jsr181 jsr181.jar jsr181-api.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jersey2/ext
-	pushd "${instdir}" >/dev/null || die
-	rm cglib-2.2.0-b21.jar && java-pkg_jar-from --into "${instdir}" cglib-3 cglib.jar cglib-2.2.0-b21.jar
-	rm guava-14.0.1.jar && java-pkg_jar-from --into "${instdir}" guava-14 guava.jar guava-14.0.1.jar
-	rm org.osgi.core-4.2.0.jar && java-pkg_jar-from --into "${instdir}" osgi-core-api osgi-core-api.jar org.osgi.core-4.2.0.jar
-	rm persistence-api-1.0.jar && java-pkg_jar-from --into "${instdir}" glassfish-persistence glassfish-persistence.jar persistence-api-1.0.jar
-	rm validation-api-1.1.0.Final.jar && java-pkg_jar-from --into "${instdir}" validation-api-1.0 validation-api.jar validation-api-1.1.0.Final.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jsf-1_2
-	pushd "${instdir}" >/dev/null || die
-	rm commons-beanutils.jar && java-pkg_jar-from --into "${instdir}" commons-beanutils-1.7 commons-beanutils.jar
-	rm commons-collections.jar && java-pkg_jar-from --into "${instdir}" commons-collections commons-collections.jar
-	rm commons-digester.jar && java-pkg_jar-from --into "${instdir}" commons-digester commons-digester.jar
-	rm commons-logging.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/struts
-	pushd "${instdir}" >/dev/null || die
-	rm antlr-2.7.2.jar && java-pkg_jar-from --into "${instdir}" antlr antlr.jar antlr-2.7.2.jar
-	rm bsf-2.3.0.jar && java-pkg_jar-from --into "${instdir}" bsf-2.3 bsf.jar bsf-2.3.0.jar
-	rm commons-beanutils-1.8.0.jar && java-pkg_jar-from --into "${instdir}" commons-beanutils-1.7 commons-beanutils.jar commons-beanutils-1.8.0.jar
-	rm commons-digester-1.8.jar && java-pkg_jar-from --into "${instdir}" commons-digester commons-digester.jar commons-digester-1.8.jar
-	rm commons-fileupload-1.1.1.jar && java-pkg_jar-from --into "${instdir}" commons-fileupload commons-fileupload.jar commons-fileupload-1.1.1.jar
-	rm commons-io-1.1.jar && java-pkg_jar-from --into "${instdir}" commons-io-1 commons-io.jar commons-io-1.1.jar
-	rm commons-logging-1.0.4.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar commons-logging-1.0.4.jar
-	rm commons-validator-1.3.1.jar && java-pkg_jar-from --into "${instdir}" commons-validator commons-validator.jar commons-validator-1.3.1.jar
-	rm oro-2.0.8.jar && java-pkg_jar-from --into "${instdir}" jakarta-oro-2.0 jakarta-oro.jar oro-2.0.8.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/enterprise
-}

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 391c558..f3becd2 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0bf64eb9954902ac044869706bfb6bc6a3d6c3180db184249a94 SHA512 cf146c2b53ecf99feb93cb3ece2eb8be14b3764587d9dac5b783c5486e3f9ce1aa7bea55f3289e6aa8d4661511ed733f6bc125067ad83cff356dc46380cd8eeb WHIRLPOOL e9af0196209422a27085122ef2f2c3499f18ca82a01ee9fd4e6cd5ccf51888d26429e2dd90b705e0d2bc0c195856598f13715ae29ffa64b174e02e1617c3dd07
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 DIST netbeans-trunk-nightly-201608090002-src.zip 217056261 SHA256 f0a275e932b5948c00e24beae1eb599f8c0912fa905997b1ef7b11345fddf60c SHA512 81761482cbd5e238e1c2597a4b9bcc506b32c296e4d6c0785fa8fe69e1d1a6ddc9f4a7f6dcdb8ed816f366fb840e01a5d8003cf289bb1735be74f9906d6c7575 WHIRLPOOL 903eb7d99f8fecafca4f3a06a567a5994f0602431d29c74df1a300785b62f205e1257c1c4158cb2f7706a6c8bf70c7e3b7d7e6503a96bcaefb7411be0d701f70
@@ -30,7 +29,6 @@ DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0e
 DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 2913 SHA256 0f64221b065daf4e7ec4a250e2306ea2e9e1906418bdf15a74bf2f62ac91726d SHA512 e42fcb525d3d92fcc84778ca8e6a06288516b92117a5e587e7c3fb18ed87e9ae0359a47b196283175a7badc4e17bf8819356cf4de74a53e55c9a2ed93be8e295 WHIRLPOOL c867c8722300351c3a8ea7193f4693860ebc1d8c88d6f95db7ff5d3c005c221de639bc9225f83e683ee0830208e14c6d841ec97fdc7c4f875017397b0aaa16a3
 EBUILD netbeans-ergonomics-9999_p20160727.ebuild 2913 SHA256 44fbd1335b875431429fc7455e8cff75b11f1c379415e74dab0e935f16641af1 SHA512 f7686853b308ffbcca1530429899f118b76e0c288cd1ff9af342cb3426c6fa6af2e3c03bfde68217d7d4516f6a8648c48ff63b6a525dbda7e80010d9d3c3645e WHIRLPOOL 167dd9bc53173704d73a36106307349f297301e9fe4523a58efe5eaf2ad032123ca1e56f0cd7cf5f116c5017ddca439a312ea5221fc66be49b053c26cc94c9a8
 EBUILD netbeans-ergonomics-9999_p20160805.ebuild 2913 SHA256 5e6027dbc32197697cff6e51bbc75202d70e2d1723d3b7232b875b7c9191bd1e SHA512 80f5f05d92bd66c9850276866685d2f545cad6ca2efd755c1069c6f5228b07ff8fd41944c1ea94354d21d470de70b3bb7f6d84e032859de243782f965e8f4619 WHIRLPOOL 5ec24eae8cb8bac91c7965a28e8306a1546cedabf9216e06f74319516df123158717f8738df06f4f2c90cb6916685c2868113824065e5b555484190669e643cd
 EBUILD netbeans-ergonomics-9999_p20160809.ebuild 2913 SHA256 c92e2ff4b194e526bdf5308bf24e70a4027054634cdbc0c8b12445dd63a30e7a SHA512 d85fb971e7089c48f7d481458c0b274b6c69a552523aa1190546e5d1b9e44b91e229641d289b00126a299733bb9dcba74f70af0aad8170dd0a21f2a93e8599d9 WHIRLPOOL 0f8f39654e28a39fb16c6c00f0240eacf30a2c5ab2956344a0b4709b4fb0446727d4acb25f257fc2db7ab25979f2934efe2ebf1d723062816b02f476433f73c3

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160726.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160726.ebuild
deleted file mode 100644
index dfd3a22..0000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160726.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Ergonomics Cluster"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-26_00-02-33/zip/netbeans-trunk-nightly-201607260002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-nb-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ergonomics -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-nb-${SLOT}/nb nb || die
-	cat /usr/share/netbeans-nb-${SLOT}/nb/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.nb.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/ergonomics >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/ergonomics$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ergonomics
-}

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index 2c88c87..f17171b 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -7,7 +7,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0bf64eb9954902ac044869706bfb6bc6a3d6c3180db184249a94 SHA512 cf146c2b53ecf99feb93cb3ece2eb8be14b3764587d9dac5b783c5486e3f9ce1aa7bea55f3289e6aa8d4661511ed733f6bc125067ad83cff356dc46380cd8eeb WHIRLPOOL e9af0196209422a27085122ef2f2c3499f18ca82a01ee9fd4e6cd5ccf51888d26429e2dd90b705e0d2bc0c195856598f13715ae29ffa64b174e02e1617c3dd07
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 DIST netbeans-trunk-nightly-201608090002-src.zip 217056261 SHA256 f0a275e932b5948c00e24beae1eb599f8c0912fa905997b1ef7b11345fddf60c SHA512 81761482cbd5e238e1c2597a4b9bcc506b32c296e4d6c0785fa8fe69e1d1a6ddc9f4a7f6dcdb8ed816f366fb840e01a5d8003cf289bb1735be74f9906d6c7575 WHIRLPOOL 903eb7d99f8fecafca4f3a06a567a5994f0602431d29c74df1a300785b62f205e1257c1c4158cb2f7706a6c8bf70c7e3b7d7e6503a96bcaefb7411be0d701f70
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0e
 DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 3377 SHA256 b45f733134cc75997718dbfbf6a3d02e3c6eab38bf4b23ea84c1a29281e419dd SHA512 03514caddb6f8e9fb04c85c8f2a3e47fb4718a248f082119ecfa1c541e53123c0bc08f9524263de0905ba340108ae53da3ecff1f91cb200af71374b0d52a1bfc WHIRLPOOL 5f377c28e81ccddb3da0e84cd019b54c30c08ac87ce8780cca0786e985cc347ba32495cb118832865fc257df0f967aa9b61e306c1f765ce7989d1617d3ff9200
 EBUILD netbeans-extide-9999_p20160727.ebuild 3377 SHA256 5f73a894a795ba5283951e749e6132022ab19d15250a55c8f1effce5af1e3307 SHA512 b4c4c15d09ef14e0f7fb37401ae55cce65ef2a4dbb9feaa74243fc706c5ddf2c9295c26229ab87b2c146bb4e1a732fac258fdc2e2cab803c1ff3e68b33ff7356 WHIRLPOOL e6ca429608bc37218149cd4529eb6e2ad12690bb56a44bd46530646170adb709bc8e5360a92072cd9b635a665c38862f7dbb284e3fa0b4fdcedc39fc7c701df0
 EBUILD netbeans-extide-9999_p20160805.ebuild 3377 SHA256 5e06394ce97e0f015462aa6bdcd136355a682a53a0ad82dc1c5f134932abc142 SHA512 c17f5143dd8192a178d222850476529f35e026ca16f29be7860032910fc19fde750c3bd4ed8fc1e7f67b10d6d232a0625e7b45832a510fb9c6e287b82a76b6d7 WHIRLPOOL ff2fc02914bb163ee3e78d107746f2cce9f015457a450a8abf880b9a3084b4835a4a6fa8df0a60269b50f1d1330ab0e7c523ee880b7decb0bea9258564c0b810
 EBUILD netbeans-extide-9999_p20160809.ebuild 3377 SHA256 19f32c2ec58805a8ba4d2626cca16543af1b554eb709d9bb102ba068ad108d11 SHA512 78fcc396162fb6cb46638d9b09f83759859af91cd6bc4ff1210542ac98638a08118a6995fe05578cf5b03e8eeb18a0ddfac5ac4eb8f127a5b401aab2414c0cda WHIRLPOOL b63cb58123d05051f60fc751f682e334540f28e236816290ee890f22e46fba73a66422a289088caf8a81d04ff862d8a96c53f8cc7d36d737b81d1e3f1a9f3284

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160726.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160726.ebuild
deleted file mode 100644
index 53b2296..0000000
--- a/dev-java/netbeans-extide/netbeans-extide-9999_p20160726.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans ExtIDE Cluster"
-HOMEPAGE="http://netbeans.org/projects/ide"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-26_00-02-33/zip/netbeans-trunk-nightly-201607260002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip
-	http://hg.netbeans.org/binaries/545E2B7AB1BD579CC76E3836055877982C5CD0C6-ant-misc-1.9.7.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	dev-java/javahelp:0
-	${CDEPEND}"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.extide -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip o.apache.tools.ant.module/external/ant-libs-1.9.7.zip || die
-	ln -s "${DISTDIR}"/545E2B7AB1BD579CC76E3836055877982C5CD0C6-ant-misc-1.9.7.zip o.apache.tools.ant.module/external/ant-misc-1.9.7.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	unset DISPLAY
-	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
-}
-
-src_install() {
-	pushd nbbuild/netbeans/extide >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/extide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/extide
-}

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 3b7a485..9e9bfb0 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -5,7 +5,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0bf64eb9954902ac044869706bfb6bc6a3d6c3180db184249a94 SHA512 cf146c2b53ecf99feb93cb3ece2eb8be14b3764587d9dac5b783c5486e3f9ce1aa7bea55f3289e6aa8d4661511ed733f6bc125067ad83cff356dc46380cd8eeb WHIRLPOOL e9af0196209422a27085122ef2f2c3499f18ca82a01ee9fd4e6cd5ccf51888d26429e2dd90b705e0d2bc0c195856598f13715ae29ffa64b174e02e1617c3dd07
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 DIST netbeans-trunk-nightly-201608090002-src.zip 217056261 SHA256 f0a275e932b5948c00e24beae1eb599f8c0912fa905997b1ef7b11345fddf60c SHA512 81761482cbd5e238e1c2597a4b9bcc506b32c296e4d6c0785fa8fe69e1d1a6ddc9f4a7f6dcdb8ed816f366fb840e01a5d8003cf289bb1735be74f9906d6c7575 WHIRLPOOL 903eb7d99f8fecafca4f3a06a567a5994f0602431d29c74df1a300785b62f205e1257c1c4158cb2f7706a6c8bf70c7e3b7d7e6503a96bcaefb7411be0d701f70
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0e
 DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 3416 SHA256 4a5078fdb207606b04792b824fb6f76f7e6e8b6bebf806ec6eca22998feecfb5 SHA512 4c20436c57537ea3adc9c9697053c5fb45e257c7c69ddb0b00024d5858d8fce3833318fdcaa286ab1f32972fddd9a1c94ea5cd28e935cbe626c7ad759d3fbb4d WHIRLPOOL f6b82e7f117578a24b3bf718ebc90e8ae3962f8d3c55c172f5326cd07133848b7b594dbeb1a3e888e10c7d2bd7bb1e5de17b86bc8ed10bfca5c5739a294206ef
 EBUILD netbeans-groovy-9999_p20160727.ebuild 3416 SHA256 0ff981bdca33e139e245cb0bfb48ea25404b1bf43b1d45296add49ddeaf06f57 SHA512 141c44b2e2c31161469826557b26edb3b9d841122440bfd44e196aab9d0fe45997b47dd17d58b2b6db632d7257e701a7b34e581562793316d9a16629766b3cf8 WHIRLPOOL ead729eb89e7a0b9adec81dd0e5ed83f1793ccc1beed9f690e4edb56c541d0fdddd96fc0c92666a0cca3f931b70515e2b280b643aafd9edd1deffadfa13b0b26
 EBUILD netbeans-groovy-9999_p20160805.ebuild 3416 SHA256 13d715215a17c2f0d9e5e289dfa942433e3f52ca33de3554c6a9aa97b35bd39b SHA512 d3e1a676d5dfe4d23e4fe863bdec76eeb2dfaa26f316da055e68380c4af7a93a1db55a67512ed09aea50f16888592dbab1b44cc38b34c1cf1fe1542e501868df WHIRLPOOL 93e1ca50d7186ca0c8f4e83fe21166148c3b4b99912438bd38d815aaecd222d86ef0a9499664ab95dc8b1452a42c465cc25258d55646508dfb28ec0e185ed46f
 EBUILD netbeans-groovy-9999_p20160809.ebuild 3416 SHA256 9cba6475ec6bf0d0049177f8402330f98368da55a51cba8617233facd39e0010 SHA512 ef530a4b6b5df55635e969f8b871f7672801aab549254e5f59f77aa070e0b4d9ef0e25026c7a0d0ec7ee1f37ab2574a5653c4de9d8b7c776067d3fe29a2f7133 WHIRLPOOL ddc4e71bdb1ad1f7f5e78401cc573ebb4c2bad0aeaff2cb4bad139e3765678acb2d9f47b6b4a28223347f218c0e55fb41edd8b3e7177543a524b9df8e4de9a53

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160726.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160726.ebuild
deleted file mode 100644
index 3a79655..0000000
--- a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160726.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Groovy Cluster"
-HOMEPAGE="http://netbeans.org/projects/groovy"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-26_00-02-33/zip/netbeans-trunk-nightly-201607260002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/01730F61E9C9E59FD1B814371265334D7BE0B8D2-groovy-all-2.4.5.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.groovy -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/01730F61E9C9E59FD1B814371265334D7BE0B8D2-groovy-all-2.4.5.jar libs.groovy/external/groovy-all-2.4.5.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/groovy >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/groovy$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/groovy
-}

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 6d44f51..1ef8a85 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -8,7 +8,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0bf64eb9954902ac044869706bfb6bc6a3d6c3180db184249a94 SHA512 cf146c2b53ecf99feb93cb3ece2eb8be14b3764587d9dac5b783c5486e3f9ce1aa7bea55f3289e6aa8d4661511ed733f6bc125067ad83cff356dc46380cd8eeb WHIRLPOOL e9af0196209422a27085122ef2f2c3499f18ca82a01ee9fd4e6cd5ccf51888d26429e2dd90b705e0d2bc0c195856598f13715ae29ffa64b174e02e1617c3dd07
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 DIST netbeans-trunk-nightly-201608090002-src.zip 217056261 SHA256 f0a275e932b5948c00e24beae1eb599f8c0912fa905997b1ef7b11345fddf60c SHA512 81761482cbd5e238e1c2597a4b9bcc506b32c296e4d6c0785fa8fe69e1d1a6ddc9f4a7f6dcdb8ed816f366fb840e01a5d8003cf289bb1735be74f9906d6c7575 WHIRLPOOL 903eb7d99f8fecafca4f3a06a567a5994f0602431d29c74df1a300785b62f205e1257c1c4158cb2f7706a6c8bf70c7e3b7d7e6503a96bcaefb7411be0d701f70
@@ -35,7 +34,6 @@ DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0e
 DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 4126 SHA256 063a865a89d4d4c566d53ae77a754a61c74d9837cd982e203d276008b8c7e7dc SHA512 1824c591a18d713347f1ca4f3bafc945ea9c54fdab7d3fbf6ef5b8550535e8e4d6965b997cc6b3cdf311fd8fcd4495810477a39aff8520cd2cc486993e1f6924 WHIRLPOOL 9b5f3d910228fce6268b06f55285100f033ef3de9c344d4f3f7f24cbc7ad871cf8b3771abec2e6362d515918d73b6475e5943b20d4f6472a5f7513e3815eb696
 EBUILD netbeans-harness-9999_p20160727.ebuild 4126 SHA256 fc8c88d1a56ae970dcb826c90ef2b2201a846a2a517d0324d06f0080fad3f11e SHA512 a3ff90bf9d6f176dd08b4b3b3812720a3b75ad8dd8d33cfb025f1be6097642aa0d8644385aacd99cc1c4f1244c8cd75231f6977ab9a225927029c9eaf010ce4b WHIRLPOOL fe678f3d203467f746fe43e61b05c3078b1a433ba288928aec13b33b2553ba011c894350d8c08034c8ff4174b174d9ad686cbc0b2c53c40e38b2b066db305cad
 EBUILD netbeans-harness-9999_p20160805.ebuild 4126 SHA256 e1726eadd01d8707fb8faf5dc0a5c42073ea4dd5b5265cc69ff5ac775543cefc SHA512 bd33858446356dc69e916d22d1c1775a947d2762c9b004814815b3385b3e9052ba8b242209593507276bf1ad9311e51c8c1c8eed57fe01d265b1b20ef575ad4b WHIRLPOOL 969b4d11a1023c7ef720bbb34869e4da9c9d878a0c16871ecd023857ad4732b397eaa9d194df9f9958f5b30aec09e8c073610f4063f0b837160a658bdef4ee40
 EBUILD netbeans-harness-9999_p20160809.ebuild 4126 SHA256 f032777e233a90ecf88886af0faa49c9b9fe5be788c186f1eb1622f90fdf4b73 SHA512 8f50148c2c8978ccdcd3495fab8cc541170fbe09f76003af1e8e6fe54efdcd4056922ba3351dab7d19b4c3deb593f3ab75e60693fc869ba9fcf33823690710e8 WHIRLPOOL f636f5eafb4bbfa624df6d5d1978c1814f0e780ea045119ee0aa9a28fc8d659c10be77794531db83870f5aa768adbe756f184d54de877236409d2f91ab004de4

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160726.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160726.ebuild
deleted file mode 100644
index 2f02b24..0000000
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20160726.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Harness"
-HOMEPAGE="http://netbeans.org/features/platform/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-26_00-02-33/zip/netbeans-trunk-nightly-201607260002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
-	http://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar
-	http://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip
-	http://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip
-	http://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-platform-${PV}
-	dev-java/javahelp:0"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	>=dev-java/junit-4.4:4"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.harness -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar apisupport.harness/external/bindex-2.2.jar || die
-	ln -s "${DISTDIR}"/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar apisupport.harness/external/jnlp-servlet.jar || die
-	ln -s "${DISTDIR}"/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar jemmy/external/jemmy-2.3.1.1.jar || die
-	ln -s "${DISTDIR}"/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip jemmy/external/jemmy-2.3.1.1-doc.zip || die
-	ln -s "${DISTDIR}"/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip jemmy/external/jemmy-2.3.1.1-src.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into apisupport.harness/external javahelp jsearch.jar jsearch-2.0_05.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/harness >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/harness$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	fperms 755 launchers/app.sh
-	find "${D}" -name "*.exe" -type f -delete
-
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/antlib
-	pushd "${instdir}" >/dev/null || die
-	rm jsearch-2.0_05.jar && java-pkg_jar-from --into "${instdir}" javahelp jsearch.jar jsearch-2.0_05.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/harness
-}

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 0869c0b..b4cfcbd 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -142,7 +142,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0bf64eb9954902ac044869706bfb6bc6a3d6c3180db184249a94 SHA512 cf146c2b53ecf99feb93cb3ece2eb8be14b3764587d9dac5b783c5486e3f9ce1aa7bea55f3289e6aa8d4661511ed733f6bc125067ad83cff356dc46380cd8eeb WHIRLPOOL e9af0196209422a27085122ef2f2c3499f18ca82a01ee9fd4e6cd5ccf51888d26429e2dd90b705e0d2bc0c195856598f13715ae29ffa64b174e02e1617c3dd07
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 DIST netbeans-trunk-nightly-201608090002-src.zip 217056261 SHA256 f0a275e932b5948c00e24beae1eb599f8c0912fa905997b1ef7b11345fddf60c SHA512 81761482cbd5e238e1c2597a4b9bcc506b32c296e4d6c0785fa8fe69e1d1a6ddc9f4a7f6dcdb8ed816f366fb840e01a5d8003cf289bb1735be74f9906d6c7575 WHIRLPOOL 903eb7d99f8fecafca4f3a06a567a5994f0602431d29c74df1a300785b62f205e1257c1c4158cb2f7706a6c8bf70c7e3b7d7e6503a96bcaefb7411be0d701f70
@@ -169,7 +168,6 @@ DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0e
 DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 EBUILD netbeans-ide-8.0.2-r2.ebuild 29330 SHA256 4822cbe26fc19685164c35d69e75bc20578ca8a5ce3394fe97bde6acc721fd2d SHA512 552f35cb1aa5429beb70c72a0cd2a3aa3a006f5870ec4084e88632a39e2ccdc05d0b2b15a87f26c72cdffb3c9a6fa0a124a8d501edeef9aa9580396922071e8d WHIRLPOOL 4c9bce3ca21d5ae61ef9392b9282c2dff9de7f82f2e83d2944a2906ca2180ef0ffab59489bdbb6afc7ba88d5143d77b47a0cf6b219a5a4d385b68afcacd3fe6d
 EBUILD netbeans-ide-8.1-r2.ebuild 30301 SHA256 892f20531352d85b5b72b1c85352eefa444917b515b0b564f04c4f91d1e654f9 SHA512 50af4873fd3ea7755b0d33b086be7e07766b6c009a46ec3954a67a1da9930378bcf9da6d18b7e60078b31af4b36ccf060f22378a8ef26b3829ccf30a529dd023 WHIRLPOOL 1024af16e7cae7f4728dd37f88031be33253b7c62548a095d3e827abeccb6c183d34ce312bd1a0f808f0d107aff217e4b81b7a17eecc6842e1d914d7061df2c9
-EBUILD netbeans-ide-9999_p20160726.ebuild 29867 SHA256 8869ab05195b271f6778d85766fa3f9fd961e0c083dd46b3a053101e0ab05c96 SHA512 6fec085ea686b0542eb98875716958a899b4058abda539f883b2ad701d8805ac8c74486a783e0ff11ceebc996e5eeff744f429d8f36c361ab9c6d334c55e7e66 WHIRLPOOL 3f1bc01d0fc4d54f176ee1f8115080447b739749f1e2fafc3e1db7648e9d8ff2e661979490020d43c1d7e24ad51d32a7bca5ed1b0b2b4a39d2c95a449b12112f
 EBUILD netbeans-ide-9999_p20160727.ebuild 29867 SHA256 f20aa4f6ecf6ece497b148a16b9cb74d61716098ec33c10934fa16d4fe465f95 SHA512 8a65144b5388b69ce62661d3e32141d4b1ef5ac2880e3ce5f1e6693494ad87b762d0b3cd91cb9aea2c0f5192faa54bf04d7116becd5ba52e5d904d507167dc6f WHIRLPOOL 684c0237cf4040946647e08e4c929454e58272cf104525a1a6f78199da3da27c6bf49b28a1b1a9790b551a436f4e26e315770a3e968ca77a41854d36f76ed3c3
 EBUILD netbeans-ide-9999_p20160805.ebuild 29867 SHA256 a6e5b01dd7645ae6d601e387ce1a9cfd13bc1f55befbafd4a1c3e65677063381 SHA512 ef130ea92b4eaf0d08466ca830bd19a533a1fe83b721d95a9cfd6f215dabb31f994dac566104af447ab30b4928167e48f72ce254a2c6a4f066c8b5c89b62e584 WHIRLPOOL d5b3323224d1bca0ca62d972e50b574ac53742b4fed709e104acf0c00c72348d19177277bc8c8567948631b455c102050b084572c73f5ed24ea104aed8c8d0a9
 EBUILD netbeans-ide-9999_p20160809.ebuild 29867 SHA256 b15bdd68bbc3ab11e44f9db65d37d5c6c84b75c7593c8693703a41da9c6bbccc SHA512 06d5280069e4082154254b318f0826954d08d364b8141b50fbf38b3fc92543f143ed0ebc271ede7cacc93d846c6a3b535d0abb1a3b2877932f26fb9f0af59439 WHIRLPOOL d677c6393fd1d476948f61a14fcf31146418d2ece0508f6ed12ba368ad5e421fe1f14e767cebeff075c693626d029ee6f8d9ea7ce165e0a5cde7ee439e9e11ca

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

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 401969b..7d9b3fe 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -38,7 +38,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0bf64eb9954902ac044869706bfb6bc6a3d6c3180db184249a94 SHA512 cf146c2b53ecf99feb93cb3ece2eb8be14b3764587d9dac5b783c5486e3f9ce1aa7bea55f3289e6aa8d4661511ed733f6bc125067ad83cff356dc46380cd8eeb WHIRLPOOL e9af0196209422a27085122ef2f2c3499f18ca82a01ee9fd4e6cd5ccf51888d26429e2dd90b705e0d2bc0c195856598f13715ae29ffa64b174e02e1617c3dd07
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 DIST netbeans-trunk-nightly-201608090002-src.zip 217056261 SHA256 f0a275e932b5948c00e24beae1eb599f8c0912fa905997b1ef7b11345fddf60c SHA512 81761482cbd5e238e1c2597a4b9bcc506b32c296e4d6c0785fa8fe69e1d1a6ddc9f4a7f6dcdb8ed816f366fb840e01a5d8003cf289bb1735be74f9906d6c7575 WHIRLPOOL 903eb7d99f8fecafca4f3a06a567a5994f0602431d29c74df1a300785b62f205e1257c1c4158cb2f7706a6c8bf70c7e3b7d7e6503a96bcaefb7411be0d701f70
@@ -65,7 +64,6 @@ DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0e
 DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 15656 SHA256 b4bdbaa284e5081e64dac110f95a1798350cd821e5bddc210957c8852918559e SHA512 82e0b5329cecfa0f3ed1dbdc16319592c2b71c3fe4b93503e1ed02bef7f18a91d8cef91b44d242b418e437a329db30127357d965bc6d578797245afdd05b4e38 WHIRLPOOL 02782938a01df4ecdfcd9bc99d1aa9853ff91b5c81507189e1ac7a66ec5dae657aeb32c3bcf99f91ec0f38e1f65da097d5c783eb84fdb5766dd5be2c3d2349f6
 EBUILD netbeans-java-9999_p20160727.ebuild 15656 SHA256 ed21f4b2da8ad6afceb3774e40a632209345124897cf1ad48ca730805a65342e SHA512 3ba58f3a471eb3f1eac803241eaa9fd2a14d351eeee61d7e572c6526142e62528ad904b191c13354bc039c7b671160fb9a1e026f043061c6736f142086fed5eb WHIRLPOOL 5dc117e908fe416258333bf06140d4095a7d5657dd05c82a055add90af569ca66db3bb5ded00adaa782d74febc93448d2a158b492d854a21e00afc22bac04cfe
 EBUILD netbeans-java-9999_p20160805.ebuild 15656 SHA256 8fd66a5aad22d20caa1386bf0ae7388037fbbb7ef8a75ceba804b014f94ac4b6 SHA512 0b8e2dd9f19603682409a151b2cc614e06c37cf892a42830ed7841b8ef7c96c64d9d6ee0035140f3089a8801f8f5768aee651dd9634e43a4728554e7cc2514c1 WHIRLPOOL fec2d5c85420b3db2ffd45e7427c8f71d48e50cef2c181266367d75f1b341c9a85029f3e90d1fe7b88d3654c77a4c53293b9f1df9262d8bb9b95a9cbbf424681
 EBUILD netbeans-java-9999_p20160809.ebuild 15656 SHA256 3b109093b32816e9b0e387739bd464e29cc86ace8d7c17d7741e3d942e52cfe6 SHA512 efa59fdb0d73f67d7728b027b421bf16b542ac69ac01a1802cf0098e7e0fbd6dee6bf0c44371ca9387a34dde1b626e9737ad274240f2413211b06b2869acb390 WHIRLPOOL 6d992d6df38cdeb9fafcb9bbafbd2f5f1608ab45a7d616692aa19860bf3e5c11d3ea903cbfe9fbb8e45130434b01ccb40446838a28be0a81ffe7bdaf7f5fb8a3

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160726.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160726.ebuild
deleted file mode 100644
index a2c208b..0000000
--- a/dev-java/netbeans-java/netbeans-java-9999_p20160726.ebuild
+++ /dev/null
@@ -1,280 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-# Maven cannot be unbundled because it depends on exact maven version and exact content of maven directory
-
-DESCRIPTION="Netbeans Java Cluster"
-HOMEPAGE="http://netbeans.org/projects/java"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-26_00-02-33/zip/netbeans-trunk-nightly-201607260002-src.zip"
-# jarjar-1.4 contains also asm libraries
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar
-	http://hg.netbeans.org/binaries/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip
-	http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
-	http://hg.netbeans.org/binaries/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar
-	http://hg.netbeans.org/binaries/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip
-	http://hg.netbeans.org/binaries/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar
-	http://hg.netbeans.org/binaries/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar
-	http://hg.netbeans.org/binaries/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar
-	http://hg.netbeans.org/binaries/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar
-	http://hg.netbeans.org/binaries/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip
-	http://hg.netbeans.org/binaries/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip
-	http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip
-	http://hg.netbeans.org/binaries/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip
-	http://hg.netbeans.org/binaries/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar
-	http://hg.netbeans.org/binaries/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar
-	http://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar
-	http://hg.netbeans.org/binaries/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar
-	http://hg.netbeans.org/binaries/CE81899206FF733BB596523C26FBA17E029689B8-nb-javac-impl.jar
-	http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
-	http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar
-	http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip
-	http://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip
-	http://hg.netbeans.org/binaries/BFCC4C322190D6E3DD2FA9F191C0359D380D87C5-wagon-file-2.10.jar
-	http://hg.netbeans.org/binaries/4EF309C09ABB5F8B2D0C6A4010205DB185729CDC-wagon-http-2.10-shaded.jar
-	http://hg.netbeans.org/binaries/3B96251214DF697E902C849EB0B4A0EFA2CD1A53-wagon-http-shared-2.10.jar
-	http://hg.netbeans.org/binaries/0CD9CDDE3F56BB5250D87C54592F04CBC24F03BF-wagon-provider-api-2.10.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-websvccommon-${PV}
-	dev-java/beansbinding:0
-	dev-java/cglib:3
-	dev-java/jdom:0"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0
-	dev-java/json-simple:0
-	dev-java/junit:4"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}
-	dev-java/absolutelayout:0
-	>=dev-java/antlr-2.7.7-r7:0
-	dev-java/c3p0:0
-	dev-java/commons-cli:1
-	dev-java/commons-collections:0
-	dev-java/dom4j:1
-	dev-java/fastinfoset:0
-	dev-java/glassfish-transaction-api:0
-	dev-java/javassist:3
-	dev-java/jboss-logging:0
-	dev-java/jsr67:0
-	dev-java/jsr181:0
-	>=dev-java/jtidy-1:0
-	dev-java/log4j:0
-	dev-java/mimepull:0
-	dev-java/oracle-javamail:0
-	dev-java/saaj:0
-	dev-java/slf4j-api:0
-	dev-java/slf4j-log4j12:0
-	dev-java/slf4j-simple:0
-	dev-java/stax-ex:0
-	dev-java/stax2-api:0
-	dev-java/xmlstreambuffer:0"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.java -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-pkg_pretend() {
-	local die_now=""
-
-	if [ -d /usr/share/netbeans-java-${SLOT}/ant ]; then
-		if [ -n "$(find /usr/share/netbeans-java-${SLOT}/ant -type l)" ]; then
-			eerror "Please remove following symlinks and run emerge again:"
-			find /usr/share/netbeans-java-${SLOT}/ant -type l
-			die_now="1"
-		fi
-	fi
-
-	if [ -L /usr/share/netbeans-java-${SLOT}/maven ]; then
-		if [ -z "${die_now}" ]; then
-			eerror "Please remove following symlinks and run emerge again:"
-		fi
-
-		echo "/usr/share/netbeans-java-${SLOT}/maven"
-		die_now="1"
-	fi
-
-	if [ -n "${die_now}" ]; then
-		die "Symlinks exist"
-	fi
-}
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar maven/external/aether-api-1.0.2.v20150114.jar || die
-	ln -s "${DISTDIR}"/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip maven.embedder/external/apache-maven-3.0.5-bin.zip || die
-	ln -s "${DISTDIR}"/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip o.jdesktop.beansbinding/external/beansbinding-1.2.1-doc.zip || die
-	ln -s "${DISTDIR}"/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar j2ee.eclipselink/external/eclipselink.jar || die
-	ln -s "${DISTDIR}"/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip hibernate4lib/external/hibernate-release-4.3.1-lib.zip || die
-	ln -s "${DISTDIR}"/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar maven.indexer/external/indexer-artifact-5.1.1.jar || die
-	ln -s "${DISTDIR}"/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar maven.indexer/external/indexer-core-5.1.1-patched.jar || die
-	ln -s "${DISTDIR}"/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar maven/external/jarjar-1.4.jar || die
-	ln -s "${DISTDIR}"/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar j2ee.eclipselink/external/javax.persistence_2.1.0.v201304241213.jar || die
-	ln -s "${DISTDIR}"/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip websvc.jaxws21/external/jaxws-2.2.6.zip || die
-	ln -s "${DISTDIR}"/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip websvc.jaxws21api/external/jaxws-2.2.6-api.zip || die
-	ln -s "${DISTDIR}"/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip websvc.jaxws21/external/jaxws-api-doc.zip || die
-	ln -s "${DISTDIR}"/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip j2ee.eclipselink/external/JPAjavadocs04032013.zip || die
-	ln -s "${DISTDIR}"/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar maven.indexer/external/lucene-core-3.6.2.jar || die
-	ln -s "${DISTDIR}"/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar maven.indexer/external/lucene-highlighter-3.6.2.jar || die
-	ln -s "${DISTDIR}"/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar maven.embedder/external/maven-dependency-tree-2.0.jar || die
-	ln -s "${DISTDIR}"/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
-	ln -s "${DISTDIR}"/CE81899206FF733BB596523C26FBA17E029689B8-nb-javac-impl.jar libs.javacimpl/external/nb-javac-impl.jar || die
-	ln -s "${DISTDIR}"/CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.jar maven/external/netbeans-cos.jar || die
-	ln -s "${DISTDIR}"/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar || die
-	ln -s "${DISTDIR}"/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselinkmodelgen/external/org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar || die
-	ln -s "${DISTDIR}"/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip libs.springframework/external/spring-framework-3.2.7.RELEASE.zip || die
-	ln -s "${DISTDIR}"/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip libs.springframework/external/spring-framework-4.0.1.RELEASE.zip || die
-	ln -s "${DISTDIR}"/BFCC4C322190D6E3DD2FA9F191C0359D380D87C5-wagon-file-2.10.jar maven.embedder/external/wagon-file-2.10.jar || die
-	ln -s "${DISTDIR}"/4EF309C09ABB5F8B2D0C6A4010205DB185729CDC-wagon-http-2.10-shaded.jar maven.embedder/external/wagon-http-2.10-shaded.jar || die
-	ln -s "${DISTDIR}"/3B96251214DF697E902C849EB0B4A0EFA2CD1A53-wagon-http-shared-2.10.jar maven.embedder/external/wagon-http-shared-2.10.jar || die
-	ln -s "${DISTDIR}"/0CD9CDDE3F56BB5250D87C54592F04CBC24F03BF-wagon-provider-api-2.10.jar maven.embedder/external/wagon-provider-api-2.10.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into libs.cglib/external cglib-3 cglib.jar cglib-2.2.jar
-	java-pkg_jar-from --build-only --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
-	java-pkg_jar-from --into maven.embedder/external jdom jdom.jar jdom-1.0.jar
-	java-pkg_jar-from --into o.jdesktop.beansbinding/external beansbinding beansbinding.jar beansbinding-1.2.1.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/java >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-	grep -E "/java$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	chmod 755 "${D}"/${INSTALL_DIR}/maven/bin/mvn* || die
-	rm -fr "${D}"/${INSTALL_DIR}/maven/bin/*.bat || die
-
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/maven/lib
-	pushd "${instdir}" >/dev/null || die
-	rm commons-cli-1.2.jar && java-pkg_jar-from --into "${instdir}" commons-cli-1 commons-cli.jar commons-cli-1.2.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext
-	pushd "${instdir}" >/dev/null || die
-	rm AbsoluteLayout.jar  && java-pkg_jar-from --into "${instdir}" absolutelayout absolutelayout.jar AbsoluteLayout.jar
-	rm beansbinding-1.2.1.jar && java-pkg_jar-from --into "${instdir}" beansbinding beansbinding.jar beansbinding-1.2.1.jar
-	rm cglib-2.2.jar && java-pkg_jar-from --into "${instdir}" cglib-3 cglib.jar cglib-2.2.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/hibernate4
-	pushd "${instdir}" >/dev/null || die
-	rm antlr-2.7.7.jar && java-pkg_jar-from --into "${instdir}" antlr antlr.jar antlr-2.7.7.jar
-	rm c3p0-0.9.2.1.jar && java-pkg_jar-from --into "${instdir}" c3p0 c3p0.jar c3p0-0.9.2.1.jar
-	rm cglib-2.2.jar && java-pkg_jar-from --into "${instdir}" cglib-3 cglib.jar cglib-2.2.jar
-	rm commons-collections-3.2.1.jar && java-pkg_jar-from --into "${instdir}" commons-collections commons-collections.jar commons-collections-3.2.1.jar
-	rm dom4j-1.6.1.jar && java-pkg_jar-from --into "${instdir}" dom4j-1 dom4j.jar dom4j-1.6.1.jar
-	rm javassist-3.18.1-GA.jar && java-pkg_jar-from --into "${instdir}" javassist-3 javassist.jar javassist-3.18.1-GA.jar
-	rm jboss-logging-3.1.3.GA.jar && java-pkg_jar-from --into "${instdir}" jboss-logging jboss-logging.jar jboss-logging-3.1.3.GA.jar
-	rm jboss-transaction-api_1.2_spec-1.0.0.Final.jar && java-pkg_jar-from --into "${instdir}" glassfish-transaction-api jta.jar jboss-transaction-api_1.2_spec-1.0.0.Final.jar
-	rm jtidy-r8-20060801.jar && java-pkg_jar-from --into "${instdir}" jtidy jtidy.jar jtidy-r8-20060801.jar
-	rm log4j-1.2.12.jar && java-pkg_jar-from --into "${instdir}" log4j log4j.jar log4j-1.2.12.jar
-	rm slf4j-api-1.6.1.jar && java-pkg_jar-from --into "${instdir}" slf4j-api slf4j-api.jar slf4j-api-1.6.1.jar
-	rm slf4j-log4j12-1.6.1.jar && java-pkg_jar-from --into "${instdir}" slf4j-log4j12 slf4j-log4j12.jar slf4j-log4j12-1.6.1.jar
-	rm slf4j-simple-1.6.1.jar && java-pkg_jar-from --into "${instdir}" slf4j-simple slf4j-simple.jar slf4j-simple-1.6.1.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxws22
-	pushd "${instdir}" >/dev/null || die
-	rm FastInfoset.jar && java-pkg_jar-from --into "${instdir}" fastinfoset fastinfoset.jar FastInfoset.jar
-	rm javax.mail_1.4.jar && java-pkg_jar-from --into "${instdir}" oracle-javamail mail.jar javax.mail_1.4.jar
-	rm mimepull.jar && java-pkg_jar-from --into "${instdir}" mimepull mimepull.jar
-	rm saaj-impl.jar && java-pkg_jar-from --into "${instdir}" saaj saaj.jar saaj-impl.jar
-	rm stax-ex.jar && java-pkg_jar-from --into "${instdir}" stax-ex stax-ex.jar
-	rm stax2-api.jar && java-pkg_jar-from --into "${instdir}" stax2-api stax2-api.jar
-	rm streambuffer.jar && java-pkg_jar-from --into "${instdir}" xmlstreambuffer xmlstreambuffer.jar streambuffer.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxws22/api
-	pushd "${instdir}" >/dev/null || die
-	rm jsr181-api.jar && java-pkg_jar-from --into "${instdir}" jsr181 jsr181.jar jsr181-api.jar
-	rm saaj-api.jar && java-pkg_jar-from --into "${instdir}" jsr67 jsr67.jar saaj-api.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/maven
-	pushd "${instdir}" >/dev/null || die
-	rm jdom-1.0.jar && java-pkg_jar-from --into "${instdir}" jdom jdom.jar jdom-1.0.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java
-}

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 4499034..f3d7278 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0bf64eb9954902ac044869706bfb6bc6a3d6c3180db184249a94 SHA512 cf146c2b53ecf99feb93cb3ece2eb8be14b3764587d9dac5b783c5486e3f9ce1aa7bea55f3289e6aa8d4661511ed733f6bc125067ad83cff356dc46380cd8eeb WHIRLPOOL e9af0196209422a27085122ef2f2c3499f18ca82a01ee9fd4e6cd5ccf51888d26429e2dd90b705e0d2bc0c195856598f13715ae29ffa64b174e02e1617c3dd07
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 DIST netbeans-trunk-nightly-201608090002-src.zip 217056261 SHA256 f0a275e932b5948c00e24beae1eb599f8c0912fa905997b1ef7b11345fddf60c SHA512 81761482cbd5e238e1c2597a4b9bcc506b32c296e4d6c0785fa8fe69e1d1a6ddc9f4a7f6dcdb8ed816f366fb840e01a5d8003cf289bb1735be74f9906d6c7575 WHIRLPOOL 903eb7d99f8fecafca4f3a06a567a5994f0602431d29c74df1a300785b62f205e1257c1c4158cb2f7706a6c8bf70c7e3b7d7e6503a96bcaefb7411be0d701f70
@@ -33,7 +32,6 @@ DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0e
 DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 4971 SHA256 ea2d1f4a305aeefea537b23c11d9b8b59ca31798d2819bd6cd06a4e2354bcec1 SHA512 5995560a03a6486a93282c4bfc01295a065ec8f2f6566ed486fe2f2f4c69bcd43c44fecdc4f90e9a2c62a78a1ddbeafc9c990c73f01734a4d8ce373754c3b735 WHIRLPOOL aee5fb419748f2659c34ec3cbf0b6e300bd544cf8f88b897d59452bfe0f2232a5d4ea421e26c98fe88afdfaaad61c389cee702cc17e7fac154459f7b0f8a8925
 EBUILD netbeans-javacard-9999_p20160727.ebuild 4971 SHA256 b1ee376520b2d9f77091d624a472d8d4e632ed622785d13277c9a2c672bfb8fa SHA512 67dc27e090d7df7f82d0ff0130ddab8366dbd1898153b8cbd6cdfbc319754d535a4734fa85efe7be530f12d74742b99838f91d6446ac1138af744d8f055cddf1 WHIRLPOOL 96cdb3c33bed0ff5782591a47b645184e90ba6dfa7c44e812fbfafc8dfba4ff4f3f3f9016f7c736b29e12d04356a0b8efee289704b40c1731f0b66c15199c21c
 EBUILD netbeans-javacard-9999_p20160805.ebuild 4971 SHA256 b7e3e600097e97891fe5bf6fc7ba2e3588e42f9a28228ef2b6a70746bab1c5d2 SHA512 1260a91fcf223caa93ece524320cc1b2897e74925d389d82b232da7a2d226e137173b10cb3dad0517157e101e6c42601e59bb1163132a8052e1fc76cc3daa62b WHIRLPOOL 61c45684d9796faea7b11d94941bad1810a9190ce957b6fa0d5780050b72df414352b878ccb2a3955b09ce23d0d007570975ed64c4d4d03adec40275b8b0adec
 EBUILD netbeans-javacard-9999_p20160809.ebuild 4971 SHA256 5a599eaef3e6108e43252f2c30e9d13a1212694e9a4ea11079b5c065fc6d093d SHA512 d2abdec1e7dacf600afc396e66f36f230711178b1709901ccf09e06a4cf957599ce1fe996ea91326af57bfeb2c5ae9967f36dbaeef984dad76c99b1b01f8dfd6 WHIRLPOOL 3d5069ee3a244b27988f6584f06dd9e0c680f25588f07a51b09104970c8acffa95bbf3fef04ebbb477056adc2a6db77906a8b6e87a2a955b891791d367c10236

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160726.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160726.ebuild
deleted file mode 100644
index ebe82d1..0000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160726.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans JavaCard Cluster"
-HOMEPAGE="http://netbeans.org/projects/javacard"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-26_00-02-33/zip/netbeans-trunk-nightly-201607260002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar
-	http://hg.netbeans.org/binaries/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar
-	http://hg.netbeans.org/binaries/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}
-	dev-java/ant-contrib:0
-	dev-java/asm:3
-	dev-java/bcel:0
-	dev-java/commons-cli:1
-	dev-java/commons-codec:0
-	dev-java/commons-httpclient:3
-	dev-java/commons-logging:0"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.javacard -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar javacard.ri.platform/external/anttasks.jar || die
-	ln -s "${DISTDIR}"/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar javacard.apdu.io/external/apduio.jar || die
-	ln -s "${DISTDIR}"/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip javacard.ri.bundle/external/javacard_ri.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/javacard >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/javacard$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	rm -fr "${D}"/${INSTALL_DIR}/bin || die
-
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/JCDK3.0.2_ConnectedEdition/lib
-	pushd "${instdir}" >/dev/null || die
-	rm ant-contrib-1.0b3.jar && java-pkg_jar-from --into "${instdir}" ant-contrib ant-contrib.jar ant-contrib-1.0b3.jar
-	rm asm-all-3.1.jar && java-pkg_jar-from --into "${instdir}" asm-3 asm.jar asm-all-3.1.jar
-	rm bcel-5.2.jar && java-pkg_jar-from --into "${instdir}" bcel bcel.jar bcel-5.2.jar
-	rm commons-cli-1.0.jar && java-pkg_jar-from --into "${instdir}" commons-cli-1 commons-cli.jar commons-cli-1.0.jar
-	rm commons-codec-1.3.jar && java-pkg_jar-from --into "${instdir}" commons-codec commons-codec.jar commons-codec-1.3.jar
-	rm commons-httpclient-3.0.jar && java-pkg_jar-from --into "${instdir}" commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.0.jar
-	rm commons-logging-1.1.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar commons-logging-1.1.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/javacard
-}

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index 8b94634..0bf3243 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -5,7 +5,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0bf64eb9954902ac044869706bfb6bc6a3d6c3180db184249a94 SHA512 cf146c2b53ecf99feb93cb3ece2eb8be14b3764587d9dac5b783c5486e3f9ce1aa7bea55f3289e6aa8d4661511ed733f6bc125067ad83cff356dc46380cd8eeb WHIRLPOOL e9af0196209422a27085122ef2f2c3499f18ca82a01ee9fd4e6cd5ccf51888d26429e2dd90b705e0d2bc0c195856598f13715ae29ffa64b174e02e1617c3dd07
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 DIST netbeans-trunk-nightly-201608090002-src.zip 217056261 SHA256 f0a275e932b5948c00e24beae1eb599f8c0912fa905997b1ef7b11345fddf60c SHA512 81761482cbd5e238e1c2597a4b9bcc506b32c296e4d6c0785fa8fe69e1d1a6ddc9f4a7f6dcdb8ed816f366fb840e01a5d8003cf289bb1735be74f9906d6c7575 WHIRLPOOL 903eb7d99f8fecafca4f3a06a567a5994f0602431d29c74df1a300785b62f205e1257c1c4158cb2f7706a6c8bf70c7e3b7d7e6503a96bcaefb7411be0d701f70
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0e
 DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 6293 SHA256 4cb1aa813d16116f1b4606ade20a77bba7950ba86d680149d17b5c6641342342 SHA512 2b16a76c082c76431c3622e215801c1c133e455b7f2a4b15fd075a78c166cd6b5f30f40745f53be9ff0cb5a24d4832f0562278ac42f2f266b76611a3289b01de WHIRLPOOL dcd7d717e90178dd04a1a8ebb79bbd23f3e8316c8a66abadb3a4f66a48c3a889147155dd650be168bffd0a38fed627ef3821d9a1148ab84dcf5cd878518746cd
 EBUILD netbeans-javadoc-9999_p20160727.ebuild 6293 SHA256 252788c15ce2112ca38bb2ba973c9469ef254ba3365f2f7754cc91bf3e10d33b SHA512 c6e5842c0deb4c7d4afec97cd32af0e274e8efa942c46bd28c00d63b3f5afa642a4a8587841c10a43c30c71ebb32cf9cb8cfac7e57c57d7541d3b9b576ac995f WHIRLPOOL bcba22021000cb48f9f779561b35852283dc0948c45562a4c9e9bb68eabc13a2fa982080ded58fd65281aaf18b5cfb849acd66830efe90f9a333a45f218cf697
 EBUILD netbeans-javadoc-9999_p20160805.ebuild 6293 SHA256 39069bd8e788b3cbedefe8818d489a051a5bb51d453951078034f32a1abdf6dc SHA512 4aed18ed367b64f931ce0a0a4717ee23a0bb7782b73caa6ff795a0780c0167fc6fa2f29b7c635fca4b0a22f95032f1c19d83fdbf2ff771c9e6eee18f1ff802d2 WHIRLPOOL 0e5ed36ba6222dd7dcbac59f67328b0df98b22e42b40ff28072547ff06e4464796131217647d33915f17e6889142d419a667a94f426a9ac36df75dcb28ad32d9
 EBUILD netbeans-javadoc-9999_p20160809.ebuild 6293 SHA256 5711af550cd9374b2402e3bb9231a2104432bb22667419732be1861bf94b4cec SHA512 cfde64bbac9043c08250e517d7440943f5dc9133591ec3e02be98e58e7d87311dcff5ab0cd9f45e99218b16f7a88f325767a0deb0b877f7759d566ce4319f022 WHIRLPOOL 546091d899c116f531b1f4a531e469ca5274ce9cbc20b3c42ba231cb776f5bbbf44770821a6c05a831accce31a29b4688f4cec33c238d8e1de90851e9ca1a842

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160726.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160726.ebuild
deleted file mode 100644
index 6030196..0000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160726.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans JavaDocs"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-26_00-02-33/zip/netbeans-trunk-nightly-201607260002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-# oracle-jdk-bin is needed because of javafx which is not currently packaged separately
-DEPEND="dev-java/oracle-jdk-bin:1.8[javafx]
-	app-arch/unzip
-	dev-java/javahelp:0
-	dev-java/junit:4
-	~dev-java/netbeans-apisupport-${PV}
-	~dev-java/netbeans-cnd-${PV}
-	~dev-java/netbeans-dlight-${PV}
-	~dev-java/netbeans-enterprise-${PV}
-	~dev-java/netbeans-ergonomics-${PV}
-	~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-groovy-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-javacard-${PV}
-	~dev-java/netbeans-mobility-${PV}
-	~dev-java/netbeans-nb-${PV}
-	~dev-java/netbeans-php-${PV}
-	~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-profiler-${PV}
-	~dev-java/netbeans-websvccommon-${PV}"
-RDEPEND=""
-
-JAVA_PKG_BSFIX="off"
-JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.8"
-JAVA_PKG_WANT_SOURCE="1.7"
-JAVA_PKG_WANT_TARGET="1.7"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip o.apache.tools.ant.module/external/ant-libs-1.9.7.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-apisupport-${SLOT} apisupport || die
-	cat /usr/share/netbeans-apisupport-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.apisupport.built
-
-	ln -s /usr/share/netbeans-cnd-${SLOT} cnd || die
-	cat /usr/share/netbeans-cnd-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.cnd.built
-
-	ln -s /usr/share/netbeans-dlight-${SLOT} dlight || die
-	cat /usr/share/netbeans-dlight-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.dlight.built
-
-	ln -s /usr/share/netbeans-enterprise-${SLOT} enterprise || die
-	cat /usr/share/netbeans-enterprise-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.enterprise.built
-
-	ln -s /usr/share/netbeans-ergonomics-${SLOT} ergonomics || die
-	cat /usr/share/netbeans-ergonomics-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ergonomics.built
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-groovy-${SLOT} groovy || die
-	cat /usr/share/netbeans-groovy-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.groovy.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-javacard-${SLOT} javacard || die
-	cat /usr/share/netbeans-javacard-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.javacard.built
-
-	ln -s /usr/share/netbeans-mobility-${SLOT} mobility || die
-	cat /usr/share/netbeans-mobility-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.mobility.built
-
-	ln -s /usr/share/netbeans-nb-${SLOT}/nb nb || die
-	cat /usr/share/netbeans-nb-${SLOT}/nb/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.nb.built
-
-	ln -s /usr/share/netbeans-php-${SLOT} php || die
-	cat /usr/share/netbeans-php-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.php.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-profiler-${SLOT} profiler || die
-	cat /usr/share/netbeans-profiler-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.profiler.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	eant -Dpermit.jdk8.builds=true -f nbbuild/build.xml bootstrap || die
-	ANT_OPTS="-Xmx1536m" eant -Dpermit.jdk8.builds=true -f nbbuild/javadoctools/build.xml build-javadoc
-}
-
-src_install() {
-	rm nbbuild/build/javadoc/*.zip
-	java-pkg_dojavadoc nbbuild/build/javadoc
-}

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 70efadc..36c2532 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -11,7 +11,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0bf64eb9954902ac044869706bfb6bc6a3d6c3180db184249a94 SHA512 cf146c2b53ecf99feb93cb3ece2eb8be14b3764587d9dac5b783c5486e3f9ce1aa7bea55f3289e6aa8d4661511ed733f6bc125067ad83cff356dc46380cd8eeb WHIRLPOOL e9af0196209422a27085122ef2f2c3499f18ca82a01ee9fd4e6cd5ccf51888d26429e2dd90b705e0d2bc0c195856598f13715ae29ffa64b174e02e1617c3dd07
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 DIST netbeans-trunk-nightly-201608090002-src.zip 217056261 SHA256 f0a275e932b5948c00e24beae1eb599f8c0912fa905997b1ef7b11345fddf60c SHA512 81761482cbd5e238e1c2597a4b9bcc506b32c296e4d6c0785fa8fe69e1d1a6ddc9f4a7f6dcdb8ed816f366fb840e01a5d8003cf289bb1735be74f9906d6c7575 WHIRLPOOL 903eb7d99f8fecafca4f3a06a567a5994f0602431d29c74df1a300785b62f205e1257c1c4158cb2f7706a6c8bf70c7e3b7d7e6503a96bcaefb7411be0d701f70
@@ -38,7 +37,6 @@ DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0e
 DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 4717 SHA256 6186231ec60cc3e9352ef6aac6744b45d6ec096b9208c766b2f208edfd044f5e SHA512 b1d322976745d28065ee76a62c65231b4890715c38b143508d7b81c99d25c65298bb564f1c8e45c37db5b1b4255d9aa9d5ec0b090d9f63f1e0b9b453fc489f14 WHIRLPOOL 49b587b41efcfa7853ca98d5e6b18608428492396bbbe4c2f52b6840d7aeb3d68deccd306a0a92e03917ef7eab0710edc8fbdd010aaf25597f839622171371ff
 EBUILD netbeans-javafx-9999_p20160727.ebuild 4717 SHA256 0370ef84d4cbfe2f2a521292e27144523681e96d53e91cd623f71104d6a67e14 SHA512 75cd6a994bb7c9393d2319badb49b0f1c7eeebd2c48f0b168da76573d2c079e9360b5331e9d0b9a233978ccd99290b0c686c2ebbf0e4677b1ce836bc1d1ee663 WHIRLPOOL 3ee7209e0c01c2e60ee211b87c398c4fcfb1e5ec63fb434976041c478d401d979a5c67dbde79eeec431b512c6893ad6fe8a7be3c831293a7892e853cbac3f545
 EBUILD netbeans-javafx-9999_p20160805.ebuild 4717 SHA256 0ab75a5cfeb7229da3a1dc00b2dd7157f6de1a4fc8e1d8fdadbe0c2b0f74d22c SHA512 2cb81a9528264ce6012deacdd812c24f22c918a2ea6c4ce148723a0a78285d5a98e1696d5f950843cc1f67321bf544215271f1d7bf620294945bddb30bce0acf WHIRLPOOL 3e4eb69d8821b87ec9ac0a17aa89389d0d76f839d40982f9080cd43aa632f818627eac1bf07e65dba877d3ee715f35e9b54e421346525e9216b36c4f3fc9e583
 EBUILD netbeans-javafx-9999_p20160809.ebuild 4717 SHA256 4e91d25d04a3f331a53833868405ae4241c07622f11cf44dd2f5513b8e2cbcd5 SHA512 ab6d7690c79dc32455e655bcacfcf4053a98cadb5ef05301bf4d115170711a233623a64808a6258f8ebe0baf586643b9d79a236ebf3beddaca67d9f463e5619e WHIRLPOOL 148f3a8b439f428ace496edfcf014dc5500f343d1a758bb58d355bdd3694e0b9026359f7adaf3cfdc56614dd43c54e2a88515f0fbb38c1311363e980f21f9dbc

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160726.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160726.ebuild
deleted file mode 100644
index 52ff70f..0000000
--- a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160726.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans JavaFX Cluster"
-HOMEPAGE="http://netbeans.org/projects/javafx"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-26_00-02-33/zip/netbeans-trunk-nightly-201607260002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
-	http://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar
-	http://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip
-	http://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip
-	http://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar
-	http://hg.netbeans.org/binaries/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0
-	dev-java/junit:4"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.javafx -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar apisupport.harness/external/bindex-2.2.jar || die
-	ln -s "${DISTDIR}"/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar apisupport.harness/external/jnlp-servlet.jar || die
-	ln -s "${DISTDIR}"/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar jemmy/external/jemmy-2.3.1.1.jar || die
-	ln -s "${DISTDIR}"/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip jemmy/external/jemmy-2.3.1.1-doc.zip || die
-	ln -s "${DISTDIR}"/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip jemmy/external/jemmy-2.3.1.1-src.zip || die
-	ln -s "${DISTDIR}"/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into apisupport.harness/external javahelp jsearch.jar jsearch-2.0_05.jar
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/javafx >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/javafx$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/javafx
-}

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index ff52674..53b1e7d 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0bf64eb9954902ac044869706bfb6bc6a3d6c3180db184249a94 SHA512 cf146c2b53ecf99feb93cb3ece2eb8be14b3764587d9dac5b783c5486e3f9ce1aa7bea55f3289e6aa8d4661511ed733f6bc125067ad83cff356dc46380cd8eeb WHIRLPOOL e9af0196209422a27085122ef2f2c3499f18ca82a01ee9fd4e6cd5ccf51888d26429e2dd90b705e0d2bc0c195856598f13715ae29ffa64b174e02e1617c3dd07
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 DIST netbeans-trunk-nightly-201608090002-src.zip 217056261 SHA256 f0a275e932b5948c00e24beae1eb599f8c0912fa905997b1ef7b11345fddf60c SHA512 81761482cbd5e238e1c2597a4b9bcc506b32c296e4d6c0785fa8fe69e1d1a6ddc9f4a7f6dcdb8ed816f366fb840e01a5d8003cf289bb1735be74f9906d6c7575 WHIRLPOOL 903eb7d99f8fecafca4f3a06a567a5994f0602431d29c74df1a300785b62f205e1257c1c4158cb2f7706a6c8bf70c7e3b7d7e6503a96bcaefb7411be0d701f70
@@ -30,7 +29,6 @@ DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0e
 DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 4412 SHA256 3f56c4dca782b3bc27f5b6e0ba6d786091db3f8f7e736cd78e2dd8ea38f76ff3 SHA512 7a55fb8c75cacdd59827b50c10308a08beeedae9a3a09342d18e84cb432c0db0f6b3c052db336ca0114b14c440253022fa5c06b3a3d8a4f3645188a92c0ae1e3 WHIRLPOOL eceb99365cdc47692b74bf170ba0488f1089b59ab577bec1ecd2f2c229c237b5ce669e62a68fe1f37df956ad53d05cac87646599139fca6e24e8a60ff3cad07a
 EBUILD netbeans-mobility-9999_p20160727.ebuild 4412 SHA256 3181731ccb3d338ab0dc72fc9b0607d48a98db6408d7fd305c558653b1928d82 SHA512 c6c4e366babe7af5a6475ac4a500ef2f9428911c042aad6d54109e84220de31bb80fb73132c181434cadf218d153821f834feb591acccef8ac5efb90d61abcc8 WHIRLPOOL 6cfa577b0d718f403d1d08ed2daa9e1c393a10c8626fd965348f702532a9fc780f09a3860e6e5507eba16b1d365362e903ec6a402c32ab838045cc4ff897edd5
 EBUILD netbeans-mobility-9999_p20160805.ebuild 4412 SHA256 a41d717864a56f05306e368243d3ddbeda846f367ae6222b24bce1523bfb7e19 SHA512 13d0e451ddca0217329139be86e3cf5cfc63af0b7841e92efbfcd04c665500f2eb3169f7559befc3188b4ba27256c69954328a1c0d8d3768b51cf49634769f74 WHIRLPOOL a97fc399cf3c9cd6bc9ee438a6b5de82642baa64ccba80c720d302c9f48fcbd96e30b1008bb7bc72bdf858887b1bfe774add9fe8dc8d6e3230ed8047b8eddc56
 EBUILD netbeans-mobility-9999_p20160809.ebuild 4412 SHA256 64a8d1049e3af6e36e2386a9ee1c2c59f789a24fec8df688fbe55b44e969ea1b SHA512 ffac090bbfb9c23db4d22652481bfec5631389d4e9f1ebe4cbbd59cd5829f3469cbea811f4e108c1b0172369954aec46e1e269d9ef25ce4175a1a04084d14500 WHIRLPOOL 77f45d36aacd88ad501435092784b17b2f79eeaf1ed654d571a6e7ba78f59f6ac8301064fb58f3324f484bb5fd1f34192649ff02269d9d63ac0c6db9ced4ba73

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160726.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160726.ebuild
deleted file mode 100644
index c548e71..0000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160726.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Mobility Cluster"
-HOMEPAGE="http://netbeans.org/features/platform/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-26_00-02-33/zip/netbeans-trunk-nightly-201607260002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-apisupport-${PV}
-	~dev-java/netbeans-enterprise-${PV}
-	~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-websvccommon-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.mobility -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f | grep -vE "mobility.databindingme/lib/netbeans_databindingme.*\.jar" \
-		| grep -v "vmd.components.midp/netbeans_midp_components_basic/dist/netbeans_midp_components_basic.jar" \
-		| grep -v "vmd.components.midp.pda/netbeans_midp_components_pda/dist/netbeans_midp_components_pda.jar" \
-		| grep -v "vmd.components.midp.wma/netbeans_midp_components_wma/dist/netbeans_midp_components_wma.jar" \
-		| grep -v "vmd.components.svg/nb_svg_midp_components/dist/nb_svg_midp_components.jar" | xargs rm
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-apisupport-${SLOT} apisupport || die
-	cat /usr/share/netbeans-apisupport-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.apisupport.built
-
-	ln -s /usr/share/netbeans-enterprise-${SLOT} enterprise || die
-	cat /usr/share/netbeans-enterprise-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.enterprise.built
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/mobility >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/mobility$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	rm -rf "${D}"/${INSTALL_DIR}/modules/lib || die
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/mobility
-}

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 333f72d..299c4f6 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0bf64eb9954902ac044869706bfb6bc6a3d6c3180db184249a94 SHA512 cf146c2b53ecf99feb93cb3ece2eb8be14b3764587d9dac5b783c5486e3f9ce1aa7bea55f3289e6aa8d4661511ed733f6bc125067ad83cff356dc46380cd8eeb WHIRLPOOL e9af0196209422a27085122ef2f2c3499f18ca82a01ee9fd4e6cd5ccf51888d26429e2dd90b705e0d2bc0c195856598f13715ae29ffa64b174e02e1617c3dd07
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 DIST netbeans-trunk-nightly-201608090002-src.zip 217056261 SHA256 f0a275e932b5948c00e24beae1eb599f8c0912fa905997b1ef7b11345fddf60c SHA512 81761482cbd5e238e1c2597a4b9bcc506b32c296e4d6c0785fa8fe69e1d1a6ddc9f4a7f6dcdb8ed816f366fb840e01a5d8003cf289bb1735be74f9906d6c7575 WHIRLPOOL 903eb7d99f8fecafca4f3a06a567a5994f0602431d29c74df1a300785b62f205e1257c1c4158cb2f7706a6c8bf70c7e3b7d7e6503a96bcaefb7411be0d701f70
@@ -33,7 +32,6 @@ DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0e
 DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 4111 SHA256 914fc806c0c6dabe5b4b1ebc0b7f013e17fb042de587811b8410b46da9e39dfe SHA512 1eb08797e5e261912e0be656928324dfbddcecf60f7c849ba3f0952ed034cee39cf68a75ec76ea9257a0542529ac629849338ab5aa672763f350fe9f030113b1 WHIRLPOOL 19bc4171859d690450e3eca42c4e98c5b5a8814932b44571358c1349d34bd9e0a2866e5523bc2562df67d81926f61ba050fbf49425e53a48eff92e28843eb74b
 EBUILD netbeans-nb-9999_p20160727.ebuild 4111 SHA256 70da776a92a3084541cccc8c4b22cef4355242a8f43a439bd19ff941e5810872 SHA512 3c2deaac1cbfe62369dfc0b736f9dab42937463ebc49d1707f614f768604fc3fd681c99ef3bd436e0c67c8a012fcb4b0805bc72b40c58b226ec4f33701b9f294 WHIRLPOOL b5246428c5f6316e763bbe5fbfc703bceb2dfdfc111b0d5cd0433266ea2be49adb282477d41822fd23cf3fee2c741c5898804230bd699741c35234e76c7decba
 EBUILD netbeans-nb-9999_p20160805.ebuild 4111 SHA256 09bb7fee378ce42b8e5227641d546bbb8dcd0ca0abaa1a0194d53579d0e8d57d SHA512 e9d2421c26e73ed059a94472594a43f40ea36d658c671cfa86bb719bfbf68e0c0e2aaf5462728c848f29b62653a37c614fb7f46caa1f72cfbb7501ae2c8169cf WHIRLPOOL 1349f7b111532a8b6999469225aaffe8b894e89e99e428511d9048d315728a47c7ecfe86ad09e36e8953fa4913654d889e8e0f975a9223fbfc10f215aa77d311
 EBUILD netbeans-nb-9999_p20160809.ebuild 4111 SHA256 6d55df0ddaba364166e03ccaca27601db8078d105e0428d0f746215b91c94826 SHA512 9b89877aa985d8ea34f12a51cacd1a5d987a6972b8b2cec78adbdf1d69b633a26843c35c7019ccc2580e2081ceb9f73b959d6d7aa45f1e35569a3b365ed36a67 WHIRLPOOL 920a5db9e591874cd639ace9ad8306dec85dd60e8fc0dde304bfe55fbc37a73e59fe3f66b2b965f303e68bb9b376992503bc9dbe6b048454904a71bc08c3cbdd

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160726.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160726.ebuild
deleted file mode 100644
index 3056ffb..0000000
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20160726.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans IDE Branding"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-26_00-02-33/zip/netbeans-trunk-nightly-201607260002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster create-netbeans-import finish-build"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.nb -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans >/dev/null || die
-
-	insinto ${INSTALL_DIR}/nb
-
-	grep -E "/nb$" moduleCluster.properties > "${D}"/${INSTALL_DIR}/nb/moduleCluster.properties || die
-
-	insinto ${INSTALL_DIR}
-	doins -r nb
-	dodoc *.txt
-	dohtml *.html *.css
-
-	insinto ${INSTALL_DIR}/bin
-	doins bin/netbeans
-	dosym ${INSTALL_DIR}/bin/netbeans /usr/bin/netbeans-${SLOT}
-	fperms 755 ${INSTALL_DIR}/bin/netbeans
-
-	insinto /etc/netbeans-${SLOT}
-	doins etc/*
-	dosym /etc/netbeans-${SLOT} ${INSTALL_DIR}/etc
-
-	# fix paths per bug# 163483
-	if [[ -e "${D}"/${INSTALL_DIR}/bin/netbeans ]]; then
-		sed -i -e "s:\"\$progdir\"/../etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans
-		sed -i -e "s:\"\${userdir}\"/etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans
-	fi
-
-	dodir /usr/share/icons/hicolor/32x32/apps
-	dosym ${INSTALL_DIR}/nb/netbeans.png /usr/share/icons/hicolor/32x32/apps/netbeans-${SLOT}.png
-	dodir /usr/share/icons/hicolor/128x128/apps
-	cp "${DISTDIR}"/netbeans-7.0.png "${D}"/usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png || die
-	dosym /usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png /usr/share/pixmaps/netbeans-${SLOT}.png
-
-	popd >/dev/null || die
-
-	make_desktop_entry netbeans-${SLOT} "Netbeans ${PV}" netbeans-${SLOT} Development
-
-	mkdir -p  "${D}"/${INSTALL_DIR}/nb/config || die
-	echo "NBGNT" > "${D}"/${INSTALL_DIR}/nb/config/productid || die
-}

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index 4298230..d24bcad 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -8,7 +8,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0bf64eb9954902ac044869706bfb6bc6a3d6c3180db184249a94 SHA512 cf146c2b53ecf99feb93cb3ece2eb8be14b3764587d9dac5b783c5486e3f9ce1aa7bea55f3289e6aa8d4661511ed733f6bc125067ad83cff356dc46380cd8eeb WHIRLPOOL e9af0196209422a27085122ef2f2c3499f18ca82a01ee9fd4e6cd5ccf51888d26429e2dd90b705e0d2bc0c195856598f13715ae29ffa64b174e02e1617c3dd07
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 DIST netbeans-trunk-nightly-201608090002-src.zip 217056261 SHA256 f0a275e932b5948c00e24beae1eb599f8c0912fa905997b1ef7b11345fddf60c SHA512 81761482cbd5e238e1c2597a4b9bcc506b32c296e4d6c0785fa8fe69e1d1a6ddc9f4a7f6dcdb8ed816f366fb840e01a5d8003cf289bb1735be74f9906d6c7575 WHIRLPOOL 903eb7d99f8fecafca4f3a06a567a5994f0602431d29c74df1a300785b62f205e1257c1c4158cb2f7706a6c8bf70c7e3b7d7e6503a96bcaefb7411be0d701f70
@@ -35,7 +34,6 @@ DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0e
 DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 4418 SHA256 521f26a4aaf11c9f8c83ec8579139f3e7602cad7d305610f7c39b9e928231f69 SHA512 67b56b4c640b26ecc4b5dac146a07490944c8139da84a129259b88461fa8e6d3268f1b39becff6da3e49aa86b8da666dc7a1a52de02ff3a7188f0930f6f59480 WHIRLPOOL 9e017f383407056f3b242db533162cce5adfb83c7bcb731f54bde9637a3f5a0915abcb5a4cda1e7abcc30879e39d656105b6fd45e7a83f043ee4a2d66f82b89f
 EBUILD netbeans-php-9999_p20160727.ebuild 4418 SHA256 fb596960721bd84a462cf9bae85856e3bdbf87586af5ea47243a380b7326ade3 SHA512 be988749609f48e53026593876699c62d7929719a6fbe0054cde38fa7564886cdcb500b3a84055f2cca57034113cc00207f84639a4eb2f475f3c4acc180b6fe0 WHIRLPOOL 9d23cc557c59fcbd363e49a7bb2cb4f1541d53e438e111bd51f49c70f584e60ddb528cae0704db65135b9c54be746e305a4f70e1875de4f4f2d332595578c4b0
 EBUILD netbeans-php-9999_p20160805.ebuild 4418 SHA256 ca5953e1f7771dca5d26be7bc8b6ca785af67ee854830c8bf01edd1e5c46340f SHA512 430b0955c7ccb0bb8495ca94610623c12142585b15aa3c547e6f03b58f29c7fbd0dbf26bb3ca098ea81da22fb79789563e3795ce1e083a1bbf23adc3a385a9c7 WHIRLPOOL 22951c3969bb6f3e0676b46c770a628798afc4eeeb9b24aea70f15c06e92b7aef01ed8b8089cf2a34055e19183927b14c91e3b836e163505a780bfe04f6da782
 EBUILD netbeans-php-9999_p20160809.ebuild 4418 SHA256 ba12af974c54f01510fb34d85c8ccee40e3049c1faf013547264c0f433df8965 SHA512 b1797ef8b7b8fddf51e539b2dccf39b04f4df50f3f7f75d7717be2da1cb14ea91dbef8f5bd652f946d8a54285d99846275af2e5e47807ffe1dffba3bf41d41c2 WHIRLPOOL dca0cbbb2ae9c298152087ee9a17e760639c04b06b560928e6d474dd1d5c168df956036c09aa33de81a9133c354dea96598c3f0cd4fdf5dfd1d4a5204b7902ba

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160726.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160726.ebuild
deleted file mode 100644
index 5b255e1..0000000
--- a/dev-java/netbeans-php/netbeans-php-9999_p20160726.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans PHP Cluster"
-HOMEPAGE="http://netbeans.org/projects/php"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-26_00-02-33/zip/netbeans-trunk-nightly-201607260002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip
-	http://hg.netbeans.org/binaries/472A52636BE09823B4E5F707071B31FB990A7375-phpsigfiles.zip
-	http://hg.netbeans.org/binaries/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-webcommon-${PV}
-	~dev-java/netbeans-websvccommon-${PV}
-	dev-java/javacup:0"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.php -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip php.phpdoc.documentation/external/phpdocdesc.zip || die
-	ln -s "${DISTDIR}"/472A52636BE09823B4E5F707071B31FB990A7375-phpsigfiles.zip php.project/external/phpsigfiles.zip || die
-	ln -s "${DISTDIR}"/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip php.editor/external/predefined_vars.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into libs.javacup/external javacup javacup.jar java-cup-11a.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-webcommon-${SLOT} webcommon || die
-	cat /usr/share/netbeans-webcommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.webcommon.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/php >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/php$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext
-	pushd "${instdir}" >/dev/null || die
-	rm java-cup-11a.jar && java-pkg_jar-from --into "${instdir}" javacup javacup.jar java-cup-11a.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/php
-}

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 2baf33d..183cf90 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -29,7 +29,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0bf64eb9954902ac044869706bfb6bc6a3d6c3180db184249a94 SHA512 cf146c2b53ecf99feb93cb3ece2eb8be14b3764587d9dac5b783c5486e3f9ce1aa7bea55f3289e6aa8d4661511ed733f6bc125067ad83cff356dc46380cd8eeb WHIRLPOOL e9af0196209422a27085122ef2f2c3499f18ca82a01ee9fd4e6cd5ccf51888d26429e2dd90b705e0d2bc0c195856598f13715ae29ffa64b174e02e1617c3dd07
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 DIST netbeans-trunk-nightly-201608090002-src.zip 217056261 SHA256 f0a275e932b5948c00e24beae1eb599f8c0912fa905997b1ef7b11345fddf60c SHA512 81761482cbd5e238e1c2597a4b9bcc506b32c296e4d6c0785fa8fe69e1d1a6ddc9f4a7f6dcdb8ed816f366fb840e01a5d8003cf289bb1735be74f9906d6c7575 WHIRLPOOL 903eb7d99f8fecafca4f3a06a567a5994f0602431d29c74df1a300785b62f205e1257c1c4158cb2f7706a6c8bf70c7e3b7d7e6503a96bcaefb7411be0d701f70
@@ -56,7 +55,6 @@ DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0e
 DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 9520 SHA256 37d585dfcb3fe3945f1a40493695892af455f99a6ad6b4d33663251494e56a4d SHA512 9fa9e38328bb44b437b04a877be340d234b6d1a0039de75bb61852f142174f3d73b227828cb6bfd2def19050cb5102ee3c8f4b98e9044df51b667c81f937d4b3 WHIRLPOOL 66490293a57c48db63f947de70f0f2d505b8ca3d86f4b09e140c1f4ba87fe744d07dd58ad272d9ce877b67e827a4c65e25fe63839142e8c9a7f8c626a3741c8b
 EBUILD netbeans-platform-9999_p20160727.ebuild 9520 SHA256 63e08e0c701b7bc57ea1508ae6612d3240e8d82211adcefa1bf4a711fff3af14 SHA512 42ba85af6ba2a1b3d5d70fc53f1bd688cd4a7d6878555a7ad7d9163c44cf3b5905827ab1a68bde1b47523b7c73e69d9fb2bf9d1c09562bf1add2970ed0d36db8 WHIRLPOOL 06c4fb0cde2c72ecb8e97ba49d949a91ba128d87197449c42621d2b410d16b4de50dfbe7621c88c47d2f0ebf7b22a42cf5259e0316842ac32d8e958557b85966
 EBUILD netbeans-platform-9999_p20160805.ebuild 9520 SHA256 546ab9250584d86027340a44ea3387216a7db6029f5af7c797e52202328b37c1 SHA512 d3408e43f8b658475e411f4f1e867d4a1dc136fc61a4190776facea4dc4042487875dec3eb39857813682b9a744b08de440a8a429e65ba7371eb304aa21536ca WHIRLPOOL 4e902c0137be4f332f300398462fb765c663686b7bf6c4d4f1bac60b5bf3397231733367c5b625e72cba6702590bc530f0d5bdb42f84cbdc23ce0ffc8460e986
 EBUILD netbeans-platform-9999_p20160809.ebuild 9520 SHA256 d4e9b26a05bb74dc0537ef1cff826eb21dd881c0de1ea1f4d65c6ffac6a13ce9 SHA512 050917dce2edf1fb10571f4e91d24d62c0e3ff317dc9e96109105695de646c4d76151486501a4ef98bec17fda8e6c97e6eb409e265a93fdd46646b8948b860a2 WHIRLPOOL ce6543e916a0e55fcde658c11a3f9bd29cf59a336b1ad5fd7186de5778cd5a2c515b1c1be80136a876188e236b9d1668304ad945c1987d512af96b396a2f8240

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160726.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160726.ebuild
deleted file mode 100644
index fa0b2f8..0000000
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20160726.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Platform"
-HOMEPAGE="http://netbeans.org/features/platform/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-26_00-02-33/zip/netbeans-trunk-nightly-201607260002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar
-	http://hg.netbeans.org/binaries/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar
-	http://hg.netbeans.org/binaries/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar
-	http://hg.netbeans.org/binaries/771CDCA0A3F2F3CE818E20CC2D707A3592422485-ko4j-1.3.jar
-	http://hg.netbeans.org/binaries/A3085BAA78C8EE7F55081E70C79ABE04CA38CE93-net.java.html-1.3.jar
-	http://hg.netbeans.org/binaries/7FC91530F4395FA0D58F9539F3B40858E766BFA3-net.java.html.boot-1.3.jar
-	http://hg.netbeans.org/binaries/5C992BAEC0111EE293BD44173140A9D8EC860765-net.java.html.boot.fx-1.3.jar
-	http://hg.netbeans.org/binaries/BF6C9BB0FFB78A6B846ECAEB880C460D883B4F72-net.java.html.boot.script-1.3.jar
-	http://hg.netbeans.org/binaries/10E4214A89082C70FCF9F721953001C0932037BA-net.java.html.geo-1.3.jar
-	http://hg.netbeans.org/binaries/D97314CE1869DD3B8B8942256A70673E2991C9DD-net.java.html.json-1.3.jar
-	http://hg.netbeans.org/binaries/6BDCE8349F83CD02F2942D4FBFA86A81A129F42A-net.java.html.sound-1.3.jar
-	http://hg.netbeans.org/binaries/E5DDC5E827D3D62E7BE9F7E32927CA01F2839971-org.eclipse.osgi_3.9.1.v20140110-1610.jar
-	http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip
-	http://hg.netbeans.org/binaries/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip
-	http://hg.netbeans.org/binaries/CEC2829EC391CB404AD32EB2D08F879C418B745B-xhr4j-1.3.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-# oracle-jdk-bin is needed for now because of javafx which is not packaged separately yet
-# [parseprojectxml] Distilling /var/tmp/portage/dev-java/netbeans-platform-9999_p20151108/work/nbbuild/build/public-package-jars/org-netbeans-libs-javafx.jar from [/var/tmp/portage/dev-java/netbeans-platform-9999_p20151108/work/nbbuild/netbeans/platform/modules/org-netbeans-libs-javafx.jar, /usr/lib64/icedtea8/jre/lib/ext/jfxrt.jar]
-# [parseprojectxml] Classpath entry /usr/lib64/icedtea8/jre/lib/ext/jfxrt.jar does not exist; skipping
-#  [nbmerge] Failed to build target: all-api.htmlui
-
-CDEPEND="dev-java/hamcrest-core:1.3
-	dev-java/javahelp:0
-	>=dev-java/jna-3.4:0
-	dev-java/junit:4[source]
-	>=dev-java/osgi-core-api-5:0
-	dev-java/osgi-compendium:0
-	dev-java/swing-layout:1[source]
-	dev-java/testng:0"
-DEPEND="dev-java/oracle-jdk-bin:1.8[javafx]
-	app-arch/unzip
-	${CDEPEND}"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.platform -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.8"
-JAVA_PKG_WANT_SOURCE="1.7"
-JAVA_PKG_WANT_TARGET="1.7"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar libs.asm/external/asm-all-5.0.1.jar || die
-	ln -s "${DISTDIR}"/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar libs.felix/external/felix-4.2.1.jar || die
-	ln -s "${DISTDIR}"/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar junitlib/external/junit-4.12-javadoc.jar || die
-	ln -s "${DISTDIR}"/771CDCA0A3F2F3CE818E20CC2D707A3592422485-ko4j-1.3.jar o.n.html.ko4j/external/ko4j-1.3.jar || die
-	ln -s "${DISTDIR}"/A3085BAA78C8EE7F55081E70C79ABE04CA38CE93-net.java.html-1.3.jar net.java.html/external/net.java.html-1.3.jar || die
-	ln -s "${DISTDIR}"/7FC91530F4395FA0D58F9539F3B40858E766BFA3-net.java.html.boot-1.3.jar net.java.html.boot/external/net.java.html.boot-1.3.jar || die
-	ln -s "${DISTDIR}"/5C992BAEC0111EE293BD44173140A9D8EC860765-net.java.html.boot.fx-1.3.jar net.java.html.boot.fx/external/net.java.html.boot.fx-1.3.jar || die
-	ln -s "${DISTDIR}"/BF6C9BB0FFB78A6B846ECAEB880C460D883B4F72-net.java.html.boot.script-1.3.jar net.java.html.boot.script/external/net.java.html.boot.script-1.3.jar || die
-	ln -s "${DISTDIR}"/10E4214A89082C70FCF9F721953001C0932037BA-net.java.html.geo-1.3.jar net.java.html.geo/external/net.java.html.geo-1.3.jar || die
-	ln -s "${DISTDIR}"/D97314CE1869DD3B8B8942256A70673E2991C9DD-net.java.html.json-1.3.jar net.java.html.json/external/net.java.html.json-1.3.jar || die
-	ln -s "${DISTDIR}"/6BDCE8349F83CD02F2942D4FBFA86A81A129F42A-net.java.html.sound-1.3.jar net.java.html.sound/external/net.java.html.sound-1.3.jar || die
-	ln -s "${DISTDIR}"/E5DDC5E827D3D62E7BE9F7E32927CA01F2839971-org.eclipse.osgi_3.9.1.v20140110-1610.jar netbinox/external/org.eclipse.osgi_3.9.1.v20140110-1610.jar || die
-	ln -s "${DISTDIR}"/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip o.jdesktop.layout/external/swing-layout-1.0.4-doc.zip || die
-	ln -s "${DISTDIR}"/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip libs.testng/external/testng-6.8.1-javadoc.zip || die
-	ln -s "${DISTDIR}"/CEC2829EC391CB404AD32EB2D08F879C418B745B-xhr4j-1.3.jar o.n.html.xhr4j/external/xhr4j-1.3.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	# upstream jna jar contains bundled binary libraries so we disable that feature
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --into libs.junit4/external hamcrest-core-1.3 hamcrest-core.jar hamcrest-core-1.3.jar
-	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into libs.jna/external jna jna.jar jna-4.2.2.jar
-	java-pkg_jar-from --into libs.jna.platform/external jna platform.jar jna-platform-4.2.2.jar
-	java-pkg_jar-from --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
-	ln -s /usr/share/junit-4/sources/junit-src.zip junitlib/external/junit-4.12-sources.jar || die
-	java-pkg_jar-from --into libs.osgi/external osgi-core-api osgi-core-api.jar osgi.core-5.0.0.jar
-	java-pkg_jar-from --into libs.osgi/external osgi-compendium osgi-compendium.jar osgi.cmpn-4.2.jar
-	java-pkg_jar-from --into o.jdesktop.layout/external swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
-	ln -s /usr/share/swing-layout-1/sources/swing-layout-src.zip o.jdesktop.layout/external/swing-layout-1.0.4-src.zip || die
-	java-pkg_jar-from --into libs.testng/external testng testng.jar testng-6.8.1-dist.jar
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	unset DISPLAY
-	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
-}
-
-src_install() {
-	pushd nbbuild/netbeans/platform >/dev/null || die
-
-	java-pkg_dojar lib/*.jar
-	grep -E "/platform$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	insinto ${INSTALL_DIR}
-	doins -r *
-	rm "${D}"/${INSTALL_DIR}/docs/junit-4.12-sources.jar || die
-	dosym /usr/share/junit-4/sources/junit-src.zip ${INSTALL_DIR}/docs/junit-4.12-sources.jar
-	rm "${D}"/${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip || die
-	dosym /usr/share/swing-layout-1/sources/swing-layout-src.zip ${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip
-	find "${D}"/${INSTALL_DIR} -name "*.exe" -delete
-	find "${D}"/${INSTALL_DIR} -name "*.dll" -delete
-	rm -fr "${D}"/modules/lib || die
-
-	popd >/dev/null || die
-
-	fperms 775 ${INSTALL_DIR}/lib/nbexec
-	dosym ${INSTALL_DIR}/lib/nbexec /usr/bin/nbexec-${SLOT}
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext
-	pushd "${instdir}" >/dev/null || die
-	rm hamcrest-core-1.3.jar && java-pkg_jar-from --into "${instdir}" hamcrest-core-1.3 hamcrest-core.jar hamcrest-core-1.3.jar
-	rm jhall-2.0_05.jar && java-pkg_jar-from --into "${instdir}" javahelp jhall.jar jhall-2.0_05.jar
-	rm jna-4.2.2.jar && java-pkg_jar-from --into "${instdir}" jna jna.jar jna-4.2.2.jar
-	rm jna-platform-4.2.2.jar && java-pkg_jar-from --into "${instdir}" jna platform.jar jna-platform-4.2.2.jar
-	rm junit-4.12.jar && java-pkg_jar-from --into "${instdir}" junit-4 junit.jar junit-4.12.jar
-	rm osgi.cmpn-4.2.jar && java-pkg_jar-from --into "${instdir}" osgi-compendium osgi-compendium.jar osgi.cmpn-4.2.jar
-	rm osgi.core-5.0.0.jar && java-pkg_jar-from --into "${instdir}" osgi-core-api osgi-core-api.jar osgi.core-5.0.0.jar
-	rm swing-layout-1.0.4.jar && java-pkg_jar-from --into "${instdir}" swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
-	rm testng-6.8.1-dist.jar && java-pkg_jar-from --into "${instdir}" testng testng.jar testng-6.8.1-dist.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/platform
-}

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 9c8253b..fa5e3bb 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0bf64eb9954902ac044869706bfb6bc6a3d6c3180db184249a94 SHA512 cf146c2b53ecf99feb93cb3ece2eb8be14b3764587d9dac5b783c5486e3f9ce1aa7bea55f3289e6aa8d4661511ed733f6bc125067ad83cff356dc46380cd8eeb WHIRLPOOL e9af0196209422a27085122ef2f2c3499f18ca82a01ee9fd4e6cd5ccf51888d26429e2dd90b705e0d2bc0c195856598f13715ae29ffa64b174e02e1617c3dd07
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 DIST netbeans-trunk-nightly-201608090002-src.zip 217056261 SHA256 f0a275e932b5948c00e24beae1eb599f8c0912fa905997b1ef7b11345fddf60c SHA512 81761482cbd5e238e1c2597a4b9bcc506b32c296e4d6c0785fa8fe69e1d1a6ddc9f4a7f6dcdb8ed816f366fb840e01a5d8003cf289bb1735be74f9906d6c7575 WHIRLPOOL 903eb7d99f8fecafca4f3a06a567a5994f0602431d29c74df1a300785b62f205e1257c1c4158cb2f7706a6c8bf70c7e3b7d7e6503a96bcaefb7411be0d701f70
@@ -30,7 +29,6 @@ DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0e
 DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 3472 SHA256 9e18bfb3068b1c55766af682d3248c8337d18faad1344092a9c35f42a6d8e626 SHA512 c69bba3bae120d6bdb9eeb3c27663b56a0bb3f11fe58ab3f100175ff8e5dc214d6ea87d3587071bffa2d26569b410b09477eb4a55978ab25d63edbf956598df0 WHIRLPOOL 0443cfbe6289fdaf07720ce3816a1585b2540bf0611645eafe3395104df4862f0fa25f5d907794900648cb28b4883911baa8e607a646dc74b5945ea60168ffa7
 EBUILD netbeans-profiler-9999_p20160727.ebuild 3472 SHA256 04b29552e8a6089e0a56d4cd9714f128e9750445573306ab643ac4ce05be009b SHA512 e19ad44453696af938630e5c5efce5ab786f0367535ed1a0d500a03a025d024bcb36911a68c6b043225640a59604af343dbacf78009d193cdeb0a21be544fd1c WHIRLPOOL 6072b53a30147d7d97b85141f0416ce3eed72dbd80c47c9d4e486a83dddc4881e0cd699b6f557b8965ea5a34ae1b79d835547b12ec640e312086d5820f4d02a7
 EBUILD netbeans-profiler-9999_p20160805.ebuild 3472 SHA256 a69831eec96d1ff1b001d66eeed5085433fc3ecae308e67409226f305d0a75a4 SHA512 8c1f686bf8fcb8a4319c8169c43b0ef13b0bf9431babe8002865ca0b96f840c89feb5799034052ee199b2cbb09527cf78e340fceba571c4ff3efd75160b27053 WHIRLPOOL 528861b4f14316b5143799bd451fdd1fa078722ba0fd782ab25019ebf0d92451dae8d23132425aa3ace8ab36d3df24e750d3e4fc4692b52ac96402b8a536e414
 EBUILD netbeans-profiler-9999_p20160809.ebuild 3472 SHA256 e48396e4beb2dce00ebd932c68cecbbc7fe2ce22727ec8318f70538b1d49cea9 SHA512 4a3f3abbcce7ecbbc226a3bed28347c2dbf434b8ecc34c9c61507f20d42f9eb8b74ef2a39307672be681920505bb2d2aca4ef934ff567c2bda6bec941ef5a9e8 WHIRLPOOL feb603f6cd04c67bc0308f1a54a7c5acc83fe325b089d0f01d06c3c99119b6649a76330a659d56b22d976afbd9de6c39f3b4e7a0a1416a1ae7370a0eb0503de6

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160726.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160726.ebuild
deleted file mode 100644
index c80294e..0000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160726.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Profiler Cluster"
-HOMEPAGE="http://netbeans.org/projects/profiler"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-26_00-02-33/zip/netbeans-trunk-nightly-201607260002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-# Binary files needed for remote profiling
-QA_PREBUILT="usr/share/netbeans-profiler-${SLOT}/lib/deployed/*"
-
-CDEPEND="~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.profiler -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/profiler >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/profiler$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	for file in lib/deployed/cvm/linux/*.so ; do
-		fperms 755 ${file}
-	done
-
-	for file in lib/deployed/jdk*/linux*/*.so ; do
-		fperms 755 ${file}
-	done
-
-	for file in remote-pack-defs/*.sh ; do
-		fperms 755 ${file}
-	done
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/profiler
-}

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index c327cfb..96c127f 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -22,7 +22,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0bf64eb9954902ac044869706bfb6bc6a3d6c3180db184249a94 SHA512 cf146c2b53ecf99feb93cb3ece2eb8be14b3764587d9dac5b783c5486e3f9ce1aa7bea55f3289e6aa8d4661511ed733f6bc125067ad83cff356dc46380cd8eeb WHIRLPOOL e9af0196209422a27085122ef2f2c3499f18ca82a01ee9fd4e6cd5ccf51888d26429e2dd90b705e0d2bc0c195856598f13715ae29ffa64b174e02e1617c3dd07
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 DIST netbeans-trunk-nightly-201608090002-src.zip 217056261 SHA256 f0a275e932b5948c00e24beae1eb599f8c0912fa905997b1ef7b11345fddf60c SHA512 81761482cbd5e238e1c2597a4b9bcc506b32c296e4d6c0785fa8fe69e1d1a6ddc9f4a7f6dcdb8ed816f366fb840e01a5d8003cf289bb1735be74f9906d6c7575 WHIRLPOOL 903eb7d99f8fecafca4f3a06a567a5994f0602431d29c74df1a300785b62f205e1257c1c4158cb2f7706a6c8bf70c7e3b7d7e6503a96bcaefb7411be0d701f70
@@ -49,7 +48,6 @@ DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0e
 DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 6242 SHA256 69f1b62f9854561efb578637a3e15ebcfff378922782577ea06c7043f40d39d1 SHA512 20576ede88474e3c3f7fd2e72384675c60730b9c5f4cfb452bc7a87905308feeac77307a855f87978c044c308be68584e9375850b342cd48eba214b113e5aab5 WHIRLPOOL 0bc8d4883a57af2ed2d5a5ca84d4902b03bf1434579defff2737d6e47a5ea23154c73e58efa000a123dbb74a677b68ce1140640d2d06b6cd0335cb4d6f481cb9
 EBUILD netbeans-webcommon-9999_p20160727.ebuild 6242 SHA256 a6b8229bb9ec92945fec640edc45eee24b21e2476839c0a2ca92c1d923c757e7 SHA512 5220fb7a8f278fe4a632b5333e8856d58eac8fb1cc5440ea3b912055111315714366f978a43562dea806a45299ad9c82d9050803b8685c910a6fabbc5eec7b9a WHIRLPOOL 075f3241ba415961b3cbce2731c5b6c16c54ac73068f6813c1b628050df26470341073d632ae831145667c49e9a32d6264d8f505cd4e3091c986332d498fbcfc
 EBUILD netbeans-webcommon-9999_p20160805.ebuild 6242 SHA256 d4360b1017f3d9da2542318e75a0908026d2cbe41decaa16dab141cfe240683a SHA512 967236a8ec2035cc5622777f1b84763f163da728f3f6d5625205448d9682e5d7f60f4163ed366d1edb9cafbcbc3e222a4e8786d2ddc28ba04e28056e499bffdc WHIRLPOOL d8d803ecf8391ece21538d27ee4b1c0327a8cb4268601111d9b24344638b76f49b5dd71484a52afbf3f4f10365d5a9d1aea3d88837d2ed54e309989df7e53c34
 EBUILD netbeans-webcommon-9999_p20160809.ebuild 6242 SHA256 be4bbfe8b2da33a58e613abc7a1392bf87ad4ea4db306d9a195c79577ecee91a SHA512 7ce16484c42d7410a345e6863e235da5684b41a213d4443bc9a7a54504221263e174d4a19f3a7a5f60a2221f0104952852ea0d11d94704f549fd6de63a234f02 WHIRLPOOL b9196a94d64e4ce1622bae5d60c567307393bba074797f106a5d4f94419d6ea406d30524305fabf1655e88f7ca5cde99448a2d6b6ea0e0a732278829289ccb1a

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

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 8d34964..7342526 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0bf64eb9954902ac044869706bfb6bc6a3d6c3180db184249a94 SHA512 cf146c2b53ecf99feb93cb3ece2eb8be14b3764587d9dac5b783c5486e3f9ce1aa7bea55f3289e6aa8d4661511ed733f6bc125067ad83cff356dc46380cd8eeb WHIRLPOOL e9af0196209422a27085122ef2f2c3499f18ca82a01ee9fd4e6cd5ccf51888d26429e2dd90b705e0d2bc0c195856598f13715ae29ffa64b174e02e1617c3dd07
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 DIST netbeans-trunk-nightly-201608090002-src.zip 217056261 SHA256 f0a275e932b5948c00e24beae1eb599f8c0912fa905997b1ef7b11345fddf60c SHA512 81761482cbd5e238e1c2597a4b9bcc506b32c296e4d6c0785fa8fe69e1d1a6ddc9f4a7f6dcdb8ed816f366fb840e01a5d8003cf289bb1735be74f9906d6c7575 WHIRLPOOL 903eb7d99f8fecafca4f3a06a567a5994f0602431d29c74df1a300785b62f205e1257c1c4158cb2f7706a6c8bf70c7e3b7d7e6503a96bcaefb7411be0d701f70
@@ -30,7 +29,6 @@ DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0e
 DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 2721 SHA256 b1ee00734f3213fded0e0fcdd807bdb20a114ada052451df6e3566142949735c SHA512 01e7acb1638070ca74e7d31fc29fc502f60d30bbee61a64e751dac7503cd6edfec84fd1ee00d54e18ccdffc560cf3bcc0255bc06d8f68519ade5b4606d240cab WHIRLPOOL 28b0a1f3f065590227678a99efcd2f28b7e78da4e19b86b4518e4a28b3884bc43a98cc5c7ee12ea4de833a15319227eef62ccdaac4d28214dcff5bcdd425f79c
 EBUILD netbeans-websvccommon-9999_p20160727.ebuild 2721 SHA256 0f32abfe8cbff7b26c7b28fa3bb0bb15e5a682f81f8698c04d0b89d2347ba183 SHA512 10c819c8fbe76490640d3e2f60062c6c47eab3239395aa70caa2268bc783da52f775de61b6aa43beeb19e6fab3bcc46da4dc6cb590303c1026fbda5381ab6c37 WHIRLPOOL 8ba2fccb655bed25f0ff0f8979dbad675976ea77aa30fa4dcda3c8bb28154fed3935a7dd3eba668def44582e547908b5cb388c3d9cd710daaa990fb4d8d54230
 EBUILD netbeans-websvccommon-9999_p20160805.ebuild 2721 SHA256 5d067a2efa2ccff444b377ca2c33880788383bba8e8747d4d3cc61a4727e0b1a SHA512 7cae0ffd2e701262b03cb672077a6614b296ddbc9c15d2a4dffc0f9b971ba43a768e74cedd9666b459dc0243dcfbf227f9b0e45e03e99231bc0cb38abd34ea8f WHIRLPOOL 7373b765908ff38ec8af04f852603b0dd6cf141f8aa2a5d64cbab051030f143cc0b37109b8f98bf3e0a1a10efbe5ed9f3f8563eb46f1058d3bbfdbe9f8ca0667
 EBUILD netbeans-websvccommon-9999_p20160809.ebuild 2721 SHA256 83c47f4cd0e28ca7c088d4dba8a311892d0313d0528bb38cabad89e1a5018a5f SHA512 b1dadd45bf979a8f8e351d82eda8f8445c049c77655d889415e7d6418667d368f3d38e5428ff866559e12fa6f0c15529e65deb16e4f9039007d0e1c55458f05f WHIRLPOOL 82fbec856d51fd38e1e055dd7eacd1109867ba97b865488313cde171c37c288846898c25c9eb229ed3868728b619fc35c0f6561a24a20e18cda3db18bdcb2805

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160726.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160726.ebuild
deleted file mode 100644
index 817e45f..0000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160726.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans Web Services Common Cluster"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-26_00-02-33/zip/netbeans-trunk-nightly-201607260002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-ide-${PV}"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.websvccommon -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/websvccommon >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-	grep -E "/websvccommon$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/websvccommon
-}

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 754368e..ff5a08c 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99e
 DIST netbeans-l10n-8.0.1-20141110.tar.bz2 12065358 SHA256 542d325cbc6e0e617f6076e964e37803ec322b6d0ee4724a6d2127f2f480fb24 SHA512 28242dcbe7bcbc6a9abce15dfe6fd6140a275a417d96ff28228315bdc0ce8110ede899a1815e2fdf9115b48221d50cd3ff5b71a15d36316d04d81f66e9c0cac4 WHIRLPOOL 0318caea3463d3f7bb8876774b1cc9467dadd9bc36497a9304ed12900e2fabdc4dcdfec0b9eaee27bb36c39e9caff3743c5a42ad4c3a432205a716832688c4d6
 DIST netbeans-l10n-8.1-20151105.tar.bz2 11945028 SHA256 33e86aa7315021d28fdb64790233327d7599c98bcf3ab9d936b6fe924884325a SHA512 eb3163eaa8add417a0e8ac3ed4923a6e4992a80eaac00a01eed24e0e1ceb8a5cbd308659bcf0e5e1192ac8e84a79ea36744ad6b2589d60891b03b37102e9435d WHIRLPOOL f214a865bfd8c54341fb9d538da6db4d9b24906b0d94b3ee6cbf4a525e8842d28e852febb2f34c4c31f989d1b6baf750480bc2f04d94bcd7a8bdb8c9553ef590
 DIST netbeans-l10n-9999-20131010.tar.bz2 12440242 SHA256 64c48605820ec1f35e38c34b48cc16cd40c053d085d50819d4b4e9a80453dfa9 SHA512 7d4d61fa61710186fefd90721598ec635db7c6249ce6fc484fd5813636220f163b60230349c984c398c87e083d2d629c531fe5b4cea3752ebbcaa9823b701a02 WHIRLPOOL 10506e3a3004d6c0ab17b05507f72db2c25d2713c3233a7f5478da27d3b1261b5fb6d5f71cbf369858668ca2d1219dad1900c6c42d3f250adcc935e846e56b09
-DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0bf64eb9954902ac044869706bfb6bc6a3d6c3180db184249a94 SHA512 cf146c2b53ecf99feb93cb3ece2eb8be14b3764587d9dac5b783c5486e3f9ce1aa7bea55f3289e6aa8d4661511ed733f6bc125067ad83cff356dc46380cd8eeb WHIRLPOOL e9af0196209422a27085122ef2f2c3499f18ca82a01ee9fd4e6cd5ccf51888d26429e2dd90b705e0d2bc0c195856598f13715ae29ffa64b174e02e1617c3dd07
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
 DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 DIST netbeans-trunk-nightly-201608090002-src.zip 217056261 SHA256 f0a275e932b5948c00e24beae1eb599f8c0912fa905997b1ef7b11345fddf60c SHA512 81761482cbd5e238e1c2597a4b9bcc506b32c296e4d6c0785fa8fe69e1d1a6ddc9f4a7f6dcdb8ed816f366fb840e01a5d8003cf289bb1735be74f9906d6c7575 WHIRLPOOL 903eb7d99f8fecafca4f3a06a567a5994f0602431d29c74df1a300785b62f205e1257c1c4158cb2f7706a6c8bf70c7e3b7d7e6503a96bcaefb7411be0d701f70
@@ -33,7 +32,6 @@ DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0e
 DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 6939 SHA256 6d77d80205042f72e52fa2a6d98f4d8d940e3298f2e67c4db48cf3360c9ad470 SHA512 70bae8da40f377610552d1e108797602a61130c3c7910bb8c65c832242937e8e26e986706197f21ecded09709facfa1b6b2753b845cf81dee8bf8335cbf3de55 WHIRLPOOL 27273a5debefbfdcbe9f45c5383c104ecea9e1b4dc7793c7941196dc8c4d17c708f6d7d6fdd7b328afd2c86254a9376e167df8f16f0356d9e5c8866d9d83986a
 EBUILD netbeans-9999_p20160727.ebuild 6939 SHA256 e82a22e92ca017a1a2a4c54f2016c3034ef959b32624efa09225367868628e60 SHA512 70c6ef34cc377ed8aa56ce01e2e7fde7dec41f6159dfea89cb85d753d3a5b0699eeb7d7c5aaadded4472c0b38bce830ec2941973b56bcca077c4895a0d13c84d WHIRLPOOL e01c3528904dd6c2978d0769d14759a062d1a6eecd9881dc023441b0c30fa3eb378d702c67a4a78bec433d6488c6b217dc176fbaab65fffb8a79d1c312d2f790
 EBUILD netbeans-9999_p20160805.ebuild 6939 SHA256 5ffdd07851b1d258f805db5481734db1921762bdf06cb56f6a14fca653bf85d4 SHA512 2ec0e15dcb6068967d6a687b262e13c9b67f83a6062baabedbe633adc4b4b0021dec52b57a8ee1496510343a2d2ae4c39173b69fe9d1e6178bb86a43d862999c WHIRLPOOL 67f4ab9b4d2d87377dbe3e86220d7df00b6b385ce7e2f8aa7490c980c26154c25449b07705d90c9414a533b3006319bb0b1035201da823afca2e94d8fb9b3ce3
 EBUILD netbeans-9999_p20160809.ebuild 6939 SHA256 14fa042412f2449b87aba41ca4810563119707c2a7c87c7a54a1db64767ae506 SHA512 70021add22dccf7c1025dea3ece4cc3ce4f34c130f7df3d27f76e995d13ad0b8659692c8fd81fd3e3d61282b001551992c1468b76fa0c7f45e106c4ce5d2a2c8 WHIRLPOOL 60190142aa282065144f7453cab9e5f2e64dbe9f20d1e16f546a9d191a30ac19f358771311c4994a4910c2e7dfadf86abcf2f9e9cc1b34efd83c865a285f0e1e

diff --git a/dev-util/netbeans/netbeans-9999_p20160726.ebuild b/dev-util/netbeans/netbeans-9999_p20160726.ebuild
deleted file mode 100644
index 626acd7..0000000
--- a/dev-util/netbeans/netbeans-9999_p20160726.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans IDE"
-HOMEPAGE="http://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-07-26_00-02-33/zip/netbeans-trunk-nightly-201607260002-src.zip"
-PATCHES_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2"
-L10N_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-9999-20131010.tar.bz2"
-ALL_URLS="${SOURCE_URL} ${PATCHES_URL} ${L10N_URL}"
-SRC_URI="linguas_af? ( ${ALL_URLS} )
-	linguas_ar? ( ${ALL_URLS} )
-	linguas_ar_SA? ( ${ALL_URLS} )
-	linguas_bg? ( ${ALL_URLS} )
-	linguas_ca? ( ${ALL_URLS} )
-	linguas_cs? ( ${ALL_URLS} )
-	linguas_de? ( ${ALL_URLS} )
-	linguas_el? ( ${ALL_URLS} )
-	linguas_es? ( ${ALL_URLS} )
-	linguas_es_CO? ( ${ALL_URLS} )
-	linguas_fil? ( ${ALL_URLS} )
-	linguas_fr? ( ${ALL_URLS} )
-	linguas_gl? ( ${ALL_URLS} )
-	linguas_hi_IN? ( ${ALL_URLS} )
-	linguas_id_ID? ( ${ALL_URLS} )
-	linguas_it? ( ${ALL_URLS} )
-	linguas_ja? ( ${ALL_URLS} )
-	linguas_ko? ( ${ALL_URLS} )
-	linguas_lt? ( ${ALL_URLS} )
-	linguas_nl_BE? ( ${ALL_URLS} )
-	linguas_nl_NL? ( ${ALL_URLS} )
-	linguas_pl? ( ${ALL_URLS} )
-	linguas_pt_BR? ( ${ALL_URLS} )
-	linguas_pt_PT? ( ${ALL_URLS} )
-	linguas_ro? ( ${ALL_URLS} )
-	linguas_ru? ( ${ALL_URLS} )
-	linguas_si? ( ${ALL_URLS} )
-	linguas_sq? ( ${ALL_URLS} )
-	linguas_sr? ( ${ALL_URLS} )
-	linguas_sv? ( ${ALL_URLS} )
-	linguas_ta_IN? ( ${ALL_URLS} )
-	linguas_tr? ( ${ALL_URLS} )
-	linguas_vi? ( ${ALL_URLS} )
-	linguas_zh_CN? ( ${ALL_URLS} )
-	linguas_zh_TW? ( ${ALL_URLS} )
-"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE_NETBEANS_MODULES="
-	+netbeans_modules_apisupport
-	netbeans_modules_cnd
-	netbeans_modules_dlight
-	netbeans_modules_enterprise
-	netbeans_modules_ergonomics
-	netbeans_modules_extide
-	netbeans_modules_groovy
-	+netbeans_modules_java
-	netbeans_modules_javacard
-	+netbeans_modules_javafx
-	netbeans_modules_mobility
-	netbeans_modules_php
-	+netbeans_modules_profiler
-	netbeans_modules_webcommon
-	+netbeans_modules_websvccommon"
-IUSE_LINGUAS="
-	linguas_af
-	linguas_ar
-	linguas_ar_SA
-	linguas_bg
-	linguas_ca
-	linguas_cs
-	linguas_de
-	linguas_el
-	linguas_es
-	linguas_es_CO
-	linguas_fil
-	linguas_fr
-	linguas_gl
-	linguas_hi_IN
-	linguas_id_ID
-	linguas_it
-	linguas_ja
-	linguas_ko
-	linguas_lt
-	linguas_nl_BE
-	linguas_nl_NL
-	linguas_pl
-	linguas_pt_BR
-	linguas_pt_PT
-	linguas_ro
-	linguas_ru
-	linguas_si
-	linguas_sq
-	linguas_sr
-	linguas_sv
-	linguas_ta_IN
-	linguas_tr
-	linguas_vi
-	linguas_zh_CN
-	linguas_zh_TW"
-IUSE="doc ${IUSE_NETBEANS_MODULES} ${IUSE_LINGUAS}"
-S="${WORKDIR}"
-
-DEPEND=">=virtual/jdk-1.7
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-nb-${PV}
-	~dev-java/netbeans-platform-${PV}
-	netbeans_modules_apisupport? ( ~dev-java/netbeans-apisupport-${PV} )
-	netbeans_modules_cnd? ( ~dev-java/netbeans-cnd-${PV} )
-	netbeans_modules_dlight? ( ~dev-java/netbeans-dlight-${PV} )
-	netbeans_modules_enterprise? ( ~dev-java/netbeans-enterprise-${PV} )
-	netbeans_modules_ergonomics? ( ~dev-java/netbeans-ergonomics-${PV} )
-	netbeans_modules_extide? ( ~dev-java/netbeans-extide-${PV} )
-	netbeans_modules_groovy? ( ~dev-java/netbeans-groovy-${PV} )
-	netbeans_modules_java? ( ~dev-java/netbeans-java-${PV} )
-	netbeans_modules_javacard? ( ~dev-java/netbeans-javacard-${PV} )
-	netbeans_modules_javafx? ( ~dev-java/netbeans-javafx-${PV} )
-	netbeans_modules_mobility? ( ~dev-java/netbeans-mobility-${PV} )
-	netbeans_modules_php? ( ~dev-java/netbeans-php-${PV} )
-	netbeans_modules_profiler? ( ~dev-java/netbeans-profiler-${PV} )
-	netbeans_modules_webcommon? ( ~dev-java/netbeans-webcommon-${PV} )
-	netbeans_modules_websvccommon? ( ~dev-java/netbeans-websvccommon-${PV} )
-	doc? ( ~dev-java/netbeans-javadoc-${PV} )"
-
-JAVA_PKG_BSFIX="off"
-NBLOCALES=""
-
-pkg_setup() {
-	for lingua in ${IUSE_LINGUAS} ; do
-		local lang=${lingua/linguas_/}
-
-		if [[ "${lang}" = "ar" ]] ; then
-			lang="ar_EG,ar_SA"
-		elif [[ "${lang}" = "es" ]] ; then
-			lang="es,es_CO"
-		elif [[ "${lang}" = "fil" ]] ; then
-			lang="fil_PH"
-		elif [[ "${lang}" = "gl" ]] ; then
-			lang="gl_ES"
-		elif [[ "${lang}" = "id_ID" ]] ; then
-			lang="in_ID"
-		fi
-
-		if use ${lingua} ; then
-			if [ -z "${NBLOCALES}" ] ; then
-				NBLOCALES="${lang}"
-			else
-				NBLOCALES="${NBLOCALES},${lang}"
-			fi
-		fi
-	done
-
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	if [ -n "${NBLOCALES}" ] ; then
-		unpack $(basename ${SOURCE_URL})
-		unpack $(basename ${L10N_URL})
-
-		einfo "Deleting bundled jars..."
-		find -name "*.jar" -type f -delete
-
-		unpack netbeans-9999-r16-build.xml.patch.bz2
-	fi
-}
-
-src_prepare() {
-	if [ -n "${NBLOCALES}" ] ; then
-		einfo "Deleting bundled class files..."
-		find -name "*.class" -type f | xargs rm -vf
-
-		epatch netbeans-9999-r16-build.xml.patch
-
-		# Support for custom patches
-		if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-			local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-			if [ -n "${files}" ] ; then
-				einfo "Applying custom patches:"
-
-				for file in ${files} ; do
-					epatch "${file}"
-				done
-			fi
-		fi
-
-		einfo "Symlinking external libraries..."
-		java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	fi
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	if [ -n "${NBLOCALES}" ] ; then
-		einfo "Compiling support for locales: ${NBLOCALES}"
-		eant -f nbbuild/build.xml bootstrap || die
-		eant -Dlocales=${NBLOCALES} -Ddist.dir=../nbbuild/netbeans -Dnbms.dir="" -Dnbms.dist.dir="" \
-			-Dpermit.jdk7.builds=true -f l10n/build.xml build || die
-	fi
-}
-
-src_install() {
-	if [ -n "${NBLOCALES}" ] ; then
-		pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-		for cluster in apisupport cnd dlight enterprise ergonomics groovy harness ide java javacard javafx mobility php platform profiler webcommon websvccommon ; do
-			if [ -d "${cluster}" ] ; then
-				insinto /usr/share/netbeans-${cluster}-${SLOT}
-				doins -r ${cluster}/*
-			fi
-		done
-
-		if [ -d nb ] ; then
-			insinto /usr/share/netbeans-nb-${SLOT}/nb
-			doins -r nb/*
-		fi
-
-		popd >/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	if [ -n "${NBLOCALES}" ] ; then
-		einfo "Netbeans automatically starts with the locale you have set in your user profile, if"
-		einfo "the locale is built for Netbeans."
-		einfo "If you want to force specific locale, use --locale argument, for example:"
-		einfo "${PN}-${SLOT} --locale de"
-		einfo "${PN}-${SLOT} --locale pt:BR"
-	fi
-
-	if use linguas_ar ; then
-		einfo
-		einfo "You selected Arabic locale so you can choose either ar:EG or ar:SA variant."
-	fi
-
-	if use linguas_es ; then
-		einfo
-		einfo "You selected Spanish locale so you can choose either es or es:CO variant."
-	fi
-
-	if use linguas_id_ID ; then
-		einfo
-		einfo "You selected Indonesian locale which has locale code in:ID in Netbeans."
-	fi
-}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-09-05  7:20 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-05  7:20 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-javacard/, dev-java/netbeans-apisupport/, Miroslav Šulc
  -- strict thread matches above, loose matches on Subject: below --
2016-02-03 11:24 Miroslav Šulc

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