public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-enterprise/, dev-java/netbeans-javadoc/, ...
@ 2016-05-08  6:34 Miroslav Šulc
  0 siblings, 0 replies; 4+ messages in thread
From: Miroslav Šulc @ 2016-05-08  6:34 UTC (permalink / raw
  To: gentoo-commits

commit:     a28252da9a5c5ee1214ea42df33639ae40f4b21e
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun May  8 06:34:07 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun May  8 06:34:07 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=a28252da

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.2.28

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index b26f9e0..9c5b3cb 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -13,6 +13,7 @@ DIST netbeans-trunk-nightly-201605040002-src.zip 213470987 SHA256 432c7c5f60ad6f
 DIST netbeans-trunk-nightly-201605050002-src.zip 213471902 SHA256 808e9bbc57afb9470a01ffb85b645005db1dd98c035b45296d9356f1d5f4c793 SHA512 ea4d5572fb790e50fd1d62724ac1a15caad9e01c8c9309ef8995f8e92091ba29b8fda1ee8ca14574fd5c1a07f92868216cea70f908e1ed1f734ee6ce65da9286 WHIRLPOOL 6bb173180d5b788091651ff0194ad5136d2048faf006324eb9040243897da622f2c363135b727ba12de2c4895a38fb98d28c0df6520599751582b3f94aa6d948
 DIST netbeans-trunk-nightly-201605060002-src.zip 213515050 SHA256 cc8ff54e7ae990f944e127d51b2bae614a7a5a117e3093342cf8f0a55ac320c5 SHA512 e460aa9dc8713c154400cacffd3b3c999ef9d3df8703ec8b74f597c54bba2172b7225e6a8adc22ad0a43762f4a4a887d57f517608b79af8db4d37a1d3371c80e WHIRLPOOL f6e80814ee3a79e03703cc3c3eab7194ea6f306fc6666409eb980a21e11a6b57250ea23138a61790edc81f8cf0083cd7ea1af7aa9f743e0db16857e41b761fd3
 DIST netbeans-trunk-nightly-201605070002-src.zip 213540102 SHA256 6a040f33a06dc6f57384b7d17a354cbffd3f5f78cdded520022e4ac8d48214e7 SHA512 3210979db5446f32df0fed36c091473116b2cbfec3f5fffd675e8e81357cd3f94e2edd0d06f903f5d4a32ccc48e2c0d914102a6eefcb4273712943f029ce9619 WHIRLPOOL b507b5b2ab4dd90b540595636904bb3328ffc4c7ff3a7e0d7a69422bd18145658b6f4bf115270677d7a68d5525234359a60b506096b94385a60e7979227a2fca
+DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 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_p20160428.ebuild 3384 SHA256 e866d9fd43d85c959d598d6111e061a3138aea2a9133f516f547a15370086e3a SHA512 cdf600716d69e7b50162f7556e2f70c6cfe9c998c94529be32305cb6bcf732ff568cdb7a3529478c12c72693a8aaa3edd10b2e752f875f6a40ef9599daff9bc1 WHIRLPOOL 5571ecd51924a63326a4759bdd584da6e7c2e5f9b33b7eeea01e4afbd58d6bdf6360e964896112aab5dde57c7b52d136e37e35f35883f3762543afb28a84cd42
@@ -25,4 +26,5 @@ EBUILD netbeans-apisupport-9999_p20160504.ebuild 3384 SHA256 b538e26b62174ce9bd4
 EBUILD netbeans-apisupport-9999_p20160505.ebuild 3384 SHA256 8fd3400eeea06b1cad395d647633856e003360cd220a4610b1ed7b002513ad41 SHA512 80bcde442c49a64d8bc853ee89a87ffb4296a20a2232b032f5f6f4f7c8d6f556148b99b4a3b8af5e6e6f77d9265842b02dad481bada861c2a2186b932a91c36b WHIRLPOOL a9aea3e22e8649126e250ee111d75335d50ca8df0ae3c3c18a1f21a944ab6d4f01e68ab43d20802011334bfb0350bec072719eaeb5684d665a9fc391afe93e69
 EBUILD netbeans-apisupport-9999_p20160506.ebuild 3384 SHA256 4f78c8aa5383f64832da15491e388b8b803060f97ca21ef73a1cac1de91349c6 SHA512 c8e796157279ccadc99507f566e2d52aac850046385ffe426483704b10eb6fcb1c26b38716f02195dea7122d6c8df5474c5b21ce1a2edc39c8638706f4047732 WHIRLPOOL a41a8ecd221e43532bff16d2edf156becccbf3b4254eba029c7d3f0151600bd91ec99e4fab193d756250baba7c4d7ba1b356c207503f7f0d81501c28c8c9b1b6
 EBUILD netbeans-apisupport-9999_p20160507.ebuild 3384 SHA256 ae79acb7c64cebe92ccd65514b6437077d296f8facbb2930dfac71a259119fa0 SHA512 8a17e730f3b40f0cff89eb8c6c57d71c1da7bfeea8afb96ceabcc5b72760f04626ca9de629091ada9e360403b5a5d6feed811f6569798f362c591260d9d62484 WHIRLPOOL 162a119c6ac1226a66f8cfecf0ecb63f159690bec4bdf23e45d583d845c05d607624cf9afb2a1efed2c58d8348cdf5f11737fcbc2c887d85eec3b0b1204fcf69
+EBUILD netbeans-apisupport-9999_p20160508.ebuild 3384 SHA256 61ba5483e2004475b2c7bea0f45961c63233cf5d9fc23226ea238999e0c61711 SHA512 1962ce40f3ba4505b0c80562a6e9a1267d2d0c1d3b2051b54b5b5977223093e2f760e699784ecb19421074b52b5a112281dbd6a9ef617e0cb88f537288c06586 WHIRLPOOL fa0de9ba1ab7043f95017b86763b56558d6e2b6c2379992fd55653196489be8fa8e1f38dc306476ba395d0b24ddf104b7c2574a6c419ca740084c86e4fef5123
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160508.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160508.ebuild
new file mode 100644
index 0000000..f88ef98
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160508.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-05-08_00-02-33/zip/netbeans-trunk-nightly-201605080002-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 2951846..702a957 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201605040002-src.zip 213470987 SHA256 432c7c5f60ad6f
 DIST netbeans-trunk-nightly-201605050002-src.zip 213471902 SHA256 808e9bbc57afb9470a01ffb85b645005db1dd98c035b45296d9356f1d5f4c793 SHA512 ea4d5572fb790e50fd1d62724ac1a15caad9e01c8c9309ef8995f8e92091ba29b8fda1ee8ca14574fd5c1a07f92868216cea70f908e1ed1f734ee6ce65da9286 WHIRLPOOL 6bb173180d5b788091651ff0194ad5136d2048faf006324eb9040243897da622f2c363135b727ba12de2c4895a38fb98d28c0df6520599751582b3f94aa6d948
 DIST netbeans-trunk-nightly-201605060002-src.zip 213515050 SHA256 cc8ff54e7ae990f944e127d51b2bae614a7a5a117e3093342cf8f0a55ac320c5 SHA512 e460aa9dc8713c154400cacffd3b3c999ef9d3df8703ec8b74f597c54bba2172b7225e6a8adc22ad0a43762f4a4a887d57f517608b79af8db4d37a1d3371c80e WHIRLPOOL f6e80814ee3a79e03703cc3c3eab7194ea6f306fc6666409eb980a21e11a6b57250ea23138a61790edc81f8cf0083cd7ea1af7aa9f743e0db16857e41b761fd3
 DIST netbeans-trunk-nightly-201605070002-src.zip 213540102 SHA256 6a040f33a06dc6f57384b7d17a354cbffd3f5f78cdded520022e4ac8d48214e7 SHA512 3210979db5446f32df0fed36c091473116b2cbfec3f5fffd675e8e81357cd3f94e2edd0d06f903f5d4a32ccc48e2c0d914102a6eefcb4273712943f029ce9619 WHIRLPOOL b507b5b2ab4dd90b540595636904bb3328ffc4c7ff3a7e0d7a69422bd18145658b6f4bf115270677d7a68d5525234359a60b506096b94385a60e7979227a2fca
+DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 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_p20160428.ebuild 4790 SHA256 af153a0e0435678331a5a5a43c3f393786a0f804dedbc7fbccc3b539cea583bf SHA512 cae08e9b98753c358da559fdf3387c860fd8ba8a4dd5d787f843b4cfe8f1aacf9bb1d57be5b7e52849abcfcc219262b8bcc338a6ff05451aefd2e434a4d86eee WHIRLPOOL bfaf9faa4bbed952d542ec45d51daa200bb307a922889ad6b586fec4f3386ca995ca1dac974e789a072abb4d69b58ae7c0056086966329af07244a23c0924370
@@ -37,4 +38,5 @@ EBUILD netbeans-cnd-9999_p20160504.ebuild 4790 SHA256 0534dc35f278f625fad58f0da7
 EBUILD netbeans-cnd-9999_p20160505.ebuild 4790 SHA256 173cca31f0e271ff6cd1944af0cc34f57624eef724facaf96df6f6ab6942fd68 SHA512 79eb381578f98852716e40c7f379c13928cc795c2475ecdfa02b16e2b01d429e395c545411ae32009680664f62ded63faaebd02c9a16126fa7b20503421c6258 WHIRLPOOL 2322422b2ce3b8b0d477d58558374b79f57ff58c1fb8fea610be7184c2fdb629c3c634f755c30bc6059bcab610267c794f8536fd3af0e246a8270b53066b7910
 EBUILD netbeans-cnd-9999_p20160506.ebuild 4790 SHA256 8cfb057e63732f9dd06b1bf1682fc6468986fa37d7fe67d85c5de1f014a2cb50 SHA512 c7bbccc2813f96379000fc8189c393eb79b22951d069efaad606ae34892519f024056f279e37c9744a4a6f2017d1a60a0bd25ea28b17ca3f18c9f0814f277f4f WHIRLPOOL a792feed58ff245a4e99d31ec94f995e2ee0fa9b9e96fac7bf7bfb9c661b8788f67a6d5bfa291739d7c1e5a0cd283384c2ebaf4f894c62de3779aab7e6b35198
 EBUILD netbeans-cnd-9999_p20160507.ebuild 4790 SHA256 b757a262243b08e47ee3adb9d7a9903966abbed2b8d3a17f5fabd960ec76f66c SHA512 b673e91a1e6af4f11369f9a8d67e3cb8f16acc0d6415d589fb89b4c5d696e22111064b3345f4a70279b18a7c3096ab1d7099a7c3a3d43e2fa9bd7057dcedc347 WHIRLPOOL fda9bdc1843e8abf24b9c672f69d98c93c9246ca926a6e301f20aa15dc30a506f4f8e9f9e113d692c2974bcf3cc2bb0f295c560ed81b1402303ce73cfe5a4fa0
+EBUILD netbeans-cnd-9999_p20160508.ebuild 4790 SHA256 fc7ea76cdc4b24eba4336f573331143c12dc1293b8b71de66c16575b7733e54e SHA512 ad209f568643a44e3f06050b1be9717213d0c7829e30913f1d8b4c165e87d25ca00a4d11fd7b6d724041a5e37cd9e215ff1d4352bd0a6e0f4b5354e0c96e9fec WHIRLPOOL 4a529fe1254fe901404fd4234bccf0a43b5e26cee5a33c074c7a3096c2331adfc1ab8706d63924b2f5e384261578936595fbb106c4f61d625fa86771f83182dc
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160508.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160508.ebuild
new file mode 100644
index 0000000..c43eaca
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160508.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-05-08_00-02-33/zip/netbeans-trunk-nightly-201605080002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar
+	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
+	http://hg.netbeans.org/binaries/85FD13415B0553D6421F4BBA5FE0F587B9748B20-clank_0.3.6.zip
+	http://hg.netbeans.org/binaries/4E984D00D9ABA25E7C9F65B2CD3BBA56DE82B648-cnd-build-trace-1.0.zip
+	http://hg.netbeans.org/binaries/E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip
+	http://hg.netbeans.org/binaries/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+# These files are for remote development and debugging
+QA_PREBUILT="usr/share/netbeans-cnd-${SLOT}/bin/*"
+
+CDEPEND="~dev-java/netbeans-dlight-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	>=dev-java/jna-3.4.0
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.cnd -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r16-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar libs.antlr3.devel/external/antlr-3.4.jar || die
+	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
+	ln -s "${DISTDIR}"/85FD13415B0553D6421F4BBA5FE0F587B9748B20-clank_0.3.6.zip libs.clank/external/clank_0.3.6.zip || die
+	ln -s "${DISTDIR}"/4E984D00D9ABA25E7C9F65B2CD3BBA56DE82B648-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 e6bf991..c290f47 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -16,6 +16,7 @@ DIST netbeans-trunk-nightly-201605040002-src.zip 213470987 SHA256 432c7c5f60ad6f
 DIST netbeans-trunk-nightly-201605050002-src.zip 213471902 SHA256 808e9bbc57afb9470a01ffb85b645005db1dd98c035b45296d9356f1d5f4c793 SHA512 ea4d5572fb790e50fd1d62724ac1a15caad9e01c8c9309ef8995f8e92091ba29b8fda1ee8ca14574fd5c1a07f92868216cea70f908e1ed1f734ee6ce65da9286 WHIRLPOOL 6bb173180d5b788091651ff0194ad5136d2048faf006324eb9040243897da622f2c363135b727ba12de2c4895a38fb98d28c0df6520599751582b3f94aa6d948
 DIST netbeans-trunk-nightly-201605060002-src.zip 213515050 SHA256 cc8ff54e7ae990f944e127d51b2bae614a7a5a117e3093342cf8f0a55ac320c5 SHA512 e460aa9dc8713c154400cacffd3b3c999ef9d3df8703ec8b74f597c54bba2172b7225e6a8adc22ad0a43762f4a4a887d57f517608b79af8db4d37a1d3371c80e WHIRLPOOL f6e80814ee3a79e03703cc3c3eab7194ea6f306fc6666409eb980a21e11a6b57250ea23138a61790edc81f8cf0083cd7ea1af7aa9f743e0db16857e41b761fd3
 DIST netbeans-trunk-nightly-201605070002-src.zip 213540102 SHA256 6a040f33a06dc6f57384b7d17a354cbffd3f5f78cdded520022e4ac8d48214e7 SHA512 3210979db5446f32df0fed36c091473116b2cbfec3f5fffd675e8e81357cd3f94e2edd0d06f903f5d4a32ccc48e2c0d914102a6eefcb4273712943f029ce9619 WHIRLPOOL b507b5b2ab4dd90b540595636904bb3328ffc4c7ff3a7e0d7a69422bd18145658b6f4bf115270677d7a68d5525234359a60b506096b94385a60e7979227a2fca
+DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 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_p20160428.ebuild 2968 SHA256 a78d9fe846d94ed422c84a3dd06ff9b4eba872d64ffd217817f93f3bface22ba SHA512 c8ba6923704e00c0da015c99217c078e2eb3b548fa80f0a17d6189e94e7781ae57cb5c9a67e3921fb1c4dbba717b73cb0b56542ad247c0ec740578cf981ed78d WHIRLPOOL 6828cb5cd0d0669bf1114d12f86dbc386cb3f49df002501b61bfc518c507882f961ebc63cce7e9d3382961189be71e51ca4acedcbc93c9d7547bcd93b9f36750
@@ -28,4 +29,5 @@ EBUILD netbeans-dlight-9999_p20160504.ebuild 2968 SHA256 c31dcca14083b07d621e3a5
 EBUILD netbeans-dlight-9999_p20160505.ebuild 2968 SHA256 df406609c6dea46a11bb1f9518e09df7bdfcec545723e1af334b73b947041be4 SHA512 78af4ac0fe2af4b45d5d92654471bbee098490c9467bffa4b0027735767e68a259d6ce367efaff515a754b49ef0d6c0d7639b45a63d84275e70755ecc3cf7b69 WHIRLPOOL 3eedf9771b5dd62438e73c6b2970edbccc36310ae53c4af9061caaabae1777eeb3ae5d16a3335a2446073ca643866028c847450fe466fafff28d80f91f68edce
 EBUILD netbeans-dlight-9999_p20160506.ebuild 2968 SHA256 f071a634b1c0c1ccc5e519d61c9a15b8b2243ad7d7052d1e681e3407d2e6d46a SHA512 954dfd1a8fb88d212b686bf16f70e94fbad1f1b90abbc6301adefff742ead2003f447fcff628ded4352d3bfa6b35347c13ba2e78475ae8f4af480423fe95ce52 WHIRLPOOL 4bba51bedc361c2cea5d61243c6222c1f2f695d2232aad42da4d4a493f2601d94fecb76a0ea47d555ddf07e82fd3c5a68bb98420d081de0c341971f1b848da9c
 EBUILD netbeans-dlight-9999_p20160507.ebuild 2968 SHA256 8a863ea0e2ea87cd29f49b20a9e7bc65fffb94ef42b7046faa9283f591efe440 SHA512 ad259516b255f559005c4bc5c732a4c8be87180f1bfde76575be672605de880293a3a07c1879631c3b1d6e3d022fd0da2af2313792a037b72bf537b7ae9989e7 WHIRLPOOL db5bdf4f463605981126e4b0392a79f97dd87a7986dec84c93aaac823effcdaf060de5db92c24611ed0548a8ac846141bd075ecdc3407427afbbaab39cbf470a
+EBUILD netbeans-dlight-9999_p20160508.ebuild 2968 SHA256 4e995c8c7dad8e19189296675718454986ed6bf2d864ea87f9728a6fe23e52e9 SHA512 42ae7bb92998312e3c9473751421e32381aec11859cb4666bf5ae4177947d7c7b83e3e1444c76e6dfc6f2f42f378d5ed3df1c1f77cb701f57943f22a4f4122c2 WHIRLPOOL 85b6bb59f0ac646919204db6651c344b4aebc8c6cf6767bcad21024128959f12eaa7cc4ee8fb08de5e0bcdfca387243b9054af9abf2955fe80895c83abbb57ee
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160508.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160508.ebuild
new file mode 100644
index 0000000..09fa69b
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160508.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-05-08_00-02-33/zip/netbeans-trunk-nightly-201605080002-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 a7e5961..ebf5d83 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -45,6 +45,7 @@ DIST netbeans-trunk-nightly-201605040002-src.zip 213470987 SHA256 432c7c5f60ad6f
 DIST netbeans-trunk-nightly-201605050002-src.zip 213471902 SHA256 808e9bbc57afb9470a01ffb85b645005db1dd98c035b45296d9356f1d5f4c793 SHA512 ea4d5572fb790e50fd1d62724ac1a15caad9e01c8c9309ef8995f8e92091ba29b8fda1ee8ca14574fd5c1a07f92868216cea70f908e1ed1f734ee6ce65da9286 WHIRLPOOL 6bb173180d5b788091651ff0194ad5136d2048faf006324eb9040243897da622f2c363135b727ba12de2c4895a38fb98d28c0df6520599751582b3f94aa6d948
 DIST netbeans-trunk-nightly-201605060002-src.zip 213515050 SHA256 cc8ff54e7ae990f944e127d51b2bae614a7a5a117e3093342cf8f0a55ac320c5 SHA512 e460aa9dc8713c154400cacffd3b3c999ef9d3df8703ec8b74f597c54bba2172b7225e6a8adc22ad0a43762f4a4a887d57f517608b79af8db4d37a1d3371c80e WHIRLPOOL f6e80814ee3a79e03703cc3c3eab7194ea6f306fc6666409eb980a21e11a6b57250ea23138a61790edc81f8cf0083cd7ea1af7aa9f743e0db16857e41b761fd3
 DIST netbeans-trunk-nightly-201605070002-src.zip 213540102 SHA256 6a040f33a06dc6f57384b7d17a354cbffd3f5f78cdded520022e4ac8d48214e7 SHA512 3210979db5446f32df0fed36c091473116b2cbfec3f5fffd675e8e81357cd3f94e2edd0d06f903f5d4a32ccc48e2c0d914102a6eefcb4273712943f029ce9619 WHIRLPOOL b507b5b2ab4dd90b540595636904bb3328ffc4c7ff3a7e0d7a69422bd18145658b6f4bf115270677d7a68d5525234359a60b506096b94385a60e7979227a2fca
+DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 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_p20160428.ebuild 15825 SHA256 d36265c231f1f56c998acc0e6268f1c61be91492a9243785066dbbfc6ff3053f SHA512 c7c3a2ab27a93d457f5f95341b6e740e66ee57dca0998cadb6f97842084a2450669fefb0bf3611c52df23b266bef5004b916e769e2fd6886915705729d79e91f WHIRLPOOL 8e461fad4f405bda6a70b1024fd9ef18b8070deda66b328838cd1eb6b0665727553075222d489c2f657eb286da8c33b48f1de347efd514f28860c8aa397c076c
@@ -57,4 +58,5 @@ EBUILD netbeans-enterprise-9999_p20160504.ebuild 15825 SHA256 294c324135d41c8ffa
 EBUILD netbeans-enterprise-9999_p20160505.ebuild 15825 SHA256 8da1648c9f26e48e55ff58fdc9eed9d9cd9820949d85eacdbca52c27bf57e0fe SHA512 28808fae58b3eaa0a4128f29d4fdead96eab5f51a640c61c4fa9a3ccefa0e8604cdcf16014fd9895478999f85760604db0e8ef59b21df4d80be42651076b8348 WHIRLPOOL b37551986ffc10ed84be7eca623674490e85e4443cf91efd75709db2d6cd92d072b541707fc069447dbf438876d4987c53b7865e9be24fc529b967721f8c8aab
 EBUILD netbeans-enterprise-9999_p20160506.ebuild 15825 SHA256 72a954557f27b6451a9b6b9dda47e15dcf8978babf72cb04af8a7dfc89cdeb04 SHA512 08680acc34681c1ba50aa806c0bb0c6b1ba42b7efd5c2cf4cabf1057d823ca82baba6e9cdaa764374013a7bbe3f5474155e5d3179e74b44f5d7891a55812dbc6 WHIRLPOOL d5538887358557a55bd8dc0ff18f3c272d26ebd2662869f5b21d2eab825b87919b0139ee9d55e4be13e34d33fd2be38b953574910cc0048f3651d42dabb8819d
 EBUILD netbeans-enterprise-9999_p20160507.ebuild 15825 SHA256 cd489fd2fe291118ea7c0e354aa83ccd671216de7ae82d0711464636d22b1e76 SHA512 e2123f67def93ada7c404723e4dffd805b760783a91c1593351d734f86b8073f425d730157903a9623f13590b660458ca418fedf2246120902eabd959b443afe WHIRLPOOL c75ebdccf46bc9dbab0b7afad83d8176ad2458d1e867124e388eb21d2cfbb31dd73b1f3b53a221e8526c05e44b100a934a4dfb82c160cb3d35b3ff3e4463f3c3
+EBUILD netbeans-enterprise-9999_p20160508.ebuild 15825 SHA256 bcf66354128206178639fcf4bb5bea1d5f466ad468bee9c12dc84ccfc965fd42 SHA512 fc599048d57451c2a79f6a463b4c0cc19070dad376f178281803f514e035b03c5d85be7598e08b7ac0712793e0766bfdeb08a51b7d03531883e7a29d1bdb7492 WHIRLPOOL 6f08fe9672954cba7c98092f18cc6ead68865f2bc6606fce04fceec261007e50539974c3a395d74fc2f44117cc1ccc882aa116cb18d331eb150171e57d106e0a
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160508.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160508.ebuild
new file mode 100644
index 0000000..49767c6
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160508.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-05-08_00-02-33/zip/netbeans-trunk-nightly-201605080002-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 8b8cf78..23d163f 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -13,6 +13,7 @@ DIST netbeans-trunk-nightly-201605040002-src.zip 213470987 SHA256 432c7c5f60ad6f
 DIST netbeans-trunk-nightly-201605050002-src.zip 213471902 SHA256 808e9bbc57afb9470a01ffb85b645005db1dd98c035b45296d9356f1d5f4c793 SHA512 ea4d5572fb790e50fd1d62724ac1a15caad9e01c8c9309ef8995f8e92091ba29b8fda1ee8ca14574fd5c1a07f92868216cea70f908e1ed1f734ee6ce65da9286 WHIRLPOOL 6bb173180d5b788091651ff0194ad5136d2048faf006324eb9040243897da622f2c363135b727ba12de2c4895a38fb98d28c0df6520599751582b3f94aa6d948
 DIST netbeans-trunk-nightly-201605060002-src.zip 213515050 SHA256 cc8ff54e7ae990f944e127d51b2bae614a7a5a117e3093342cf8f0a55ac320c5 SHA512 e460aa9dc8713c154400cacffd3b3c999ef9d3df8703ec8b74f597c54bba2172b7225e6a8adc22ad0a43762f4a4a887d57f517608b79af8db4d37a1d3371c80e WHIRLPOOL f6e80814ee3a79e03703cc3c3eab7194ea6f306fc6666409eb980a21e11a6b57250ea23138a61790edc81f8cf0083cd7ea1af7aa9f743e0db16857e41b761fd3
 DIST netbeans-trunk-nightly-201605070002-src.zip 213540102 SHA256 6a040f33a06dc6f57384b7d17a354cbffd3f5f78cdded520022e4ac8d48214e7 SHA512 3210979db5446f32df0fed36c091473116b2cbfec3f5fffd675e8e81357cd3f94e2edd0d06f903f5d4a32ccc48e2c0d914102a6eefcb4273712943f029ce9619 WHIRLPOOL b507b5b2ab4dd90b540595636904bb3328ffc4c7ff3a7e0d7a69422bd18145658b6f4bf115270677d7a68d5525234359a60b506096b94385a60e7979227a2fca
+DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 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_p20160428.ebuild 2913 SHA256 03be7f911ef9e0cc84ae0c302552ce8755cfb31022c087e620b214d4becdef0a SHA512 4961338b8b363a36000ab2ee47d567bf8bf7fdd7e10d63c046f9b1d00ea415390e1cfeae5d02d6090afaa5ab45f7c05b1aa3fc071f1c073eaacb288eddad4832 WHIRLPOOL 110c80e66dfd1e0f880f50fbbc8795445dfb62f6c6b7424b0791067b9b28c58979bd7e56f4df31d3da8f86aa33df43529c3d3f1c795ff14424e8530176c7db46
@@ -25,4 +26,5 @@ EBUILD netbeans-ergonomics-9999_p20160504.ebuild 2913 SHA256 f50cee0830f21b75cf6
 EBUILD netbeans-ergonomics-9999_p20160505.ebuild 2913 SHA256 dba5325a46925e55f1dd0157d15126c1098443eb6468ba152ac862feffda15e3 SHA512 4318a2362d21d33d5371eddbefcc3fae64641d1652990f477a3c271dadfcae70367da60d9070b3ba205874766927a5a1b0edeb6b4b04260c207b7bf7d2f88b7b WHIRLPOOL 8a8ad0ddb94beef6ecd90204a3309b46a4881db3d454ddc32fb74e8bccff555dd2099fa3aea8f9645097d168b82a40e147a0d7502a42d28ffa83a4827e069a1f
 EBUILD netbeans-ergonomics-9999_p20160506.ebuild 2913 SHA256 173e2ae37e01edcf3820068b00c762184fe28f9c2963e37c2c5a63bb0b85414a SHA512 eaa7133a0198026803331cfe911ed46b1f5effc74939381799b051db9ea24aae97803e18b43581c8b1f180a23bf9f214767392b0b4989e88dc96af44457bb824 WHIRLPOOL 53db449a8dd4e6c9dd2aa291613e3e05aa6d1b3f02bf731cf7fd54a1f513f9a5e3976861054fe013b30c48c8c081e5b441f45b7a9297f903e4c4324a0a35e597
 EBUILD netbeans-ergonomics-9999_p20160507.ebuild 2913 SHA256 559f3095401160088d42c1f1b035a0112cde0e2ad040f9ad8af1e16f5122d5a7 SHA512 323c85f7cbcfee0debde160d4bd280fd89aeb4a03faf52169a43582a629294f9abe9791e8d523651c3b199a73321b2d3e56f23a56d44852ad190217a2830b833 WHIRLPOOL 8520d1c31b3d37c7ed4d0705719764435e4415883227c496a81401fc0294519cfc215819bf4ddaae850161d22ee161aee072b8f22da27791ab19c728799ab1bc
+EBUILD netbeans-ergonomics-9999_p20160508.ebuild 2913 SHA256 8705444f8ef6951d5917790f0917e6bb9b12e0c0208794b5dd3085c6233cc494 SHA512 c36eec83394e3c84ba830163b4c412c13e0869c2cff3f298f986efb4dadf0b78465964f4d4cdd319845f423f135b2d115230d039f2f78dacb7a84bc175cf1469 WHIRLPOOL c40f6a6100f1927303d309d7230c13ab661bbd47f02ed250e8a5613feae60a0429952908b218bfcd4c085b8fb800efd4caaf2bc24ca14b3ff033aad8c0152b86
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160508.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160508.ebuild
new file mode 100644
index 0000000..b57d24c
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160508.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-05-08_00-02-33/zip/netbeans-trunk-nightly-201605080002-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 02872f8..88612d7 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -17,6 +17,7 @@ DIST netbeans-trunk-nightly-201605040002-src.zip 213470987 SHA256 432c7c5f60ad6f
 DIST netbeans-trunk-nightly-201605050002-src.zip 213471902 SHA256 808e9bbc57afb9470a01ffb85b645005db1dd98c035b45296d9356f1d5f4c793 SHA512 ea4d5572fb790e50fd1d62724ac1a15caad9e01c8c9309ef8995f8e92091ba29b8fda1ee8ca14574fd5c1a07f92868216cea70f908e1ed1f734ee6ce65da9286 WHIRLPOOL 6bb173180d5b788091651ff0194ad5136d2048faf006324eb9040243897da622f2c363135b727ba12de2c4895a38fb98d28c0df6520599751582b3f94aa6d948
 DIST netbeans-trunk-nightly-201605060002-src.zip 213515050 SHA256 cc8ff54e7ae990f944e127d51b2bae614a7a5a117e3093342cf8f0a55ac320c5 SHA512 e460aa9dc8713c154400cacffd3b3c999ef9d3df8703ec8b74f597c54bba2172b7225e6a8adc22ad0a43762f4a4a887d57f517608b79af8db4d37a1d3371c80e WHIRLPOOL f6e80814ee3a79e03703cc3c3eab7194ea6f306fc6666409eb980a21e11a6b57250ea23138a61790edc81f8cf0083cd7ea1af7aa9f743e0db16857e41b761fd3
 DIST netbeans-trunk-nightly-201605070002-src.zip 213540102 SHA256 6a040f33a06dc6f57384b7d17a354cbffd3f5f78cdded520022e4ac8d48214e7 SHA512 3210979db5446f32df0fed36c091473116b2cbfec3f5fffd675e8e81357cd3f94e2edd0d06f903f5d4a32ccc48e2c0d914102a6eefcb4273712943f029ce9619 WHIRLPOOL b507b5b2ab4dd90b540595636904bb3328ffc4c7ff3a7e0d7a69422bd18145658b6f4bf115270677d7a68d5525234359a60b506096b94385a60e7979227a2fca
+DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 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_p20160428.ebuild 3377 SHA256 b69e4995f884a7524e29274702b2eb3851dca8a7c74a618d98725fe26f951332 SHA512 c8fc3c04d1fc7b2586bcaa5972b1f40ac94b09097f4ad0333d50e9c494f2b2e131dd504c5a274d0b130b1887e2ace51eecca46f20fab32198a123591e6fde228 WHIRLPOOL d921c10e7a80ac065dea04ff546b5635eb8d251a37cc0d8b7533097cc4fc28683d3a60b1b9bb8459b1abc4878fdb306f07db6d80ca65e92dba9543b32866f412
@@ -29,4 +30,5 @@ EBUILD netbeans-extide-9999_p20160504.ebuild 3377 SHA256 edc6470cecbbde6d464589d
 EBUILD netbeans-extide-9999_p20160505.ebuild 3377 SHA256 a098e5af48ff5b8f0dac8ff42e34e866d4ba3c9d5eca0a505e874863dd4d48f6 SHA512 2cbdf74d125cf11164a2cc777e6672fee39d759b5b6e60287b8a3c10de428ad43d89922a1ee838f7f4b644bd961c57cf2dbde66db8d96b4f365bef5796dd127c WHIRLPOOL fe12217acf1fe7e0fc3005f5e823530a2d1fe611c9be070fe5ce1b0220770d88a18fd7acbeedcdfee54cef0cfb3bb2d0fa365ff85b760fd1c421bdfb7bcd68c6
 EBUILD netbeans-extide-9999_p20160506.ebuild 3377 SHA256 b00deda1ff1ccd14e4419c98c9118a25441229cb60b4fae3106faefd05749670 SHA512 fc82f4aa14b502a40ee164f37046b090a4084effcb1a04af8f20b6699ce6f716ef7b737372cee8a6e53c873b3e5382199ff8c84853dfe4f2036d968b4d8e340a WHIRLPOOL aeab15f612f43f2694e53cc0c80d577a7c4ca32b9741392db33784e93126363880ec1948bdc64a14f3bdb062129e4c36bd3b7eef5a2738b9594e0778d198b377
 EBUILD netbeans-extide-9999_p20160507.ebuild 3377 SHA256 48629a8cc108c70ddda71209b0d42a82c5e88edbb554a3a66de1aa213c73e6ee SHA512 28005a104d299e8ab4241443334b536b385e500dfaee56a3a5adddf1e78da4682cd3160d5d1f246fe82b6d6dc8ff2bd8c404eaecf1dead7a8b8b5da6154cd9fa WHIRLPOOL cfa9fb1a80c69f839a1e96e6080692deab587096d55e076d0d89bb61370212e35490dea80ebe3a9bfa57219086d958c26120773db97358e134e23ddf3bfbe301
+EBUILD netbeans-extide-9999_p20160508.ebuild 3377 SHA256 4679473bbf738c87c3dffab2d96be9970dfb13034435bf02441631128289dc30 SHA512 7e04a176ec96a1425664e04c30a609e4f26482cb59e00fb3fb4308f9c11a8480d700ff790a4390adfdf9e1d19be57f9430b95c5bf61c75f97c1f5f6f4723f4fe WHIRLPOOL abfd7d9833403f9bce91ed9d80f46c7aa046b7e2f78447ff7d096e40937e497b61d6e3fc4939af471f27ffc7dbd065d88fbc5daab2fe323d21e17c06df44b166
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160508.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160508.ebuild
new file mode 100644
index 0000000..013be61
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20160508.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-05-08_00-02-33/zip/netbeans-trunk-nightly-201605080002-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 e9bfbb0..a654266 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -15,6 +15,7 @@ DIST netbeans-trunk-nightly-201605040002-src.zip 213470987 SHA256 432c7c5f60ad6f
 DIST netbeans-trunk-nightly-201605050002-src.zip 213471902 SHA256 808e9bbc57afb9470a01ffb85b645005db1dd98c035b45296d9356f1d5f4c793 SHA512 ea4d5572fb790e50fd1d62724ac1a15caad9e01c8c9309ef8995f8e92091ba29b8fda1ee8ca14574fd5c1a07f92868216cea70f908e1ed1f734ee6ce65da9286 WHIRLPOOL 6bb173180d5b788091651ff0194ad5136d2048faf006324eb9040243897da622f2c363135b727ba12de2c4895a38fb98d28c0df6520599751582b3f94aa6d948
 DIST netbeans-trunk-nightly-201605060002-src.zip 213515050 SHA256 cc8ff54e7ae990f944e127d51b2bae614a7a5a117e3093342cf8f0a55ac320c5 SHA512 e460aa9dc8713c154400cacffd3b3c999ef9d3df8703ec8b74f597c54bba2172b7225e6a8adc22ad0a43762f4a4a887d57f517608b79af8db4d37a1d3371c80e WHIRLPOOL f6e80814ee3a79e03703cc3c3eab7194ea6f306fc6666409eb980a21e11a6b57250ea23138a61790edc81f8cf0083cd7ea1af7aa9f743e0db16857e41b761fd3
 DIST netbeans-trunk-nightly-201605070002-src.zip 213540102 SHA256 6a040f33a06dc6f57384b7d17a354cbffd3f5f78cdded520022e4ac8d48214e7 SHA512 3210979db5446f32df0fed36c091473116b2cbfec3f5fffd675e8e81357cd3f94e2edd0d06f903f5d4a32ccc48e2c0d914102a6eefcb4273712943f029ce9619 WHIRLPOOL b507b5b2ab4dd90b540595636904bb3328ffc4c7ff3a7e0d7a69422bd18145658b6f4bf115270677d7a68d5525234359a60b506096b94385a60e7979227a2fca
+DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 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_p20160428.ebuild 3416 SHA256 e79a68a525a8e7b9929f6099fcd1e18066daf75b72d06556c2fa24ad49c5b998 SHA512 3d2b217ce426091f0f3cbc1f3ea8881fa21c5bb482da2830349d1283ab9192354100b994b1a3ce4cb86265356035b417e1855d3a50e88e13cd41154bfc00c83d WHIRLPOOL 72d71a968c86d7f7033c35b624852e32dfce945c6711a74b30ef71f3f017a6fc9ff1dfce9c57e1c4ccb273f60c7263dc221fcd7a26a0ffd2acaa4b5f44c05450
@@ -27,4 +28,5 @@ EBUILD netbeans-groovy-9999_p20160504.ebuild 3416 SHA256 b67581ce3ecd67505cd4a92
 EBUILD netbeans-groovy-9999_p20160505.ebuild 3416 SHA256 001f06e585484fb1049e6f116b3ab096f45a6f06b740fd712137422b890a6e52 SHA512 b7fd494521fe2ce3b626a836f7a8abcd7898939ad7b613f3616bae921826a915ab1eaca7b19dfdec7cc2a919b59cf640fbec29e9ad715663e56165a11d2a864d WHIRLPOOL a0b6e32b790b6cab41db99d0ee7eaebc3b55b8649707fe500ad49fc927398a58ae36b82ec78ec7ec6377cac473b0b63c0a11b697bd205ab5959b7280a496d797
 EBUILD netbeans-groovy-9999_p20160506.ebuild 3416 SHA256 5dcb25c339a01ca6dad90913d6f68cfae90ee1a217180fa1f24dc286832d220b SHA512 c5fbdde03b1d6cef6b5b96ed8fd78c3051de3aefac6a253a15b48b76c9046a38593173fa69e40fdf68fd242a2fac98d44b5a311086c011aafe44e1ceae9a8186 WHIRLPOOL e4653bf5b64444ba061fd8077257da7d704864e8cab3d6ab9c9d8d59e64fa4b7b391af47088276a388cb98f4dbca7ddf198fefb0c622d039c05e7d6a408ff52a
 EBUILD netbeans-groovy-9999_p20160507.ebuild 3416 SHA256 48dc2fb9af109a0dfe29803b5485b3253ac8dc77219705abd631e552e50cf7a7 SHA512 a75bbe432f5369654d6f776841656023ace0f56c6d477eb1c77333eb7833f5294e14deefc71d35182e36d9b7e649886f35a999abd1b1e971bcdcd2db61fa3571 WHIRLPOOL 241cbe090d0d4ca85300732299cd58fedefece517b00791e770053ea716e50b5c6f34bed7e9ce91d43e4bf46ec988d2d0f07b72502c290465dc74e80dd4a6744
+EBUILD netbeans-groovy-9999_p20160508.ebuild 3416 SHA256 a964cc414b4db6f6e4940c71c72528d8baca5cb2270e945cdc4a928ede5c35ef SHA512 c683321445908e24df00614f8c74b68aaca339134ef898849483cce09dbc22e620c3875aeb740c728a77feafda65e013b0284598a00dfc912c64e21417e69a0b WHIRLPOOL ec6e1db72ae421a4caa1fdd13100a712c5fce27f6ea964dad2ffa6e23b55e9747a4d1b33725ac556d749d5b86198a5dd7fb661febb998762e92b959ea6192fc7
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160508.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160508.ebuild
new file mode 100644
index 0000000..63daad6
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160508.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-05-08_00-02-33/zip/netbeans-trunk-nightly-201605080002-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 1dabec3..49b7943 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -18,6 +18,7 @@ DIST netbeans-trunk-nightly-201605040002-src.zip 213470987 SHA256 432c7c5f60ad6f
 DIST netbeans-trunk-nightly-201605050002-src.zip 213471902 SHA256 808e9bbc57afb9470a01ffb85b645005db1dd98c035b45296d9356f1d5f4c793 SHA512 ea4d5572fb790e50fd1d62724ac1a15caad9e01c8c9309ef8995f8e92091ba29b8fda1ee8ca14574fd5c1a07f92868216cea70f908e1ed1f734ee6ce65da9286 WHIRLPOOL 6bb173180d5b788091651ff0194ad5136d2048faf006324eb9040243897da622f2c363135b727ba12de2c4895a38fb98d28c0df6520599751582b3f94aa6d948
 DIST netbeans-trunk-nightly-201605060002-src.zip 213515050 SHA256 cc8ff54e7ae990f944e127d51b2bae614a7a5a117e3093342cf8f0a55ac320c5 SHA512 e460aa9dc8713c154400cacffd3b3c999ef9d3df8703ec8b74f597c54bba2172b7225e6a8adc22ad0a43762f4a4a887d57f517608b79af8db4d37a1d3371c80e WHIRLPOOL f6e80814ee3a79e03703cc3c3eab7194ea6f306fc6666409eb980a21e11a6b57250ea23138a61790edc81f8cf0083cd7ea1af7aa9f743e0db16857e41b761fd3
 DIST netbeans-trunk-nightly-201605070002-src.zip 213540102 SHA256 6a040f33a06dc6f57384b7d17a354cbffd3f5f78cdded520022e4ac8d48214e7 SHA512 3210979db5446f32df0fed36c091473116b2cbfec3f5fffd675e8e81357cd3f94e2edd0d06f903f5d4a32ccc48e2c0d914102a6eefcb4273712943f029ce9619 WHIRLPOOL b507b5b2ab4dd90b540595636904bb3328ffc4c7ff3a7e0d7a69422bd18145658b6f4bf115270677d7a68d5525234359a60b506096b94385a60e7979227a2fca
+DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 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_p20160428.ebuild 4126 SHA256 6fa78ddd6b86962f5c5ddadd1493edf1f6545863f195b3bf390c970a07cb0b30 SHA512 6a9dc57df3f90fc79d5d372454fbabfa86ae4fbe951896018dfc6682663617721e3cbff4e68c051bf22c5d0764840ab2abf993f3754f7d6c27c44fe20125bc2e WHIRLPOOL 81e8cbac2a7fb4b976bdf5c6764f619f3b9130cf3c1d0f9ea80eebf3c58bba95aa61a8e5c10c2d52122a138c58fc51f5ce63fb36a1462e98577e64bed9e8637a
@@ -30,4 +31,5 @@ EBUILD netbeans-harness-9999_p20160504.ebuild 4126 SHA256 f2d05ecbc1a506855bbbab
 EBUILD netbeans-harness-9999_p20160505.ebuild 4126 SHA256 dbf3bf5320b9677387bd5323c15c25681f5b03770814b1413c1ebb0751209d57 SHA512 d0f6f477047c9b1129f82d9191ff91bb5e87defedae0a6f7a521066a8e8383d29c41500786447861650280473ab7d251498c8e71e70a54d58b6519c026532e9a WHIRLPOOL 17b174155875fdbf9048094502d770d9ca3961b0335773d98889fdc35ff7d8cd2890f2746863705967088b0c19a6a97607367bff71dfe73fbff4d060f31a1e40
 EBUILD netbeans-harness-9999_p20160506.ebuild 4126 SHA256 ede7879514c710883f84ba1575897a7f2babded7a25ae27f5ba85dda1f419df1 SHA512 96ec703c9349ac2dc263514050a54e9a7faf2ebacb9250e33dcd240f0d817670007a1d9d466b4cf5e4d2ddb3482dbcca70d66d9e8451320cc571de65a2d1ced0 WHIRLPOOL b392878a09217e5140c28c63abbb32ee1be495ae8841a990940d701f186bff84c75de958fb817e3dd1d30dbe16af6af97735e8a5fb3230518ca354b74d094c42
 EBUILD netbeans-harness-9999_p20160507.ebuild 4126 SHA256 cdfeb4da090e8f479fc8b3f5ea2d352128ad199bd62f625fbe1dea65a77d5897 SHA512 871d836753893c36e2683f9d5d3c261f6c7ff97e3cbbc8318c18da756308b854392ad14524faba2b1f2c5b6221d442ef313b402a09f5573b50c42d492830904e WHIRLPOOL 7ebfb01ffe6c6acfb3a40837d23fa9da00bbc100c3b366867cfe1ee038617044807c3df7b23d08dbb9b52d785e6ea92b7168ff83d99b90238ae34d95219f244e
+EBUILD netbeans-harness-9999_p20160508.ebuild 4126 SHA256 5caa0e368ffa4302371570aa1bb29fb6b66f0ab056bad9681ecd1b6624a5a8c7 SHA512 77db748695ea1956a94f95a02d7764e5540cba76475b425e8b63cdc206f96e8e0dc4f4bbad60f940e69ca394eeb0ee56dd41eb517d3409c981b38817c5183642 WHIRLPOOL 64be326d31bc967f5a1138e8e71813f0b047a39cdc5b58726371ea755264fecea2d4ee61d8072607ba7fcd906812f9004e31e9a094963f08a3497e7979560f1b
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160508.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160508.ebuild
new file mode 100644
index 0000000..e49666c
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20160508.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-05-08_00-02-33/zip/netbeans-trunk-nightly-201605080002-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 5c0e0f0..5bd6679 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -152,6 +152,7 @@ DIST netbeans-trunk-nightly-201605040002-src.zip 213470987 SHA256 432c7c5f60ad6f
 DIST netbeans-trunk-nightly-201605050002-src.zip 213471902 SHA256 808e9bbc57afb9470a01ffb85b645005db1dd98c035b45296d9356f1d5f4c793 SHA512 ea4d5572fb790e50fd1d62724ac1a15caad9e01c8c9309ef8995f8e92091ba29b8fda1ee8ca14574fd5c1a07f92868216cea70f908e1ed1f734ee6ce65da9286 WHIRLPOOL 6bb173180d5b788091651ff0194ad5136d2048faf006324eb9040243897da622f2c363135b727ba12de2c4895a38fb98d28c0df6520599751582b3f94aa6d948
 DIST netbeans-trunk-nightly-201605060002-src.zip 213515050 SHA256 cc8ff54e7ae990f944e127d51b2bae614a7a5a117e3093342cf8f0a55ac320c5 SHA512 e460aa9dc8713c154400cacffd3b3c999ef9d3df8703ec8b74f597c54bba2172b7225e6a8adc22ad0a43762f4a4a887d57f517608b79af8db4d37a1d3371c80e WHIRLPOOL f6e80814ee3a79e03703cc3c3eab7194ea6f306fc6666409eb980a21e11a6b57250ea23138a61790edc81f8cf0083cd7ea1af7aa9f743e0db16857e41b761fd3
 DIST netbeans-trunk-nightly-201605070002-src.zip 213540102 SHA256 6a040f33a06dc6f57384b7d17a354cbffd3f5f78cdded520022e4ac8d48214e7 SHA512 3210979db5446f32df0fed36c091473116b2cbfec3f5fffd675e8e81357cd3f94e2edd0d06f903f5d4a32ccc48e2c0d914102a6eefcb4273712943f029ce9619 WHIRLPOOL b507b5b2ab4dd90b540595636904bb3328ffc4c7ff3a7e0d7a69422bd18145658b6f4bf115270677d7a68d5525234359a60b506096b94385a60e7979227a2fca
+DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 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_p20160428.ebuild 30761 SHA256 d6735e6e8cf412cbfb9dd4a2f0f68f8296b74e03fe87b12150506f7c063f281d SHA512 d3c49f4a00823801049688170c461ebcc5de106f30fa11e232d953a56cf196c946610cbda0216f393c28923efd5017a28d8fc5870d90e98c6a5fd347a400711d WHIRLPOOL ba3d111337fd5e21e3a4e97457c1f00f2b53b0af20991833203c6f68301520853731f63b291d6adc55d6a96b42d52e13e6d65bd6dcf529c39bc40f30d334155a
@@ -164,4 +165,5 @@ EBUILD netbeans-ide-9999_p20160504.ebuild 30761 SHA256 289783fb0f91bf72c6ed45450
 EBUILD netbeans-ide-9999_p20160505.ebuild 30761 SHA256 dbe5adcbd6a617c9da1fddd7b0d0d04098c2f48c00c5960c0302d2451b80d435 SHA512 faf4b282fb63c98fee24c1f87d8b6dcd87c3285e5735a1c0ef72f2c1d38705e45207aec10f2a251fbbe1275887c33c59b967fe1e5234e5289146450db10413c0 WHIRLPOOL a67239bdd9695007a52daa779c230e4b662c8f63bb932f8601e3eb82e1597033e16f8b8b1b68884e6868b8505e7da41949d074f558a6635e6002f14399f3ca2c
 EBUILD netbeans-ide-9999_p20160506.ebuild 30761 SHA256 f0b1b022043a5f04c6951fa71889f58deca378ec07074866d849b83bf1fc39cb SHA512 7edda08f34b7b113d0692061394f5ab02e837ecc8f67d5867ad67b0c0af3e4425805eacb92dd769922dfbed74012ad98a404b9b85bdaa2be3f7948cf3310eaa3 WHIRLPOOL d69c2768783970cd18aefafca408f67cc91dd430feed74b6f95dced5767930627e6a4a728ce7ea21cfba719ef89bdc96861ad9c7ebc182c42ffd043d446fbe01
 EBUILD netbeans-ide-9999_p20160507.ebuild 30761 SHA256 fe5d92a8e420dcc61f1f3ea6108c57d60c4dd16ee65aede15b0d0f06933d7cd9 SHA512 b5511eebf0b552085dd1ad6e00de54dbb509131ef1f5d41ea6629a755d925208c5626fc933e4cba53b0abad3bb17b64c6aef6214eebcf5267cb55d5746dde6f0 WHIRLPOOL 579c27eae140f5b308ccfa9e7bc34350bafdcaf60986e0d73a00abca68bd4c9202053047f439ab75d2a6a0af20abff1792e07e6605db242daaad96ce2841c580
+EBUILD netbeans-ide-9999_p20160508.ebuild 30761 SHA256 62d2935857bc57848e7eb87dbfa621cad343d4544d2742cc3c6ccc5dc399f286 SHA512 0851eddfe367bca706a34fe7314500a6299cb900e379664eb9013ad083c3059221356a9af7770ad0118502a97fe61924925cf7f82a4598a9268794d5e40ccf7b WHIRLPOOL 4abc9e4e34567a1799489cc118415d84d2ac07c6c70307073d550ba536cc95ca54f736179a745d0be282c9e8e231c23d9d400c6d27e3b9081f2ec0951c8ac152
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index c7003b2..6410d8d 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -46,6 +46,7 @@ DIST netbeans-trunk-nightly-201605040002-src.zip 213470987 SHA256 432c7c5f60ad6f
 DIST netbeans-trunk-nightly-201605050002-src.zip 213471902 SHA256 808e9bbc57afb9470a01ffb85b645005db1dd98c035b45296d9356f1d5f4c793 SHA512 ea4d5572fb790e50fd1d62724ac1a15caad9e01c8c9309ef8995f8e92091ba29b8fda1ee8ca14574fd5c1a07f92868216cea70f908e1ed1f734ee6ce65da9286 WHIRLPOOL 6bb173180d5b788091651ff0194ad5136d2048faf006324eb9040243897da622f2c363135b727ba12de2c4895a38fb98d28c0df6520599751582b3f94aa6d948
 DIST netbeans-trunk-nightly-201605060002-src.zip 213515050 SHA256 cc8ff54e7ae990f944e127d51b2bae614a7a5a117e3093342cf8f0a55ac320c5 SHA512 e460aa9dc8713c154400cacffd3b3c999ef9d3df8703ec8b74f597c54bba2172b7225e6a8adc22ad0a43762f4a4a887d57f517608b79af8db4d37a1d3371c80e WHIRLPOOL f6e80814ee3a79e03703cc3c3eab7194ea6f306fc6666409eb980a21e11a6b57250ea23138a61790edc81f8cf0083cd7ea1af7aa9f743e0db16857e41b761fd3
 DIST netbeans-trunk-nightly-201605070002-src.zip 213540102 SHA256 6a040f33a06dc6f57384b7d17a354cbffd3f5f78cdded520022e4ac8d48214e7 SHA512 3210979db5446f32df0fed36c091473116b2cbfec3f5fffd675e8e81357cd3f94e2edd0d06f903f5d4a32ccc48e2c0d914102a6eefcb4273712943f029ce9619 WHIRLPOOL b507b5b2ab4dd90b540595636904bb3328ffc4c7ff3a7e0d7a69422bd18145658b6f4bf115270677d7a68d5525234359a60b506096b94385a60e7979227a2fca
+DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 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_p20160428.ebuild 15656 SHA256 197082a052d63c9aea66f8595e7a2cdc28ef3a0c3e662f4dbf215d794e2b8129 SHA512 5658fd47bd0582945b333a666e47eab9d358fe92277725edfdedde5ae5572b51aed6a63808e13c5d27bb788738fcd263baf36c6b1ff8740153fd89605a5aa9f4 WHIRLPOOL ac7ecbd6bea378255961f986f2998bc6bfdd6bff3343df76ad4f3445bf2d8a0815437cf547dd50a9b4ed4c80b57c027e77b9c39b22ed3d9769dce35672ec02fa
@@ -58,4 +59,5 @@ EBUILD netbeans-java-9999_p20160504.ebuild 15656 SHA256 3a8bd1c525bac4af14417dc3
 EBUILD netbeans-java-9999_p20160505.ebuild 15656 SHA256 d24aa8e1ce996aa5621b951f14ea16425218256d6d45f4903f3d70a289a30636 SHA512 e666f80301f729088ca5ea4fb8ce4282de63cb183d409d269f4e65b9df6114caa49ef76ff570b9379d3d0fb6f0b940ce046e3ce77837b6986d10f442d6e5eecf WHIRLPOOL 9f7d0bbf68869cf8f45eb451e52c1ceca35e71f70bd95214282aaf8a3b2bacb7f3ff6908ed0756ac59e23ddb314da7b215f3d13d7790e48ec57e89a0ea5a29b9
 EBUILD netbeans-java-9999_p20160506.ebuild 15656 SHA256 47531285bfd1edf428352196116ab41134bc3efa111231c752101d1b91c4de07 SHA512 23aa52b93e751d5a4c8a4119742f41d9828e047b7cecf134f99fc372cc12ffd5d15293e0cd5f7440d59492e7456632a3d2a86ce9881c141c4706fea0022f023b WHIRLPOOL a212b4d6206fa983bd0b10fc54c719ba87fdcb8e2228c4adea81f485ad89b171da1b51f2e260623628a566c9732116840977c80bb67c3f55461a0c93df454b93
 EBUILD netbeans-java-9999_p20160507.ebuild 15656 SHA256 058bdb033b7b74421329564311f9025801cd4818403d8970c7f45065f5e55b93 SHA512 4d0802d21498f96eabe025d477cc869db2443f3df9deff105d834fc2a42c32aa0046115d20f02f8e1f88e87c8dddc2aa12749cfd2aa0736ff8af71945e5599fe WHIRLPOOL 376918e3d87b9ea9a363e7d9e7f8c140742d6d42a35f1cedfd51ee920fa5e7f52e5477af749041480468f6d791701adfd1347dd59fb12ba52396aec148719f63
+EBUILD netbeans-java-9999_p20160508.ebuild 15656 SHA256 e89c743f36445b911e302574b328c168da74cd5920b5c89f3478862d80ffcfb2 SHA512 3021aa13c5d6cc1dba386ac4108a3954ec85f4ecd1019a06cf7df90f7efec8c648faf546b960ae8f3a3816b18f68664868c12cea2198312d84c19eb3a1b71fa9 WHIRLPOOL a63e996040b157d3abb68929e7625c27e43b8f23cb80c4debef879c961556e8197ecf357912b4047c415ec2fd8342c74a7546d5daa1bfa59df36e6e49096ad05
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160508.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160508.ebuild
new file mode 100644
index 0000000..1b056c9
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20160508.ebuild
@@ -0,0 +1,280 @@
+# 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-05-08_00-02-33/zip/netbeans-trunk-nightly-201605080002-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/E3764E0AB4F9F9ED16AEB6A68B8E3F2442DDCCB6-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}"/E3764E0AB4F9F9ED16AEB6A68B8E3F2442DDCCB6-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 eed4004..5c133c4 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -16,6 +16,7 @@ DIST netbeans-trunk-nightly-201605040002-src.zip 213470987 SHA256 432c7c5f60ad6f
 DIST netbeans-trunk-nightly-201605050002-src.zip 213471902 SHA256 808e9bbc57afb9470a01ffb85b645005db1dd98c035b45296d9356f1d5f4c793 SHA512 ea4d5572fb790e50fd1d62724ac1a15caad9e01c8c9309ef8995f8e92091ba29b8fda1ee8ca14574fd5c1a07f92868216cea70f908e1ed1f734ee6ce65da9286 WHIRLPOOL 6bb173180d5b788091651ff0194ad5136d2048faf006324eb9040243897da622f2c363135b727ba12de2c4895a38fb98d28c0df6520599751582b3f94aa6d948
 DIST netbeans-trunk-nightly-201605060002-src.zip 213515050 SHA256 cc8ff54e7ae990f944e127d51b2bae614a7a5a117e3093342cf8f0a55ac320c5 SHA512 e460aa9dc8713c154400cacffd3b3c999ef9d3df8703ec8b74f597c54bba2172b7225e6a8adc22ad0a43762f4a4a887d57f517608b79af8db4d37a1d3371c80e WHIRLPOOL f6e80814ee3a79e03703cc3c3eab7194ea6f306fc6666409eb980a21e11a6b57250ea23138a61790edc81f8cf0083cd7ea1af7aa9f743e0db16857e41b761fd3
 DIST netbeans-trunk-nightly-201605070002-src.zip 213540102 SHA256 6a040f33a06dc6f57384b7d17a354cbffd3f5f78cdded520022e4ac8d48214e7 SHA512 3210979db5446f32df0fed36c091473116b2cbfec3f5fffd675e8e81357cd3f94e2edd0d06f903f5d4a32ccc48e2c0d914102a6eefcb4273712943f029ce9619 WHIRLPOOL b507b5b2ab4dd90b540595636904bb3328ffc4c7ff3a7e0d7a69422bd18145658b6f4bf115270677d7a68d5525234359a60b506096b94385a60e7979227a2fca
+DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 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_p20160428.ebuild 4971 SHA256 953faa9ef469c397ce24d47c608926a014b50202ec5197261f4d7118a5a2be0c SHA512 a14dc4090bef622fd3b13dcf19d2f692996d541b54ee156c2bd7cc87da5a5273c955fa829026f88e3d04be09f4275e41be797eee29a64c0b5af13eb7955b9527 WHIRLPOOL fed09a4d12a7adb2ac2de781f5452df9764cd56ae26e8396d516c06e739af88f34b44135f1a7a136d972ff545fb807d69fd6ed2fb82370eb09020a4f822e8a8e
@@ -28,4 +29,5 @@ EBUILD netbeans-javacard-9999_p20160504.ebuild 4971 SHA256 98273508f1245cbc3ff5f
 EBUILD netbeans-javacard-9999_p20160505.ebuild 4971 SHA256 821151cb3b172b6a322f5f47955b04f4331015ef985741a197ad762673ce9693 SHA512 ab526bdbd3c3a04eaae35045b59ec1db95d595d3bd42d6c5c7f2a3c7052e118ddeb4d7951dccb2a91efd6a4ce814e01c881464e5be88fe72ad75099b79b53eef WHIRLPOOL 591634cdf178c3e843089cba36662e38ebda6e12d4669b2ecf68ceff84fef132c00d47a5b434647119d8027b33b367a38527f06f2cff68333e0863a0b69bf59f
 EBUILD netbeans-javacard-9999_p20160506.ebuild 4971 SHA256 3994936ed99bf6869b44340e65ec9057d6da109221e5a7a06f3da179d3b2e772 SHA512 ea4957a6f76bdc3013aa152e11659af204c783a2c4fd41b133077cef516793cffe9cdda267eb185b6e6fee56469ebc5d3717a32251ac463457daec9043052f8a WHIRLPOOL 9a38cb15f7ff0770d500b9cf73ac7e2b49b209ab458e1d6728b9f3e00496fd38af9457b245f0cb85f6971b2ae5ce648e57358796d249da325dce5cc3e569cf30
 EBUILD netbeans-javacard-9999_p20160507.ebuild 4971 SHA256 4db71464037647eb5949fe66664256cd768dee1dd8e612f038d43f71ce776e7e SHA512 b555b0b0be3e480e65378d3c4f3d0cd4ba5c9ac3f747d683ba6ccaf4b5e33f3b4aa540f432ffb7846b6a94a4b7b1e60d0bfa994403a43578c19b40f1a5bd4d02 WHIRLPOOL 7371517dd386ad0139dc0715732ec1996b04866365d523a88951f6c3af1253bfb9ed1825eab73b044230d7c56fece09204e7d2792934925db2df7f781f73353d
+EBUILD netbeans-javacard-9999_p20160508.ebuild 4971 SHA256 362fd2ccc9f3d6392a5a673fbc5f7b8a7cadfceb50791306688d220851f95876 SHA512 cbbd1f4f446862cc19adf06f4ff4633d205cea6feabf112fccbdb8559728bfc641523ee88eaff859d6a893414b5bacaa04aee5203a748a076ee066004b0911c3 WHIRLPOOL a0f9f8373cb8624927fe0856b25071ac7731fde1419845dd8211064bf6d5490da1f02595c338a0ddd814e4430747efd23d155100396264a01c3261ce4b9ecc06
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160508.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160508.ebuild
new file mode 100644
index 0000000..c496891
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160508.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-05-08_00-02-33/zip/netbeans-trunk-nightly-201605080002-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 e08e9d1..7822ce2 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -15,6 +15,7 @@ DIST netbeans-trunk-nightly-201605040002-src.zip 213470987 SHA256 432c7c5f60ad6f
 DIST netbeans-trunk-nightly-201605050002-src.zip 213471902 SHA256 808e9bbc57afb9470a01ffb85b645005db1dd98c035b45296d9356f1d5f4c793 SHA512 ea4d5572fb790e50fd1d62724ac1a15caad9e01c8c9309ef8995f8e92091ba29b8fda1ee8ca14574fd5c1a07f92868216cea70f908e1ed1f734ee6ce65da9286 WHIRLPOOL 6bb173180d5b788091651ff0194ad5136d2048faf006324eb9040243897da622f2c363135b727ba12de2c4895a38fb98d28c0df6520599751582b3f94aa6d948
 DIST netbeans-trunk-nightly-201605060002-src.zip 213515050 SHA256 cc8ff54e7ae990f944e127d51b2bae614a7a5a117e3093342cf8f0a55ac320c5 SHA512 e460aa9dc8713c154400cacffd3b3c999ef9d3df8703ec8b74f597c54bba2172b7225e6a8adc22ad0a43762f4a4a887d57f517608b79af8db4d37a1d3371c80e WHIRLPOOL f6e80814ee3a79e03703cc3c3eab7194ea6f306fc6666409eb980a21e11a6b57250ea23138a61790edc81f8cf0083cd7ea1af7aa9f743e0db16857e41b761fd3
 DIST netbeans-trunk-nightly-201605070002-src.zip 213540102 SHA256 6a040f33a06dc6f57384b7d17a354cbffd3f5f78cdded520022e4ac8d48214e7 SHA512 3210979db5446f32df0fed36c091473116b2cbfec3f5fffd675e8e81357cd3f94e2edd0d06f903f5d4a32ccc48e2c0d914102a6eefcb4273712943f029ce9619 WHIRLPOOL b507b5b2ab4dd90b540595636904bb3328ffc4c7ff3a7e0d7a69422bd18145658b6f4bf115270677d7a68d5525234359a60b506096b94385a60e7979227a2fca
+DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 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_p20160428.ebuild 6293 SHA256 a45afe043254c2596f50568a88fe8e61738ee230c369fdc09e583b1898af2b35 SHA512 4a06b6abae4513a4fc810f735546777ff7f68f63f49def5a210dad83e09a75c44b59c80afb5bb6a22f6bcaa28ff97021ac2b987cbb2d4f4715abf7e3ac5d090b WHIRLPOOL a8a400e470bcab256c606583faa300745e3fc8f604c0788e3a37d6015c7f1e6781d4444472dfa6359a1b6001d2769ab175da299c783c5e5f6e8261890c41f407
@@ -27,4 +28,5 @@ EBUILD netbeans-javadoc-9999_p20160504.ebuild 6293 SHA256 770899b7b69f99b7788378
 EBUILD netbeans-javadoc-9999_p20160505.ebuild 6293 SHA256 abf79f24be83a540435ede5db7f25c5b2cee47c94f5b82d0ab3fb60dcb1ed334 SHA512 a3e24c99ce6011437f6120c6e24c7fad11b6ae64a115cd67cc02bf2ed7781710133ba88b3fed02ce3141a9e23318a3a5540c5863efed688e95629683edc13f41 WHIRLPOOL 20704cff9161448ac319032a16303c4eafc267c0bdb5b6fd3b8d2f64169851801e184275c24cd1a3caeff0cc5e5378023fbe0b270784ff6b64506cbacd22a704
 EBUILD netbeans-javadoc-9999_p20160506.ebuild 6293 SHA256 cab2313a3c978064507478ca214af8f8817d076dcff5330952dd7a802d812b86 SHA512 8940849846512f798d173a49cddf65fa8629fb8c063227aa9a3d876622b51ca814126bb2f2119c53f168bf491a3aff7a9cb8a4faa4226508c8dc8d8ab60dd23c WHIRLPOOL e2a7dfbcb244f51adb9e4d085eb54df09591863166e6168959603200ba44cf5b2d4633eb9c7f3324175249545501965f397803ff2287fc795dd7f1172d84fc7c
 EBUILD netbeans-javadoc-9999_p20160507.ebuild 6293 SHA256 ada56bc2a7f2b96c0dbc17d4bd9019451edebc2a604bdf94213779ba278d762f SHA512 5e0291f8fadcb1205aac746b9231c93b4c78e63f93dd6302c6d8056bb7150a9ebd5dfb110ef03bfab211917f58c50c7b4a91fd4891f0fe9009f79bb81ea98c98 WHIRLPOOL 4641206ad191d09a98b5d1bb9291b8e2508a3928e038d9b8adaf60b10e4c8f2c12366222dd88e158da09d76d1c5538b031878bf411022c8f91b6eeb1aa6183f8
+EBUILD netbeans-javadoc-9999_p20160508.ebuild 6293 SHA256 a461652ca3d47c9a85410ab1643ba0e39cdc0180c20d603dd103d73d9d8e98f2 SHA512 03c07c187d736659715ed8dbfdf5f155a1e80cf90b58427e4148813ef2a78958a8c23962842bbd19086c95725c1ba76430fbce6e93fa42adfff68b6c5a834c6a WHIRLPOOL a23386c2d77323529aff85fb3d10ff0af93a4abc404feafdc341cdbb9fdca99349ea8e29f3c49d0b131142e19194e18838908ca8be815eb40f471e185c601a38
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160508.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160508.ebuild
new file mode 100644
index 0000000..30580d9
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160508.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-05-08_00-02-33/zip/netbeans-trunk-nightly-201605080002-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 c28c6cc..c3743c3 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -21,6 +21,7 @@ DIST netbeans-trunk-nightly-201605040002-src.zip 213470987 SHA256 432c7c5f60ad6f
 DIST netbeans-trunk-nightly-201605050002-src.zip 213471902 SHA256 808e9bbc57afb9470a01ffb85b645005db1dd98c035b45296d9356f1d5f4c793 SHA512 ea4d5572fb790e50fd1d62724ac1a15caad9e01c8c9309ef8995f8e92091ba29b8fda1ee8ca14574fd5c1a07f92868216cea70f908e1ed1f734ee6ce65da9286 WHIRLPOOL 6bb173180d5b788091651ff0194ad5136d2048faf006324eb9040243897da622f2c363135b727ba12de2c4895a38fb98d28c0df6520599751582b3f94aa6d948
 DIST netbeans-trunk-nightly-201605060002-src.zip 213515050 SHA256 cc8ff54e7ae990f944e127d51b2bae614a7a5a117e3093342cf8f0a55ac320c5 SHA512 e460aa9dc8713c154400cacffd3b3c999ef9d3df8703ec8b74f597c54bba2172b7225e6a8adc22ad0a43762f4a4a887d57f517608b79af8db4d37a1d3371c80e WHIRLPOOL f6e80814ee3a79e03703cc3c3eab7194ea6f306fc6666409eb980a21e11a6b57250ea23138a61790edc81f8cf0083cd7ea1af7aa9f743e0db16857e41b761fd3
 DIST netbeans-trunk-nightly-201605070002-src.zip 213540102 SHA256 6a040f33a06dc6f57384b7d17a354cbffd3f5f78cdded520022e4ac8d48214e7 SHA512 3210979db5446f32df0fed36c091473116b2cbfec3f5fffd675e8e81357cd3f94e2edd0d06f903f5d4a32ccc48e2c0d914102a6eefcb4273712943f029ce9619 WHIRLPOOL b507b5b2ab4dd90b540595636904bb3328ffc4c7ff3a7e0d7a69422bd18145658b6f4bf115270677d7a68d5525234359a60b506096b94385a60e7979227a2fca
+DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 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_p20160428.ebuild 4717 SHA256 d66d24fd69cf70db58c771a8022cbd16fe687b8fa04fad227460c9c4c16a282f SHA512 a8eadadc1e636c9a3907909fdc8f39af3c3f789dadd440f3717f183e28489b6f6d07e82ef1665b06dba6f2d7d750482c7f22b55ee8a38356d8208ba3e5c27ff5 WHIRLPOOL 2a938d9fde09ab500cb042026520f13f99c6d74452a230f146bf6d69930a6d4e1e3d108fa7e1d459712e6c6893b758d4f42025e0d5e32dc24db26b97b980194b
@@ -33,4 +34,5 @@ EBUILD netbeans-javafx-9999_p20160504.ebuild 4717 SHA256 3894459832bf08e92e08054
 EBUILD netbeans-javafx-9999_p20160505.ebuild 4717 SHA256 1c857a478100292ea345a4efb5fc266abd4b5a4af1d6ff3d6fe4c26aee8feb1b SHA512 b61721a6274e2d280436b4c8ad3cc1fdda4530c4bfc4c764be086e91bfa594e26a19738278199b5b69db49c63c003186eb6a9ab6940cb9e693553c806425d922 WHIRLPOOL fbfbf70a0fcb08914b9ab36db0a0e681be6c126884bbbe489998388125d011d8874f58b4805386696125b6d306c82359bdac8ee0a184785010324e0be4fddc97
 EBUILD netbeans-javafx-9999_p20160506.ebuild 4717 SHA256 f6a0f8d5c863557611eae4850e8a732a60d73a7800339b3c2201ad94513e3c72 SHA512 ca9cc8f55ec85c4d2787115348ba8204bde9a8b3331b38e05896229fc9f66a18903a823383ea45c5655fd00d704dac0212d578b05364e9e198071beff2f9c845 WHIRLPOOL 5262a41467113b375ba2ca8d6fb36524948e4647ddd6719617b47957455436311a3d766deaa6f30aa436bd2282d41c9f98323c7f7fc6948e3ba9945a3ac72829
 EBUILD netbeans-javafx-9999_p20160507.ebuild 4717 SHA256 3afb6a822cb9b2a6f0d2ee4eb07fb43581a660d3d6e90ec08f62a5f17d8fb125 SHA512 e59a3488b654724803ef0b6f256caf3e78b63989c81c3b2d736c742c37d3dabe4c284a7e8eeb3fcbc51583e4214e94a7ea989b38a010b7688d5998b2b268d5aa WHIRLPOOL b4dfea197b03f34a190010c52b6625f5203d97f0ff9fc14a4cac71700d876787f41eed9a4683505d132a538d60c4a73a8336b9e916fbe2eefbe9e582f61584ca
+EBUILD netbeans-javafx-9999_p20160508.ebuild 4717 SHA256 d6774497eca22aee6fe81b14e15c98ee7757ae8857d0d759e976f967e464fabb SHA512 fcc85e62aae48f322f2e0d8efb259e3cae587598e01675549fb279eec4149e0972018574fac90f8b9312db4f058d84dc4fa90a1f562e3b33f67421695e728521 WHIRLPOOL 0eb76d3bb1e15bb8592031c20d37a9dfd50f28550282ca2aa49cf2b311d21b687de6c0de9a6bcd6ac76bbaa8c6478360174cca919320a87b5920b4810099f127
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160508.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160508.ebuild
new file mode 100644
index 0000000..cc6da82
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160508.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-05-08_00-02-33/zip/netbeans-trunk-nightly-201605080002-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 82d1fe0..ede7088 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -13,6 +13,7 @@ DIST netbeans-trunk-nightly-201605040002-src.zip 213470987 SHA256 432c7c5f60ad6f
 DIST netbeans-trunk-nightly-201605050002-src.zip 213471902 SHA256 808e9bbc57afb9470a01ffb85b645005db1dd98c035b45296d9356f1d5f4c793 SHA512 ea4d5572fb790e50fd1d62724ac1a15caad9e01c8c9309ef8995f8e92091ba29b8fda1ee8ca14574fd5c1a07f92868216cea70f908e1ed1f734ee6ce65da9286 WHIRLPOOL 6bb173180d5b788091651ff0194ad5136d2048faf006324eb9040243897da622f2c363135b727ba12de2c4895a38fb98d28c0df6520599751582b3f94aa6d948
 DIST netbeans-trunk-nightly-201605060002-src.zip 213515050 SHA256 cc8ff54e7ae990f944e127d51b2bae614a7a5a117e3093342cf8f0a55ac320c5 SHA512 e460aa9dc8713c154400cacffd3b3c999ef9d3df8703ec8b74f597c54bba2172b7225e6a8adc22ad0a43762f4a4a887d57f517608b79af8db4d37a1d3371c80e WHIRLPOOL f6e80814ee3a79e03703cc3c3eab7194ea6f306fc6666409eb980a21e11a6b57250ea23138a61790edc81f8cf0083cd7ea1af7aa9f743e0db16857e41b761fd3
 DIST netbeans-trunk-nightly-201605070002-src.zip 213540102 SHA256 6a040f33a06dc6f57384b7d17a354cbffd3f5f78cdded520022e4ac8d48214e7 SHA512 3210979db5446f32df0fed36c091473116b2cbfec3f5fffd675e8e81357cd3f94e2edd0d06f903f5d4a32ccc48e2c0d914102a6eefcb4273712943f029ce9619 WHIRLPOOL b507b5b2ab4dd90b540595636904bb3328ffc4c7ff3a7e0d7a69422bd18145658b6f4bf115270677d7a68d5525234359a60b506096b94385a60e7979227a2fca
+DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 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_p20160428.ebuild 4412 SHA256 92ec38e61718089a7a0f048629e2390b138113cfd286ba1e8168edd9ac86aae1 SHA512 0b0b3e80376fecf0af36478252595774af197c427a8162cd2394e43d3e1772a730434cf07de1680be0bd7c3777d826c822334ce4f36c42d7a05e8aae306c4a3e WHIRLPOOL 2b317f045489273543ccd76df12009bf2b9230912a5ba4814ad5e1dab25dbe92cd0b317d4458835ed64d6386bb5216b328e1afc53d60fb9b07848397581c6bdf
@@ -25,4 +26,5 @@ EBUILD netbeans-mobility-9999_p20160504.ebuild 4412 SHA256 f7988d1e68fe142d6f5cd
 EBUILD netbeans-mobility-9999_p20160505.ebuild 4412 SHA256 7e49b0c0d96acbc466dd131e766816e43ada38582b5d38cdace450e34581bb16 SHA512 94cc54e7484e0db776e1409c94976c23a7e2fbd4a42758301ec16e60334a9b8e9d40fede14a2136cfa704bf15c058fbf18e156b7685c8587a16598a09ac0fa7d WHIRLPOOL 7ef48583a0dfa52567d3c1955f8329a6e75ba99f7788833b4fc39b10469e725af2534d1d3bb1b63d792cd936d7a84e1ea55ea26933e7a9df68d18eff7647c178
 EBUILD netbeans-mobility-9999_p20160506.ebuild 4412 SHA256 5709c1d7c984152e354486798dbbaae73473852cb558e215690e04129eb498a4 SHA512 a81d7d177ea3a52fb12119491d79dde92f2870ca738c5d2bf682aef0ec0fbd4fe8487427c553c11ff5e3e262309f90869dd4feb8e1e2176f04aa749a90c21af9 WHIRLPOOL 403d1093946da10f6c2a57a8f14723355ab1375544f8b463e998977b84cd9a19c85a9c2199aa91a1d4f7af47f7903fc2c113101c5746397c291486d142e33972
 EBUILD netbeans-mobility-9999_p20160507.ebuild 4412 SHA256 4ade3fc523c138d3c50cae68ad31587d5d84646ecf448fd71256eaf4d90d58c6 SHA512 0b3feb338d32b5f590b9cd9985fac77ab2fde4d7b1fd773809b084abd631956ebe7c321b9e6e5703891bd84f1cc2914932f08713b995e28edf4e68aab7452079 WHIRLPOOL 08ae87ebe6a9280d00faff4f748e9efda1b3df371546687a9d49e074832bbef747e0cb59e9f8ab95a0ee19121faadfb7ff106e9ab29d58ce600467b0ab47c008
+EBUILD netbeans-mobility-9999_p20160508.ebuild 4412 SHA256 9ebe4871b1ca45bbb0f4fed226041933c682b8b639c4de2f53be9a144851aa03 SHA512 900a839a97f4a2bc1584753e6d6665735cc746b9f07b38e54d69d102fb9bf8cc26071df41f174c926c873d6c4941a3e9dc28e09efc7960a9c83016707666a354 WHIRLPOOL 4afa0a3e00c4a26f3d38e5aa0542483a1a4a833b980f92d65a4c90320abb39b12be0871fa7e8a61d98d49eac9596821e00656e77e41b421107e20399aa22efcc
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160508.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160508.ebuild
new file mode 100644
index 0000000..49cbde8
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160508.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-05-08_00-02-33/zip/netbeans-trunk-nightly-201605080002-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 50d6557..0fc4835 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -16,6 +16,7 @@ DIST netbeans-trunk-nightly-201605040002-src.zip 213470987 SHA256 432c7c5f60ad6f
 DIST netbeans-trunk-nightly-201605050002-src.zip 213471902 SHA256 808e9bbc57afb9470a01ffb85b645005db1dd98c035b45296d9356f1d5f4c793 SHA512 ea4d5572fb790e50fd1d62724ac1a15caad9e01c8c9309ef8995f8e92091ba29b8fda1ee8ca14574fd5c1a07f92868216cea70f908e1ed1f734ee6ce65da9286 WHIRLPOOL 6bb173180d5b788091651ff0194ad5136d2048faf006324eb9040243897da622f2c363135b727ba12de2c4895a38fb98d28c0df6520599751582b3f94aa6d948
 DIST netbeans-trunk-nightly-201605060002-src.zip 213515050 SHA256 cc8ff54e7ae990f944e127d51b2bae614a7a5a117e3093342cf8f0a55ac320c5 SHA512 e460aa9dc8713c154400cacffd3b3c999ef9d3df8703ec8b74f597c54bba2172b7225e6a8adc22ad0a43762f4a4a887d57f517608b79af8db4d37a1d3371c80e WHIRLPOOL f6e80814ee3a79e03703cc3c3eab7194ea6f306fc6666409eb980a21e11a6b57250ea23138a61790edc81f8cf0083cd7ea1af7aa9f743e0db16857e41b761fd3
 DIST netbeans-trunk-nightly-201605070002-src.zip 213540102 SHA256 6a040f33a06dc6f57384b7d17a354cbffd3f5f78cdded520022e4ac8d48214e7 SHA512 3210979db5446f32df0fed36c091473116b2cbfec3f5fffd675e8e81357cd3f94e2edd0d06f903f5d4a32ccc48e2c0d914102a6eefcb4273712943f029ce9619 WHIRLPOOL b507b5b2ab4dd90b540595636904bb3328ffc4c7ff3a7e0d7a69422bd18145658b6f4bf115270677d7a68d5525234359a60b506096b94385a60e7979227a2fca
+DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 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_p20160428.ebuild 4111 SHA256 8e968459df586e6fc8b27eb683e2b0936dba423cccdb334af64c3918d2749843 SHA512 9ca5684d63d1efe7b5158014375752449fbce3a3fb86acfcd12a14f7c9195fefca83d11379906cbd707a48a60ae24a5312c9823acf337811e1d00e9711dbe126 WHIRLPOOL 8ddbc652a3ef6a2fa079498f3d59900f7a507d4494a2aa514cfaae3a1b67fba2880d80a9d285a9513fb9e00e6c3c842b3e8faf6060d1b545706cb2c871443f2d
@@ -28,4 +29,5 @@ EBUILD netbeans-nb-9999_p20160504.ebuild 4111 SHA256 d63657e534e89717ce6210fc9ed
 EBUILD netbeans-nb-9999_p20160505.ebuild 4111 SHA256 8c91c3a3a72c04d0701e053bbf217e3eebd9da7810cf8386b8011ae64b9e2b16 SHA512 ee8f93cb619071f002faaa89031c03ca715f7b39ea91df5b0d277d9ebfbc5e0c13c27265fa97a8a64697ab823f2b5cf05f9977e548ebfe76eb1d360aaa28f00e WHIRLPOOL ef3ce3abcc82ed62a848627ae1266c64b4f66875a375f151dfc9969a12a574cc6219501dc9126bc1e0c0d3745816dde211c30964fe654acfa8299e529bd38de9
 EBUILD netbeans-nb-9999_p20160506.ebuild 4111 SHA256 070b1ed7e4708ffc7fc0632f09f52f5bdde3efa7fd14d81f5116f7f34cefdb35 SHA512 be89609851992395c05177024829b8164a056a78eb9ee95642f0e8de0e37b430c02b669e044c9b047b53b0a970b4a91c529719bae6c2a544b606f2006713c6a9 WHIRLPOOL 13429b1feeed588563f7ad030525bb49e6aef32927a735649ed08ffb35ed729fe204f63bf5e2b8458f0168581ea0f96a933ac0cc5b50fb822baa4855b7cb2673
 EBUILD netbeans-nb-9999_p20160507.ebuild 4111 SHA256 aa4417282a4c7f96f1e5f4482e9fe65634e33c8bc73e7c027be52538178176e0 SHA512 abf6c86453275cd20fc7bb22927bb0b3ef728eb00f5e43406c383faefae0f25d51a9e00d6f58dcd7859a5c0d94abb1054534d7c8c869c6f7eb0b28a8068f78a5 WHIRLPOOL 4c8c462e2f420e5f56f57c2b70a374ebffcf8ff23a845af1e904dceedca03318ccc13fa64e5e7c9e6f0262978139ed8e0c3d9c110daeae7c9f73a4e38b6d3271
+EBUILD netbeans-nb-9999_p20160508.ebuild 4111 SHA256 e9d9fb384d3788ac7c4a42932975bf98c90414d825c09c370d2c3e99cebba7e2 SHA512 627f46cdf769caa505ff05762655445b2611483152cc63847ba60e5e79ba3eeb58f0fd8edf07d4facde87bf0833f7f73f466b3822222a9605705ba3c26a109b1 WHIRLPOOL 7fa12467be9dea5143b7daf39dc69c453c0ccd51ddb34250f9ffcdc2414c714b1f3d8a6d7ca95beff3316bcc5a51506ee2f3ea4cf985c35137032d05e6e39a39
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160508.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160508.ebuild
new file mode 100644
index 0000000..88f2a20
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20160508.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-05-08_00-02-33/zip/netbeans-trunk-nightly-201605080002-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 6452984..14be5d8 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -18,6 +18,7 @@ DIST netbeans-trunk-nightly-201605040002-src.zip 213470987 SHA256 432c7c5f60ad6f
 DIST netbeans-trunk-nightly-201605050002-src.zip 213471902 SHA256 808e9bbc57afb9470a01ffb85b645005db1dd98c035b45296d9356f1d5f4c793 SHA512 ea4d5572fb790e50fd1d62724ac1a15caad9e01c8c9309ef8995f8e92091ba29b8fda1ee8ca14574fd5c1a07f92868216cea70f908e1ed1f734ee6ce65da9286 WHIRLPOOL 6bb173180d5b788091651ff0194ad5136d2048faf006324eb9040243897da622f2c363135b727ba12de2c4895a38fb98d28c0df6520599751582b3f94aa6d948
 DIST netbeans-trunk-nightly-201605060002-src.zip 213515050 SHA256 cc8ff54e7ae990f944e127d51b2bae614a7a5a117e3093342cf8f0a55ac320c5 SHA512 e460aa9dc8713c154400cacffd3b3c999ef9d3df8703ec8b74f597c54bba2172b7225e6a8adc22ad0a43762f4a4a887d57f517608b79af8db4d37a1d3371c80e WHIRLPOOL f6e80814ee3a79e03703cc3c3eab7194ea6f306fc6666409eb980a21e11a6b57250ea23138a61790edc81f8cf0083cd7ea1af7aa9f743e0db16857e41b761fd3
 DIST netbeans-trunk-nightly-201605070002-src.zip 213540102 SHA256 6a040f33a06dc6f57384b7d17a354cbffd3f5f78cdded520022e4ac8d48214e7 SHA512 3210979db5446f32df0fed36c091473116b2cbfec3f5fffd675e8e81357cd3f94e2edd0d06f903f5d4a32ccc48e2c0d914102a6eefcb4273712943f029ce9619 WHIRLPOOL b507b5b2ab4dd90b540595636904bb3328ffc4c7ff3a7e0d7a69422bd18145658b6f4bf115270677d7a68d5525234359a60b506096b94385a60e7979227a2fca
+DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 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_p20160428.ebuild 4418 SHA256 ff39622b2f582fb73f069ddea76fcb846f2fdbdce6559af061a13ead577d4a47 SHA512 3f71b975e8316433510e89914be7a1ffe7837a39d42a4c8f25a033b82d54bee62cafe0a28d45cada322594dfc328f43c2a1a05abbec1e43e207f73fcb225e128 WHIRLPOOL 696cf1a13fe113a7156da0fa4db41802052c5885a1cde7eb5eac17431ca31792576d22d4cecc6b2bd5ead506abb0e3a3d0dee62183b346aed1aa146234c7df8a
@@ -30,4 +31,5 @@ EBUILD netbeans-php-9999_p20160504.ebuild 4418 SHA256 b094c476e852d45c2dd8cbc2d1
 EBUILD netbeans-php-9999_p20160505.ebuild 4418 SHA256 67cc7582c55bb4b06ebdbcaf9e0f5ff01fa2aa5cac46dfb552d296b04a2b29d5 SHA512 25ac0540d8524eb0d2ab30080c8b822b83bf1ad6f054b79da1d51b2fc9ceb9799c09d8a630a13d65580ce763c32fe46b9d1d25bfd0799ad6f1929624d8f08b70 WHIRLPOOL af3b6f6bad1836c8ec52de2cae2a0576e076d344da56f32d7d89f78e0acc026ae478ad2725b6e6c8d461cdabf1003740abb7554e2b7833853943a065c22e329b
 EBUILD netbeans-php-9999_p20160506.ebuild 4418 SHA256 76c6a950bdb0c1811c27c88327fa98c9d86c94fa08dd0dbe69f058fba4151c88 SHA512 818438033d666347275c09255b095a22d49955cc86b83bebb2c6a8dbd76354b8c5e6942bbb66651fb22590b63da08ae02a36cb3af2f45f7cb7d51899888f294a WHIRLPOOL 18b475fb85b5bad8543c611cc7c54e16b4a04e535e79ba1bc8aa71ba0210b8c6d79e9bd7d32634ddc60d46b1209367b3e48580b63a1c24053b04015f4d3d4a03
 EBUILD netbeans-php-9999_p20160507.ebuild 4418 SHA256 f83ac8bf9041f6fa0c4941a26040a6621b82a4a5e3809a210f415e300116aaa1 SHA512 850edbc73c7c632c6241cb7f099885a5ab92db279f6c927ef20d94ee88b4156199449e413306ae7eea8bb7557c9f1387b8b780912c67d287746d0c87481926fd WHIRLPOOL 99969ade1856324acd5549cc3575b29d84b66ba5a25385ab5f63b38c09a02d645581b96a34a6326155841ca10c626c2d7fe52331574a9e46d5ae7729cdeb4371
+EBUILD netbeans-php-9999_p20160508.ebuild 4418 SHA256 e87d5f34e2875998b5038f80e156c8f3ad130e61f72d91e85a324f2e00fbec32 SHA512 1d017ecf250e196514c5468257cc9a2c023ddf66248dadbd6ea9a3b2a5f7c98cb2e59ef0d28724b9be98deb1ae29311b6ef2a75a77a190ea24a4eb6552b024ca WHIRLPOOL 9842c381b442ca55052871a8e64932caceb5a0cb361b81f13add5e6bf1f34a7d4ae14df439928e7fef8468cb2add3bf6c4f9a774ce7b7d7ba8656f5abf0e2eff
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160508.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160508.ebuild
new file mode 100644
index 0000000..3f985d6
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20160508.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-05-08_00-02-33/zip/netbeans-trunk-nightly-201605080002-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 112854a..8536857 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201605040002-src.zip 213470987 SHA256 432c7c5f60ad6f
 DIST netbeans-trunk-nightly-201605050002-src.zip 213471902 SHA256 808e9bbc57afb9470a01ffb85b645005db1dd98c035b45296d9356f1d5f4c793 SHA512 ea4d5572fb790e50fd1d62724ac1a15caad9e01c8c9309ef8995f8e92091ba29b8fda1ee8ca14574fd5c1a07f92868216cea70f908e1ed1f734ee6ce65da9286 WHIRLPOOL 6bb173180d5b788091651ff0194ad5136d2048faf006324eb9040243897da622f2c363135b727ba12de2c4895a38fb98d28c0df6520599751582b3f94aa6d948
 DIST netbeans-trunk-nightly-201605060002-src.zip 213515050 SHA256 cc8ff54e7ae990f944e127d51b2bae614a7a5a117e3093342cf8f0a55ac320c5 SHA512 e460aa9dc8713c154400cacffd3b3c999ef9d3df8703ec8b74f597c54bba2172b7225e6a8adc22ad0a43762f4a4a887d57f517608b79af8db4d37a1d3371c80e WHIRLPOOL f6e80814ee3a79e03703cc3c3eab7194ea6f306fc6666409eb980a21e11a6b57250ea23138a61790edc81f8cf0083cd7ea1af7aa9f743e0db16857e41b761fd3
 DIST netbeans-trunk-nightly-201605070002-src.zip 213540102 SHA256 6a040f33a06dc6f57384b7d17a354cbffd3f5f78cdded520022e4ac8d48214e7 SHA512 3210979db5446f32df0fed36c091473116b2cbfec3f5fffd675e8e81357cd3f94e2edd0d06f903f5d4a32ccc48e2c0d914102a6eefcb4273712943f029ce9619 WHIRLPOOL b507b5b2ab4dd90b540595636904bb3328ffc4c7ff3a7e0d7a69422bd18145658b6f4bf115270677d7a68d5525234359a60b506096b94385a60e7979227a2fca
+DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 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_p20160428.ebuild 9520 SHA256 43ab2d84807ce29e75b611c4aee4269e1cd2ab9bcd41220e572d68f2095280a1 SHA512 698447f4e5a9dbe05337a59966f05fe7f4bc8517dd463571b65d6ab777239191ee341fb56b1c9c1b479b3fad247c5284c3712f3b142839d930214f36d75e194b WHIRLPOOL b38abccc36b868f0f07607a2d487335d134554c44e085418dd4e15b6dbdbca18337fd1dc50729bc92e2e076210fb6be7caf1502c76e3100d4e0fdd8d56e3fe1f
@@ -51,4 +52,5 @@ EBUILD netbeans-platform-9999_p20160504.ebuild 9520 SHA256 320af491ea11228284b5b
 EBUILD netbeans-platform-9999_p20160505.ebuild 9520 SHA256 452f7f2fde7936219dd37ab1069a122820458f5abd468cd33ebe8eedf2e21a07 SHA512 20a618a805c2bff4da38418315223bd2602e308d0ec2793536919f1b4daedc037c1cfdafa029113bdd5df23baa1611f6f37fd86c436db1a66dadaddd2c10e555 WHIRLPOOL c26494016c6ffcfa1cc7272d541c2de1e249279478e4ac2d6fb81eaed64025ec55a7e321608179ef7f5bcc34fb0fe8e677d4af3ebe865f61438432b32049d408
 EBUILD netbeans-platform-9999_p20160506.ebuild 9520 SHA256 7d97bf35db26ca7e946c52bd32e5771de73fb91451e1cbcb9f1f6a17cb7c5cbe SHA512 94d944872f586eccf9cb512694b84d2dd1c25784048b96202266d5e0a57cb2372bab7c7d5aff0bbbba73adc75e476604b2b3cb408d595671e697547c4af546c4 WHIRLPOOL c571f6f655053bec8e863a6b319059eddb8fb13424199f8bcf794dfa6ecf4caf8c31196d80b7d856622612bb5723caaccc4c2d5b3c6d3172ab46ee51a5ae7ba2
 EBUILD netbeans-platform-9999_p20160507.ebuild 9520 SHA256 fcfc478007eaaa9c120f6fd2378feba08d87a133835ed60f36283ec786fd1596 SHA512 551e8230eb6820130f2c69b684db17ea6e56b12b693fcf0467763167a3ebbb0a684f3d81408ef7aa933ce66e960b3b273f43dfe709c366867d23330e819dd18f WHIRLPOOL 49800980152785301af1ea5d3de7a8a515cdf8a59309b80851f654db857b699c85c40e227750813a4ddda5b6e7e6fbbe08909e879e123bc2349c33c141718bd6
+EBUILD netbeans-platform-9999_p20160508.ebuild 9520 SHA256 2af3567fecb758a6da54c9ee47a357e9afaa73fed0c0f264a4d7651a6cbeb8fd SHA512 881e9129a0997690c01b118cbabc24ab4a80f590c1265d1126585a0c4ed40ea71e1b4320f1b9879e38c59f18637797015ec53e0ba122bd2d9717fbf717fc4b84 WHIRLPOOL faa4a3f8a1d11445e6e8008f112d690ad5c10b7b49aa66d747aac05bc934636ec93ce13bd4c4096716b46a8231a954720c4f6f2cc6b5d334fb3e352fd935ed76
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160508.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160508.ebuild
new file mode 100644
index 0000000..c0c7ae9
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20160508.ebuild
@@ -0,0 +1,167 @@
+# 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-05-08_00-02-33/zip/netbeans-trunk-nightly-201605080002-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 9e75847..fff846f 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -13,6 +13,7 @@ DIST netbeans-trunk-nightly-201605040002-src.zip 213470987 SHA256 432c7c5f60ad6f
 DIST netbeans-trunk-nightly-201605050002-src.zip 213471902 SHA256 808e9bbc57afb9470a01ffb85b645005db1dd98c035b45296d9356f1d5f4c793 SHA512 ea4d5572fb790e50fd1d62724ac1a15caad9e01c8c9309ef8995f8e92091ba29b8fda1ee8ca14574fd5c1a07f92868216cea70f908e1ed1f734ee6ce65da9286 WHIRLPOOL 6bb173180d5b788091651ff0194ad5136d2048faf006324eb9040243897da622f2c363135b727ba12de2c4895a38fb98d28c0df6520599751582b3f94aa6d948
 DIST netbeans-trunk-nightly-201605060002-src.zip 213515050 SHA256 cc8ff54e7ae990f944e127d51b2bae614a7a5a117e3093342cf8f0a55ac320c5 SHA512 e460aa9dc8713c154400cacffd3b3c999ef9d3df8703ec8b74f597c54bba2172b7225e6a8adc22ad0a43762f4a4a887d57f517608b79af8db4d37a1d3371c80e WHIRLPOOL f6e80814ee3a79e03703cc3c3eab7194ea6f306fc6666409eb980a21e11a6b57250ea23138a61790edc81f8cf0083cd7ea1af7aa9f743e0db16857e41b761fd3
 DIST netbeans-trunk-nightly-201605070002-src.zip 213540102 SHA256 6a040f33a06dc6f57384b7d17a354cbffd3f5f78cdded520022e4ac8d48214e7 SHA512 3210979db5446f32df0fed36c091473116b2cbfec3f5fffd675e8e81357cd3f94e2edd0d06f903f5d4a32ccc48e2c0d914102a6eefcb4273712943f029ce9619 WHIRLPOOL b507b5b2ab4dd90b540595636904bb3328ffc4c7ff3a7e0d7a69422bd18145658b6f4bf115270677d7a68d5525234359a60b506096b94385a60e7979227a2fca
+DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 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_p20160428.ebuild 3472 SHA256 c01c6eaecbc72dff72adbdd14940ae8935b207096293026b94bc2e3f620e934d SHA512 9a0cfbe6a0e5b27611f4817889d3b102ecbf07c05987b558e17013711c3f40a2239a07c340effe846d54b14bd4f4987adef4c290563bfa461e56762d99f8c2bf WHIRLPOOL 4c47981cf634b924f82b4c9b8cd2fac84006454beb9d7923757b0eb5d82512b58090245fa068f66b6760ac83681106ab659ca036907d40faf9709274a99dccaf
@@ -25,4 +26,5 @@ EBUILD netbeans-profiler-9999_p20160504.ebuild 3472 SHA256 4697a61068993189cb572
 EBUILD netbeans-profiler-9999_p20160505.ebuild 3472 SHA256 08eb954db1fd0efae70a781ed277ab88dc7aeae5c6a77a4103962e4d8ee6ab69 SHA512 2a4c26ee818964947c4c318937ce477ec1c30ea2161afb77aef355bfbc8354a3d8a13323bb4a5732c887a96d830d399c4fd46b3997fffc41d2ea65d32ff218b2 WHIRLPOOL 26cf8df9097d0064a95192e066dd530537def49d7be53399685eff2d8222081dae104efe04a42cbca7dbf30b024643304b67e9f7232e8da322e5b66e5397f721
 EBUILD netbeans-profiler-9999_p20160506.ebuild 3472 SHA256 f007acfb99a24159a6935e6bfc4bc0ba9ca5bdbf04ae88cd4f41c049737d9019 SHA512 e90cdec1330f3ba601599357af467760502316f0e28233c623ea8776a9bc2efd4728f8d56961b200d6d39da4bf27814bab5446768842cfba4eb20d6f608d02ea WHIRLPOOL e4327eba4215843c01d8d3b5f0819baba5caf83e3b889160061d9ba16102d69a59c3e398e5ed6689b72dacac7e6219eaf9d379d2893d7b79815deed3f6d47af5
 EBUILD netbeans-profiler-9999_p20160507.ebuild 3472 SHA256 1d67a170f04bbcd6e74c648f7f8dabeb2f77e5677b6cea3b11aa7c59ba2f19d7 SHA512 1f3f55d9cc8110ea034035df1cf26b57a0b53093e4d31fef4db708b24ef926b5067d26022779d4c330fb9fe9f95c178112c8b63d251f4dae2bd6373ad4c46586 WHIRLPOOL e5b8757f46ce6c5c00c70b2a998e7951de03ae74f8e229a91340a243baf2e029d3e585a6372665f2273521a6c07cb0b78ec28fed9ed3444a0dd657f184f90213
+EBUILD netbeans-profiler-9999_p20160508.ebuild 3472 SHA256 4ec2a490ee4bdeaeb6d9cb5d243a1bda6cd04f3f1ddc4632b4247b5356d2fe7a SHA512 09d16b0dca1ebed31c18cb71032e9173a49c9bbffd046356d7da5ee4dc51f9d364fca9bf50ba9338942dcc79022850db551d733fca977040548a03a21e026c07 WHIRLPOOL 48437ada44ee16604ee5783cc955d07e17402b19c792bc8a57f9436feedcc036469b26db985378b1845c51f37b8a2ce8c4c98c6b18dfd6d85c4ead117706bccb
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160508.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160508.ebuild
new file mode 100644
index 0000000..1e306e5
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160508.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-05-08_00-02-33/zip/netbeans-trunk-nightly-201605080002-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 dff0493..3f9a175 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201605040002-src.zip 213470987 SHA256 432c7c5f60ad6f
 DIST netbeans-trunk-nightly-201605050002-src.zip 213471902 SHA256 808e9bbc57afb9470a01ffb85b645005db1dd98c035b45296d9356f1d5f4c793 SHA512 ea4d5572fb790e50fd1d62724ac1a15caad9e01c8c9309ef8995f8e92091ba29b8fda1ee8ca14574fd5c1a07f92868216cea70f908e1ed1f734ee6ce65da9286 WHIRLPOOL 6bb173180d5b788091651ff0194ad5136d2048faf006324eb9040243897da622f2c363135b727ba12de2c4895a38fb98d28c0df6520599751582b3f94aa6d948
 DIST netbeans-trunk-nightly-201605060002-src.zip 213515050 SHA256 cc8ff54e7ae990f944e127d51b2bae614a7a5a117e3093342cf8f0a55ac320c5 SHA512 e460aa9dc8713c154400cacffd3b3c999ef9d3df8703ec8b74f597c54bba2172b7225e6a8adc22ad0a43762f4a4a887d57f517608b79af8db4d37a1d3371c80e WHIRLPOOL f6e80814ee3a79e03703cc3c3eab7194ea6f306fc6666409eb980a21e11a6b57250ea23138a61790edc81f8cf0083cd7ea1af7aa9f743e0db16857e41b761fd3
 DIST netbeans-trunk-nightly-201605070002-src.zip 213540102 SHA256 6a040f33a06dc6f57384b7d17a354cbffd3f5f78cdded520022e4ac8d48214e7 SHA512 3210979db5446f32df0fed36c091473116b2cbfec3f5fffd675e8e81357cd3f94e2edd0d06f903f5d4a32ccc48e2c0d914102a6eefcb4273712943f029ce9619 WHIRLPOOL b507b5b2ab4dd90b540595636904bb3328ffc4c7ff3a7e0d7a69422bd18145658b6f4bf115270677d7a68d5525234359a60b506096b94385a60e7979227a2fca
+DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 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_p20160428.ebuild 5343 SHA256 3b6415155ed76a64dbed48af896dcb00fde8f49f53248bd544305bd6bbe01577 SHA512 d3a549390972da7e210c839116f2a9f0607b6bef416d3169493b00b525fb7280b5fbd9d633ca23d21168303ddb16e51af92272e9296d1dd9d6ca7437dfe7e4fe WHIRLPOOL b4d34bf8241733789c989859edb61d235868465a3362488b4a28dc66c7a4b866f97cf8a1178bf92c90078514d8b102a41bfcb2d6addd44b389277e7fb1436b2d
@@ -40,4 +41,5 @@ EBUILD netbeans-webcommon-9999_p20160504.ebuild 5343 SHA256 2d468847b7d3f115b58a
 EBUILD netbeans-webcommon-9999_p20160505.ebuild 5343 SHA256 f78f536535fd78bd5a07d46b4e57c48f3a415a9a1d9603f779cbece3ee360779 SHA512 624ab5a5b287ab76efc5ecb9c4b92e3faeb7a6aa59d1adee401d3c7a898eb3ab2b56e8735c63edbf793cbeea8bc60334f3cff0e0ad346beb7a6e8d84c501bc55 WHIRLPOOL d6e2ade17b3c9edc0fca27e3cfc91ce648125c381c87ef4205cfd61e0c7500630ca78067974c5598b12b6b6ef5dad2192fcf587c664ce3dc8510968b787aa4af
 EBUILD netbeans-webcommon-9999_p20160506.ebuild 5343 SHA256 ec578fef005605e740b38ce239465a1c393a59e965cf34c45caa232b56543234 SHA512 b95543b31995cfb7ccec5eef51e229d5e8a5c86013abcd116a503d52f1521028331fbe198c70ca9877e50147c74398a7a60971d8ceb765d366527d9751c32f95 WHIRLPOOL eaf68f934302d3f53a9ec50367a8c94f8c8e309dcc98bac7c3f939fd044afb24cfc9d9959982b52005bf61770897f36a56d68c77bd8500bc2a6503a45462c09e
 EBUILD netbeans-webcommon-9999_p20160507.ebuild 5343 SHA256 f030bedab10f8cff97e9f85b2dc44d1f6b76c6531a2e2a033cb61321ff10f8e1 SHA512 2aac325f9b99d05a41fa408a9b8f181ea93f7b30af32bfdd2cb1086bc5fcf1acc5ea02e1530f8709cccebf32ff1994bda253064cea520ea74dcbd8a19af107b2 WHIRLPOOL c6a3a69c3ee99b449a2795bb877c009305902cc8653836f85dc3ecfc8eceb055ae521ab4206aa6101faf35bbaab9da427528e4e55317c855b2530f7bafa7681b
+EBUILD netbeans-webcommon-9999_p20160508.ebuild 5343 SHA256 8fb9d1fbd8ccd487072f542502f11963eaa593ada43e25dc423bc07c147086a3 SHA512 ca2e204fb95fb5163aaa50efad8fb543de6ab4fb6278c8366be53e5ee733f68d36fdb699e3add7f889a055fa004af375191b4dece7c3a1085468a830c76c0a87 WHIRLPOOL 4558220e141f3e7f4e204297f264e07eee13aee6e1164914046446a4a2d377314a1ef1848e8e173fdc183706a9acdb0561d087bc0b46badcf358952b35a73d94
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 7e4f969..30720bf 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -13,6 +13,7 @@ DIST netbeans-trunk-nightly-201605040002-src.zip 213470987 SHA256 432c7c5f60ad6f
 DIST netbeans-trunk-nightly-201605050002-src.zip 213471902 SHA256 808e9bbc57afb9470a01ffb85b645005db1dd98c035b45296d9356f1d5f4c793 SHA512 ea4d5572fb790e50fd1d62724ac1a15caad9e01c8c9309ef8995f8e92091ba29b8fda1ee8ca14574fd5c1a07f92868216cea70f908e1ed1f734ee6ce65da9286 WHIRLPOOL 6bb173180d5b788091651ff0194ad5136d2048faf006324eb9040243897da622f2c363135b727ba12de2c4895a38fb98d28c0df6520599751582b3f94aa6d948
 DIST netbeans-trunk-nightly-201605060002-src.zip 213515050 SHA256 cc8ff54e7ae990f944e127d51b2bae614a7a5a117e3093342cf8f0a55ac320c5 SHA512 e460aa9dc8713c154400cacffd3b3c999ef9d3df8703ec8b74f597c54bba2172b7225e6a8adc22ad0a43762f4a4a887d57f517608b79af8db4d37a1d3371c80e WHIRLPOOL f6e80814ee3a79e03703cc3c3eab7194ea6f306fc6666409eb980a21e11a6b57250ea23138a61790edc81f8cf0083cd7ea1af7aa9f743e0db16857e41b761fd3
 DIST netbeans-trunk-nightly-201605070002-src.zip 213540102 SHA256 6a040f33a06dc6f57384b7d17a354cbffd3f5f78cdded520022e4ac8d48214e7 SHA512 3210979db5446f32df0fed36c091473116b2cbfec3f5fffd675e8e81357cd3f94e2edd0d06f903f5d4a32ccc48e2c0d914102a6eefcb4273712943f029ce9619 WHIRLPOOL b507b5b2ab4dd90b540595636904bb3328ffc4c7ff3a7e0d7a69422bd18145658b6f4bf115270677d7a68d5525234359a60b506096b94385a60e7979227a2fca
+DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 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_p20160428.ebuild 2721 SHA256 e06e7fe1eeda962aff7fbc12e4c46d0d1b20c20c2c312ae0ce8958a832ad6055 SHA512 00b42a7ffa32ea8488086b9ab2ca09610d920ff325e640077159ad4c08418e43855aacc741d094304a891e665c46be785997cd857c0607de49955e8475369404 WHIRLPOOL 5b30492d9257888e1ca4b45e092e2c7fe7548b4160939ac8f1f32dbe625b9534a669d62727abcd80be9809071973d27ea403fb1a765665a09c21dcd112485443
@@ -25,4 +26,5 @@ EBUILD netbeans-websvccommon-9999_p20160504.ebuild 2721 SHA256 d58def77d55ba6634
 EBUILD netbeans-websvccommon-9999_p20160505.ebuild 2721 SHA256 693b442aa50ad6725e4353f5b2bf44aec4b61e3056638a9be53a53feaa9ce7a7 SHA512 3276d85bccc6bdf610de5d65549aff3640cd1339a06463115c30849f8002bbe60f038736424f32f5c9c1e467072d439336cc6abbe5280b434e2749601c7906da WHIRLPOOL 4974dbbce9cef6419c42cf7e04babb6a140a3ee4c3947dc47dfa32719245489a2cf17e27dc6d502c18f5e35d7f46f9d00be46510a52bdd4a35244dd1bb10ed7e
 EBUILD netbeans-websvccommon-9999_p20160506.ebuild 2721 SHA256 4bfc3859090fe7b1992d2f5a3cd177cbb90e51b35ce1087fc920ce24b9c469c9 SHA512 7dc63bed190f983a9d92d3ccc457b2fa0724592a2a9c7263f2d44bf7ebdf6cf097119af90c21e5e2acc49d319da7473cbf52f032d768480ef17b97ce5cd9f99f WHIRLPOOL d931308d5dcf09806b3565ac2e5ca3af392fd0e24b4d23120eaf6a8771efb7658ed1968827fab9f88c0e499200930339758b82979cbef60d69ccabab81748b24
 EBUILD netbeans-websvccommon-9999_p20160507.ebuild 2721 SHA256 c91a2d660f20c92ff7ba50b0783ab60d482f3a959df56fad4d33c0ff5a9fa999 SHA512 0af23840089f592bc3dea2ebdea87a508efdfe3873c0e6a126101cb0f04886cc04066c42f632c28e772bceca3f34b4d9d77711df8ed303a6493de27df08a5902 WHIRLPOOL 6b129b6115604f7a05960024073d47f31269216132d59330fea81f4ec524ea5450b0db8741b5ae1d315a5ba633e7730068d8f55a245b6a322e8df9bcbdabde45
+EBUILD netbeans-websvccommon-9999_p20160508.ebuild 2721 SHA256 90693d0cdc122c82c9865090846c4efe9d310247693749002bb4176925fe6da4 SHA512 19f49b6c7a5afd4ae1355e9e0b431346b41cbd22369743f224e715743fc5df24288579ca2eea3531612d9344e3e33d0b976b696fc777485a5f6b02ddc0f7b914 WHIRLPOOL 5bb4bf8cf213a6c5563b7c92da1b6f56568e6a8e09c030db316f68741b57f3a33d1187babfe241912dea2b8e2d357872203cd2590df733509384b94705e08cf7
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160508.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160508.ebuild
new file mode 100644
index 0000000..dcdcd37
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160508.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-05-08_00-02-33/zip/netbeans-trunk-nightly-201605080002-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 c2f10d7..1b32fb0 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -16,6 +16,7 @@ DIST netbeans-trunk-nightly-201605040002-src.zip 213470987 SHA256 432c7c5f60ad6f
 DIST netbeans-trunk-nightly-201605050002-src.zip 213471902 SHA256 808e9bbc57afb9470a01ffb85b645005db1dd98c035b45296d9356f1d5f4c793 SHA512 ea4d5572fb790e50fd1d62724ac1a15caad9e01c8c9309ef8995f8e92091ba29b8fda1ee8ca14574fd5c1a07f92868216cea70f908e1ed1f734ee6ce65da9286 WHIRLPOOL 6bb173180d5b788091651ff0194ad5136d2048faf006324eb9040243897da622f2c363135b727ba12de2c4895a38fb98d28c0df6520599751582b3f94aa6d948
 DIST netbeans-trunk-nightly-201605060002-src.zip 213515050 SHA256 cc8ff54e7ae990f944e127d51b2bae614a7a5a117e3093342cf8f0a55ac320c5 SHA512 e460aa9dc8713c154400cacffd3b3c999ef9d3df8703ec8b74f597c54bba2172b7225e6a8adc22ad0a43762f4a4a887d57f517608b79af8db4d37a1d3371c80e WHIRLPOOL f6e80814ee3a79e03703cc3c3eab7194ea6f306fc6666409eb980a21e11a6b57250ea23138a61790edc81f8cf0083cd7ea1af7aa9f743e0db16857e41b761fd3
 DIST netbeans-trunk-nightly-201605070002-src.zip 213540102 SHA256 6a040f33a06dc6f57384b7d17a354cbffd3f5f78cdded520022e4ac8d48214e7 SHA512 3210979db5446f32df0fed36c091473116b2cbfec3f5fffd675e8e81357cd3f94e2edd0d06f903f5d4a32ccc48e2c0d914102a6eefcb4273712943f029ce9619 WHIRLPOOL b507b5b2ab4dd90b540595636904bb3328ffc4c7ff3a7e0d7a69422bd18145658b6f4bf115270677d7a68d5525234359a60b506096b94385a60e7979227a2fca
+DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 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_p20160428.ebuild 6939 SHA256 1b8ffc29323b7fe1c2308f75240c295e475626a7232fe70c6a6d096adce971fa SHA512 232be1939cb9767558f9befc29f085962d978b508940a093850602dd10a4ad49e801cb526d1ced56da3654bdf31f447619ac1bab2ae4c712fe858a475baffcc7 WHIRLPOOL 2e4d5265c0870bda91523777b9ddc9383e83a81befa8a86beb9c3f99990fa3ff6a22770d621a4120f8e891e607b61300308f5f3c433446e6bd59944fad8617c7
@@ -28,4 +29,5 @@ EBUILD netbeans-9999_p20160504.ebuild 6939 SHA256 fb4ecf8ad8f283ba5f1e6f50d92ed5
 EBUILD netbeans-9999_p20160505.ebuild 6939 SHA256 86c0f1b8d778816065a8b513e11f4225b13b66681c3376eea9d5df9197d52c94 SHA512 32d263b4c76f0d2b82361ccde4f564f2805e2af308610769cbb4cba5b682b8cfbd5f00f740402c40c819f2558fa583ba322417ddce2a9e8a79f2413affaf47bc WHIRLPOOL 5e6950ab404d3af1d82bb0221f3179455bcc00eb0c481b3034e85e5a0b8e218aa0f72dcc208a3710acf3b382c5e27f293fa90dd61c840e859b65b7f5d88f6e3b
 EBUILD netbeans-9999_p20160506.ebuild 6939 SHA256 d30cb0bf1c36d5c6b7759ca2fbb96cee31e4fe636169fdd3c0e4ce09363005ea SHA512 93ee46659661ca40ae5681d61e62bfea0771b20c484dd3819c584e506b0159c42e521d1058739639bcee1a98e4599ac4ceda329983356fef90a404855f746979 WHIRLPOOL 5df396eeb332aa8740144ee1f8dff829380889b5680f01400a41930f39e96444e226ce8caee23280f0b66cf0c58ce6a808495321c834acf2150592afe4b9472c
 EBUILD netbeans-9999_p20160507.ebuild 6939 SHA256 31c569e6224f070ad110658828c58f00a35425f60b045f25f40e48ae3b1fa4d6 SHA512 92d939520464b998e9b8d49fa3c066f59803a1ce6b2200a51ecdb1a3a6b8ea8ab89edbcf85aedeec0f58faa9abd4bbff9217ffba94e0c68e4b5c726a607bf369 WHIRLPOOL a82baf2a7926c186bed865fb0c05d97582993e360320db4c467955b5b4619f879bf33b0f329c4baafe23e10acfcde7d51fe3a9cffc5232fe470c063a807f7c7c
+EBUILD netbeans-9999_p20160508.ebuild 6939 SHA256 2e50741e1ddfb89297434a83c69a769b601c45e09b997e3949c6cb8bda7ba684 SHA512 c8bbd7235c751d7cbdd95fbe8cc06aca2359200e5e169f6d3072935c521b35505215c8f617811136b1d7b1ad22c899c8aea4836f5b7d5db33a022607087f706a WHIRLPOOL 03d5ca811132b3722078021f761478deeec336e01a833746fa556751a8429c5c7b1fad004695a20b61667ab748e50772f4785a3ca1633ee71e983c99ae96f261
 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834

diff --git a/dev-util/netbeans/netbeans-9999_p20160508.ebuild b/dev-util/netbeans/netbeans-9999_p20160508.ebuild
new file mode 100644
index 0000000..3b3e496
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20160508.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-05-08_00-02-33/zip/netbeans-trunk-nightly-201605080002-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] 4+ messages in thread

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-enterprise/, dev-java/netbeans-javadoc/, ...
@ 2016-06-30  8:27 Miroslav Šulc
  0 siblings, 0 replies; 4+ messages in thread
From: Miroslav Šulc @ 2016-06-30  8:27 UTC (permalink / raw
  To: gentoo-commits

commit:     3139fb5ce77664214a8588edeb24102319401a65
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 07:26:51 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 07:26:51 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=3139fb5c

netbeans: removed obsolete ebuilds

Package-Manager: portage-2.3.0

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 77170af..6f63d3b 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-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 DIST netbeans-trunk-nightly-201606010002-src.zip 213564247 SHA256 1298b642375838c792d0334de386924e095024fd2f4ef450d6093de436d37855 SHA512 e5fa2fbdfb7bae2d4053fda427e0367eab20770926dcceb6be6476c5df3a4581ffbcf86be9857456ca3c06e723c96503bb547af7d2842dde1ba6dd6cab062e74 WHIRLPOOL 65976354661f4328a8b86543c8c34c6383d5199a3af692ad9cd1de3401509106f24927943f12bd90d4d621a1af65132581ff0b9bf1ef48c5a8916e0ec462bd9e
 DIST netbeans-trunk-nightly-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
 DIST netbeans-trunk-nightly-201606030002-src.zip 213220744 SHA256 c90867dac6486f399b74933e9a771646dd5a288b94f41cf0b5c44f9cb9c911a7 SHA512 00cb8987fba28724277b070a177d3b008eff889cca0a98517b799a573dd79e8af083c19ca3243c079ff2c8e50a65c6649cdd0a8a5f282a756feb7e7b347791d4 WHIRLPOOL a8f2a23e4f1a92cb2305d7fdbe533173f8d66b5caaf0e7b63ef7427295b821301ac44d55bc0603cc5f4572d2cddd110e7ef35eb15600951468f67ff532730d27
@@ -28,7 +27,6 @@ DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844ef
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
 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_p20160531.ebuild 3384 SHA256 4ce32af94f3710f3378fc1db750b702a9766abb55ace825be772e9b1ef0f511c SHA512 a66453f69db0ad75c1443ae009a61aafdc3135b527479232eb28c6c5cda2ae0ab998e3905b34ceb6b3275266c501342e9e2f450a5533d41bfa8d971b4b1eb4d2 WHIRLPOOL ae765125a30d7f14251141f571f018139a18e8a30d7b0cfcd18558fa801b33bac97f2e4982477086b8f30a9b29f055ee8132a609d955d061778a8668b656d98a
 EBUILD netbeans-apisupport-9999_p20160601.ebuild 3384 SHA256 917780bc42080342a907c499454e4d1f802563d79d1db2db0d8e308069050e3c SHA512 7a3f3b54f21382aa7a76c63aa7474d802f948c710bf4becf202762a373a3563f81fcf1a1ccffbf821c05f3bd7ab87b60827e9c1ab09863abe41edd2496f750fb WHIRLPOOL 93bb9dcb7da36620d51e279863af996d0d72ebb1a9149f656b1729c873a739bf7870b917057d3464ef6727c09e5ff44a5284eac5796ede58b143230bb0508848
 EBUILD netbeans-apisupport-9999_p20160602.ebuild 3384 SHA256 9f9e0061fd2123bd1d5018466e7a64f3cd376b30d528fff37056e38d18cf89b1 SHA512 099cce38418570263bd2c8d4ec44980e1bcd7a320ebcd00abf511e58d7517964d51086495ac45388cb2e8e0caafa313bd8536c8e7dca5e67d49b43967f4187ab WHIRLPOOL d1ab187f69d55dbbb869f200463b0e82be1bb1964b092b2808a455a04a44e3944d7d1206a0d46e7ab1f14e60f9ec6836c288c8435be268193f4dc4bad5afabb4
 EBUILD netbeans-apisupport-9999_p20160603.ebuild 3384 SHA256 69ee2eadb5a39a566802993b0b947fb728d57b053fa3dd757118bd4510eab104 SHA512 465b671bfa3f518247a520b8435c813008295139d5a75e802bbb99ad61cd282487868a9065ee17f0269474f1b815edcc4f57049fe6cb64dc95f7336fd580bf6e WHIRLPOOL c70b39a582e447a9995c7e87d247c9582b4e2b81ce188331c025de3efb34e7617840aa78c9b3477cee293788440265c17bad9351acd10b725e5c5095b3989be4

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160531.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160531.ebuild
deleted file mode 100644
index 5edb604..0000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160531.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-05-31_00-02-33/zip/netbeans-trunk-nightly-201605310002-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 40fb3b8..16288ff 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-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 DIST netbeans-trunk-nightly-201606010002-src.zip 213564247 SHA256 1298b642375838c792d0334de386924e095024fd2f4ef450d6093de436d37855 SHA512 e5fa2fbdfb7bae2d4053fda427e0367eab20770926dcceb6be6476c5df3a4581ffbcf86be9857456ca3c06e723c96503bb547af7d2842dde1ba6dd6cab062e74 WHIRLPOOL 65976354661f4328a8b86543c8c34c6383d5199a3af692ad9cd1de3401509106f24927943f12bd90d4d621a1af65132581ff0b9bf1ef48c5a8916e0ec462bd9e
 DIST netbeans-trunk-nightly-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
 DIST netbeans-trunk-nightly-201606030002-src.zip 213220744 SHA256 c90867dac6486f399b74933e9a771646dd5a288b94f41cf0b5c44f9cb9c911a7 SHA512 00cb8987fba28724277b070a177d3b008eff889cca0a98517b799a573dd79e8af083c19ca3243c079ff2c8e50a65c6649cdd0a8a5f282a756feb7e7b347791d4 WHIRLPOOL a8f2a23e4f1a92cb2305d7fdbe533173f8d66b5caaf0e7b63ef7427295b821301ac44d55bc0603cc5f4572d2cddd110e7ef35eb15600951468f67ff532730d27
@@ -41,7 +40,6 @@ DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844ef
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
 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_p20160531.ebuild 4790 SHA256 b0f128cc2702719236a0cae0cba9a9f2674594b12781a25e281f52aac68b0ae7 SHA512 6fefa351b7abd2ebf3ffad1d8c234507b14538097143fa8005048565e1fabcef28068013a0e50457cd5d7827e87ec4b78c66f7d8770b81ece6a6029709831612 WHIRLPOOL 7add3fb0af325d58e6630a025632d441d4c2b7050f5271aedc187b00f69f1a5b389455afd8ff04b8fd8f96b39caac137acae9f2529a1251ac036beb8f50ce6c4
 EBUILD netbeans-cnd-9999_p20160601.ebuild 4790 SHA256 d519d679c1a8527e706fc54cbee9f0679ce5cd4768edb5b6d8124ff5a11ce986 SHA512 b16f75d0534b9966f1c8a0d1ab2b61cab72aa523d800d710e6d479468a0cf72cc44a343e167b0c63db8ba5e78e3bb96ea75200d2f850fea973e778521b52f190 WHIRLPOOL 2492e733e7a16de4f0972d079ff385ef69e553c1f9e3ae8e9e8fc61140aecb270080606bd0b24eb0934f70e98c67b55da7f1700904e6e38dc04fcb98464e8e1f
 EBUILD netbeans-cnd-9999_p20160602.ebuild 4790 SHA256 2459de80a913934d021318558ac0f674d838ac9829bff2a13e3a645948ba6b44 SHA512 6b13ec3c8f2d537f753c62b14935c8dbe9f39d28a36dec434d47ce4c46cf0f8310cd76cc0814530b2b46f31b19c1cc06d076d82ccf5719fd38a6961f863df5d4 WHIRLPOOL 57e8efd404a66954e969aa1b3f54378e5766fe97b077d064c2ae73abdfdd68301e0edab2df4c668f2f5ec992f500cc9710fc68001ed53cfda31332cd23250a32
 EBUILD netbeans-cnd-9999_p20160603.ebuild 4790 SHA256 a3648171d92b77a61300fbc53523bf78cfc27827b9d2e82295e47a2398c8d1b1 SHA512 8c9f6e18e55721626fda45aa438a4e34edc2fd4f676c717390103a43faaa4a3f68455d0ff533dcfba3b6509fa9f195f9efd00cfc888d3a50e88d08811dd756e5 WHIRLPOOL 5de059517672498e9ddb52bcec24ef6dfc4a3ecba183ebd5404714f43b306eb337a3067bd3a9ee91b887f73f9b868c28f8a3e913254c4b8e78fc9fcf4b78c87f

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

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index bb9e248..57e92b7 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 DIST netbeans-trunk-nightly-201606010002-src.zip 213564247 SHA256 1298b642375838c792d0334de386924e095024fd2f4ef450d6093de436d37855 SHA512 e5fa2fbdfb7bae2d4053fda427e0367eab20770926dcceb6be6476c5df3a4581ffbcf86be9857456ca3c06e723c96503bb547af7d2842dde1ba6dd6cab062e74 WHIRLPOOL 65976354661f4328a8b86543c8c34c6383d5199a3af692ad9cd1de3401509106f24927943f12bd90d4d621a1af65132581ff0b9bf1ef48c5a8916e0ec462bd9e
 DIST netbeans-trunk-nightly-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
 DIST netbeans-trunk-nightly-201606030002-src.zip 213220744 SHA256 c90867dac6486f399b74933e9a771646dd5a288b94f41cf0b5c44f9cb9c911a7 SHA512 00cb8987fba28724277b070a177d3b008eff889cca0a98517b799a573dd79e8af083c19ca3243c079ff2c8e50a65c6649cdd0a8a5f282a756feb7e7b347791d4 WHIRLPOOL a8f2a23e4f1a92cb2305d7fdbe533173f8d66b5caaf0e7b63ef7427295b821301ac44d55bc0603cc5f4572d2cddd110e7ef35eb15600951468f67ff532730d27
@@ -31,7 +30,6 @@ DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844ef
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
 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_p20160531.ebuild 2968 SHA256 690e1c9bfff7d6073d58ab2866668e7f308c2eb3b962ef5e507ff11af6309d9d SHA512 e02b30bde93a346b85d920e7612ad09b2cb1cd5aecd563a0eef69e274580c67bd77f5e5802634d04ef64ced10c8c16e7b489346fb6c2901b04761f17ed4d285a WHIRLPOOL c67fd009b2aaef051466b88cd56d0877768a208b25876af5f5a338da25b1e33e52f6a87de6ee5fd87b953ac052bec9a060be5b9d9c2465d5914af88f2cbf7157
 EBUILD netbeans-dlight-9999_p20160601.ebuild 2968 SHA256 b8e54d0e7e8461f5f8e1c0ff45a2c6e11d833505b297f0c26e7a5467580cf2e7 SHA512 493f4fb6b46dcb66efe94efba561e17bd5bd60c5ee1a04e1274d1a99aadb5569307aa21445f71479b1c7938625efa785147d322f028747fd1254df08ddaef7f2 WHIRLPOOL c14df90f2d76ed52347ac9ab3d9d5d416821add0d223ce39bf4f9cded5c7757df1c2153fd58424ebd68e553aa0522ce5536858748fc085dfc853a48f7e64b2ed
 EBUILD netbeans-dlight-9999_p20160602.ebuild 2968 SHA256 351088ebb237b03559f3dda345e6e6d6ce56cfe5e64489006f96fb36528891c8 SHA512 5c1f3c5ebb06d5724524766b9ba32ee672e40489170a8300dba367d0ded696eea0db5874f9859c673d8133ccf6a541ec618dae0e822e454280d277113683a327 WHIRLPOOL a41ea5b2ff9f23bff25f7075e9786d224551a1413a3604e14f1a8a23e45185d42e3ed36cc677e41e105c684a41e0aeea365d59b50bd3a6b5cbd5ead6871cb941
 EBUILD netbeans-dlight-9999_p20160603.ebuild 2968 SHA256 ac3f70b6b69522a477f68c4cf7bfe769cf9d1ec705e25ec9330fe51b51f5ae32 SHA512 148b7393120bb874d9d2e212e7efe8a28260fa78ade34d09ca618bec66a31370fc517f864ee43d8f592536c4c599d02c86152d4e27f7f93ffecb3ea1db2d3fe9 WHIRLPOOL 6c6e3ba09232b5ff5223d358b0a793f51ddb4f2e15f239362f6142fe9f38fd06db958050c189e3bb52eed223c52a4b0a4d1290d3897cca416efdb36db03f69f3

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160531.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160531.ebuild
deleted file mode 100644
index 99d8f37..0000000
--- a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160531.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-05-31_00-02-33/zip/netbeans-trunk-nightly-201605310002-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 6bf7e66..8dbae88 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-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 DIST netbeans-trunk-nightly-201606010002-src.zip 213564247 SHA256 1298b642375838c792d0334de386924e095024fd2f4ef450d6093de436d37855 SHA512 e5fa2fbdfb7bae2d4053fda427e0367eab20770926dcceb6be6476c5df3a4581ffbcf86be9857456ca3c06e723c96503bb547af7d2842dde1ba6dd6cab062e74 WHIRLPOOL 65976354661f4328a8b86543c8c34c6383d5199a3af692ad9cd1de3401509106f24927943f12bd90d4d621a1af65132581ff0b9bf1ef48c5a8916e0ec462bd9e
 DIST netbeans-trunk-nightly-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
 DIST netbeans-trunk-nightly-201606030002-src.zip 213220744 SHA256 c90867dac6486f399b74933e9a771646dd5a288b94f41cf0b5c44f9cb9c911a7 SHA512 00cb8987fba28724277b070a177d3b008eff889cca0a98517b799a573dd79e8af083c19ca3243c079ff2c8e50a65c6649cdd0a8a5f282a756feb7e7b347791d4 WHIRLPOOL a8f2a23e4f1a92cb2305d7fdbe533173f8d66b5caaf0e7b63ef7427295b821301ac44d55bc0603cc5f4572d2cddd110e7ef35eb15600951468f67ff532730d27
@@ -60,7 +59,6 @@ DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844ef
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
 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_p20160531.ebuild 15825 SHA256 8896ee4302604466c12ab67fcfaaab19412001cfdb847354bf82f53ad77d3865 SHA512 e975151fd925aa2cb0f6e581d65e6377f3973bcbef832d6f09f485adf00a7c1a5fcbd0080f5f47e36d1f5d7a4568329d71b3e00ae7c4f2b08adc88264a654748 WHIRLPOOL 69647fc959f74528efb56ee23b47943fe43624be9d338fd2cdf9ac0cda575d29e0db2336a8252105108dbe0dcaf36e48a58712457470f54089ba1dd20bce391d
 EBUILD netbeans-enterprise-9999_p20160601.ebuild 15825 SHA256 ab4b1c6666b1b31dea4521db86f71136fe492d79ac25984084dcc010c4953505 SHA512 d2a0f6f0460e74a6e58438571966953bf7b3d4f9cd0712500b27025e75f6495b7a3fb9923ae0d79d80c921d15078518d3b1a6b148c5f7872dc45617dd172a712 WHIRLPOOL 45208c94005b564269a78856e84781d8628910e48c39c85d65502e2cf3123110f02d062ec7e80027805784b3bb95ae12bc292b8915846155ecda5ccffc422f11
 EBUILD netbeans-enterprise-9999_p20160602.ebuild 15825 SHA256 f0d497d0a62a9fddaee1a27f3b53b430d13fa5a012e78adecc176860dc287174 SHA512 63cdd3fea0813992e4b55f4e5d63c0efd596f4f8c4c96ebfe8ae284814d9aa04db0336e6973801591b17a394f1557df9e19779c64051d89aa37303765b6d466a WHIRLPOOL 8785f4139ecc23a225c1fd0de9478b18de97061097a3529bbc2bd425cabbc6f60fb14ef187e4288cdbea759b7161204139768c65004750dc563f4602627950d0
 EBUILD netbeans-enterprise-9999_p20160603.ebuild 15825 SHA256 c2341b75632753bdc414b1d6ee72aa424e21d001c08eb69bf79c654769bcffb3 SHA512 eff678abacdecfc0ad714f1b97a19e1fb5749f1cff64802e01b5b45dffd6c9d1727a332b8faf6dad58f88dcd9889fd827e00cbe6a35c40d33795381f05b7bc23 WHIRLPOOL ca8febdd203a9de067b184847d73bf85d9f9ea5a8e92770895626ebc18c034fd7095fdd63cac2a5f324b570a786873fd4a5c1597a618d7ce32d69c2f2f48377f

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160531.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160531.ebuild
deleted file mode 100644
index 3e12079..0000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160531.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-05-31_00-02-33/zip/netbeans-trunk-nightly-201605310002-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 cbc9f4d..43477cf 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-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 DIST netbeans-trunk-nightly-201606010002-src.zip 213564247 SHA256 1298b642375838c792d0334de386924e095024fd2f4ef450d6093de436d37855 SHA512 e5fa2fbdfb7bae2d4053fda427e0367eab20770926dcceb6be6476c5df3a4581ffbcf86be9857456ca3c06e723c96503bb547af7d2842dde1ba6dd6cab062e74 WHIRLPOOL 65976354661f4328a8b86543c8c34c6383d5199a3af692ad9cd1de3401509106f24927943f12bd90d4d621a1af65132581ff0b9bf1ef48c5a8916e0ec462bd9e
 DIST netbeans-trunk-nightly-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
 DIST netbeans-trunk-nightly-201606030002-src.zip 213220744 SHA256 c90867dac6486f399b74933e9a771646dd5a288b94f41cf0b5c44f9cb9c911a7 SHA512 00cb8987fba28724277b070a177d3b008eff889cca0a98517b799a573dd79e8af083c19ca3243c079ff2c8e50a65c6649cdd0a8a5f282a756feb7e7b347791d4 WHIRLPOOL a8f2a23e4f1a92cb2305d7fdbe533173f8d66b5caaf0e7b63ef7427295b821301ac44d55bc0603cc5f4572d2cddd110e7ef35eb15600951468f67ff532730d27
@@ -28,7 +27,6 @@ DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844ef
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
 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_p20160531.ebuild 2913 SHA256 d2a5f6fc547d45a82546c9f7d41b32924f3e9c974c122b00f1a853560581250c SHA512 5e684421b0d5a90eaab360ad674fb2a5ba32c548c8f29a70de5537e33743a3122ae6a7634243d614b8cac09fc307b9461a9acaa42fdbb2c1c5ea46281c5fa1bb WHIRLPOOL a5168ac0341486a43586d3e7af41172623ad574d2933c07903e808ef6fb21d793627b3210a8daa038b8552d4382533438c3ccfa0552865f3e9c74d1a334f6756
 EBUILD netbeans-ergonomics-9999_p20160601.ebuild 2913 SHA256 257c09a1072e694f0508ac5a1995ae3fdca17bf0fb53604bb46f94754ab3b878 SHA512 595d8a6e2391c6fffafe66a66ff9f4f518926bc33e16f63289002ac78e1b77f43310313bcab3f2c8b1dc51a4d60a81a129ec80545ea50c5080d585b0d41e9d9e WHIRLPOOL 86877a5d2de37fe475ac2a5fb73c0d87cb073e581d93a5036f157598a2653f9a8e9f3a5330990ab7c6f0a3bee8ec7bf937ce6ced00c418d6f64b2e32f2d61787
 EBUILD netbeans-ergonomics-9999_p20160602.ebuild 2913 SHA256 8a7812ccff99e623b71ae4996708dc44bd2afec57f32f8f67820dec994db0cce SHA512 5e482ab060145b2ead40c7f338665ca918635445ab9f40d23508785588b96f6b1755271fae96462124382d3388e2b810776c233c39054239112035ff16215da7 WHIRLPOOL 453cdd733a2e346ed12998f1c70f6ac33c0931b5b8be3f8b8dca0cede9561ef5fd995e71eb842d9b509bb559f559612c39a4dff33c6a18bf0e4611dff2033108
 EBUILD netbeans-ergonomics-9999_p20160603.ebuild 2913 SHA256 a18f1e11ab7f6fda357beb9a768c6d741c618bb65a10eed9fa94c81e3aac7e56 SHA512 cbcece526c10b28a36513269447a2e61db8db9ebd6624a4fe68821fc2662fc44119d6a0ce254104c693b76092dfd0422fe1f8b2f72064be502c6012c18d39b56 WHIRLPOOL 0b8c1339bfb07b03e641b675571067104aebb22061de3edc23110afe8ad130acb149cf4b4e4ae8c72ccbe598f3f972c92800ad728d4e98b6bfd724f0470c24fb

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160531.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160531.ebuild
deleted file mode 100644
index 3f695c2..0000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160531.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-05-31_00-02-33/zip/netbeans-trunk-nightly-201605310002-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 144afe8..d9d9822 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-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 DIST netbeans-trunk-nightly-201606010002-src.zip 213564247 SHA256 1298b642375838c792d0334de386924e095024fd2f4ef450d6093de436d37855 SHA512 e5fa2fbdfb7bae2d4053fda427e0367eab20770926dcceb6be6476c5df3a4581ffbcf86be9857456ca3c06e723c96503bb547af7d2842dde1ba6dd6cab062e74 WHIRLPOOL 65976354661f4328a8b86543c8c34c6383d5199a3af692ad9cd1de3401509106f24927943f12bd90d4d621a1af65132581ff0b9bf1ef48c5a8916e0ec462bd9e
 DIST netbeans-trunk-nightly-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
 DIST netbeans-trunk-nightly-201606030002-src.zip 213220744 SHA256 c90867dac6486f399b74933e9a771646dd5a288b94f41cf0b5c44f9cb9c911a7 SHA512 00cb8987fba28724277b070a177d3b008eff889cca0a98517b799a573dd79e8af083c19ca3243c079ff2c8e50a65c6649cdd0a8a5f282a756feb7e7b347791d4 WHIRLPOOL a8f2a23e4f1a92cb2305d7fdbe533173f8d66b5caaf0e7b63ef7427295b821301ac44d55bc0603cc5f4572d2cddd110e7ef35eb15600951468f67ff532730d27
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844ef
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
 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_p20160531.ebuild 3377 SHA256 8fe07d5a616af6c87fa929aa68745c940bc0b4fec9296a9713e4e081f46de096 SHA512 11f2ab2646e8e3d44475be7c479aa7c710e9fe704802ea14b3613e0da67a5fa25c329d08ab68c31f6fb17a3426f654fb59e89b6ba64f4c587d0a571230307c4a WHIRLPOOL 51111d987e7f08ddbe53af36e0f56b719d87e243d30756a8959e415b0751bbb5219939e6848bf106e1606c37e60106f0d6aaafe8f379db95c01bf819e83ef698
 EBUILD netbeans-extide-9999_p20160601.ebuild 3377 SHA256 f00795a59287fb81ad7171b10d8bafda2b118bd28e08ccc1a0de34dee3e942a5 SHA512 d87a2d902b261b6611fe5ecdcded01b83a317572badb6fa115e2a253af2dc8ff4edeec17cf584eeb2111fdccbe10e7bc7a046ee85e8f74a9e9b7ed953fd4ceb6 WHIRLPOOL e890ab0710f18324733bbec6d64874236fb1981d77aba749e6dcd0e1bec9177b62bd0ec119e2be62480da62af0600ff819233404b1cab078766b217e45c0af87
 EBUILD netbeans-extide-9999_p20160602.ebuild 3377 SHA256 accab66f7708728148d4ac2f50cfa3675debee5b43d10f0a907eb03232ebff7a SHA512 5399f07b2bdb4c7b5d0d65657d360717392d2b9a931f8bed52e052630757de37052e31b256f1864fb2cf1268cc048c49512fb14f9146bd44be90dd1ef32abcc7 WHIRLPOOL 80c3103b8cc790e0202b1519f14c15d704fdd7fb40fe837ca867b05de913fd7e4b4ac301ac62c95d1b9d06eb1aaff76cb309e55812c6cee34ae35d3cfc350fcc
 EBUILD netbeans-extide-9999_p20160603.ebuild 3377 SHA256 e4b4378d726c11b69f137cfccd0e2e7c7b93ec9684a4c7fdc2c4d6e46c676648 SHA512 b0632996aa3f9d703e6f0b8ecf500691b3d8eec4c9d7d678356e039bb28be72cd11f93dc760209fdd2061f9be3e8f0a69daaf33651c31b66d9d5de8e557e215c WHIRLPOOL 69098cdb56c2865e31e069441732967e47b30088bb5482ffc6502d75d5ba38b1372151b2167997916173e83c53308fb0c129e164a6ab1d92c46f2f088e407809

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160531.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160531.ebuild
deleted file mode 100644
index 102d476..0000000
--- a/dev-java/netbeans-extide/netbeans-extide-9999_p20160531.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-05-31_00-02-33/zip/netbeans-trunk-nightly-201605310002-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 db678ac..a86db18 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-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 DIST netbeans-trunk-nightly-201606010002-src.zip 213564247 SHA256 1298b642375838c792d0334de386924e095024fd2f4ef450d6093de436d37855 SHA512 e5fa2fbdfb7bae2d4053fda427e0367eab20770926dcceb6be6476c5df3a4581ffbcf86be9857456ca3c06e723c96503bb547af7d2842dde1ba6dd6cab062e74 WHIRLPOOL 65976354661f4328a8b86543c8c34c6383d5199a3af692ad9cd1de3401509106f24927943f12bd90d4d621a1af65132581ff0b9bf1ef48c5a8916e0ec462bd9e
 DIST netbeans-trunk-nightly-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
 DIST netbeans-trunk-nightly-201606030002-src.zip 213220744 SHA256 c90867dac6486f399b74933e9a771646dd5a288b94f41cf0b5c44f9cb9c911a7 SHA512 00cb8987fba28724277b070a177d3b008eff889cca0a98517b799a573dd79e8af083c19ca3243c079ff2c8e50a65c6649cdd0a8a5f282a756feb7e7b347791d4 WHIRLPOOL a8f2a23e4f1a92cb2305d7fdbe533173f8d66b5caaf0e7b63ef7427295b821301ac44d55bc0603cc5f4572d2cddd110e7ef35eb15600951468f67ff532730d27
@@ -30,7 +29,6 @@ DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844ef
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
 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_p20160531.ebuild 3416 SHA256 afba60b1ab66a4189c113e0d504f897d9efad1ed55628c05544eace987a570cb SHA512 dc2b6bacc5cd01d73f3eb64ae059202f65d998a48997c5773d7a03b0c04a350ce538532b07d329f761331ea9ff88ff61ad7eb7b1d064d1ea772802a0ee833d1f WHIRLPOOL 78880b46d8c066462c4897df5a1258eeb6531f6b5e769af157f7b1414ccc3a518f47aed9fc5a8cb2c9e36e77d568f48a4aa5cd66b73c7b198d53f67b071ece64
 EBUILD netbeans-groovy-9999_p20160601.ebuild 3416 SHA256 8702022d7ee560f5aabec6891097902ee2dcad43c9ffba55cb406e79b2edf868 SHA512 16e4862b749ac7c65921c024ec2600dbbdba1c75aa52a364de73ad657862d6f3309d180d2a6ac56ff9d10538046de4013dc6ec76e8884e4e46c05dfd8d3657e8 WHIRLPOOL bd19c6b5b5372261bc7b5bfa862db08b30897a7843e545d06b7be592d8ff17ea6e9a75d2be641999d5285f9e6722767ed68836acf91bb18b9cae03b3655e1d2c
 EBUILD netbeans-groovy-9999_p20160602.ebuild 3416 SHA256 214540d35a040cf91bcfcf173f730ef69e49a2950a2936c42996b4c169fa51b9 SHA512 9dcf127f42f8af264068b876cd094ff570c478105e856759835218f5cc84dbe98b052b11c27962229d4168d39cd32d73638d3a760e0ed96d91de4b15cefa0a07 WHIRLPOOL af0c027f196481280ae8131d511b9318f3d0c1bf1d893bfb08ad7bddc5e92cd1713d747d84f9cc4b4cc6687560ace1f48dc2c99c5bc6e84e29eabc64f6e81408
 EBUILD netbeans-groovy-9999_p20160603.ebuild 3416 SHA256 0951e9bcdf7ac663c4534defc5e51b1cbda8d266a65805d91826265c2405c6cb SHA512 f0b5dd482a96ce98602ae256ccae9c166b6d217f5a7f8ed9948d82474f1fcf31e0819ee53ed2a2d9a73bbdd2d5e574c24b19bc45f320b253977d9d0e6f2e53f2 WHIRLPOOL 004fb585be59ecd5c97dc89944c9de0007d3a31ea5665c3b1358231576a5a4484cd39cf31f111ff2307be4b60b90e51e8dc7fc2b37e0f44de0aa7835ac1ad34b

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160531.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160531.ebuild
deleted file mode 100644
index 5ce6f0b..0000000
--- a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160531.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-05-31_00-02-33/zip/netbeans-trunk-nightly-201605310002-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 2607baf..287333a 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-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 DIST netbeans-trunk-nightly-201606010002-src.zip 213564247 SHA256 1298b642375838c792d0334de386924e095024fd2f4ef450d6093de436d37855 SHA512 e5fa2fbdfb7bae2d4053fda427e0367eab20770926dcceb6be6476c5df3a4581ffbcf86be9857456ca3c06e723c96503bb547af7d2842dde1ba6dd6cab062e74 WHIRLPOOL 65976354661f4328a8b86543c8c34c6383d5199a3af692ad9cd1de3401509106f24927943f12bd90d4d621a1af65132581ff0b9bf1ef48c5a8916e0ec462bd9e
 DIST netbeans-trunk-nightly-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
 DIST netbeans-trunk-nightly-201606030002-src.zip 213220744 SHA256 c90867dac6486f399b74933e9a771646dd5a288b94f41cf0b5c44f9cb9c911a7 SHA512 00cb8987fba28724277b070a177d3b008eff889cca0a98517b799a573dd79e8af083c19ca3243c079ff2c8e50a65c6649cdd0a8a5f282a756feb7e7b347791d4 WHIRLPOOL a8f2a23e4f1a92cb2305d7fdbe533173f8d66b5caaf0e7b63ef7427295b821301ac44d55bc0603cc5f4572d2cddd110e7ef35eb15600951468f67ff532730d27
@@ -33,7 +32,6 @@ DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844ef
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
 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_p20160531.ebuild 4126 SHA256 68fe3568590b425f719804a05a92b4c2201544150c0468756e5e761420c8cdc2 SHA512 adf63f4ae0069318f7630786bf8c5eaa73d4fe68d8e67a4297219cbe5affd399daa556cbf5f34ca87d4352f6e69c02a3c39e48d2213a4a390ac5c1badbe2cc94 WHIRLPOOL 92602e7834a99cc320e23cbe455ef94202e3441fa7332c151745207afd375466492cf18282bcf2fafb409de1caa8a3dd128ad28c8d36e0232e926d9cd04b9df5
 EBUILD netbeans-harness-9999_p20160601.ebuild 4126 SHA256 09ce0bc1cbf8d2c8cbc14c02b6e981958cad9b8a7ba7f26a283ea9d9ffcafa27 SHA512 0a0ced1be53478236aca906eb7e40511017e15111d18c696c9679c1b06c1ddf12f5cf00c02d118f6d5ae69ba7bd34d85701fdb3fb2b9514c9b75371f5c326eee WHIRLPOOL 4241c1663e5180d29ef4667078ce7f615c38d39d61546f357f2ed3b71e97efe548580dbe89773959ef921acfa7277f737997121a61fcb2c9d018488280287c19
 EBUILD netbeans-harness-9999_p20160602.ebuild 4126 SHA256 aa6cd18675cff39af819566282a6ca2ba7517022887258c0cca45c1eef0f0472 SHA512 316a736a27c44368af9e6c418b417b0c0495c82eaff9f692f745dabdb68c02361a0910bf13c5710b15c57696a15226ff7fbe9fd85f8b6fa9827dae772039044f WHIRLPOOL d0576ff6178bf7e690808dbd22aa6c8a2534bd1f03ccefe1b311d38c3a9f645ea2df1b969afb9491f68309361ecfb8cbb2ee3563246c90a96d3b587154442d4c
 EBUILD netbeans-harness-9999_p20160603.ebuild 4126 SHA256 63e37d2551036e0ffc3e6027b3af27c58a05f26cca652d004125eea6e1584e42 SHA512 4b6ca8fa5d9905a031a28890cfce6f20f4fa81c8bb0c5009ee57021f6662b1a509bdf00a6b1a0afd723c243743a2e162ff89b8a7ad64e7afd6efeb89563587c0 WHIRLPOOL 7a4ac3fc55a80ab0952085a0dbea302de2263a332637d2154a3d2fe7a824458efcd0a9e1a1b13730aa95e28dd2ed76a1c1f2f14f648ddede921ddbfb54ad4612

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160531.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160531.ebuild
deleted file mode 100644
index de0dcf4..0000000
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20160531.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-05-31_00-02-33/zip/netbeans-trunk-nightly-201605310002-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 a7f3a4e..cdee202 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -143,7 +143,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 DIST netbeans-trunk-nightly-201606010002-src.zip 213564247 SHA256 1298b642375838c792d0334de386924e095024fd2f4ef450d6093de436d37855 SHA512 e5fa2fbdfb7bae2d4053fda427e0367eab20770926dcceb6be6476c5df3a4581ffbcf86be9857456ca3c06e723c96503bb547af7d2842dde1ba6dd6cab062e74 WHIRLPOOL 65976354661f4328a8b86543c8c34c6383d5199a3af692ad9cd1de3401509106f24927943f12bd90d4d621a1af65132581ff0b9bf1ef48c5a8916e0ec462bd9e
 DIST netbeans-trunk-nightly-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
 DIST netbeans-trunk-nightly-201606030002-src.zip 213220744 SHA256 c90867dac6486f399b74933e9a771646dd5a288b94f41cf0b5c44f9cb9c911a7 SHA512 00cb8987fba28724277b070a177d3b008eff889cca0a98517b799a573dd79e8af083c19ca3243c079ff2c8e50a65c6649cdd0a8a5f282a756feb7e7b347791d4 WHIRLPOOL a8f2a23e4f1a92cb2305d7fdbe533173f8d66b5caaf0e7b63ef7427295b821301ac44d55bc0603cc5f4572d2cddd110e7ef35eb15600951468f67ff532730d27
@@ -168,7 +167,6 @@ DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844ef
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
 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_p20160531.ebuild 30761 SHA256 7309d48bc6cafdb8e1b7aadb2eb62830ef23d2362b495c26cc5bcb5a32bdb398 SHA512 f3623dee4ca4660af77d812103061b3dcc6469b6f17de17593514e94129eb8fb2762911afdc87ccb3e16f690ce75404ccb1f428ea58e4520ae6d0247851115e8 WHIRLPOOL 96f0cac48e2214606406c58e454e3bd662aa7bd51f11766c5be901c9034a869b55a9dd5c3f7be82236434909459b2aa2254b4bfbc8d8cd52469ef59446c6dec2
 EBUILD netbeans-ide-9999_p20160601.ebuild 30761 SHA256 64254fa95036e095f34e2a408065ed0f9d15d6488413d9d274c3838cb8045ded SHA512 77ad5b4f5df722fef543b567d1e01949e9d96cce38ebf6f3cfa5f72eb2dabadf5b63de313141877805dab06f8c5fe17013ea90b252280b36c44b7e69a8960a4b WHIRLPOOL 4e8e39faf1e8828f0439e00f5815fdfe20043cd56c65146b99b11408474dc9e2f4e37230dac4dac628631a931d0782bbc0569cf6becb463d7108c543931da575
 EBUILD netbeans-ide-9999_p20160602.ebuild 30761 SHA256 25a187d71b98cc313552edef677f1574768cb8ac9001d9357459c97547893bbc SHA512 a34cdce3f7cb3ae23437d433929891349f933d3dd8eaa5792927b8a619a58507e246dbd7ef1b0d1d38e5a01601df1f3bf03b72d0e10c72be481e2872d98ffe76 WHIRLPOOL f795e0395924136cd8cb1b1864059bc0973ac423313e44764de112717bc186d5b4afe3ea625d2d95019a7106286919fb02b2ed7fd991d6e82ad25d57bdd7fdc3
 EBUILD netbeans-ide-9999_p20160603.ebuild 30761 SHA256 c513df7ac72c16af426b80f091b5affc10af7c4ea6f91f73ba75185893a26bfe SHA512 a8ef06e29929f7fddd28f9a62579dbe7ab8a2f1548e3039c022c169950420c158d35aed182b67c3519b42e16911a4696a6c6cf6f70930da078dd415cc338abe8 WHIRLPOOL 466cf61b820e4e7d1c4a92f4d03d88d9e895905122544db2702d8c7439dc3d5c806632c94daa8b1e7b21bcfe9ea66386380c6715d9af80217a0c1f734e2a1bfb

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

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index ba25972..a139107 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -24,7 +24,6 @@ DIST A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip 19
 DIST AA575D7D97D3261048FD3E4ECC1B3F9DAA3E707E-nb-javac-impl.jar 3036152 SHA256 707ea8fa93e21a3fae0bfa4f2956e579e3e16d4c39c5cb67cbc7bd72f3458a66 SHA512 9fe7e10e574d983cf1fe4d1d3ef6c548dcd62f3f346ce5f2c7ea21cb8d62c1153981df3fe1e087af07a418b16546b86c1c635e4aacede5962a9bb2b50b53e9fd WHIRLPOOL 7c5d266ae902dcd199b066eb409c04865599bf5f2a527d5f8336ef3d855583c826da262136e5032b055e65c205be5d9a35f04015b8119b460821e0776ff48a33
 DIST B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar 173819 SHA256 4f2dbc36ec77519df339846cf5333e874d6f147f5d46ccdfabb18af34ee3bd5b SHA512 ccd48f9fe445b669763428dace1a02d5820a33d872c952d3a74608f868ca225c017999ae15857ed544799d467068b759d216121ba79d3288f323aa2cffb95fa8 WHIRLPOOL 02e8556df81839b0b90c912b9e22c22c9f10c54ee0aabda4768eaf6956f7e3e29c9b24a46e20bb264f2ea186c1642ec7baeb375b2a8951737543ac16e73f9260
 DIST B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.jar 2259343 SHA256 551a7c1bfacb60eebe7eb5b004b69f546840cc3fca82f44431e4ac6215163f39 SHA512 67b973d2a3d52fba14ec2d285f4c2f0b0490be04d73c38918c2657f7fc257656f793e1e4eaa9221579ed93cd3ec1ce0c120f5b4fbc86582b95308c1f8b64fb79 WHIRLPOOL ae6e765a49e0cf8284a3496005a571f96ba730133c220ea77b8d19520a8579e4ac4879f1218ec38c0210c56add19ead8b3a4d104613c9788387213ce8561c8cf
-DIST B732870DED6CCA71896B0D8913C7035E396550D9-nb-javac-impl.jar 3035583 SHA256 68c11a17d3b985557bb6cba96f68b0114e50d54d661d0352e7b765d1e612db72 SHA512 c0817f343df5d025eee0bfd979bd5ded9acd4ae6ad537488e803267cc6b289d309ddc8a93df6de904809bec04a0fd5e175666cef1fecfc2b3e8775428d2e8ce1 WHIRLPOOL ee2067b34b162658e6402ed6189fdfa84392bd4f84d7535f0e0cee9859ec7e427ff7b60fdf1135879d44d61b20992886502767aaa92cc07fb824cc2e3e814f0c
 DIST BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar 56032 SHA256 817762baeabb24daf8a41a9716e31f85a7659147d09264a499f4d35b0fe04115 SHA512 c84d4066b9519cf2c00d5d4f054865693cd1665e5db3b30f6e77b44a7c0d3055cc40a1641b805ea38d2294e2cab1a27fab85035950ff0d94960a4de185bcc76b WHIRLPOOL aae6bc05d3b441443b9f0d80e65fde81614b0206eee5714f4e51ceaa0adb778758a5d65efb3a4963111f3b258753e0154447914a5586251883d22b0c1e09f9f3
 DIST BFCC4C322190D6E3DD2FA9F191C0359D380D87C5-wagon-file-2.10.jar 11429 SHA256 bf363540ede1db9782511d5ddcfcc6871d5026946ba4d214061ca992f064e128 SHA512 f7a69e5622153a3f6568a7b28b753ab0d19adea6c34a265b5efeaf95a9961dd0af711d0719956e0859fa3c63a1c06237381c35f20fb14e1fc9d9894f09f3522a WHIRLPOOL 4d223e3c256956d05ebf7d5e58ae3276027f0ff2effa8b54a3a8badf480029e19b8cb1b880139bde75167d886daaa6bc9c1d27c68d3b5bab01babbe607f56b54
 DIST C09FC722275CC8A84C455660B15E41CDC1654FE5-nb-javac-impl.jar 3035581 SHA256 e9debda04e078947905ea08cb6ab524b9f7d519bdcf1dd4fc7d22be4d5c745d8 SHA512 45970388501473540b4b70378f99f97c89ee56d2a0b86fe07cbc56263973014286597c48deb08fb22d4f562ba4cd5a8cc738db267d96f4df5248643105ef72ef WHIRLPOOL 5c86935599c5767b424c5255988e33941606a78a4dc5611eb098488ddbc9fe1568a5b889b1ef5bcc8365623d02adf12691a5e004bb793ac5afd27e23ba60377f
@@ -44,7 +43,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 DIST netbeans-trunk-nightly-201606010002-src.zip 213564247 SHA256 1298b642375838c792d0334de386924e095024fd2f4ef450d6093de436d37855 SHA512 e5fa2fbdfb7bae2d4053fda427e0367eab20770926dcceb6be6476c5df3a4581ffbcf86be9857456ca3c06e723c96503bb547af7d2842dde1ba6dd6cab062e74 WHIRLPOOL 65976354661f4328a8b86543c8c34c6383d5199a3af692ad9cd1de3401509106f24927943f12bd90d4d621a1af65132581ff0b9bf1ef48c5a8916e0ec462bd9e
 DIST netbeans-trunk-nightly-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
 DIST netbeans-trunk-nightly-201606030002-src.zip 213220744 SHA256 c90867dac6486f399b74933e9a771646dd5a288b94f41cf0b5c44f9cb9c911a7 SHA512 00cb8987fba28724277b070a177d3b008eff889cca0a98517b799a573dd79e8af083c19ca3243c079ff2c8e50a65c6649cdd0a8a5f282a756feb7e7b347791d4 WHIRLPOOL a8f2a23e4f1a92cb2305d7fdbe533173f8d66b5caaf0e7b63ef7427295b821301ac44d55bc0603cc5f4572d2cddd110e7ef35eb15600951468f67ff532730d27
@@ -69,7 +67,6 @@ DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844ef
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
 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_p20160531.ebuild 15656 SHA256 433143c8196e48d299bd43cdb863e6feb8a6334d0b93d8606f0a26cf2e40c307 SHA512 99d0052cf0503089ea5f6598e99628acfa229ffc611e9febfb8a03f7c245a06d7c96b058d5538715a034e66512cd60cc856c384120f9b41e49b2746e91da6b6b WHIRLPOOL 84eec64a0982a7b3ff423435401584686fa9778bbdc6065306529a220b0fb195badd6fbe524ac5665f17714c8359106509afa684b38c5a5d244efedf19c28c28
 EBUILD netbeans-java-9999_p20160601.ebuild 15656 SHA256 4ce9751a839ac02e05bf349ed6307dd9a81b59467016d6975c1dfcac53b6e8ea SHA512 d86452bc09af3c6e88d585e42ae2ce51791732c77f47a44220bb5f7903d2b68f7252f29b2fd6b9b57b6fba5db8af2d239f94a63521e712b2a83d73e43aa3f357 WHIRLPOOL 1f362ecf39da0be3a20c56a8f1f1a8be0056ab345b02050e013d867084b7bfc87e5bc39d617aec515f0f3e2d832454e5398aa5af2b42cb32cb9121a24e253169
 EBUILD netbeans-java-9999_p20160602.ebuild 15656 SHA256 715f83188a6c730b16e539731b5c2a0d12c34993bde2c708dec8e0949e6c5d15 SHA512 8adcf8e3b54e7ad64f4a24895880dd5d2edf4c8d0190f7225bf45f28ba8d17ff98f2127dc9a8d3aa9bd7859e31f09344707dc3d8d7bb4c9019bc86884a061572 WHIRLPOOL 5d067335f78e519aa35cdc4fe768df198e9ce0958aea849fe74f21e78731dba5d420a68061e343e7d017794a131046b81cb2c5215691b9471bf50291425d7b99
 EBUILD netbeans-java-9999_p20160603.ebuild 15656 SHA256 1497c4c62ff3ee65817e8eaf90381519dad151d07f5247a8d8d8de91f3a68eb9 SHA512 1a6fe6034e814351d4aa06d240d9fbea835f3bb11c0f3df3f42b9c8c0a3abb3b5bef98598bd320047df31731a70ec4acb000cb219a63a0d551e637b9a8ae093a WHIRLPOOL e284d38b3d80a050ced28f819763466053056f02f2a717f50b76f94483a04bbf0eecdefaf95d7275af2357c75b2dd16b26e96074c2aecd957fcac20a86f46ac7

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160531.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160531.ebuild
deleted file mode 100644
index 8a7d12c..0000000
--- a/dev-java/netbeans-java/netbeans-java-9999_p20160531.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-05-31_00-02-33/zip/netbeans-trunk-nightly-201605310002-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/B732870DED6CCA71896B0D8913C7035E396550D9-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}"/B732870DED6CCA71896B0D8913C7035E396550D9-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 87eff8a..9d9f7d9 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-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 DIST netbeans-trunk-nightly-201606010002-src.zip 213564247 SHA256 1298b642375838c792d0334de386924e095024fd2f4ef450d6093de436d37855 SHA512 e5fa2fbdfb7bae2d4053fda427e0367eab20770926dcceb6be6476c5df3a4581ffbcf86be9857456ca3c06e723c96503bb547af7d2842dde1ba6dd6cab062e74 WHIRLPOOL 65976354661f4328a8b86543c8c34c6383d5199a3af692ad9cd1de3401509106f24927943f12bd90d4d621a1af65132581ff0b9bf1ef48c5a8916e0ec462bd9e
 DIST netbeans-trunk-nightly-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
 DIST netbeans-trunk-nightly-201606030002-src.zip 213220744 SHA256 c90867dac6486f399b74933e9a771646dd5a288b94f41cf0b5c44f9cb9c911a7 SHA512 00cb8987fba28724277b070a177d3b008eff889cca0a98517b799a573dd79e8af083c19ca3243c079ff2c8e50a65c6649cdd0a8a5f282a756feb7e7b347791d4 WHIRLPOOL a8f2a23e4f1a92cb2305d7fdbe533173f8d66b5caaf0e7b63ef7427295b821301ac44d55bc0603cc5f4572d2cddd110e7ef35eb15600951468f67ff532730d27
@@ -31,7 +30,6 @@ DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844ef
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
 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_p20160531.ebuild 4971 SHA256 d70657ee63537c718193070179a5a0e2c84622eec1a51d4a1d44ee660088ff95 SHA512 85d5954111ba408fd2edbc8aaf58d11a66a43ef48bc0600325e26553dd8897dea49a5941cc780f22728a824fef7672df5fabe8a81e0e2b4106de515251f7afaf WHIRLPOOL 4081d9d7c5e5f56ca829c64709c4d9f0c994c3feb80982a65b20858af171ca1e61358042b1338d95c08c016ac89b3e1f4b0175df61ab5e302a788e82bba425cc
 EBUILD netbeans-javacard-9999_p20160601.ebuild 4971 SHA256 5a0abd0209890bb66c7cc8b8cd7d6e56cc97228cc653cae26ec484f83a1aa1da SHA512 a5a75a6238df091c0262074fa8c95de3a6665e4e57a3476488938c87eeaaf622d31f609577591fd946778bb6ca8808a7fe49b59295cd4dd99e3f7e5e1864d198 WHIRLPOOL 1dd3acf737833b9fe7d7202a65d8b58827247c7d1ff4b156cdc22c740b8e3218069dc327866fd24651322d943ba7a500afce75250f4ca9fe8b9ba3b3b913ec68
 EBUILD netbeans-javacard-9999_p20160602.ebuild 4971 SHA256 67b31d9bb98c525975409e54c96f560b6bd92e42fc6d4148ac42ab2e901fdad2 SHA512 68dee96fdaa012292287767287de8c4747a943090218bc8ce300368811cd8e776140643c958da14d6b0e4aab85c6fbc9034e696583317b51ca5062f42bed5233 WHIRLPOOL 001ac8bed54aec01902838857505e350a2da67ca190c88232c0b58ca03a10dd7fc6559a7776bf0ee06470e6158f6f8ac827623b1aeb11f797ed6ab2f71045353
 EBUILD netbeans-javacard-9999_p20160603.ebuild 4971 SHA256 1310df9672d4137b24cd7ae87e07af1110a8ed112957cb3a30e4873b88d4695e SHA512 734e1f6ecb7de71ed25025b391e350816cb0ba10b437269ca811e4f8254d0a25678b7762a0f537db4ba2a442e0e7cebd6cd4133b7b8fe91fa3359e53ec498fcf WHIRLPOOL 61a67a355acca170168a605331287f174d50d5354f93961f25faacb821f112efb3810e647a3cfb9972975340fef35b51f9ade1742adc596ff44e6d8ce98ac40c

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160531.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160531.ebuild
deleted file mode 100644
index 69a386a..0000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160531.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-05-31_00-02-33/zip/netbeans-trunk-nightly-201605310002-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 c11f832..2bc030a 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-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 DIST netbeans-trunk-nightly-201606010002-src.zip 213564247 SHA256 1298b642375838c792d0334de386924e095024fd2f4ef450d6093de436d37855 SHA512 e5fa2fbdfb7bae2d4053fda427e0367eab20770926dcceb6be6476c5df3a4581ffbcf86be9857456ca3c06e723c96503bb547af7d2842dde1ba6dd6cab062e74 WHIRLPOOL 65976354661f4328a8b86543c8c34c6383d5199a3af692ad9cd1de3401509106f24927943f12bd90d4d621a1af65132581ff0b9bf1ef48c5a8916e0ec462bd9e
 DIST netbeans-trunk-nightly-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
 DIST netbeans-trunk-nightly-201606030002-src.zip 213220744 SHA256 c90867dac6486f399b74933e9a771646dd5a288b94f41cf0b5c44f9cb9c911a7 SHA512 00cb8987fba28724277b070a177d3b008eff889cca0a98517b799a573dd79e8af083c19ca3243c079ff2c8e50a65c6649cdd0a8a5f282a756feb7e7b347791d4 WHIRLPOOL a8f2a23e4f1a92cb2305d7fdbe533173f8d66b5caaf0e7b63ef7427295b821301ac44d55bc0603cc5f4572d2cddd110e7ef35eb15600951468f67ff532730d27
@@ -30,7 +29,6 @@ DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844ef
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
 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_p20160531.ebuild 6293 SHA256 813a015748a35f8f8b19039880c93991752990378478f4919ab769be01b7f958 SHA512 7487278344df7ad43f801c9c15732526d49e6985aebb2a5d947f37856fd7c250563db8a9f0326d72b3dc6f7ea3e4cf3e9f9f58120828be53dcc64385bc79eadb WHIRLPOOL 6deefd30f9c64f670c0bb207c325d0810923d9a61e0877830f348a01c499db2bc65ea89caf11332d6740e5aa01241555dd0101ba6670b6002fe11d8f8981f4a5
 EBUILD netbeans-javadoc-9999_p20160601.ebuild 6293 SHA256 393d1a4c80cfc24a774cff006128b94d102036b6b6f79a52bb1ed5eeaae2e12d SHA512 e997b8ad6090084e2aa8f2a098a7e6bd3d334df18a5180812e05ad438feb88913c47d5c98188b332719932072ed468da38df82aec25d7f56683215392bb35c76 WHIRLPOOL e9c0f32106f431f418b30756a1d118ac2140df69c17c6f1a79d2cbd65bb60bcd3216fd53acc1e651d6e12f2dad18153f31923e2f95f621a8bf87b8342c1452c3
 EBUILD netbeans-javadoc-9999_p20160602.ebuild 6293 SHA256 d05f5bab2b691dcbb6b8da3d4fbda78564cb88864d9c118c8b6173d7635313f0 SHA512 b9f4424343e5a867e066499439e7291fd2e0b7495a60a0dbfa161367a166c950ed6e49d9ff30cd5e693bd8e4afc78393ff95f6d897ca2a275310e86e67f2c7e7 WHIRLPOOL 20a6430a8809bfa43b6635d913bdb3b31a0ed8530c3fb2806b4d497fb74592e96526e4f8ca02cfa501b1d63ad1f7492741b9fbf4dc87b5120afbe57abb222243
 EBUILD netbeans-javadoc-9999_p20160603.ebuild 6293 SHA256 2b612d74602bbf5a87146e3ac51e4553961e311f01d14c78b1a8be2828bb1482 SHA512 4a19ad31a472b82a089d3c6220b054d68de3d53357abb3aa48b3b86e8f7a8ff53b9c04b1fc1bfff42a752a8b60ad8d581b3d87d703be453fd7b503e1e33f84f3 WHIRLPOOL 626ff895e6e14eda79fb585b0a4e9a2ae1ec06fc6320717e4ddf84a0eeb7b8ef47df1aed39cb0e225f676a64251f8d7af0fb9fce4e1304ecf940479ce4a50cf2

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160531.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160531.ebuild
deleted file mode 100644
index 6cdd5cb..0000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160531.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-05-31_00-02-33/zip/netbeans-trunk-nightly-201605310002-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 657ce78..ee1315b 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-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 DIST netbeans-trunk-nightly-201606010002-src.zip 213564247 SHA256 1298b642375838c792d0334de386924e095024fd2f4ef450d6093de436d37855 SHA512 e5fa2fbdfb7bae2d4053fda427e0367eab20770926dcceb6be6476c5df3a4581ffbcf86be9857456ca3c06e723c96503bb547af7d2842dde1ba6dd6cab062e74 WHIRLPOOL 65976354661f4328a8b86543c8c34c6383d5199a3af692ad9cd1de3401509106f24927943f12bd90d4d621a1af65132581ff0b9bf1ef48c5a8916e0ec462bd9e
 DIST netbeans-trunk-nightly-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
 DIST netbeans-trunk-nightly-201606030002-src.zip 213220744 SHA256 c90867dac6486f399b74933e9a771646dd5a288b94f41cf0b5c44f9cb9c911a7 SHA512 00cb8987fba28724277b070a177d3b008eff889cca0a98517b799a573dd79e8af083c19ca3243c079ff2c8e50a65c6649cdd0a8a5f282a756feb7e7b347791d4 WHIRLPOOL a8f2a23e4f1a92cb2305d7fdbe533173f8d66b5caaf0e7b63ef7427295b821301ac44d55bc0603cc5f4572d2cddd110e7ef35eb15600951468f67ff532730d27
@@ -36,7 +35,6 @@ DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844ef
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
 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_p20160531.ebuild 4717 SHA256 15385908c5ed07bab07ffff59ead705b1b647f8c35689fbef1a470f382812992 SHA512 c4bcbabb3c31d484dff8dc71b37c4c86860a374f66abc317c60a993d3d87a8f30385cf142b9b64d848bbb5b48879f751351f609939ffed65e13f94cfda113b6a WHIRLPOOL 926ebb4cc0d24fe0aa4fbbf486b306b713257deb7594a02bde66d2a740890604e810f9b1b97b24d41d80b56e36024c3dd19bfcf7ccd204722bd29918a9907ca3
 EBUILD netbeans-javafx-9999_p20160601.ebuild 4717 SHA256 f07d8fa724dba872143bd7879e079e6899b148162e15103b37a9b348076a1ae8 SHA512 e112a6b5e41631452abfec970c86111c9b41df538f1ffce733eadaecc316137b900c62ad9c414bba62361a9349ce68e69fe1234305b9f70567dc67de6dd39ebd WHIRLPOOL c74f5f24b99420c1756e352536b7673e6f1836df61e06c64e35d41ba9ff7bc293271f17ea1ef7aae49aa591c3edb5bbd46e4b5c5493091524069fe2269a6c262
 EBUILD netbeans-javafx-9999_p20160602.ebuild 4717 SHA256 7df344cc9d7a9b5b3f1d8322a4c8d5fc126858c4d27a5e09421b9d80b2dda9e3 SHA512 21ec266d8c4b5cd1d397363504ef3e7ba96a5a724e1167dea35f2c861f5328cd4998ba26f7f487a1933d0a90f9225a4fb88a39836d5a6dfd5df2c8077901ef52 WHIRLPOOL 926805c7df2f92351b2f179489b2ed12e78543800d962d4117a1cc038fd1a0240b10c03a8474d51912d41d81cbffd5bd8671821f4ca1193a12e16ea0a4eaf408
 EBUILD netbeans-javafx-9999_p20160603.ebuild 4717 SHA256 ab20d26451be5be774aa0217219c8b78899887da151c300a23f762548830460f SHA512 1051f4c454732bbadd9fc1b0cbcdd31fa5c97619b33475fc41206a2ef00b4de1d20aa96b8a57872df0bdd55cb47813536eb5909f2afc18d770dfce13dbf6d23e WHIRLPOOL f06d21976c6c4ea93860d9a314061d5b47a4e1c2b10f3efac68f604d11316a017f027eeb2307cb62ab7b130fb85eef1812224db9c8fc6a47582578e35f4d22e9

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160531.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160531.ebuild
deleted file mode 100644
index 66dd8e1..0000000
--- a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160531.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-05-31_00-02-33/zip/netbeans-trunk-nightly-201605310002-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 7ed9781..7f70f93 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-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 DIST netbeans-trunk-nightly-201606010002-src.zip 213564247 SHA256 1298b642375838c792d0334de386924e095024fd2f4ef450d6093de436d37855 SHA512 e5fa2fbdfb7bae2d4053fda427e0367eab20770926dcceb6be6476c5df3a4581ffbcf86be9857456ca3c06e723c96503bb547af7d2842dde1ba6dd6cab062e74 WHIRLPOOL 65976354661f4328a8b86543c8c34c6383d5199a3af692ad9cd1de3401509106f24927943f12bd90d4d621a1af65132581ff0b9bf1ef48c5a8916e0ec462bd9e
 DIST netbeans-trunk-nightly-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
 DIST netbeans-trunk-nightly-201606030002-src.zip 213220744 SHA256 c90867dac6486f399b74933e9a771646dd5a288b94f41cf0b5c44f9cb9c911a7 SHA512 00cb8987fba28724277b070a177d3b008eff889cca0a98517b799a573dd79e8af083c19ca3243c079ff2c8e50a65c6649cdd0a8a5f282a756feb7e7b347791d4 WHIRLPOOL a8f2a23e4f1a92cb2305d7fdbe533173f8d66b5caaf0e7b63ef7427295b821301ac44d55bc0603cc5f4572d2cddd110e7ef35eb15600951468f67ff532730d27
@@ -28,7 +27,6 @@ DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844ef
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
 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_p20160531.ebuild 4412 SHA256 bfd9208382ec77f0fb140cb5aade385e9e8fe51e5f84cf374d6c1164f4f22bce SHA512 a58dcad9c20645150fe8862fabc02d1d7f68439406def14f57fa971f6cfb7249e6b21e1f7c45018324051428c6314cad21d6ab072517df4a10c926fe7c3049af WHIRLPOOL 71e47ae0aa9887f0bdb8a66deefd2e75fbb241204d11c85e5efdb345f38464c74ecc62441445f73d2806c1431b168c60434c9e4d21668cf9b7c7812c2eb28171
 EBUILD netbeans-mobility-9999_p20160601.ebuild 4412 SHA256 de087d7ef025d5ffd19b95a0b4a06d03d0d14a917b97a1dbc5d60f4d9924f5f4 SHA512 51812e2a822cdbf81d74d5264afb6b8ce8486d44f2e66ffb9cd2708d4599b8939cf77e6a7acdb81580af908cf9d1532fad92d01acfd3b79cdf41d80787e1fd53 WHIRLPOOL 3c7d7c14dd92f4062881fe0933393c4602c313e0f85a26c9bde77e6ef276aaab76080465eeb1457653e436773aef9c2a531a567dbe64052036d700d97701f94a
 EBUILD netbeans-mobility-9999_p20160602.ebuild 4412 SHA256 9cab13f457b62c8879c3af8b6b261fabcc78fb5352ad23e876f17d16becc6b0c SHA512 18af0983b9ca44ce014225becc8e2ed4e986c6497517033eea29616bc3ae398a83ef0c76415ffb74cc8d08cb3b30e7047a5959ac1b5ef39b682c1654dd949006 WHIRLPOOL 16dac895c75d51d5b3c0e711d55eebcedb09c852f1670b297081ca81d311a38455ef5eabc5c4c90e0ad05c4a13ce93cc32e5825d8855bfc26279f78c3645fad4
 EBUILD netbeans-mobility-9999_p20160603.ebuild 4412 SHA256 640d6b27f3664c2851c6b2fa8ccc7a6a1f204f3af940123284e6f90007e68d37 SHA512 9e3e0aff5b332e982b58046415d25caf47a6a3b4f25de34b94a402358c5bff69024d8f6a5b9292609605337709f29ea7ba9801e4eedb57ed8d6ca7f893fca6d5 WHIRLPOOL 3aead76a02d3a89b6372ccc59403a9cb3d65e2a4863145ad8bcc4c5baf0fe22ec11d30a4b0956787b867c3d67b94da755932e162868e5067313819df57010eb7

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160531.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160531.ebuild
deleted file mode 100644
index 592c010..0000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160531.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-05-31_00-02-33/zip/netbeans-trunk-nightly-201605310002-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 95c2560..caeb9b7 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-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 DIST netbeans-trunk-nightly-201606010002-src.zip 213564247 SHA256 1298b642375838c792d0334de386924e095024fd2f4ef450d6093de436d37855 SHA512 e5fa2fbdfb7bae2d4053fda427e0367eab20770926dcceb6be6476c5df3a4581ffbcf86be9857456ca3c06e723c96503bb547af7d2842dde1ba6dd6cab062e74 WHIRLPOOL 65976354661f4328a8b86543c8c34c6383d5199a3af692ad9cd1de3401509106f24927943f12bd90d4d621a1af65132581ff0b9bf1ef48c5a8916e0ec462bd9e
 DIST netbeans-trunk-nightly-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
 DIST netbeans-trunk-nightly-201606030002-src.zip 213220744 SHA256 c90867dac6486f399b74933e9a771646dd5a288b94f41cf0b5c44f9cb9c911a7 SHA512 00cb8987fba28724277b070a177d3b008eff889cca0a98517b799a573dd79e8af083c19ca3243c079ff2c8e50a65c6649cdd0a8a5f282a756feb7e7b347791d4 WHIRLPOOL a8f2a23e4f1a92cb2305d7fdbe533173f8d66b5caaf0e7b63ef7427295b821301ac44d55bc0603cc5f4572d2cddd110e7ef35eb15600951468f67ff532730d27
@@ -31,7 +30,6 @@ DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844ef
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
 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_p20160531.ebuild 4111 SHA256 9454e1ae9962e35c30a385e7122acdeede6635b69ddc51771ca64a7501022881 SHA512 e8e6cc8d454cb2e7cad0c613258bbe1110104fda4e01b95662496082d04d692273676e13ccb19227cf8858bed13fa0434d84431625eb266e9f10df8b059af4a8 WHIRLPOOL 2491d248c0de3e7ae2379c20d3184980482490a0409231ac1b1b1c5a60636258cfd0d99f4b2a7691b7f2f117889c996265a3b1c210c504be8c7e397b5366e940
 EBUILD netbeans-nb-9999_p20160601.ebuild 4111 SHA256 a5c19f24bdbd819a742487647bebb88d1dd16218c2b2c699a33eeff16e26edd7 SHA512 c851d47b0400c0e49535f32f978117e03be90d539caa6bc47e7c24c95d7c94631728ce89218e55d39bfa4a69f41b472cd0638aa539e29ab2a05c1dc05c0b11f7 WHIRLPOOL 73ce719f741a26938e6b1fa7651b5a2cc64a6cdaeaf1d3d43f7af70a48819189b9c2a8ab97e1c394246d401a0e5019d608fe01418af2297469f3c9485ffe88e9
 EBUILD netbeans-nb-9999_p20160602.ebuild 4111 SHA256 7f4ce60bf8856117c7540eb74b3cec16e9b9895908e545192ed2dff7172e5b00 SHA512 43561ecdade3bc16fcbcbd7368721841014e3928823f6ebac6e3a36ef0bd21ff8fc083cdc22cd7745ad470a30fa41624146cd015f80ff172eeb91fe2097237f2 WHIRLPOOL d505738ec13725696e6e7ed1136ff5d5e7dd7dcb7857d42e9fd989489d476d04552474318f1b7b497d9ae7038fc6c2dba22d888d88fe83596585f5fb0671a394
 EBUILD netbeans-nb-9999_p20160603.ebuild 4111 SHA256 a1cea0ba15b462dc5f2639d434e71c9bc12444b588f57e91c3d7ee5902479ad7 SHA512 a9e80a95a241e48f6b50c0e42511886518456ce7e4f5c71099158f91b0ba48c633db934310d5c15e08333b4fe1840f92022a6006c8dd6135b74f9c061fd856b0 WHIRLPOOL 3cca997c01c81b13c7286ede54e12c429891c0e5edbd96d13f6154acdea696d146e6a1a862f167d30250e1289e573e1de881f669214d2e4b720dab74cfed0c3a

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160531.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160531.ebuild
deleted file mode 100644
index a05157f..0000000
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20160531.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-05-31_00-02-33/zip/netbeans-trunk-nightly-201605310002-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 65fabd5..6127c8f 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-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 DIST netbeans-trunk-nightly-201606010002-src.zip 213564247 SHA256 1298b642375838c792d0334de386924e095024fd2f4ef450d6093de436d37855 SHA512 e5fa2fbdfb7bae2d4053fda427e0367eab20770926dcceb6be6476c5df3a4581ffbcf86be9857456ca3c06e723c96503bb547af7d2842dde1ba6dd6cab062e74 WHIRLPOOL 65976354661f4328a8b86543c8c34c6383d5199a3af692ad9cd1de3401509106f24927943f12bd90d4d621a1af65132581ff0b9bf1ef48c5a8916e0ec462bd9e
 DIST netbeans-trunk-nightly-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
 DIST netbeans-trunk-nightly-201606030002-src.zip 213220744 SHA256 c90867dac6486f399b74933e9a771646dd5a288b94f41cf0b5c44f9cb9c911a7 SHA512 00cb8987fba28724277b070a177d3b008eff889cca0a98517b799a573dd79e8af083c19ca3243c079ff2c8e50a65c6649cdd0a8a5f282a756feb7e7b347791d4 WHIRLPOOL a8f2a23e4f1a92cb2305d7fdbe533173f8d66b5caaf0e7b63ef7427295b821301ac44d55bc0603cc5f4572d2cddd110e7ef35eb15600951468f67ff532730d27
@@ -33,7 +32,6 @@ DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844ef
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
 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_p20160531.ebuild 4418 SHA256 156207d35036cfa9b1c0e00d845d09817c2d3967352fb7e356d3d508c6fe0c0a SHA512 d18f6f011e86269f51c3d53b23793aa6e8ba1d3f936a77d0325344f43c5c068bcdf5d1c22751d21553903efcf05039a97a622f9128e4874f72ef440bab63d715 WHIRLPOOL 89f240bd119853d93be72d7ba9c4a63208bf328a04177b8b141726af0bf7d3934b6d60ac79f135389f03e0533c346ff8131abc890170d070e369f3ec5c11c2f2
 EBUILD netbeans-php-9999_p20160601.ebuild 4418 SHA256 2d9d4657a09b64c390257565e5dce1274d28304f1099b886d946b9329c6ba52f SHA512 41b55730648af35f24cba97bed75c62368644491567186333042bc86c39cd14b5f1e6e136ce3db0c063b4074e3d2f552e65a5747f9f569dfb7242fa572c7756c WHIRLPOOL 7ca3535df7d8adc3ca9704846d16595d2a05eac24560b19013c709d4fec3fffcf8b2ce21e43247242017e1727e9a9a38bf33ef72ad19480231149425d9ae3af5
 EBUILD netbeans-php-9999_p20160602.ebuild 4418 SHA256 c651c0408d6fa0b9cee0fde33975d4b94ee24cba36ec0dd1e03221d962185c8c SHA512 5afab0cd329177c51dde78ba2eb6e90a15df8759add25a1b19bed90f9ed6dea30e0c3a62474ecbce67f1199c8ee0f4c1ce028b5ca13097a52b7afaab666f96df WHIRLPOOL 6f1f4b1578531338867502381aa6dc898cabfebf4cad40f0ee0e103ed80780f0cde7ce4da3ccb49a52ac48235deefdef73a1dd6a7ce7f728963a71dd52bb0f97
 EBUILD netbeans-php-9999_p20160603.ebuild 4418 SHA256 93fbf55773dad79c113d8f272f89611f32d973fd55c79058ebfdc8fe3a7bb302 SHA512 15da6d30984e9425aaa0a95b08950a0513a4bdaf890ae6a20979dd5da4f069490b88661b6e8bdc6315aeeb1fa5a3156afc01f09ce8dff9087db2ed09a739fb63 WHIRLPOOL ff21e35964a987b2ab6bd2461caaf24adbba1800d9bdd6f6d2fbaf13e5fe1fed379051b3646d89843c52fe6f533825ea57c535cf4000ab3c4e0c5262b02568be

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160531.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160531.ebuild
deleted file mode 100644
index 05f1117..0000000
--- a/dev-java/netbeans-php/netbeans-php-9999_p20160531.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-05-31_00-02-33/zip/netbeans-trunk-nightly-201605310002-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 7d4afc1..e234228 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-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 DIST netbeans-trunk-nightly-201606010002-src.zip 213564247 SHA256 1298b642375838c792d0334de386924e095024fd2f4ef450d6093de436d37855 SHA512 e5fa2fbdfb7bae2d4053fda427e0367eab20770926dcceb6be6476c5df3a4581ffbcf86be9857456ca3c06e723c96503bb547af7d2842dde1ba6dd6cab062e74 WHIRLPOOL 65976354661f4328a8b86543c8c34c6383d5199a3af692ad9cd1de3401509106f24927943f12bd90d4d621a1af65132581ff0b9bf1ef48c5a8916e0ec462bd9e
 DIST netbeans-trunk-nightly-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
 DIST netbeans-trunk-nightly-201606030002-src.zip 213220744 SHA256 c90867dac6486f399b74933e9a771646dd5a288b94f41cf0b5c44f9cb9c911a7 SHA512 00cb8987fba28724277b070a177d3b008eff889cca0a98517b799a573dd79e8af083c19ca3243c079ff2c8e50a65c6649cdd0a8a5f282a756feb7e7b347791d4 WHIRLPOOL a8f2a23e4f1a92cb2305d7fdbe533173f8d66b5caaf0e7b63ef7427295b821301ac44d55bc0603cc5f4572d2cddd110e7ef35eb15600951468f67ff532730d27
@@ -54,7 +53,6 @@ DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844ef
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
 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_p20160531.ebuild 9520 SHA256 de67b49b3884b84c135bdb1cd5f1fdc2dd4ac860789b8d626720d2831053f5dc SHA512 d9e4346029c2a7a03da0ac1e30bf46a8da252549076c57df9e829889987cdcdf54b918b246f220ac740c1ddd92109f0784aa3b030ab7113bf8de99581dc2f5d6 WHIRLPOOL 32a12d3710c15b02d8469bcde1280857e309ed091c9dfaa0488049e68ecb75c55f7b6c2ed62686020642487ce69611a58a130cbae966a1d4dc97b1d9ffc3d449
 EBUILD netbeans-platform-9999_p20160601.ebuild 9520 SHA256 5223d635370db664a276876deeed41dc3fddc112e061c64f0ed8fb4c9b412e6c SHA512 858275dc34af4d2951d4f5c1da27bbaeb77e4f47e9cbe2a02b4fcae2aa7c21a9bf25b560f2d22056c4a16e052f21332e21ce74402d32b22fda6e31b53cb8cb18 WHIRLPOOL 7f58bf005bbf87ba79fa583d06ca7164a7308c82201b24f374627d6f598e9ca2fdfbc86d31c911cec8ea8d26cd571ad48c9b73317c52e696db15fdadf702f8f0
 EBUILD netbeans-platform-9999_p20160602.ebuild 9520 SHA256 04e640511e43fafd79faf71c2603422e283da09e715d6b70658d157b2ea65352 SHA512 3903d54f86fa9c692468e0ed33a5120932abb2ba6a3b9ef7ba1c7a730226f11304d2139d780c9b35b8a1258fd108ca4caad9c04b166586eabbcb542ee15981a2 WHIRLPOOL c866345f84cef66a97a31262f286fb59f228e948f752d013c1747b20ee2e7c5d054486c0b18a1bc435c311d107b54fd3bd976f48a8194be373b820d00cec8d85
 EBUILD netbeans-platform-9999_p20160603.ebuild 9520 SHA256 66b2eac4b37c99c2c878372bcec818c08f3e51046c0f466502e5a9f798414ced SHA512 ff9df7ce2e6c73aeb653bebaedf42c1a17f410f60b33fc3e0d1b503eaa47b426f4e107a8b8fe622010f8bf843c4499d8cd8299e18e17013117a6ad718544e974 WHIRLPOOL 8259bbd9e943d098e61529b3961ad4efea2517e2035aed273411234cf805ccb8c997cab1169170fdaccc94cc1522d124c397ee7667eb95688f7ae6e798d3cc55

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160531.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160531.ebuild
deleted file mode 100644
index dca5668..0000000
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20160531.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-05-31_00-02-33/zip/netbeans-trunk-nightly-201605310002-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 53505f1..8377d0e 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-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 DIST netbeans-trunk-nightly-201606010002-src.zip 213564247 SHA256 1298b642375838c792d0334de386924e095024fd2f4ef450d6093de436d37855 SHA512 e5fa2fbdfb7bae2d4053fda427e0367eab20770926dcceb6be6476c5df3a4581ffbcf86be9857456ca3c06e723c96503bb547af7d2842dde1ba6dd6cab062e74 WHIRLPOOL 65976354661f4328a8b86543c8c34c6383d5199a3af692ad9cd1de3401509106f24927943f12bd90d4d621a1af65132581ff0b9bf1ef48c5a8916e0ec462bd9e
 DIST netbeans-trunk-nightly-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
 DIST netbeans-trunk-nightly-201606030002-src.zip 213220744 SHA256 c90867dac6486f399b74933e9a771646dd5a288b94f41cf0b5c44f9cb9c911a7 SHA512 00cb8987fba28724277b070a177d3b008eff889cca0a98517b799a573dd79e8af083c19ca3243c079ff2c8e50a65c6649cdd0a8a5f282a756feb7e7b347791d4 WHIRLPOOL a8f2a23e4f1a92cb2305d7fdbe533173f8d66b5caaf0e7b63ef7427295b821301ac44d55bc0603cc5f4572d2cddd110e7ef35eb15600951468f67ff532730d27
@@ -28,7 +27,6 @@ DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844ef
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
 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_p20160531.ebuild 3472 SHA256 9e2c7054767d9e66b88875d475df39b647e59cc2425f9595f7d4a7729bd90668 SHA512 e4e287730eaacb68857c14709158b1c1599788b2f0ce618a5590132c03284db4a7d9516825b5ccd8a73892cbc0b8a4e37ba19c4d26697dc8184907a77fe81685 WHIRLPOOL 0db65c1fb83c23d28690ab591096e9768fe2e4952d7cd836307fee1b1f7896bfa673cf9383fae70718fcf43abf7e1bc2f4b0867746af027c3cb77f7d9d58ef09
 EBUILD netbeans-profiler-9999_p20160601.ebuild 3472 SHA256 37317cb96a6c56cfe9527057b08b926da46e95a3a5bf95b011a0dda633073ebb SHA512 9997245c34fc4c15c0e073b1a98c1c2ee578a67604a4b0ec9faa9837f37413f76ac8d6df03676718aa562b0f1665305e56f37e8f71e636d264fb32e6405cf77c WHIRLPOOL 72ab0acbb7ca0d405584a88d88f294ebdf5a63ab0b6117e5fe63dbcb04b2fb2fca5698f08998903166d514daaa3b81f3f545284a121249ddc499076d1565cf71
 EBUILD netbeans-profiler-9999_p20160602.ebuild 3472 SHA256 b246204a0d12311afb9c026fd7e541c25a95fcf468a73a14702afa4a214c21da SHA512 24ec9f99d1543d907b49041b0b5d8fa193c49e9c7cb31d08b35fdf2688f6d6c670f073045bde18e313b67ef41188cafea0a050fb25b2bf0a844d62992866255b WHIRLPOOL 28881dc2f67f104704ef73536d5c76794a0e32a9660188b61aa7edd2be7ced51fd10f2e866c59f57b434379bbd6bf0b901cbf2dca6a8116bf45e5fad496baf2b
 EBUILD netbeans-profiler-9999_p20160603.ebuild 3472 SHA256 4270ae5e55a178e2188f887957670f0cdcaed12a755d2928eb0bef03312806ef SHA512 b5882595fb70c0ba57be45a5bded4c2cdc82193c5c5dff1dbdda550a56f13432cdb67ee8579f1d6088d819df5d0f83c9b5e3dd7fe5d6169248f9bdac719fd8af WHIRLPOOL 32b5b0008ce2c78aeecd9fb8b4b0aa2a6a508d9290586389e46463b9d7bf9a08e72f35dbf5675b318fa3de2b79b0be1032371603b8be2eb651a2c70f1c411ed6

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160531.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160531.ebuild
deleted file mode 100644
index 0996b24..0000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160531.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-05-31_00-02-33/zip/netbeans-trunk-nightly-201605310002-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 a038880..ac3a529 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -26,7 +26,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-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 DIST netbeans-trunk-nightly-201606010002-src.zip 213564247 SHA256 1298b642375838c792d0334de386924e095024fd2f4ef450d6093de436d37855 SHA512 e5fa2fbdfb7bae2d4053fda427e0367eab20770926dcceb6be6476c5df3a4581ffbcf86be9857456ca3c06e723c96503bb547af7d2842dde1ba6dd6cab062e74 WHIRLPOOL 65976354661f4328a8b86543c8c34c6383d5199a3af692ad9cd1de3401509106f24927943f12bd90d4d621a1af65132581ff0b9bf1ef48c5a8916e0ec462bd9e
 DIST netbeans-trunk-nightly-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
 DIST netbeans-trunk-nightly-201606030002-src.zip 213220744 SHA256 c90867dac6486f399b74933e9a771646dd5a288b94f41cf0b5c44f9cb9c911a7 SHA512 00cb8987fba28724277b070a177d3b008eff889cca0a98517b799a573dd79e8af083c19ca3243c079ff2c8e50a65c6649cdd0a8a5f282a756feb7e7b347791d4 WHIRLPOOL a8f2a23e4f1a92cb2305d7fdbe533173f8d66b5caaf0e7b63ef7427295b821301ac44d55bc0603cc5f4572d2cddd110e7ef35eb15600951468f67ff532730d27
@@ -51,7 +50,6 @@ DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844ef
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
 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_p20160531.ebuild 5343 SHA256 fb5426142742b8f2ab6e60afe1dd603bf952dce30dd0b9600943abd52bdd1f77 SHA512 5a55e8a188f39241fee28140be305208f52a644f363b1a74b8acdff54b3bffdc7ff336c9c91ca58b28c746c00ed3614b04a847714d31b9256bf5a5c57faad4fa WHIRLPOOL 231a9ee5f09fd9ae61994e01854194701e88ac17749e4f16f8654dfa0b53182a132fe918e44fc54be2c9326e6300c044bf23dd15039ed8cdd5049655776fa48d
 EBUILD netbeans-webcommon-9999_p20160601.ebuild 5343 SHA256 4a420ff47b4bfebf7b023327ce9da61f9b9abe25a372db5ca7dab99a3631672e SHA512 5bac7117495136ae382c996b626626d116a2024e2fd76da11cbb1613ec3e8424cd9bf96269feb641b5b8856703daeed8b652213e3fa775e6177f3f72faa05d69 WHIRLPOOL c9cfb02903f39e381ef628326ad0efcb87c374d391b2e3bd61e9d54f29aa8abdab537c834d357ffd9dec7f4e0ed0a053f70533e5af21ec078c7244c4f240e9a1
 EBUILD netbeans-webcommon-9999_p20160602.ebuild 5343 SHA256 9c1c1ac6b16eaaf3b856278abd1d37da33d43526f16845594b6d38b87e4bc6fb SHA512 afc034ab72d4874c1794136e1b868692d327940984ee8e0a1020be63982049e6780054e1aaa54e22b8824c79187b37123594737ac6dfa26e72e604665ab1150e WHIRLPOOL 87dd5858be45af4cf3c87255c7640f47eaf727b40223d0b15e3994d5fac6f15be74e3ec390f06fde23f94f79abe77993df9a748b4de08ea5837754b0bf36e28d
 EBUILD netbeans-webcommon-9999_p20160603.ebuild 5343 SHA256 f801ad849a76e95efb96794ba00c2bd1db2a52fa3ed3e324e693770a7459d717 SHA512 b929a0d322ea62667202853a32e0b7c5c07182d7e6c83909cb812d5eb9fbf82b7e895abcba0f7ab9c2c1cce76baf467409cc50466ab3a6885961e27f039777f4 WHIRLPOOL 42b123be43194dca9c5edb00ff0d9c70abeed6f90c15747cd2e325cb7467b602526430f9dd6fcf477b9cd9e734a0ccf12f6393fc3159ab958851220d70fc3c60

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

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index ad6c416..48f2e17 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-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 DIST netbeans-trunk-nightly-201606010002-src.zip 213564247 SHA256 1298b642375838c792d0334de386924e095024fd2f4ef450d6093de436d37855 SHA512 e5fa2fbdfb7bae2d4053fda427e0367eab20770926dcceb6be6476c5df3a4581ffbcf86be9857456ca3c06e723c96503bb547af7d2842dde1ba6dd6cab062e74 WHIRLPOOL 65976354661f4328a8b86543c8c34c6383d5199a3af692ad9cd1de3401509106f24927943f12bd90d4d621a1af65132581ff0b9bf1ef48c5a8916e0ec462bd9e
 DIST netbeans-trunk-nightly-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
 DIST netbeans-trunk-nightly-201606030002-src.zip 213220744 SHA256 c90867dac6486f399b74933e9a771646dd5a288b94f41cf0b5c44f9cb9c911a7 SHA512 00cb8987fba28724277b070a177d3b008eff889cca0a98517b799a573dd79e8af083c19ca3243c079ff2c8e50a65c6649cdd0a8a5f282a756feb7e7b347791d4 WHIRLPOOL a8f2a23e4f1a92cb2305d7fdbe533173f8d66b5caaf0e7b63ef7427295b821301ac44d55bc0603cc5f4572d2cddd110e7ef35eb15600951468f67ff532730d27
@@ -28,7 +27,6 @@ DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844ef
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
 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_p20160531.ebuild 2721 SHA256 bce228fa299def74deaa68fde87ebac25528749e5d19b07a9259a50f491647e7 SHA512 c0bf3f772623303e24bbce20c911741d18a8e04a756ec676aa5ac0a0ee0f12de56bfe9b8ddd8970c907e5fb8e7beeeaf9fa8dd339e17a30532162a31e04fca7f WHIRLPOOL d9c76dcf0f669068ed68fc7ba066993b95083620980682f4f752b61fa5fb556b55a4c195187421e6fcf1362bcaaf6f7b3a8b33956c7f51b9479581ccf61702fe
 EBUILD netbeans-websvccommon-9999_p20160601.ebuild 2721 SHA256 7d236f87b4c3dd1e1652f62e6d5580d0b0d5f824c2490a8f41b23ae99041d6c9 SHA512 debb6379152ae2ad627231e954995298e6ed4b767778687dc2fd09b9859cd528655176d8749f8ffe0a99c6747efc00715044075f026c44055d2828e35b5b39f2 WHIRLPOOL 61e2e77c8aaeee23ab76e213168c5f0e6262326039727179a6fe1449b2f9ef58fcf12dd5696305604789a7f0a49d18d2e0e045981c3ec4da8058cf64a3b31964
 EBUILD netbeans-websvccommon-9999_p20160602.ebuild 2721 SHA256 58e30da932c32e95754f0450b4afee41836ea8551411ea54205906b663263243 SHA512 dbfa90ffac9fc2bf28f1d9ae32f0699c3d5d56560766c2438fbd477d2a45bfb0774e690ddc9609d43f686c1faf26e8fffc660522478b2bc5afdac886243d2887 WHIRLPOOL 1ba0796772b3f1a22a1160d51a7c1f2b38f0d36b70cbef12e1c2cbe547236e5b15314edbfd4650d67614b44ec5c86f69bfef22ad04100705dfd2d64d068b3fa7
 EBUILD netbeans-websvccommon-9999_p20160603.ebuild 2721 SHA256 7bbd9106569ba0e12a3c230f68c6d48c5758fc8c57b74b0bda37c394b0953bb9 SHA512 77a0b6718ea6fa8df5a94f1250e9adeee06ab457b71db37ebba5e0dee765356c81c9496fc874d312f962baf9ba501c29839242f6a30c5fb49671b979538134e5 WHIRLPOOL 96122ba8b2dc773dc8e2dfd482878f6316077e2988e235cc28ad608bdf28bf87cff5a95e317f07f852691e4903210280f6db52ae16d2c7da88ac21a9c757e6c9

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160531.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160531.ebuild
deleted file mode 100644
index b535350..0000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160531.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-05-31_00-02-33/zip/netbeans-trunk-nightly-201605310002-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 94e1e67..3a5a537 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-201605310002-src.zip 213560171 SHA256 e947a22c24812d311618697df3b2e628ddb3ecb9879138c7fb2f4f39fd6c377f SHA512 270557610f3406e400b6e1379a1f31c9757133218f126219bfc5c4c34746428bf39a6041d04615252cab9fdbffd0a0aa96a844293b1cf6c90c4c994a3bef6dca WHIRLPOOL 9b8da244ea683aa61382134b9182fa7b98a2300d10753c6e2ac9e477676752b90c87375c6cdfedb6dfadc54f9608b0bc39d1d55bfc5e352e9b6e56066ca7c234
 DIST netbeans-trunk-nightly-201606010002-src.zip 213564247 SHA256 1298b642375838c792d0334de386924e095024fd2f4ef450d6093de436d37855 SHA512 e5fa2fbdfb7bae2d4053fda427e0367eab20770926dcceb6be6476c5df3a4581ffbcf86be9857456ca3c06e723c96503bb547af7d2842dde1ba6dd6cab062e74 WHIRLPOOL 65976354661f4328a8b86543c8c34c6383d5199a3af692ad9cd1de3401509106f24927943f12bd90d4d621a1af65132581ff0b9bf1ef48c5a8916e0ec462bd9e
 DIST netbeans-trunk-nightly-201606020002-src.zip 213141326 SHA256 44ab1e7162bf163763e5693158efb62832ed1a419fe75302bcbc5356412c19c3 SHA512 7ede37f57264ede9be95bb7318fe6748b2f401efee14c31ae5660134c32724f7fd52832b798430c4035287fa112279d62b1e58e50b6123c9a69e8ed1571870fb WHIRLPOOL 988987434ba8a3f2e74958432f03ad29601ea10d7d40d68bfe7fbfb4c767ee3efa51937efe14f7af7315f8d914fe0b9927e783c664d9dd617167f3d10bfff5d1
 DIST netbeans-trunk-nightly-201606030002-src.zip 213220744 SHA256 c90867dac6486f399b74933e9a771646dd5a288b94f41cf0b5c44f9cb9c911a7 SHA512 00cb8987fba28724277b070a177d3b008eff889cca0a98517b799a573dd79e8af083c19ca3243c079ff2c8e50a65c6649cdd0a8a5f282a756feb7e7b347791d4 WHIRLPOOL a8f2a23e4f1a92cb2305d7fdbe533173f8d66b5caaf0e7b63ef7427295b821301ac44d55bc0603cc5f4572d2cddd110e7ef35eb15600951468f67ff532730d27
@@ -31,7 +30,6 @@ DIST netbeans-trunk-nightly-201606280002-src.zip 216439941 SHA256 055d99080844ef
 DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ffbd1fba0214ea6c0681af98228ae88e7150ea7f9239fc0394ff SHA512 ed257a274129fedfebc395dbb0bede2f99d4d14900e68c7b88c7044c69c322242e658536350346972a5ec613bc88b8d4c43f890a1c5489d4c2af683fa8521ee1 WHIRLPOOL 2a181827082789fdffaf7e252bb031ea504b546dc44f6ada74c9e07a0b1cc78fe004cb653b1488201e555e256b852b11a10f2170e7ed61a20b5ae25b32a7025d
 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_p20160531.ebuild 6939 SHA256 9ff20e44634946a91118a61d579c323b10f08655c9f79fcd97022f5eed34cadd SHA512 142b74b1da34d30508f8880265c7265c87493cfd2c782a1bdd87a863e3ca7ae934813196203ce795597c7d5d1db5a9a999574eff527420285aea60407d50c31c WHIRLPOOL 964c211970defd744751eb646f0aafbfa7316d6fdbff77e614ca639c15862c830c95e85e8c7b29d68259d48023c29c2e21867803a3021834cd41bb2dfc39e709
 EBUILD netbeans-9999_p20160601.ebuild 6939 SHA256 ddbf87ffafacf1aa4824e477995b6cc1672d8790abb3c4392a4cee0a3f751f58 SHA512 a76797dbd0cad22f6d90c3d65f7cec0371f9528e6d71e4aa17a1ca17ff6b4e746c8a40ecf0c128bb621da6064b1e5bc4f441832adbe29c64b6107c9bc6564187 WHIRLPOOL 0938460ae9c74e29b67e210ba70089509828766359fa1b7d1dc13ef913327693d2dfefed5a47f205e5812b6121b540c21eb2450e769002d4af3fb53443e5b183
 EBUILD netbeans-9999_p20160602.ebuild 6939 SHA256 f815fb67bbefbcbad1a172661cae04b9548af39ce47890de00e04b0305357776 SHA512 4431c6fc931d5ec013eb8a8dbcbd2b084cd8e33974a79d0c1c6d2de58353f90476ec1f26c25ce3aa1e60f0bcf48a0f072e8d98d4c0b28034017430214a84b598 WHIRLPOOL ad33acabac5768259067b75f1236d580b5bbeb036de6cbc9c921a9ff2ed1fdf3d2893c7be6b593ebd9d73596a5a5bc6fcc9649fa26cbb0c350c4b85792c2b6bb
 EBUILD netbeans-9999_p20160603.ebuild 6939 SHA256 4bf817bf61d4c60562235ad02c7b9632c43aeb4ebb15be28afda198f7bf82666 SHA512 15816fcb207400229499bdde8738c25e130824651e5e1b75dae08f1715a365fe154c4048bc36232503af450700a1fcefcb09b6cf27e2a5467e54d3f1da848326 WHIRLPOOL fccfb4011188b88b03fde5351ca7e7cd1c862d111d19bd2ee8eecb3588e6ea63c5358d8113eb196558b9518fb34a2b47a767c67b0981c81a6375047532d45aee

diff --git a/dev-util/netbeans/netbeans-9999_p20160531.ebuild b/dev-util/netbeans/netbeans-9999_p20160531.ebuild
deleted file mode 100644
index 94dd28f..0000000
--- a/dev-util/netbeans/netbeans-9999_p20160531.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-05-31_00-02-33/zip/netbeans-trunk-nightly-201605310002-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] 4+ messages in thread

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-enterprise/, dev-java/netbeans-javadoc/, ...
@ 2016-07-11  7:55 Miroslav Šulc
  0 siblings, 0 replies; 4+ messages in thread
From: Miroslav Šulc @ 2016-07-11  7:55 UTC (permalink / raw
  To: gentoo-commits

commit:     496412b7c15ddf50c5c47b63d98c742a6be3a6f0
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 11 07:55:34 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Jul 11 07:55:34 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=496412b7

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.3.0

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 9c3c0d8..5ac472d 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201607060002-src.zip 216525395 SHA256 ea3a45a96e4ec5
 DIST netbeans-trunk-nightly-201607070002-src.zip 216525625 SHA256 ddf8129b13037315956f00228aeacf843e88fe67e4a61f2b730e5a0532c20f4f SHA512 6ce62a221980bce0b90816d68fa177b1f06b5a584e25a5a63448cae78b9de93ea79b42c3c68b958c4dab1da02c1fb3721aa3f700a74955b676ff3a9f273bba96 WHIRLPOOL f8725146f925a10084f363551548201d82fa51e0ef0ce3ca4c21be8e08bb54b74501b4daa595e7c114eef0872f5d81aa0843996f9860dc4812f736e756e4c16f
 DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6a54e207a2683623b7717028934d654ae261148fc0cf9d334fe SHA512 d722b9050498af020f173b77a9a31eff10977d54827b1fb9d772c8bdce343a90be76c22b62a03777937cd7d19465afd82011e7b82e6162511a12f03f89e648cd WHIRLPOOL 40193c2b433557f500563d698b0883dd8a7a16604494330fd9298d0e7dd901a5be7cdd7183acc2c917fc6bfa78a5b9100a68cf1c1a3c76c47da65de6bb9dcd98
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
+DIST netbeans-trunk-nightly-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 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_p20160613.ebuild 3384 SHA256 9416630550f93aaae1708f2464dd29f80cad8ca4df03fb96739c4b63d48bf2ac SHA512 0518812e04b2d4bc629d3773c64c6b857948f3dbe3f0de5b31b12fe8f48e84c3ae91925292e2beb077f2a4896e038c5e2b51b89c09d049355f2f74b3bab792c0 WHIRLPOOL 68049ea44a459bfc6a4789df2696f9ca60435ea8b72276a5fbae7fe2532f2617adf12d08c68eebdea3a45d5fb5202f2b6fd9351a66c823420303e2432f59310f
@@ -51,4 +52,5 @@ EBUILD netbeans-apisupport-9999_p20160706.ebuild 3384 SHA256 7a47effb26bd0b83296
 EBUILD netbeans-apisupport-9999_p20160707.ebuild 3384 SHA256 ab90102f365f9fc9f028b925233dff878eabc3b7baa2b1c9eca67856a0a675d4 SHA512 e0bbddf34454a573f5f81f14f44f86fd6a74b183af41e1b94b76fc62d6daaaea9e20f92085a948114b0f55ad8e5d77bbe9985948613413f02692dc567ef2718e WHIRLPOOL 28a6c633e7855b350d4172aeea0bbcc5f699295aba8df42093b9be498cc2ccfdf3955342d3ed5b400ccadae5a39ee9a05bb62284f3f8993c5f6a87216f074d32
 EBUILD netbeans-apisupport-9999_p20160708.ebuild 3384 SHA256 ae5443bbc4f537f9b2d4d9507e3004f49d9ac79f45f65db70cc03b1f38e7e696 SHA512 1188a46d25622fa4f511fdbb3b313ba3dc2d2d6ec610c018efe7ddcde5eb386b7a398387c9b9b3aeb81f82f8e73c4bdab0a92f64f634cda91d0386d9b8f19011 WHIRLPOOL f674b9fa9126e9972b2b866a352f8b2f1695ba26d82eaf0d4288092c74b67c23a03fbf2093f95a7fc4f7856fc936431f08d8be2b7c73c6ea690697df31f198e5
 EBUILD netbeans-apisupport-9999_p20160709.ebuild 3384 SHA256 ff2291110face9087273658153be86614c86f0aee6896a7ceb3c36d609abd3af SHA512 3a25f37a8fe814050ae66bd2f25e6c6f52bc56dc1733293b7471b9834e598981686c790c5e02c1b39d084c2693ef751918164f7423e2aa265ad3a5b126e175a0 WHIRLPOOL 41115144f0df3081bed7df981636b8694043c282749e5faaf13389c6c0bef9e9a4a1fc3720ce3e25ad7754254c10f3766bcde6d9b71bed7377923ac5affd7814
+EBUILD netbeans-apisupport-9999_p20160711.ebuild 3384 SHA256 5f841fa7b363550223d65b0f59719a548fefd90e9d3b72f5b4fd31134fd3fa47 SHA512 4c4252332fac461504f5d376e4d1c279f8699dbcf0b479f83182f39a2c133c9b386a48d04fdecb279480c7942159842864fc78c326288e55af16aa20dac6ffca WHIRLPOOL d42c9d8dfcb277b9ff409dc64b11c4934f8673fc327ab54fb27a5552d43eb9ad21d84618024f57fe5e064329f42c259202238f5ed8cf687ad58cabbf94e4ab89
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160711.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160711.ebuild
new file mode 100644
index 0000000..1f23d00
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160711.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-07-11_00-02-33/zip/netbeans-trunk-nightly-201607110002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.apisupport -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r16-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/apisupport >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/apisupport$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/apisupport
+}

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index 88f3fab..f231a66 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201607060002-src.zip 216525395 SHA256 ea3a45a96e4ec5
 DIST netbeans-trunk-nightly-201607070002-src.zip 216525625 SHA256 ddf8129b13037315956f00228aeacf843e88fe67e4a61f2b730e5a0532c20f4f SHA512 6ce62a221980bce0b90816d68fa177b1f06b5a584e25a5a63448cae78b9de93ea79b42c3c68b958c4dab1da02c1fb3721aa3f700a74955b676ff3a9f273bba96 WHIRLPOOL f8725146f925a10084f363551548201d82fa51e0ef0ce3ca4c21be8e08bb54b74501b4daa595e7c114eef0872f5d81aa0843996f9860dc4812f736e756e4c16f
 DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6a54e207a2683623b7717028934d654ae261148fc0cf9d334fe SHA512 d722b9050498af020f173b77a9a31eff10977d54827b1fb9d772c8bdce343a90be76c22b62a03777937cd7d19465afd82011e7b82e6162511a12f03f89e648cd WHIRLPOOL 40193c2b433557f500563d698b0883dd8a7a16604494330fd9298d0e7dd901a5be7cdd7183acc2c917fc6bfa78a5b9100a68cf1c1a3c76c47da65de6bb9dcd98
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
+DIST netbeans-trunk-nightly-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 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_p20160613.ebuild 4790 SHA256 0e11e1c172fba8176220ed0dadf8517c182cb19470740d51d67b6adb65701945 SHA512 a5ef7baa5446ae274ef3e9cc77094422d80e6cd5205cb5152451a304ce350a3ee13a70365b4c8eedef0f9bce5f39949558b9b5c114892c08e9f42e4914c1213d WHIRLPOOL d98fd4ee5875751951c33fa3246f542d4023b583d7e2d5b08e996d3a4a2c1082e5b9571445f6738a566699c53f771d1d03d9ca089053f5b679fa1b40b0ef6831
@@ -64,4 +65,5 @@ EBUILD netbeans-cnd-9999_p20160706.ebuild 4790 SHA256 f75bc3135dcf8d7550c938852a
 EBUILD netbeans-cnd-9999_p20160707.ebuild 4790 SHA256 b43945eb2a89a2d102d17819ee310d79250ab0ee1242035ca85b627610d6d6a2 SHA512 a07192a18803a5239e33790d337323f07a09cf549f06a9ee3e2b12e847e9f4a45d8b1bcb0fc2cdb3dcda99f5d13d57bce35629a6f81b3e7db87093ae42de2b68 WHIRLPOOL f4e80c46b6a514ee52732f1eac265a74b43544943337d824fd5e48fdcae11b76abe932c9611372355fbfce67457b502c6891db0fdab73cbf8964d8fb3b0004df
 EBUILD netbeans-cnd-9999_p20160708.ebuild 4790 SHA256 e27629389fb9d629de8198bd13106d46aafe8b4892e1ddfb630a89a85ef924fb SHA512 04f29c1ce236678b98c041465087abe0cecbda6f5ee9a89a80d7e84ea910d46c0df9e73d3ee6fe070a890043d87245759aa48ac5c6a1856ff54e1b54a101db2a WHIRLPOOL 54fc570a3f8a6e2a2d08b819e363ba8ecce758468cc376b5be31421a1e73b8253a6bb1fb4eb80bbeee02eb150bd9585394a265cbc7d6fce09c1d85b00946db58
 EBUILD netbeans-cnd-9999_p20160709.ebuild 4790 SHA256 ed414bc5c3bd4beee38bb50314b65f6acc4b4323033381c0043105becb63c414 SHA512 48eadd416561f8115a36e8c6b26ac91c6cba266de5d6b416feb341d10bd0288668ec5abe2e94c3ded2b75e011949392b5a54e2a12949183d2d0b0ef795d1b6db WHIRLPOOL 7b7724cf4067303e89e2fdb57cc4737890ad02f09cfd49a496833d7cb4952214a4c458154fd7486976397e1eea331e8ce198abb55718e6c03674a1b66ddc19cc
+EBUILD netbeans-cnd-9999_p20160711.ebuild 4790 SHA256 fb23bf76dc0d505e2aec98737ebee4b6b000d63dcee5f19a86e4973758312965 SHA512 0ba017ee8da5d4630dfc6e2e0b4f5881c3d9f1e81879d0c70b22755ee91b4efcbc902d98e12680cd3b4147be46193337777303214bbffd4946d74e4a8d3989a9 WHIRLPOOL 8f29699a9c512ee03aed9b825d62ef5e315dc95ce7591c0d7df2cfe79c1b4921ee7f75be0fef872aa6f3ea04c00bc2cd9b47afa4bb25753d518aa2886253279c
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index f9f755c..c789388 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201607060002-src.zip 216525395 SHA256 ea3a45a96e4ec5
 DIST netbeans-trunk-nightly-201607070002-src.zip 216525625 SHA256 ddf8129b13037315956f00228aeacf843e88fe67e4a61f2b730e5a0532c20f4f SHA512 6ce62a221980bce0b90816d68fa177b1f06b5a584e25a5a63448cae78b9de93ea79b42c3c68b958c4dab1da02c1fb3721aa3f700a74955b676ff3a9f273bba96 WHIRLPOOL f8725146f925a10084f363551548201d82fa51e0ef0ce3ca4c21be8e08bb54b74501b4daa595e7c114eef0872f5d81aa0843996f9860dc4812f736e756e4c16f
 DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6a54e207a2683623b7717028934d654ae261148fc0cf9d334fe SHA512 d722b9050498af020f173b77a9a31eff10977d54827b1fb9d772c8bdce343a90be76c22b62a03777937cd7d19465afd82011e7b82e6162511a12f03f89e648cd WHIRLPOOL 40193c2b433557f500563d698b0883dd8a7a16604494330fd9298d0e7dd901a5be7cdd7183acc2c917fc6bfa78a5b9100a68cf1c1a3c76c47da65de6bb9dcd98
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
+DIST netbeans-trunk-nightly-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 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_p20160613.ebuild 2968 SHA256 11e6bad1a8fb318d3fc74c3bfbbe3b973e5ccee211a3dd2549acb3873de25d4b SHA512 03575f33edaa1cd4f92e4a24040a4bcf383d1096bcadcd0f9fd334c8d8dbd6568a0d04e650193a9461407dff4bec50c7657bb269921639418292853451221453 WHIRLPOOL 30b9ca136b2a2d28cfbd13edbbdc9961542f91f25a2ef703d4bf78ffb8638e281eabb84dc3d6459b0540effd573c0b33cfd63a660fc23dba03cae05eb4f8ae06
@@ -54,4 +55,5 @@ EBUILD netbeans-dlight-9999_p20160706.ebuild 2968 SHA256 4d5025542fbd8bf401fe921
 EBUILD netbeans-dlight-9999_p20160707.ebuild 2968 SHA256 5fdba55c07910f1b7579ef89ec986a2a47b0e6afc61bc8e5870efd220731775c SHA512 e581bc811843fe324a2b562d5b471b49261c98a9a2a7ec6c2b4ed1f35852982e60918630b0519f01dedd5b843d2043bb63dbf972bdc73bfd5f247eed1332f7da WHIRLPOOL 4e40430ec1be8e88c1e155bfcc49af370e6898af2b3e59a762b3935ae07cf0d783f6f8248226a97d044be2df297f1654e2d4dabab7da52ca97e04276f8079762
 EBUILD netbeans-dlight-9999_p20160708.ebuild 2968 SHA256 963208175d19102addb4519d5823074d0d2da3daea532c927de895f9b97d6be1 SHA512 92c5aefabe43ce5729663c7b2d7fba3a46f30a8704cb6149916a6cf06e71eb8715891ff98c98790639e77ec428ddc3078b78f86c4cb5ea8f94142df69998c696 WHIRLPOOL f39c3869bf7a51081746adf407bc8492e672d62f5fb11d7fd33f7d4c340e59f282a9fb121dd75f0ee879660e33b5a27321e7b344c0831f85e0bf229127b16ba1
 EBUILD netbeans-dlight-9999_p20160709.ebuild 2968 SHA256 f99daf182235c7a1400d2b87cf2b5a3cf1787e65e8dc6dcfd542b89ac2aa179e SHA512 ef256b024140b6c65ba6bca7b2e17bcb449e197626a4b43d64548ccd4cbd3f8cfbeba63bc9a3d861d0773e24326dbf1c449765abac2de07a1f8cb582965a5811 WHIRLPOOL 5eb46ba9515462dbb6e03621943db90577c3e65c87de66a6ba7303f2b2f5a234cb601d8a503d69b9387e4040b0be27c53b1e28cdacd6b810b79cb746464995fe
+EBUILD netbeans-dlight-9999_p20160711.ebuild 2968 SHA256 0e535a82b19a9bede37914e9e5b5dfa01685553b67d2aa43fa9c9aa2da0a31d9 SHA512 88e45c6f6daf4ab0c135811da402edf848fa2b4f4bda8a17678571e61263623e878bb133b57d8c9e5b83858da6978fce06021efa9441b90acf6189376841634d WHIRLPOOL c4481d43930a9ea99b310e230f1bc1598b67ccbac4d044c79d7670c9f31f48ffc93b2ee1c89634756cfcd807cc0c568bc56398276d45815272104edf62ef8fb0
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160711.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160711.ebuild
new file mode 100644
index 0000000..c0a6071
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160711.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-07-11_00-02-33/zip/netbeans-trunk-nightly-201607110002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/0F89C62CA701D20BA9A9A526D4D017888C3B5A65-fs_server-1.0.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.dlight -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r16-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/0F89C62CA701D20BA9A9A526D4D017888C3B5A65-fs_server-1.0.zip dlight.remote.impl/external/fs_server-1.0.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/dlight >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/dlight$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/dlight
+}

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 7931ec8..0854e9e 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -58,6 +58,7 @@ DIST netbeans-trunk-nightly-201607060002-src.zip 216525395 SHA256 ea3a45a96e4ec5
 DIST netbeans-trunk-nightly-201607070002-src.zip 216525625 SHA256 ddf8129b13037315956f00228aeacf843e88fe67e4a61f2b730e5a0532c20f4f SHA512 6ce62a221980bce0b90816d68fa177b1f06b5a584e25a5a63448cae78b9de93ea79b42c3c68b958c4dab1da02c1fb3721aa3f700a74955b676ff3a9f273bba96 WHIRLPOOL f8725146f925a10084f363551548201d82fa51e0ef0ce3ca4c21be8e08bb54b74501b4daa595e7c114eef0872f5d81aa0843996f9860dc4812f736e756e4c16f
 DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6a54e207a2683623b7717028934d654ae261148fc0cf9d334fe SHA512 d722b9050498af020f173b77a9a31eff10977d54827b1fb9d772c8bdce343a90be76c22b62a03777937cd7d19465afd82011e7b82e6162511a12f03f89e648cd WHIRLPOOL 40193c2b433557f500563d698b0883dd8a7a16604494330fd9298d0e7dd901a5be7cdd7183acc2c917fc6bfa78a5b9100a68cf1c1a3c76c47da65de6bb9dcd98
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
+DIST netbeans-trunk-nightly-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 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_p20160613.ebuild 15825 SHA256 db8298c11c3aa38e73e76243a50349f807c07a5e7136b7f1ca283e6935026fa6 SHA512 2537fb7afc4e0e323af2ae82225872460eada3b20ab96544f4fa548961dc388e178be089bcb0f1d983259bb5bd79ecfe34bf8fdcba1c5027db62d93acfb6c6d8 WHIRLPOOL 556ed5ba19c0d7f2a58e484a76a1ef2e537a88ec77e0f2bc40ed86d4e0cbee61465bcc0c9d6b04c436a57a639d6e8b06d83afc7ea289caaf95284ad407c54945
@@ -83,4 +84,5 @@ EBUILD netbeans-enterprise-9999_p20160706.ebuild 15825 SHA256 317ac2a4e41f08154c
 EBUILD netbeans-enterprise-9999_p20160707.ebuild 15825 SHA256 c363b308fe2b270e10764f8897f0ff779c85cca488f4419f6cb91d6baca5869b SHA512 136582dcaa1f9c3c3415e37145b5f0f7f90caae25de76d737e4169c9fed67df454bbba6139468386e5d89b0ba946ed2e0f3c38089d4849c6365b33bddb56f45e WHIRLPOOL da17318b5894611098116593c866dd5f08d8be3374d206034a4c36f69cfad6e27bd0c1e720942f28b4b3beaf163fea5bbf844dc5f32f57e8d9b87f933fa5cf49
 EBUILD netbeans-enterprise-9999_p20160708.ebuild 15825 SHA256 b2f34faa9e39884e1b227894c9ceca11c5176c270a65e811ec79b9af74e35a86 SHA512 9689421669d3ffe19d1dcd26f5650dcd10d752680436f508d6addb0c0f2ce35a4510dd99cd0920bc416e1390d83c9f68ff8cee2382772badda409a3d125c4b84 WHIRLPOOL a3d64f8d4e9d93b2ea61a01acce33c241e62516c1d11eb5ebfaa9cd6b9ee3ed805749291be4e479ec6f53ce31336fe31fadaa0dcb28cad18940e482c18f151ef
 EBUILD netbeans-enterprise-9999_p20160709.ebuild 15825 SHA256 db45f24d4afa02d68a1a8beda60aa141f846c85a324ebbd44e3eedf098b4e8b4 SHA512 8d407cf0e04a9d45870224177e9eeca3ba2d14a923802eb39c9b0261e1b72e88a659bbcdf73c429443118e123b66ad86d2c002c81fb6d344e8debaaea2a50360 WHIRLPOOL 93e5aa6981befc0639da35c9f3b350b760989eb1f431cc9d014ef8484e3a3cabd177c80b37462024b6aa89a4f33ee48e4b6e8597e343a204923232fe39cfb9f6
+EBUILD netbeans-enterprise-9999_p20160711.ebuild 15825 SHA256 7451df7d091835ba79f2aaecab576d1524f14d5a65fcbf094e4a2d3a88a2692b SHA512 85dbf8aac0907adfe51948a2f6dfeddede8f8552ac1d31df93aaedf64e20a5d09c65814959e5f4c773b43a9f1ffc6ba28171b451d0465f5c4739337bbf055e6a WHIRLPOOL 4d77fb21c4ac2407c6d0fe784c5bab17e1f9c0729d1ae28da3827843a8961de210d4d8f9b27edc502f90a82142cbdd358b3aad0b5ef94bf3f68c1377ed1282ad
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 3658d8a..085cc3d 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201607060002-src.zip 216525395 SHA256 ea3a45a96e4ec5
 DIST netbeans-trunk-nightly-201607070002-src.zip 216525625 SHA256 ddf8129b13037315956f00228aeacf843e88fe67e4a61f2b730e5a0532c20f4f SHA512 6ce62a221980bce0b90816d68fa177b1f06b5a584e25a5a63448cae78b9de93ea79b42c3c68b958c4dab1da02c1fb3721aa3f700a74955b676ff3a9f273bba96 WHIRLPOOL f8725146f925a10084f363551548201d82fa51e0ef0ce3ca4c21be8e08bb54b74501b4daa595e7c114eef0872f5d81aa0843996f9860dc4812f736e756e4c16f
 DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6a54e207a2683623b7717028934d654ae261148fc0cf9d334fe SHA512 d722b9050498af020f173b77a9a31eff10977d54827b1fb9d772c8bdce343a90be76c22b62a03777937cd7d19465afd82011e7b82e6162511a12f03f89e648cd WHIRLPOOL 40193c2b433557f500563d698b0883dd8a7a16604494330fd9298d0e7dd901a5be7cdd7183acc2c917fc6bfa78a5b9100a68cf1c1a3c76c47da65de6bb9dcd98
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
+DIST netbeans-trunk-nightly-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 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_p20160613.ebuild 2913 SHA256 c0b9a98b4bb571960ff30db6ce7edeb9f71b180f8f4f5e443e057e29b55aab2d SHA512 1d9029b8bc42ceb7af9fb810cb62d90646cd69034d4eb2f4ceedc810924b5c6e54987bca7cabe522b916672059c78af86b4fdca4d647cf78bf41513037070412 WHIRLPOOL 984514ebfc4992873ac93e70179158c58b97d88b3d5ad3506f39e07c0dc4b6e635f1bd7625399ca73420d98e1be3fac2a53cab88b6498cb004b982709e745302
@@ -51,4 +52,5 @@ EBUILD netbeans-ergonomics-9999_p20160706.ebuild 2913 SHA256 a21e0892700beaf925a
 EBUILD netbeans-ergonomics-9999_p20160707.ebuild 2913 SHA256 7369b78f5d98d5010d7fce80f6c306aa55fc58f508e5d6add596d4b3670fcecc SHA512 81066f7873ac6e30c7ff72a03c22b9b62d453fddc6d57492016a54a04d27520cef1df15f56d8049e7f3c3f9a05436ffad7873333e963519c6157737ace267fbe WHIRLPOOL 89f6ac0d9283e7bc8eb6293e45042bcfb0128e2ed100a728f0b4715034bc29c6306d45ec3a204a91ffd319c4946387cd73bddc0aedd4407b1d96990b2581a17a
 EBUILD netbeans-ergonomics-9999_p20160708.ebuild 2913 SHA256 95c2ff05eee2c800991afff2c514e81e8561e08241c9fb2602331a1951591331 SHA512 4b02eed3ccfea2bbf808ab44f4d775ad890a7e03b4971fe2e280468d27757e0ccd1782dd5be83b7169f85f368cb4df4682528fd1937c843631eda8374f788684 WHIRLPOOL 2eb5241a30fdc783f6cdfd7f1d41f217fd1737acbe06d69b16048c6bf19f49bd6c567d17f972579d74ea974b14d4842e127e65a8c3adcea84a3bb14e2ce862e9
 EBUILD netbeans-ergonomics-9999_p20160709.ebuild 2913 SHA256 e8ee2af392312c09dda4022d56497faf8ea6dbdce37722ea0e3df4b4701b078d SHA512 4741695d3b6ec5820142be726352e9399f1510d0aa2c1b723e9a77a29d7476fb389f79a2fd28eb6fd9e9868810c7f47a42af2996f5d0cf08ba6844fe1d0a1ec3 WHIRLPOOL 3dfc9e5a5beb0ee1edc61eae7ef5a8723bf51a959653885f11f2c70205ee5d712bd5daafbe5237fd49ed519dba423b3897db07d00a08c54965ce4c2d30067e01
+EBUILD netbeans-ergonomics-9999_p20160711.ebuild 2913 SHA256 718c727e901597f25b86eb504724838767612441a47b593419a4865df75dd1fd SHA512 b161dcb6326cbc10d9533794883be2583ee0e8ad3da39eba86c31ca4c0b9fee9505caa80155cce1555447f1b67a431d8d781325811bc087dc587e5668cca8739 WHIRLPOOL 11d7dc3cb91cf64abfda2b65054f32f1f89e2a5d3cbab85591e918f73bff29706123c11bada3d2af721250fec83a27d5e21be21cbe3f29261599a043afcb83f5
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160711.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160711.ebuild
new file mode 100644
index 0000000..ff7cc4c
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160711.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-07-11_00-02-33/zip/netbeans-trunk-nightly-201607110002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-nb-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ergonomics -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r16-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-nb-${SLOT}/nb nb || die
+	cat /usr/share/netbeans-nb-${SLOT}/nb/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.nb.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/ergonomics >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/ergonomics$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ergonomics
+}

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index bf7ddf5..a436780 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201607060002-src.zip 216525395 SHA256 ea3a45a96e4ec5
 DIST netbeans-trunk-nightly-201607070002-src.zip 216525625 SHA256 ddf8129b13037315956f00228aeacf843e88fe67e4a61f2b730e5a0532c20f4f SHA512 6ce62a221980bce0b90816d68fa177b1f06b5a584e25a5a63448cae78b9de93ea79b42c3c68b958c4dab1da02c1fb3721aa3f700a74955b676ff3a9f273bba96 WHIRLPOOL f8725146f925a10084f363551548201d82fa51e0ef0ce3ca4c21be8e08bb54b74501b4daa595e7c114eef0872f5d81aa0843996f9860dc4812f736e756e4c16f
 DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6a54e207a2683623b7717028934d654ae261148fc0cf9d334fe SHA512 d722b9050498af020f173b77a9a31eff10977d54827b1fb9d772c8bdce343a90be76c22b62a03777937cd7d19465afd82011e7b82e6162511a12f03f89e648cd WHIRLPOOL 40193c2b433557f500563d698b0883dd8a7a16604494330fd9298d0e7dd901a5be7cdd7183acc2c917fc6bfa78a5b9100a68cf1c1a3c76c47da65de6bb9dcd98
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
+DIST netbeans-trunk-nightly-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 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_p20160613.ebuild 3377 SHA256 72ebf1a82e030a3401c1051848aaa1b629964a8c15c5891097e4f7e527f91fc1 SHA512 627bb41de96f2534b067fe2ff7c84d0baea120b9da7e3cc6b70f6e96fb6c0fbc3fbbd5c05925b91655eca25ebda8ce0d7a4ceb752e2fbe8c3d7576fc39d60f04 WHIRLPOOL ad47e2bc991af68a48c2db89fc522e0123c93ce9db55a9b9643c876269eff1ecf32db4febf2e2d025295269541d5f0db12fbe71ff2de23ebdd8b48c049bb018e
@@ -55,4 +56,5 @@ EBUILD netbeans-extide-9999_p20160706.ebuild 3377 SHA256 f24a1f29a41b8f892211c28
 EBUILD netbeans-extide-9999_p20160707.ebuild 3377 SHA256 e4becdf42116d40c8c7880c6e4360c7b01d02e43576c36ae5d2ee3d28a1a54cd SHA512 5766b18bae64391f5c23457e5f94fc9820694514cd0cc1218adb2cd35a41adea41869fefb979059e4edb45c659d88b82ec81beec26c1e7108f590d4ad749d765 WHIRLPOOL a84660a1c5b2019cadf1091a301bf2858425cfe58f912736914a5c9d90caa6f3dd17137fed733d5af9d4f64e99e14eaf15f5976ad4cd8165d223491ef9d07819
 EBUILD netbeans-extide-9999_p20160708.ebuild 3377 SHA256 1b9b6448815917b88d6156b1783912167b1288440c442c28da36189f088195a3 SHA512 d470ddf20f1b2c0d99bc33a6beff4cd27753b26b97ce35940bd139576ee1605c5478d7669b05ece1689c40d7097f52e2d1b029f84071c6e38b3e57cb4456019d WHIRLPOOL 955349954b364e3652e634ef10edf43b70ee6ab9f8d13934a45a3412a98459c7d1d042ddc41834c479eaad2a3ce9e447f0a8b083bedcb71efd3ca6b16e90e712
 EBUILD netbeans-extide-9999_p20160709.ebuild 3377 SHA256 c6a471dca8849aec0b9d57d12cbc184761d939b2d7ea555e6ab45a150a193406 SHA512 c1211cfa115e66d7d134ce8d4d5f78d3b724f2af47fa12293f14fbaded40bd8807adc13167aa2e7d6b7f92e5cfc15a63494620534c6962b912aa38b1e9436b19 WHIRLPOOL 137e9b580426133b00e393b003989ecb161b87d99d74159fe9b0ea261b8947fd87a48f6cbffae731744192b77feab0e81db4dff56e24f4a213a14d744001388d
+EBUILD netbeans-extide-9999_p20160711.ebuild 3377 SHA256 22280e55838e12a7852ef56a51c6e3c4a070ff1b35af46298d0b2d4d069771ac SHA512 98baba49dac86642a7dc884b1bc7c5e6f4d478eeb41ce9551c72c540005de1f514edff07eb44e0bf692f50af47436fefa3dbb2a7ce8c345c42dd9d4d022288c4 WHIRLPOOL 1281c30d522494389978ed8e4a19b1dee21bcfb2143f0028eb8a93c94596b790e765b6c3e5860357ec0c2084c1b7988400a054a7a313c09b6414cacbd01e21e6
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 6d46ffd..cd708fb 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201607060002-src.zip 216525395 SHA256 ea3a45a96e4ec5
 DIST netbeans-trunk-nightly-201607070002-src.zip 216525625 SHA256 ddf8129b13037315956f00228aeacf843e88fe67e4a61f2b730e5a0532c20f4f SHA512 6ce62a221980bce0b90816d68fa177b1f06b5a584e25a5a63448cae78b9de93ea79b42c3c68b958c4dab1da02c1fb3721aa3f700a74955b676ff3a9f273bba96 WHIRLPOOL f8725146f925a10084f363551548201d82fa51e0ef0ce3ca4c21be8e08bb54b74501b4daa595e7c114eef0872f5d81aa0843996f9860dc4812f736e756e4c16f
 DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6a54e207a2683623b7717028934d654ae261148fc0cf9d334fe SHA512 d722b9050498af020f173b77a9a31eff10977d54827b1fb9d772c8bdce343a90be76c22b62a03777937cd7d19465afd82011e7b82e6162511a12f03f89e648cd WHIRLPOOL 40193c2b433557f500563d698b0883dd8a7a16604494330fd9298d0e7dd901a5be7cdd7183acc2c917fc6bfa78a5b9100a68cf1c1a3c76c47da65de6bb9dcd98
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
+DIST netbeans-trunk-nightly-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 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_p20160613.ebuild 3416 SHA256 92e9be489c1b2a7ddaca7153a5ad0f84253e726b202afc3b10308849786a5448 SHA512 0e1410ca2227457f992fb6fe20a5b0544eda85a566b764bc51fb06ecfed3299ef10c311df91150166ff7f779333023297c2d81582018f586ba94e75ccac1e346 WHIRLPOOL 4bc2f4828f083340ee71100693248c13e9ba922833780a6b99b1d20ec2ac30c4ba049d99a920afa44eb08e7441e92edd9593c00c9a7b9db93874cbef9f4c13c8
@@ -53,4 +54,5 @@ EBUILD netbeans-groovy-9999_p20160706.ebuild 3416 SHA256 d7e2327c572e23aeacbaf17
 EBUILD netbeans-groovy-9999_p20160707.ebuild 3416 SHA256 9194ddebfdae2aef644b8ee5135d1a611d7192066952361aa1b5e867a178adfd SHA512 3118c33098a88eb55d787abd5de79086bad5ff4219fbab3bd27df973d8f1ce4d2b04d22dad6aac455f3d3956c32a8e30787af7138ecb066c9a9df19a654f2c2a WHIRLPOOL d09b10a786a27c7137d3fba7c9b5fa24dc438b93f404f4e9f9190ad883de45903b061a893c54f7b21c2736f3d3d48f2b1e83b91dab14487cf443a532ae5153e6
 EBUILD netbeans-groovy-9999_p20160708.ebuild 3416 SHA256 1078a851776bdfd7e8772016734f196c142a431b96139e3298482779097516e9 SHA512 71aae67744cfca2b21f56dc24e8a1d0a6b64d1589f2e8a00036d2b8641c4e5a9fe031257ed5b11e51421bd6982073b40558e864a4f2bf41985a3abd4a257c134 WHIRLPOOL 821fc1a7939bb0a291be574fc6e53d37e31f48ef8c906691d6df6c85457286d362929098e56091118b4defe12929e97a54bf208a751a44470295d223a404d87a
 EBUILD netbeans-groovy-9999_p20160709.ebuild 3416 SHA256 99d55b66920bba2e9ac078b7394f86f46c3898495c53da2d337a769ea31d2c07 SHA512 346a81381ff1b8d2c1c4fc818ff5f325948ee0c689b2ff1d9fe42dbb816b5c70000f033fe1d32669bbf933412c08179ed4f0733373d49394da0c195e22cd7d7c WHIRLPOOL 164ee93234c80c829098a6f2894bc2f7a4d998a57d441a1372db0acb63a107ef841f993226f69e6bba6f3620da80a845741cda566e8b6806cc8812e61ec088b9
+EBUILD netbeans-groovy-9999_p20160711.ebuild 3416 SHA256 0f70a9bf417bc1cf1b72147a11459f060c9e25a2c72eab37349c0c12ac4254cf SHA512 3e1b62b4a95df8f7ba6ba40a3fe10882ff266c90db82e57567e2b50653ccd81639c25ffd9ba572cd22101e09a0c45da6c9a5d6599e5cc83b8d7593d67e73fd6c WHIRLPOOL c5c5482353e72b72cebd23665d1ff2f59c3403f7ccb9632dfc9053f4dc0dab290da1e99a24193b6cbab2884fa6be21b3ed1aebf4d83f3d0b48d2dd90adb8a211
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160711.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160711.ebuild
new file mode 100644
index 0000000..9e2af89
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160711.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-07-11_00-02-33/zip/netbeans-trunk-nightly-201607110002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/01730F61E9C9E59FD1B814371265334D7BE0B8D2-groovy-all-2.4.5.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.groovy -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r16-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/01730F61E9C9E59FD1B814371265334D7BE0B8D2-groovy-all-2.4.5.jar libs.groovy/external/groovy-all-2.4.5.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/groovy >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/groovy$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/groovy
+}

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index cf05e9e..3c251fd 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201607060002-src.zip 216525395 SHA256 ea3a45a96e4ec5
 DIST netbeans-trunk-nightly-201607070002-src.zip 216525625 SHA256 ddf8129b13037315956f00228aeacf843e88fe67e4a61f2b730e5a0532c20f4f SHA512 6ce62a221980bce0b90816d68fa177b1f06b5a584e25a5a63448cae78b9de93ea79b42c3c68b958c4dab1da02c1fb3721aa3f700a74955b676ff3a9f273bba96 WHIRLPOOL f8725146f925a10084f363551548201d82fa51e0ef0ce3ca4c21be8e08bb54b74501b4daa595e7c114eef0872f5d81aa0843996f9860dc4812f736e756e4c16f
 DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6a54e207a2683623b7717028934d654ae261148fc0cf9d334fe SHA512 d722b9050498af020f173b77a9a31eff10977d54827b1fb9d772c8bdce343a90be76c22b62a03777937cd7d19465afd82011e7b82e6162511a12f03f89e648cd WHIRLPOOL 40193c2b433557f500563d698b0883dd8a7a16604494330fd9298d0e7dd901a5be7cdd7183acc2c917fc6bfa78a5b9100a68cf1c1a3c76c47da65de6bb9dcd98
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
+DIST netbeans-trunk-nightly-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 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_p20160613.ebuild 4126 SHA256 066ec33bede8251f94d066951188b03ebef32e2de7694f5437d20c4e66c01552 SHA512 7b25367afff6de9d64ee9acdb75bc0cfa49266de7259920ec887ca5db085a85e483f81d909f8ee7ca22f42d397db9722a5dbfe57d8a48ef7e5c43ba467cc5daa WHIRLPOOL 701825047efb935378e9ddeddb52dbe0962ec1a674a895dcca41fc86494fdd28e829b40edbb644e6505d0dcb60a192a796650b745ab3996f7e101ea4c335f989
@@ -56,4 +57,5 @@ EBUILD netbeans-harness-9999_p20160706.ebuild 4126 SHA256 5ba4b342afd7a6b7407ea2
 EBUILD netbeans-harness-9999_p20160707.ebuild 4126 SHA256 a1b90c448059f80f92c6f65dca0598470b33d3f17f0b8b43e5dfd6c62f6b4392 SHA512 1d913ebb8a5cf22e25ac66c36a1653ad059d036a65293f63c6c87a84643ebbafa2181d3a85ef6d531da9b36e6e87fd7d7f13a88b5cec2ba31b141e47255bb7ab WHIRLPOOL 96cd40f963c5d77de70ae5740f1b046902c6a9df621d027d9d228f24d88d2e04585121a6cdf9f9d08f2f2e89fd94f88da4f28f5028dc4be5dfe44f432da02349
 EBUILD netbeans-harness-9999_p20160708.ebuild 4126 SHA256 8b7d8bc86e6d412da2aa6d5c6f79360bb2f227ce27e01bdd1d3b83f1d34e41f3 SHA512 111b12730a8cdfad9a94d70a8581800ddc0289b8e616cbb3f0187fc5d61c7b2957def03e74b997495bf25cc474534a2080f5c53a8c913bcc47b315e1d381b208 WHIRLPOOL dd72fbf698b10631f49a5915bad7315e8c2f9b2caecd939f1aacaa84c6e5982b46ea4b86c25d8023f683c5259b8ac3d6c0a2941cd52905c4e5846462bee95d74
 EBUILD netbeans-harness-9999_p20160709.ebuild 4126 SHA256 d8a8a190777121167ebd1ae0180e139ade32a86319deec0740eff535bc4a7c41 SHA512 fdff2897148f1c58b20a5d0d7b1da46a3853a5aaaf56e8f1a003e54dd7a7228fbd65b449c0971a9b0ebd8236379f7f825b006130037209f5aa58bdb5240e575d WHIRLPOOL e06bdbd9f6a4b6d20cb157e0a0254b171c3ea5adf6d304b73bb9ed0426aec7f64fece05331a463d1d76627e5b2d39cc775e160dfd03049288cd1f8d6a4c84623
+EBUILD netbeans-harness-9999_p20160711.ebuild 4126 SHA256 8bdc2fb87f9042f86c8a12971a8c63c8694075298fbf1f036e22e6e33c2be8e3 SHA512 4412e347167376a92b5c4a4aa2c8a1c2cbaff22e31898b974510f7fdc4ed8676220f10e309efab500adc0524838af68cb3fb51e957523f581f9a1f6edc22e9ab WHIRLPOOL 31dac19fdc9ebbec4879fab96acf8738c2765c097c8b4a7fc7e706cda3a407f5950f0f035b3b1a44aaf0ad785fc511d8e1aad872dd0f555143c9e0ff7640f064
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index ac48fde..358c6cc 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -166,6 +166,7 @@ DIST netbeans-trunk-nightly-201607060002-src.zip 216525395 SHA256 ea3a45a96e4ec5
 DIST netbeans-trunk-nightly-201607070002-src.zip 216525625 SHA256 ddf8129b13037315956f00228aeacf843e88fe67e4a61f2b730e5a0532c20f4f SHA512 6ce62a221980bce0b90816d68fa177b1f06b5a584e25a5a63448cae78b9de93ea79b42c3c68b958c4dab1da02c1fb3721aa3f700a74955b676ff3a9f273bba96 WHIRLPOOL f8725146f925a10084f363551548201d82fa51e0ef0ce3ca4c21be8e08bb54b74501b4daa595e7c114eef0872f5d81aa0843996f9860dc4812f736e756e4c16f
 DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6a54e207a2683623b7717028934d654ae261148fc0cf9d334fe SHA512 d722b9050498af020f173b77a9a31eff10977d54827b1fb9d772c8bdce343a90be76c22b62a03777937cd7d19465afd82011e7b82e6162511a12f03f89e648cd WHIRLPOOL 40193c2b433557f500563d698b0883dd8a7a16604494330fd9298d0e7dd901a5be7cdd7183acc2c917fc6bfa78a5b9100a68cf1c1a3c76c47da65de6bb9dcd98
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
+DIST netbeans-trunk-nightly-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 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_p20160613.ebuild 30761 SHA256 050aad9267fa2571aa93c3d8272049096507cda7af4c0d99ed7a48924c5cabfa SHA512 fe4a440f41504abd9b9b60a2beb4e9cfc362a3058a388d0d101b0d6cc37a9180ed41bedb490c0623b5e776f49bcaecf65f8c52248e6e823c5f64bf9185b34cfe WHIRLPOOL d5092b43ffebe2b6d1d57f8727b1c8b09fde72ab52a5265326ceb36eb490a8d6f071a0292b2e158261682e662b72a9d7c81e1a8e9b3a8f00cf1c6109b996fa3a
@@ -191,4 +192,5 @@ EBUILD netbeans-ide-9999_p20160706.ebuild 29867 SHA256 a7098bf9ccd132368fdddd905
 EBUILD netbeans-ide-9999_p20160707.ebuild 29867 SHA256 42aada428fbf916fefcf9a5b9e73063f0bf3f38a5b45eb5472c4f54e56326362 SHA512 14af3ea538acb7499a837e7a0726a664884f086f7a9fbcc119498429cebc0b0d86873a95ea9b3f6fc10405535c75928d80ab970146044b0df711bd74133f5cca WHIRLPOOL 530891c349bc08deae1b3948865ecfd668aad4ea8fded6b22cce7476f4c0b7d0e2c72837cdaa161023eec9dbe9edac572b0c565cd0da79bce4394425c17f1133
 EBUILD netbeans-ide-9999_p20160708.ebuild 29867 SHA256 cdccca7d4f50b61886d971197f42528a7bc5d5a41d4e405e850c1a7c18fc0eca SHA512 abcab3407bd4c01f34b6f2a3885146db8eca759eb7a287798e1860ad5613a0ba3403bcb4ed5f13d35ec18c47c8fbf7909ed42281d892a796500c317cb916ac75 WHIRLPOOL 0d3eaa5bd6564d8c755b35957f00d5f0d0cd7a01ac3681c927cac6487e6c08ff96f3e5ee74661bbe36d7ced8173763e8e19f1175846b355cb93c00ec7cf1b7dd
 EBUILD netbeans-ide-9999_p20160709.ebuild 29867 SHA256 c59ddc10f98e85f1b3b2947132c104067a812453f145884eeff2bac0036b4c04 SHA512 f2be605fd0d65b5189be2af30161e5da0a86bb6a9e45f996dcd4e9ca0f5d1b40a6d6463d4ff1a4abea52477899ab53b10bd1a6b170ce13bf6efec58b9a387e00 WHIRLPOOL 2062f6b158778e0cc2c75f2876cf4098fae5ac42e72a23b97f5512851bad6b1e8c46d05afb232d92b401159471214cb1eb584f5c6b30faa881eca2e77864ce20
+EBUILD netbeans-ide-9999_p20160711.ebuild 29867 SHA256 b22b6f5d05a0b193cf86e10adfec890ae34521e3ad44ee71abcf0610653848ef SHA512 111ac1c6dc69da73a579ca1bfa3626d226d243e73439fc5acd82a26ee8be3f982a9a1607fe36f3626c427dd8c30a218a84060cfe7214169fbb4b62db3c32c720 WHIRLPOOL d7ac218b64f862f9c703fcd32838089048534907d801d78dc00f5ed1c4cfef3d7a128444cc5fa67008dc707ca6c60c54a2ce76ba7b970550905f5852d27426e8
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 25e9f2a..444ea24 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -64,6 +64,7 @@ DIST netbeans-trunk-nightly-201607060002-src.zip 216525395 SHA256 ea3a45a96e4ec5
 DIST netbeans-trunk-nightly-201607070002-src.zip 216525625 SHA256 ddf8129b13037315956f00228aeacf843e88fe67e4a61f2b730e5a0532c20f4f SHA512 6ce62a221980bce0b90816d68fa177b1f06b5a584e25a5a63448cae78b9de93ea79b42c3c68b958c4dab1da02c1fb3721aa3f700a74955b676ff3a9f273bba96 WHIRLPOOL f8725146f925a10084f363551548201d82fa51e0ef0ce3ca4c21be8e08bb54b74501b4daa595e7c114eef0872f5d81aa0843996f9860dc4812f736e756e4c16f
 DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6a54e207a2683623b7717028934d654ae261148fc0cf9d334fe SHA512 d722b9050498af020f173b77a9a31eff10977d54827b1fb9d772c8bdce343a90be76c22b62a03777937cd7d19465afd82011e7b82e6162511a12f03f89e648cd WHIRLPOOL 40193c2b433557f500563d698b0883dd8a7a16604494330fd9298d0e7dd901a5be7cdd7183acc2c917fc6bfa78a5b9100a68cf1c1a3c76c47da65de6bb9dcd98
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
+DIST netbeans-trunk-nightly-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 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_p20160613.ebuild 15656 SHA256 8e14cffceab0b957ddd700f8e7c714a1f3287542f6a4ca961ee50e337c9509c6 SHA512 674fc2125ad9c99fa0063bd9bae2af65a8b0cd808e72fb97b5f0f6509f25ef803f18119224dcd03cc0f87df8fb1a3bb30fda1982ca757120c948cc84eb7dc5bf WHIRLPOOL d3ef526c1809d0dddd37e96c752ea4c9bef530f745a13a399432cec3e327726eddb5b964aa4f6f5286734e97349c6cc529a423fbb0d36098a8423a8e6eaaac56
@@ -89,4 +90,5 @@ EBUILD netbeans-java-9999_p20160706.ebuild 15656 SHA256 41a8db03c50938d24b010fdd
 EBUILD netbeans-java-9999_p20160707.ebuild 15656 SHA256 bf69fb0a97bfff1da41d5e72e69f8c31172d24fdb4aa7acff9448602b8959028 SHA512 79e23712517d7e36ad4fb76d0df5262a5dbdf67f75cbef5ca659b6c7c24b579e577c364dd2681b27555d5979e99e181aa0455d64eea0fb6a23840578967f0606 WHIRLPOOL 7ed169af62305d691f6cca1c175c6a4609b32a7c906353b759c89d0d59310e20b2ee7992ca3a138005a68db0840bc5b93bcad4586789123ceb041e83cd36e921
 EBUILD netbeans-java-9999_p20160708.ebuild 15656 SHA256 cf53c668e429556e06cb2ddcb3e9221dfffbcb26979087a54cc5247eba72ee6d SHA512 af1c8cc2889cf95e4ea2f04ea615f9b587fd804ccbb51c432c149b8dae15a006f161a94533df84b0240a6b9de1275487612ac85b220d53d29d5d0f5e4ad53893 WHIRLPOOL 5df9b134c109e2b00bf2454c094bf419be0dcc38b50bf10b0cff4a4e1e6be9f1c1adc7c9b9a91e431f7c6936073adfd3811276f857197ea5d765aace4573614c
 EBUILD netbeans-java-9999_p20160709.ebuild 15656 SHA256 7eda322aea3fa2536c11fc19d9698c5703c6d1cf7394a76c3670727328691a87 SHA512 f6e47be5994d30533d109c338545b8a53fe4c8cc6b7cddb1c5e178df1ef77c54880ecea7f13016477c8e299e64e9f7a7a669d486415f2e28d9269b1732b78bae WHIRLPOOL 31290b461d6f51bac9ee08b8a92bae02b241b978ccde00a1cd78fce35ff1350ade088fd6c83294c401df848f079b05d56ca0c8664174dbf5aa5758a0a57c6a5c
+EBUILD netbeans-java-9999_p20160711.ebuild 15656 SHA256 0c5a06b6ea2d5e22bf1693da05a12d04c74db19c6797d57ccb84970fde3d6796 SHA512 dd2dd7ec7959fa0bfe865c39869547b2cf10b99c84abd78854f37c2a3182f250bc013af82fb95530fca51dada7f579b986261552a9d2509f446a72c50cbae394 WHIRLPOOL f80a146f0ab9c7326eacb96f69e30f5d4870fd1d184a5fbe6c11b2d996edb8dc2d33c1e98b85eafdeb0520779e056c080841f8bf8af433383c976b054a936fa8
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 4d3dc87..f067dea 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201607060002-src.zip 216525395 SHA256 ea3a45a96e4ec5
 DIST netbeans-trunk-nightly-201607070002-src.zip 216525625 SHA256 ddf8129b13037315956f00228aeacf843e88fe67e4a61f2b730e5a0532c20f4f SHA512 6ce62a221980bce0b90816d68fa177b1f06b5a584e25a5a63448cae78b9de93ea79b42c3c68b958c4dab1da02c1fb3721aa3f700a74955b676ff3a9f273bba96 WHIRLPOOL f8725146f925a10084f363551548201d82fa51e0ef0ce3ca4c21be8e08bb54b74501b4daa595e7c114eef0872f5d81aa0843996f9860dc4812f736e756e4c16f
 DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6a54e207a2683623b7717028934d654ae261148fc0cf9d334fe SHA512 d722b9050498af020f173b77a9a31eff10977d54827b1fb9d772c8bdce343a90be76c22b62a03777937cd7d19465afd82011e7b82e6162511a12f03f89e648cd WHIRLPOOL 40193c2b433557f500563d698b0883dd8a7a16604494330fd9298d0e7dd901a5be7cdd7183acc2c917fc6bfa78a5b9100a68cf1c1a3c76c47da65de6bb9dcd98
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
+DIST netbeans-trunk-nightly-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 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_p20160613.ebuild 4971 SHA256 5483e0c2de8069a5e708485fdbfe4c53d99dc17adcde9eb3ba06db80c1f05578 SHA512 fa0fd53c2017e0771652878c50ae9034963ae946fba7f8da33dd41671fe81a4a0761887a0ddbe8c592f7ab4e20716a554e15017129792ae853a4b92deef972d8 WHIRLPOOL 5ecd471ed031cc471b64e85a2bf578fff757a49a95ba0340676e0951881e6424f628a95dee88afe6a053d22a50a04da0eba2ed1605c8e776d28da3d7bd9cc036
@@ -54,4 +55,5 @@ EBUILD netbeans-javacard-9999_p20160706.ebuild 4971 SHA256 f7105d5d3bab4221b4d50
 EBUILD netbeans-javacard-9999_p20160707.ebuild 4971 SHA256 c2bf393de1763c5f36bb34ceb8737a3a1f6b0bfbc160e0b5e25f0654ca317212 SHA512 42abdae2d58b5d571e1dc63b8232e48cca36f9ce0ee43ac8e2c37053de209f07fef5bf3ae3693dbdbe0ea049407a4b1941d8c222ddc44ad712c6ff75fbb442d5 WHIRLPOOL 565a57ac330c2bd08ba77b2488806a81380a4a632588ecec1deae290e3c90bc350f7b035c111b5c8708b9b8c084b9e326266a77e79095315cb52ee4b9093f012
 EBUILD netbeans-javacard-9999_p20160708.ebuild 4971 SHA256 783f4d8134cad349c3cec6e0d2ee9691af409cd8876cc9aaa514d8fb7e21acb1 SHA512 938e9e8246de6a744170ce2630d6628c97761e313abb199c3f171bfa26d7dd14d922108e70d22960ef2c08c81686670e3e1a3413842e8ab19f7b7f3ad7f811ad WHIRLPOOL d330048a9ab90e148ae647c5fbc99b6f33ad4643ca82de4304dcf1440e43fc53c83357c77a90920d126afb6de96b383510a30815571ffae02872bc9708cd4ed3
 EBUILD netbeans-javacard-9999_p20160709.ebuild 4971 SHA256 cf93ce037fff4f17afe8e77ab98bfcde07a47b2b9ccbdc9afbfc6d6f9c42a2c9 SHA512 dcc8017cd7b76bfceaf1730968fcbd8beba73420b1b7d1e2eefac65511ef0ba07bc6948ee6493037370ecd26a13e140a4e06e7038002cbc75959d0ecaa61901a WHIRLPOOL c05bcc6832725f71fad172c891ecae6d5ea05ecbd0125d1003b691ec2c04cb22226fae057e701391f5b10804df35137a997e3cc0ec3f312753a60bc9ae12d26f
+EBUILD netbeans-javacard-9999_p20160711.ebuild 4971 SHA256 2c1a6b579053e905bd02edcbce8c43dbca157ac8233f9a9def84a648f64f1d6e SHA512 fdaa65d0e81933c8d43a792b48e5a0931b9bdcc86bf6d5d2be9ce0b41d91c77ac9123326fa4f590d67b42bdf3d6bd2760b0265901cdd45f3c9c43a57c3daed0c WHIRLPOOL 9a599ee5e0ab5634dd79e9115d214aeaa9e3f79c2bd95a81459b1af156e99fd53b1d7fb072d2c70aef9980c6c05be5901f72965d4e38f976dd40ec4df7a259cb
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index 630163c..f235144 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201607060002-src.zip 216525395 SHA256 ea3a45a96e4ec5
 DIST netbeans-trunk-nightly-201607070002-src.zip 216525625 SHA256 ddf8129b13037315956f00228aeacf843e88fe67e4a61f2b730e5a0532c20f4f SHA512 6ce62a221980bce0b90816d68fa177b1f06b5a584e25a5a63448cae78b9de93ea79b42c3c68b958c4dab1da02c1fb3721aa3f700a74955b676ff3a9f273bba96 WHIRLPOOL f8725146f925a10084f363551548201d82fa51e0ef0ce3ca4c21be8e08bb54b74501b4daa595e7c114eef0872f5d81aa0843996f9860dc4812f736e756e4c16f
 DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6a54e207a2683623b7717028934d654ae261148fc0cf9d334fe SHA512 d722b9050498af020f173b77a9a31eff10977d54827b1fb9d772c8bdce343a90be76c22b62a03777937cd7d19465afd82011e7b82e6162511a12f03f89e648cd WHIRLPOOL 40193c2b433557f500563d698b0883dd8a7a16604494330fd9298d0e7dd901a5be7cdd7183acc2c917fc6bfa78a5b9100a68cf1c1a3c76c47da65de6bb9dcd98
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
+DIST netbeans-trunk-nightly-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 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_p20160613.ebuild 6293 SHA256 7350990790e9615b04686d7229412f233d47a0bb453d8c481ab670f17ab29c81 SHA512 50d67d5e134c3e1c1be32abf685e72afa6e789d314083a8071afd5c4b08daf19e66281d3316a82a3564f3fe7851c5e51ff33cdf240710ce00159a9d683d9eca8 WHIRLPOOL d79fb8727ce2ba9bce59c269ac5dcb6043f80bdcfaa8ef6a5956b1f710f1af1f0a534bd68a47513626a0ab963a892b39ae66a4a07a4e7675e0e2053198f0c2dc
@@ -53,4 +54,5 @@ EBUILD netbeans-javadoc-9999_p20160706.ebuild 6293 SHA256 af7c6132817f222d5056d1
 EBUILD netbeans-javadoc-9999_p20160707.ebuild 6293 SHA256 09d884627adf40d6bd337ac72b00bf64af897d8dbc7f48e3d62fd6e8f29522ee SHA512 5d04c7e2b18a2c4d87d5d405cc73077ce5f18fe25f6a9c253512a9df5b26960527e4efd2ead0afe1a68afaff20e3b0441f1e99692a92a23de2c4c2c472f689a6 WHIRLPOOL 603ae70564f5e439a5ce7ff616e919e3c4e001ac526e3d56d4c0432ed7bd289c3349d264143cbb51965b1581a0895e024f6b6814d54cb25d63c559c9a0742bb2
 EBUILD netbeans-javadoc-9999_p20160708.ebuild 6293 SHA256 1e81575c0aab27059ccefbf01f53a9135c0ecc7ff4eb57a84c76274f6fb48d97 SHA512 1b9c055fec2c1c658854f801235090c32ff4b5760b309037aa9dcea18bafb1885a6a656aa5519b2fc746f0d5b912ae2540cdbbd903363829a16f859103d8c35f WHIRLPOOL 8bd9e8333309b641137b04ac5ebfe6dad2eb66c46a6c923147bb740a20fbcd912356f6827310928dfd237c47c5dc49cbea7a7e8609e9393a8beca657b9e253cf
 EBUILD netbeans-javadoc-9999_p20160709.ebuild 6293 SHA256 854cf451f4d1b4c657214d62096d684f46f7bd42d77c96732b82ebee676a70cb SHA512 72edbaa0c92f1b24996790d41736358581330e792501533427ff13c5e313bbde3274e4079cedd025a92f308e2a37523ff1211a3b9c47c756e170930d3dcbdda5 WHIRLPOOL d17171fe6a21a1f3243e3bac2eb94a33091c035aa3c07835551c32c9f543b4c9aa0804b8b70e8ed891e4b165266bfb8a10d6e9043fb9b1deb1ad214b79f93c87
+EBUILD netbeans-javadoc-9999_p20160711.ebuild 6293 SHA256 bfc9e984ba1ec74d85c29ece808a1bd5e520600726036020abe95d92602d958e SHA512 180cf878482ba22c207ee584c2ff46a0ff974e4b41638f12d621acf099251e6d91fb5988a20d441d47d15fa3dadce9af82c18737f09cfb3a541cbfa0d7f699f9 WHIRLPOOL cd084454b801e1f2628806efb0ca2ee95d9b984924ae9998050492afbd7f8a5149a64513c17b67a8e6c4193de0773b784c7522879c2bbad6c27e8f9542f48b94
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 1a1e6ca..2b08f81 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201607060002-src.zip 216525395 SHA256 ea3a45a96e4ec5
 DIST netbeans-trunk-nightly-201607070002-src.zip 216525625 SHA256 ddf8129b13037315956f00228aeacf843e88fe67e4a61f2b730e5a0532c20f4f SHA512 6ce62a221980bce0b90816d68fa177b1f06b5a584e25a5a63448cae78b9de93ea79b42c3c68b958c4dab1da02c1fb3721aa3f700a74955b676ff3a9f273bba96 WHIRLPOOL f8725146f925a10084f363551548201d82fa51e0ef0ce3ca4c21be8e08bb54b74501b4daa595e7c114eef0872f5d81aa0843996f9860dc4812f736e756e4c16f
 DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6a54e207a2683623b7717028934d654ae261148fc0cf9d334fe SHA512 d722b9050498af020f173b77a9a31eff10977d54827b1fb9d772c8bdce343a90be76c22b62a03777937cd7d19465afd82011e7b82e6162511a12f03f89e648cd WHIRLPOOL 40193c2b433557f500563d698b0883dd8a7a16604494330fd9298d0e7dd901a5be7cdd7183acc2c917fc6bfa78a5b9100a68cf1c1a3c76c47da65de6bb9dcd98
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
+DIST netbeans-trunk-nightly-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 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_p20160613.ebuild 4717 SHA256 a6e4bb5e4cf5be13abf3a40def21b9e7c74b673766a1ed678e268dcd1e962911 SHA512 d6f074a1965d8f9e5a759412e3651deb3e7d2cbe208ffac530843588508c9ee25018b7b011f3150af1264c4c25637973e52389eb1672bdfe67d9bab9569f70b6 WHIRLPOOL 4791dce6ec4f17c57eab3ac19ae5eb50cb8f1eadcb1ca1fe519dc169d4dca19671b57757575ce50621b5147074e3c8bf893c1f8c2228a6eeba17b104fa04c21a
@@ -59,4 +60,5 @@ EBUILD netbeans-javafx-9999_p20160706.ebuild 4717 SHA256 0a67e22f0778b15927629fc
 EBUILD netbeans-javafx-9999_p20160707.ebuild 4717 SHA256 a28990f541bd8c043a86d87632cd72b5a3e47eaee8d64fa58865cbd5f471aa79 SHA512 08b78679e90b4d326d8d7060d8c7fd40a76848bfd843c4bc9dab6bf9da8e017d16be9c720c5b7da6e4db6ec4e8c0ab7aea8339f2ed0ee8fe61fc5c3799d5784f WHIRLPOOL 585640c1f574d7304fbdda74751bbac6a12ee6afc5761548ef8425f90014b43d43997cf2fc287349838656c52b4645901202de53ee79fc2626182c5114906ef0
 EBUILD netbeans-javafx-9999_p20160708.ebuild 4717 SHA256 b9100e39b7a262225db250e90881e0c7bba507573ca31c7e206366308512ecb6 SHA512 055d3ca7e73081e3b1fc9a8b0f6e86619000e18ac9b6741a64660602ee80bee5b1578191896a97978fd462c1fe3cd27e967782d225f4fcfb12b6f312b0022d97 WHIRLPOOL 1720e08fdce8452ec867137c834d6d5bfe03ef9b23ee087621868b8e98bef7b6d1929da6c5cb386823ef0532cd7a35a9822a915f03f0ddd4b60cfcfe88bcb0e1
 EBUILD netbeans-javafx-9999_p20160709.ebuild 4717 SHA256 db65d9406d29b2ac9fa438f49371ac0d2a003b29b4e16e8fb9c10dc95fdef40d SHA512 c54655bfece165470032a4b87c7ab6c63afe3040f7c71d3e9ede5439b75c6f675de40ec8c3c68352cc497b3fdedc2ceddbf40f685b396c8c8370d994f94900a1 WHIRLPOOL c8650f40d45e06c9a00239d01ad4bcbe9598f3bb68fa585329c917733b64b3028f26a0145604f01815bd417f7a1c613f44cf2b419e140ac9a0b8193a09875f2c
+EBUILD netbeans-javafx-9999_p20160711.ebuild 4717 SHA256 2e35df2c784d4d2919b8393de8e503d01ce1a3dd01c870329992db24d40d6151 SHA512 bf54e6beb32b7e9516653292cbab1e9446bcdd242e2acb011a09e186bd8b7b0562e315f34237c087be163b8e119503ae4451ce65656514897da44781707c01da WHIRLPOOL 7f254f3694dd69bb2bd9d754729bcf407b7f0432c8796ef3f02d04cce94cb41cb864320208024af11794f7e4ea3335e9210368d3b66cbb98a38a6c32df0e7e1e
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 101f087..789d15f 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201607060002-src.zip 216525395 SHA256 ea3a45a96e4ec5
 DIST netbeans-trunk-nightly-201607070002-src.zip 216525625 SHA256 ddf8129b13037315956f00228aeacf843e88fe67e4a61f2b730e5a0532c20f4f SHA512 6ce62a221980bce0b90816d68fa177b1f06b5a584e25a5a63448cae78b9de93ea79b42c3c68b958c4dab1da02c1fb3721aa3f700a74955b676ff3a9f273bba96 WHIRLPOOL f8725146f925a10084f363551548201d82fa51e0ef0ce3ca4c21be8e08bb54b74501b4daa595e7c114eef0872f5d81aa0843996f9860dc4812f736e756e4c16f
 DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6a54e207a2683623b7717028934d654ae261148fc0cf9d334fe SHA512 d722b9050498af020f173b77a9a31eff10977d54827b1fb9d772c8bdce343a90be76c22b62a03777937cd7d19465afd82011e7b82e6162511a12f03f89e648cd WHIRLPOOL 40193c2b433557f500563d698b0883dd8a7a16604494330fd9298d0e7dd901a5be7cdd7183acc2c917fc6bfa78a5b9100a68cf1c1a3c76c47da65de6bb9dcd98
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
+DIST netbeans-trunk-nightly-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 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_p20160613.ebuild 4412 SHA256 6ccd4115395214411217851c1521a076789f673cba27af69f8899174f63c330a SHA512 b961254aa0421798d83eaf012142429f97a4761df80a9539f4ac157af76c58f8ec282839f2ea1160db70295a57665b5a07841e2059edb452d5788922675b0e47 WHIRLPOOL 3388b48379db701623f44830f11003b2e5b8285604998e4088e77c71623af92acbe0b2c0773fcf6656749cf2df34f82ac96f4f38337d44c6b911f50a3c97853e
@@ -51,4 +52,5 @@ EBUILD netbeans-mobility-9999_p20160706.ebuild 4412 SHA256 6c56a83a8b2e22b0beaf0
 EBUILD netbeans-mobility-9999_p20160707.ebuild 4412 SHA256 d28ca6cf2ee9226bfe09576cef87dafa746723b776097153e09c418772ecec4c SHA512 209d1f0dfbe393f42bbf82609acb3f0a79d1b84747eb37c67f9b825916bfb3e03038221d429fb4ce36f67d89559cd15adcf91a96f53ebc4e519862313ee25727 WHIRLPOOL 39531d36168e4b338db7b43e6cdf2cab483822e82cd1992f86de658c02c3ab4fd4458c04b0dab5bf4709ec3674126698b25bfdb5d563850a4c8c491fc4d8a547
 EBUILD netbeans-mobility-9999_p20160708.ebuild 4412 SHA256 4d164f735e4a0a6a0bdc050263dfde43c7f08fe2974ac0310c7a3d58a4429b43 SHA512 ad03174a6cbc255a36890f4832ec16e685c61754fb17e70d54cb5ac57d0de5d46faa444f6d126a56f214d6a19db4cc75c7d9ea78ece4d281f459491cb19086ad WHIRLPOOL 62562e153016fbdac9adcd130732a5c096dfcbe2b4f4b7981c40bf8b38df473a6073329dd751a9f0054188b7c0c69900b68379a968d121f412b3895f8f2a669e
 EBUILD netbeans-mobility-9999_p20160709.ebuild 4412 SHA256 64c479236cae23e6170f21f76fbab6fb962872621e3802be4575f0042b91ec2e SHA512 88715847e34c54915a9b5dba859ff8698f67f9272b3005d894ae5117ebe7a1c928ccf231b3407589e40a66f1fbe8c5c07ae121038aa7756121ef278f56ea2672 WHIRLPOOL 1d1cfb407e001cbb3a57a82a00f26135d4337a68bf47b918ebb38c0d4d2da0ed50093216cb9e3cd492f218da506b22896a8417e93b01107a6e3c48adb40615b7
+EBUILD netbeans-mobility-9999_p20160711.ebuild 4412 SHA256 d9f1267ba1361912cbc06651159d178b9b75807e7484502d0043b582a74d6492 SHA512 ec6f5ec1ce6644bcf63a3698fae293caf788632969dc83bb22653789fe505883dd07ddc026b8bffe6d14876cedd6c0b20862a946ba5c2618ed43025f491addd4 WHIRLPOOL 09886a51d38848e4f1ced067de61ef162339b2676fdfbeb152ccad37e07fdb653ff3c2b6db5c175190b57f413c13d2a968dd7884ac6cb8990cdcc36982da0da6
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index ec89fc1..131bd05 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201607060002-src.zip 216525395 SHA256 ea3a45a96e4ec5
 DIST netbeans-trunk-nightly-201607070002-src.zip 216525625 SHA256 ddf8129b13037315956f00228aeacf843e88fe67e4a61f2b730e5a0532c20f4f SHA512 6ce62a221980bce0b90816d68fa177b1f06b5a584e25a5a63448cae78b9de93ea79b42c3c68b958c4dab1da02c1fb3721aa3f700a74955b676ff3a9f273bba96 WHIRLPOOL f8725146f925a10084f363551548201d82fa51e0ef0ce3ca4c21be8e08bb54b74501b4daa595e7c114eef0872f5d81aa0843996f9860dc4812f736e756e4c16f
 DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6a54e207a2683623b7717028934d654ae261148fc0cf9d334fe SHA512 d722b9050498af020f173b77a9a31eff10977d54827b1fb9d772c8bdce343a90be76c22b62a03777937cd7d19465afd82011e7b82e6162511a12f03f89e648cd WHIRLPOOL 40193c2b433557f500563d698b0883dd8a7a16604494330fd9298d0e7dd901a5be7cdd7183acc2c917fc6bfa78a5b9100a68cf1c1a3c76c47da65de6bb9dcd98
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
+DIST netbeans-trunk-nightly-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 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_p20160613.ebuild 4111 SHA256 88f1338cfbd639272d59683e42e2cba4a58dc7aaca0b67515d0ea9147c544429 SHA512 41a86de8ac48e71121caa41073f2fa05a0244577f8c85cde6759fdaf252396bb5af326f9d2c9b1d10ab23ed84119bab9de311f3b162aad42f8e74b5e636b961d WHIRLPOOL 68ba4411a2b8d62bfefc22ab2609d8bcbc6f1e9fd7be4b3981f8891cd585b8d89209ab98524f14973978705b1db689dcec841d2d9b1d9552b731b6c2dfd96f8c
@@ -54,4 +55,5 @@ EBUILD netbeans-nb-9999_p20160706.ebuild 4111 SHA256 e548325970a095e4e9d19da14ee
 EBUILD netbeans-nb-9999_p20160707.ebuild 4111 SHA256 d944a3f5097390553bb935e590b2b56d1a6b0282f2bf8ec6d00f21150d486df8 SHA512 a5381d9f12236534822ea4d80bb53a13b62373b7eabc409822c64f2ec4b696752accb921395f9b979061f403176604d79dea831cd1bb3674dbbe67c17236f1f0 WHIRLPOOL 03ad56a6dd6afffbfd155fdbe2ed4e24764b822dcbcf4dfc1cfd4f3b5982e69fb39c9031d7bf01e306ac837ed4754a710c19b0f4030e9cd44b5e57e9f90b7132
 EBUILD netbeans-nb-9999_p20160708.ebuild 4111 SHA256 67e5e6290cf643ff9f5727055e2d7792191290148acec5eb2bf82874f46a729a SHA512 ae2d1e3ebde23933aebfb57a66a8294d86f487c763ec01a91ce3db93d5390cba1381abea165ada486200557626625a53b5355f0a628e04c8ff21d3eb52ccc88f WHIRLPOOL 46cd2bd5e966db305bfe51cd096707515f7130661ccf501d21e5d313ad29a99841b53569e3bc2a00153bc0f6f22dbe2f42cafe921c5703353928d5b96acb5fc0
 EBUILD netbeans-nb-9999_p20160709.ebuild 4111 SHA256 6ccb374c4041f62afc66096a2a21a663fbd1a002d203a8077feac755ecfa23fc SHA512 edf8686d6276a585123ad8ad5eb7ac6ad1d0a6d40afc5c4b3a08280b206f353ed13685034bfed9a574460f90c98c22d86c7c807c6064b8eb8d3cd14633fd7d65 WHIRLPOOL 49dd6ffc7cc2dcea8064df95300e18c1182d948982d5f0651e0d6660648ff921453f4803783622f1e33c9b276b4bf89f81c8c55dc736254fbde625a0cef6a9ed
+EBUILD netbeans-nb-9999_p20160711.ebuild 4111 SHA256 ba86487964a5e5cbca82a26d082142632f17c9aa6abd22b040b4d57c0ad0760a SHA512 d90a02987aeeb665f70ab5a0139a6fdc663429f64f5de47ad83df2d5fb10654590ee036fce3da45511eb276e136700cd823935f603787ac34acea5c2e5c18e6a WHIRLPOOL 1b3288fbf1b73b1be0d7d8ee6a2faecd182693c9d14f894b0c99d723a58f8cb951ba143537e2a40a7106a920aef8833f35014b1ab83682c73de3226a45bf13eb
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9

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

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index b314a5e..38edfc4 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201607060002-src.zip 216525395 SHA256 ea3a45a96e4ec5
 DIST netbeans-trunk-nightly-201607070002-src.zip 216525625 SHA256 ddf8129b13037315956f00228aeacf843e88fe67e4a61f2b730e5a0532c20f4f SHA512 6ce62a221980bce0b90816d68fa177b1f06b5a584e25a5a63448cae78b9de93ea79b42c3c68b958c4dab1da02c1fb3721aa3f700a74955b676ff3a9f273bba96 WHIRLPOOL f8725146f925a10084f363551548201d82fa51e0ef0ce3ca4c21be8e08bb54b74501b4daa595e7c114eef0872f5d81aa0843996f9860dc4812f736e756e4c16f
 DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6a54e207a2683623b7717028934d654ae261148fc0cf9d334fe SHA512 d722b9050498af020f173b77a9a31eff10977d54827b1fb9d772c8bdce343a90be76c22b62a03777937cd7d19465afd82011e7b82e6162511a12f03f89e648cd WHIRLPOOL 40193c2b433557f500563d698b0883dd8a7a16604494330fd9298d0e7dd901a5be7cdd7183acc2c917fc6bfa78a5b9100a68cf1c1a3c76c47da65de6bb9dcd98
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
+DIST netbeans-trunk-nightly-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 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_p20160613.ebuild 4418 SHA256 0576a98b6ec0dde28ac3299fc2daf2cbe94faa5b3ce0ea0f5a07149e50046bd0 SHA512 bee626cf8ae056bd3f6532d28de2c12256e94fff302dd7cb898722da5d262e6a3d250a2c1bce1b4a6a0b153f65c23ca932b5cff60d7fee0d271e0313aa27743d WHIRLPOOL 6a46163485d06d46c05150e964d4b33a7acfc07327997c63cfd0e7d374a3486dc1d500a8deba5ab3b1fdf2809c05e61283bb95b84b6551c603acdbabfa3cbd1f
@@ -56,4 +57,5 @@ EBUILD netbeans-php-9999_p20160706.ebuild 4418 SHA256 86e913e3ee738641ce2d7c39ee
 EBUILD netbeans-php-9999_p20160707.ebuild 4418 SHA256 7a5c0d246417f25c0cb10e81607c2efb39e061e3acb0b2055beb4d74bf42e5b3 SHA512 aa53537c81d3d763f7931b7b253449d28735acb4fa8bc2225c523400bef7431c18397b1ffa703ba9e096f2c57d4807913abb724cfd3e5624b8089c77140c99bf WHIRLPOOL 1d85d9f952194d3924f52b45fddcbf43d17da2f1142ee991be479fd838e50db5082408272a2feb96df3e5a7c448dcb7bbce7743a1abda59088cd43a9501e005f
 EBUILD netbeans-php-9999_p20160708.ebuild 4418 SHA256 52e95d73d12640c2129c966a30f01d6fd05c119ba69c0982a5786bd832f8bb77 SHA512 40296fd610a530c896ffd2f70be6542775c2fd1dc14ee01a996c94b7e60e09bcd93bac2bd8ca63e80362fe7a80193544039d709b97dd1ca905bcc2f1ffde9963 WHIRLPOOL 8d6c8930862c2ef9b11f40dc86cebd97f92a15321214be98d5fafa7ca2a1e23bf998b750944f26dec8d62908f8b3a4a72ec88e6e43938191bc33b6834d059955
 EBUILD netbeans-php-9999_p20160709.ebuild 4418 SHA256 32615a1e55939e861f7450d7bf439aa2610af312a901f70be0fd3281078cc0c8 SHA512 08d5fe403cdb55f5e0195c489f8f38168807c2cfe2c5099576d6bc3168eeb9b9bbeb3c7ab70efbd0c959cc25897ffbb6bc8347a4c6043df9fbc0068b95f75e19 WHIRLPOOL 593eec0d07c4a4315b6f623be19cfe4fa517f9dc6bf92a609313d7b5cd9697fdae7835b0e3a831e2470e83fc9f9ec3d54462550db68b9981f15d665bdbaafc6e
+EBUILD netbeans-php-9999_p20160711.ebuild 4418 SHA256 5474ef3a0e0d0e39fb122aafc49a731b8cc5b09c28b1b125686682c98251ada7 SHA512 9ab5dd7c33b7869f3a298b06ff9accfa50f5269bf9f4167eaa70ac0ba42c5b3735cbdc4e2686d05108908f166597f02be3be69927565e1433623a442a06bd97a WHIRLPOOL 65986488565ac9ddb5c9813405ea938d39d71ae89e5f519c0a1226d35f94d777841d573f93f3db63c837f6b5b37e6d7158a42194e1207b28bcfd005788721afc
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 694eca5..50e310f 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -52,6 +52,7 @@ DIST netbeans-trunk-nightly-201607060002-src.zip 216525395 SHA256 ea3a45a96e4ec5
 DIST netbeans-trunk-nightly-201607070002-src.zip 216525625 SHA256 ddf8129b13037315956f00228aeacf843e88fe67e4a61f2b730e5a0532c20f4f SHA512 6ce62a221980bce0b90816d68fa177b1f06b5a584e25a5a63448cae78b9de93ea79b42c3c68b958c4dab1da02c1fb3721aa3f700a74955b676ff3a9f273bba96 WHIRLPOOL f8725146f925a10084f363551548201d82fa51e0ef0ce3ca4c21be8e08bb54b74501b4daa595e7c114eef0872f5d81aa0843996f9860dc4812f736e756e4c16f
 DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6a54e207a2683623b7717028934d654ae261148fc0cf9d334fe SHA512 d722b9050498af020f173b77a9a31eff10977d54827b1fb9d772c8bdce343a90be76c22b62a03777937cd7d19465afd82011e7b82e6162511a12f03f89e648cd WHIRLPOOL 40193c2b433557f500563d698b0883dd8a7a16604494330fd9298d0e7dd901a5be7cdd7183acc2c917fc6bfa78a5b9100a68cf1c1a3c76c47da65de6bb9dcd98
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
+DIST netbeans-trunk-nightly-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 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_p20160613.ebuild 9520 SHA256 fbdbf00bead6c9e4fbe65bf4d61ca333368fa36ce8374b4161dc8a095047f418 SHA512 3fc24ed23180297ae97c26b957434caa6aa3640a42e752faf45c84dc9822faa051c2b038f69e1fef4cc6a25132a06ce28d9c3edcf18e961e82e3cd26cb18a3e8 WHIRLPOOL cca2527c4a4d9ea8d8151ba8ffc03897cd1c7a56060fd950cacdfe3f1bcf87bf61d7f7c3da6c65343d0a582e5dfa647eb3207934fcaf63ad6e17c0723a41d253
@@ -77,4 +78,5 @@ EBUILD netbeans-platform-9999_p20160706.ebuild 9520 SHA256 3fa016562c9ae2dbb2cc5
 EBUILD netbeans-platform-9999_p20160707.ebuild 9520 SHA256 884a9a0444004d094355a281bfd28a5fb55bcbfb044cc2f305076b732e5513e9 SHA512 4900f1e9d3cba5fcca2faa20ae77d7182fc2103bf24d987582b28ce88504975a227649f03fe9b8458d184dddc81f330cfbfc1f4383994f65812f6dce14a9a305 WHIRLPOOL 5834a5307100b08f55f84857fd01287c694a1ac78d2322a882a5a03aa25d933cd8fe2d8c468b2ba45b4a4265a4eb5a8157a45787ab5d556e1c8fe1cda4bf7025
 EBUILD netbeans-platform-9999_p20160708.ebuild 9520 SHA256 387e0f5ac3e3b121d211f81e90959a751add85bfb068a2164d7cb4e8d5aa8b8f SHA512 9019caace96d3ba0144acc2e36778f24cf96e55e9a035e704505b06165c964acbdc2de7f6349a16328281fbc791235d242fe738a6cd1c06b55952e5d40ffb256 WHIRLPOOL dac4f8846dd8ae47650bc0f76486ab2614d722b87e6ae2fcfa2eb8222ed64f09dcf0a4301a4ab73c35e1ff2bc755932ffd9dd9e3bf45ead94dee18a6f2598fcb
 EBUILD netbeans-platform-9999_p20160709.ebuild 9520 SHA256 8934d4601805c8eab3fe092db99bd950c28f9c7b2258236bd75c5e7d026f49a2 SHA512 82c1f72b9749c178e797993a6f722b5a152fe728facf1055bf0e83b23b7aea763fba06a7af64e16acdeef6d0b551c4c2e1cb843ecc95179b05cfb7246783000a WHIRLPOOL f5629dd9b9ed7e17a5230c0dc485c3a205470aad38a887d4afc6b40b87bf159dbe2a37171cbc6fc00c02a8fb07816164dcf44fa4dfd71ef09beea1d26cac8d96
+EBUILD netbeans-platform-9999_p20160711.ebuild 9520 SHA256 6f6b4ec6ca0d3c7fb631532aa0f11556f486219e370dc63dbf0a9db12439f2da SHA512 a9419c3d7e7ee450e5fe1fa2f11fbf3a5403f8681c224c357a461cc400c719b07f16562d804124650b071b0fcb1328c422fc03687c4081262891972591360e3c WHIRLPOOL 90c4a1e0a1e871669f3b6d2c50a677b1ba1d8be47823be4742a1ae43f9dcd843c62b3e2a8cda54f35f522c07799cdcbf3c26ec9be85002775218f9df7fe12322
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index fb4012e..7b2fdf9 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201607060002-src.zip 216525395 SHA256 ea3a45a96e4ec5
 DIST netbeans-trunk-nightly-201607070002-src.zip 216525625 SHA256 ddf8129b13037315956f00228aeacf843e88fe67e4a61f2b730e5a0532c20f4f SHA512 6ce62a221980bce0b90816d68fa177b1f06b5a584e25a5a63448cae78b9de93ea79b42c3c68b958c4dab1da02c1fb3721aa3f700a74955b676ff3a9f273bba96 WHIRLPOOL f8725146f925a10084f363551548201d82fa51e0ef0ce3ca4c21be8e08bb54b74501b4daa595e7c114eef0872f5d81aa0843996f9860dc4812f736e756e4c16f
 DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6a54e207a2683623b7717028934d654ae261148fc0cf9d334fe SHA512 d722b9050498af020f173b77a9a31eff10977d54827b1fb9d772c8bdce343a90be76c22b62a03777937cd7d19465afd82011e7b82e6162511a12f03f89e648cd WHIRLPOOL 40193c2b433557f500563d698b0883dd8a7a16604494330fd9298d0e7dd901a5be7cdd7183acc2c917fc6bfa78a5b9100a68cf1c1a3c76c47da65de6bb9dcd98
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
+DIST netbeans-trunk-nightly-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 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_p20160613.ebuild 3472 SHA256 60400b046e007007ee02d6c1a5c389d58822e2a1e985429c8d7a1fee5c14186c SHA512 2a670740357b5c16acab6c23257dc117d1b61e049114aca88caa036a2396f701bb38e19cb12ab36d902563d20033cb033c4a214562b2a954799de57b248c6f49 WHIRLPOOL 11cebe513f023c51c36582a690c4ca606f0e463a4f3567a10e8d31439ec808d932ed1302ca2ca8d74fef73d938d10f7aa105172317efe945eb2d04d587c19602
@@ -51,4 +52,5 @@ EBUILD netbeans-profiler-9999_p20160706.ebuild 3472 SHA256 74531cffd42feb2b05d5b
 EBUILD netbeans-profiler-9999_p20160707.ebuild 3472 SHA256 1f0ee9449508faa65631eb249507b2dfecffd6d96140fa3dfc85bc6e54a342d9 SHA512 95edc575e5ffe552f3c769abf6ae5a2f69c2f898c8febdf20d5f6dcd2d9fde2682cc58d3921bfd8f85b515122abf2a34887615cc368b833a9f34d7c0d90a69c8 WHIRLPOOL db33ab6962f9a89ed3e9ba6ce4a3881fe92b24687d0b7fbf1988fe0d01802ede3753c9e3bb04b390dc9056b6225c9bc4a13095d3c718500ff35803f2677f081e
 EBUILD netbeans-profiler-9999_p20160708.ebuild 3472 SHA256 0fb3054a7b8bd193b1acb546eddfb8fd9aecefd6023c2756da7bcc31ebd45d8f SHA512 8706ebd3508145d77f7b38d96e09de5289c4988687c0c4941749cf120d317a4d9dcea65beef0c44ea5d8937c94ffb47aeef52ec4a59a375e3a64bacc09638363 WHIRLPOOL f1324c8b2be60778af4e1e7bcf84338c294df52a059133511cb4c2986f86143ae632725c9970efcf1dec6260097e1006c26b7ed5b25c7fc4663cca2ba9aa0d7d
 EBUILD netbeans-profiler-9999_p20160709.ebuild 3472 SHA256 d69d67eb9e9f7c0d20d3bdedabd40de22e7bf5c220f7bbc74e6b4ca31cd1e048 SHA512 b8caa9583114b2d59d4238cc98f9af81017c6c00a3316af6d60619b7d6d2bdb83195d2aa9f38c0bb9788da86c99ef37d4726dbbfa396d964586cff149ffe2073 WHIRLPOOL cce43f65fa394b23efce5cfc270c759c91a17e767411f69b5cc800ec38d313b732802577bb2052ca4263784f1f249ae0b6b7e121e8e923d19fffc38e91d33900
+EBUILD netbeans-profiler-9999_p20160711.ebuild 3472 SHA256 77cf2cb6948a3350bc5c4816cd215ec85c8b8295bd663b271b5de0d3b873d1e4 SHA512 6779b941453292904e7c80e9f297d6faf034a1cc29ed0ee84860b567990e0c6b000602b1e5f1bfd0b923e2b780c3d14c4e2f786187454234a85b37dedd4fd37e WHIRLPOOL 08be3bfc8aaa71c037cfe784e1a6061f04cac329564daefcbd0428ee54b3ad6a80e5a09c4a6e254990df66bcf2934c56e35dd03ec525cd58ab64190a68780c4a
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index c6719bb..d6b4e01 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -50,6 +50,7 @@ DIST netbeans-trunk-nightly-201607060002-src.zip 216525395 SHA256 ea3a45a96e4ec5
 DIST netbeans-trunk-nightly-201607070002-src.zip 216525625 SHA256 ddf8129b13037315956f00228aeacf843e88fe67e4a61f2b730e5a0532c20f4f SHA512 6ce62a221980bce0b90816d68fa177b1f06b5a584e25a5a63448cae78b9de93ea79b42c3c68b958c4dab1da02c1fb3721aa3f700a74955b676ff3a9f273bba96 WHIRLPOOL f8725146f925a10084f363551548201d82fa51e0ef0ce3ca4c21be8e08bb54b74501b4daa595e7c114eef0872f5d81aa0843996f9860dc4812f736e756e4c16f
 DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6a54e207a2683623b7717028934d654ae261148fc0cf9d334fe SHA512 d722b9050498af020f173b77a9a31eff10977d54827b1fb9d772c8bdce343a90be76c22b62a03777937cd7d19465afd82011e7b82e6162511a12f03f89e648cd WHIRLPOOL 40193c2b433557f500563d698b0883dd8a7a16604494330fd9298d0e7dd901a5be7cdd7183acc2c917fc6bfa78a5b9100a68cf1c1a3c76c47da65de6bb9dcd98
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
+DIST netbeans-trunk-nightly-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 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_p20160613.ebuild 5343 SHA256 a2caf56e2a7a519a9e3c7262f8d237e5808be8928bc8ad8bb9ef7545ffe4be47 SHA512 0b99517b06e22e4a1b7ca7bea719d30428c52ebce85c80cf3e560e78cecaa8af8ed90a4e98f69efeb007634437a3b718084e1e005ca945d6f942eaf7b61fc687 WHIRLPOOL 33c1a786fc7cb490e23596a931a5dec3f791c92b799c3fa1daeccd1cbdd72e93d947c088f74852c198892f0666e13994f43e62a321b657a3dc4b757256837cd3
@@ -75,4 +76,5 @@ EBUILD netbeans-webcommon-9999_p20160706.ebuild 6242 SHA256 12cfebe400028fd7e58d
 EBUILD netbeans-webcommon-9999_p20160707.ebuild 6242 SHA256 d3d1abc3e596bf761798756e406a12f9c615b9bf7cf07c57f2455821d44234f3 SHA512 8a260e1c05d44b5c4e86585abef1fe5a09ec9eda523dceff5532ab92604cf61fef452d966ce58c3ed4d4f7c0ffa32c52003751f3dd9568f175be645cb51419d1 WHIRLPOOL 637845cf0fc830dac0ebd0e1feb734d6a4d63b853b87f8eec655248ad32231a0ebc8a16ae1268c08a670814da5a184bde5812872d176899a076c45d8d475947f
 EBUILD netbeans-webcommon-9999_p20160708.ebuild 6242 SHA256 ab29a43b40734792e4a8bcef1f69554ed4fe0593ae0a90eb3c6f82f5631b2d03 SHA512 5da1d441ad8e148568a43cb48ea4bc9ecaf7d5e0504042f7dc116671e7db90087d7bba223be4474c02f2aeae1f9cf6ce620c8527472dff4b41533fdf44c492bc WHIRLPOOL 0279d7e1688e0cb8d1d03cee9e7fbf4eb99bcab9d79bf1f5fed725cadc36456825c876135e667a265167128595147ea9b31430a82cceaccccb6cbd01cd5cd674
 EBUILD netbeans-webcommon-9999_p20160709.ebuild 6242 SHA256 65404d4f1626d6cca2ad19b4f276a4dfce53d7a03c32392d6d50e14141e57479 SHA512 40be70f00856a532ca4b94b3aacc68a2ee476efe39b3ebea649dddee6c5e11c90c8bfc81d03c2fee2e4c33c27cb3fa9d8851f19bc4d6d9c790c78bd0a596c794 WHIRLPOOL eb5d30a19f9718d551adadecce2e081a1e6ca272a662a67c7b9364bc74ded74591ff7cb1c191555f080d759fa5ef1262a86e9f0277fa8d57144ca5169ef9a51b
+EBUILD netbeans-webcommon-9999_p20160711.ebuild 6242 SHA256 cc24a6be2c157a3089d860b8815433967aada686660e1b5f6f47ffc38d6038f5 SHA512 6b9ec6faff6dddeb4510b393595bbdf2875099736711e1da1a55f70a85c5e07613081a8ddd302eab527f5fe95bbeff7450189a9a81d3e4639599cb5ab86e45a1 WHIRLPOOL cb6124dd5a9928dd2709004f4d5846eff6937520a09284ab2421ec383b793e778e5d921f04826a70885be429d951a5786d128ffc45dfcd468bf705324ee4500f
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index e8791c6..a1126b2 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201607060002-src.zip 216525395 SHA256 ea3a45a96e4ec5
 DIST netbeans-trunk-nightly-201607070002-src.zip 216525625 SHA256 ddf8129b13037315956f00228aeacf843e88fe67e4a61f2b730e5a0532c20f4f SHA512 6ce62a221980bce0b90816d68fa177b1f06b5a584e25a5a63448cae78b9de93ea79b42c3c68b958c4dab1da02c1fb3721aa3f700a74955b676ff3a9f273bba96 WHIRLPOOL f8725146f925a10084f363551548201d82fa51e0ef0ce3ca4c21be8e08bb54b74501b4daa595e7c114eef0872f5d81aa0843996f9860dc4812f736e756e4c16f
 DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6a54e207a2683623b7717028934d654ae261148fc0cf9d334fe SHA512 d722b9050498af020f173b77a9a31eff10977d54827b1fb9d772c8bdce343a90be76c22b62a03777937cd7d19465afd82011e7b82e6162511a12f03f89e648cd WHIRLPOOL 40193c2b433557f500563d698b0883dd8a7a16604494330fd9298d0e7dd901a5be7cdd7183acc2c917fc6bfa78a5b9100a68cf1c1a3c76c47da65de6bb9dcd98
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
+DIST netbeans-trunk-nightly-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 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_p20160613.ebuild 2721 SHA256 7b193c5a1db4eda9677163d40c4821d35fb65539db27a630cc8c32075559f47f SHA512 b96dec8bfde839a6056dcd14df1fbdd6a35702f71b902d28a0a401c64e3ee343283a954cbbc9bbb6cec590326a82ac3ceee4a29124fed5ea7e12eec416e94751 WHIRLPOOL d2ec04634d9b6e67681997d45a7b9a8f574ca5e949a95311fcd49540ed4090941297ac696ac10453a00973f30a5455ffdb267d9c304da741becb3fffac8e859e
@@ -51,4 +52,5 @@ EBUILD netbeans-websvccommon-9999_p20160706.ebuild 2721 SHA256 ef8237e8e7bd5632e
 EBUILD netbeans-websvccommon-9999_p20160707.ebuild 2721 SHA256 f589c9cfe190deb87bc70573bdd0f2448c504b554c561768e52d1349e5e55f0d SHA512 7c0e3c5e38505897552113b3a76f3912270134fb79ab10f6e68cc8ae69348aa178732ae8ebec59fa10c7ad3fd221e9ef2fda4e135c82e8f0288c2fedd98f6cc2 WHIRLPOOL 41ad5634085988d4dda3d189acf7b203bc5e8bfa1b2627b94766dde149c9ca1b2577be94ae38e1f341c40da86c5a72336fc1ae4d61bd148c62bb0154db998072
 EBUILD netbeans-websvccommon-9999_p20160708.ebuild 2721 SHA256 11c273062c2f0b5dc623962774650cfd45f2bf9bdaaa79c5ef241ad927ad9018 SHA512 f7f393b6987b9edd0be86c3e819281b9a653e86f7cb28795835aebc7e4e806277a104850373c01780c38f15617e8c2c873daf3667e2bf634fe94e1c57d9b8acc WHIRLPOOL 65853908f7ddf46c8e44d3fc2659934d2647ce77fca17bb4f63f701c0afb20814dcb6467b4d3879c1b465bb4e1f21cb1623474bb87e8147b1f3fd35faeb5b765
 EBUILD netbeans-websvccommon-9999_p20160709.ebuild 2721 SHA256 493341c91a0cebf30bd5f4c1dd1ce1345ba5fcfdb347b125fa087c7c2fb9a2f3 SHA512 d9da4bac81a7efee20c9b27544b8423c497c618bdf8668223ac35388b274f5e6f2cde595de910a893aa28ae989f9b1ebe8e16ea700b19f81ea2c5fbfdfb27153 WHIRLPOOL fa6e93d055cb34b7e176e70b1e8115ad3258a35df58889150e0c3f70e1be00ab0d3dbd57a8f52f2614d366ae546bf48e06ddc0ed168c9af91f700ba4b2364d5c
+EBUILD netbeans-websvccommon-9999_p20160711.ebuild 2721 SHA256 cea1ff09427eee21f47d9937481aaebb047ea8c547cebdf37d7afc58b792db3d SHA512 2566a73ffe720f414cb3d37c5511517c3d43dccf2b9f3411d5f09b2fb55f4d1e66413110dc0d847c63381bd855eae33068e1bd0baf9bc3c2f9e17938fafa4f42 WHIRLPOOL 34ff368c84c9565d8906ec7aee6ac32b34d9a3a4b6440554c5519558f9d1164bd771b772bfbb36e7906a33863194c4041e9da63f56080e59e58d20c88703b576
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160711.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160711.ebuild
new file mode 100644
index 0000000..e2bffb6
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160711.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-07-11_00-02-33/zip/netbeans-trunk-nightly-201607110002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-ide-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.websvccommon -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r16-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/websvccommon >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+	grep -E "/websvccommon$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/websvccommon
+}

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index fe106bd..2eed310 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201607060002-src.zip 216525395 SHA256 ea3a45a96e4ec5
 DIST netbeans-trunk-nightly-201607070002-src.zip 216525625 SHA256 ddf8129b13037315956f00228aeacf843e88fe67e4a61f2b730e5a0532c20f4f SHA512 6ce62a221980bce0b90816d68fa177b1f06b5a584e25a5a63448cae78b9de93ea79b42c3c68b958c4dab1da02c1fb3721aa3f700a74955b676ff3a9f273bba96 WHIRLPOOL f8725146f925a10084f363551548201d82fa51e0ef0ce3ca4c21be8e08bb54b74501b4daa595e7c114eef0872f5d81aa0843996f9860dc4812f736e756e4c16f
 DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6a54e207a2683623b7717028934d654ae261148fc0cf9d334fe SHA512 d722b9050498af020f173b77a9a31eff10977d54827b1fb9d772c8bdce343a90be76c22b62a03777937cd7d19465afd82011e7b82e6162511a12f03f89e648cd WHIRLPOOL 40193c2b433557f500563d698b0883dd8a7a16604494330fd9298d0e7dd901a5be7cdd7183acc2c917fc6bfa78a5b9100a68cf1c1a3c76c47da65de6bb9dcd98
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
+DIST netbeans-trunk-nightly-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 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_p20160613.ebuild 6939 SHA256 b21acedb1e3f8a7386609c006bb20146ab78c1d4dee0b4e5bb5098990b776ed7 SHA512 4ec46cca07c1a6c56cd9719b5d96efa5090bc6e64e1dbc2ad23c729240d1d63a832582258dbd37664c8b8df06e98fc748b97dd1816f98808005421debf795e26 WHIRLPOOL f8f5b56e96f3189bdb45865eb50dde9e75884a022a8efdd274ccaefc7a3f5647c7645f44de760c343bb36094fb91e12c6c0d0f5522b32ae7d3b78ee10b7e961d
@@ -54,4 +55,5 @@ EBUILD netbeans-9999_p20160706.ebuild 6939 SHA256 4be9bf026eac7b37722218c14fc2f0
 EBUILD netbeans-9999_p20160707.ebuild 6939 SHA256 793f95e860b5635b9a5b62020fc6582fa077ed8196126df735ea5841e582a327 SHA512 3f0bb46bc7ba3f966d4bfc706f5481c993de12b565b7c5df1eefe6f474a044c24be21704c81bbede8a8399e86b7a7cbdf8d29eae6852a80653910b1a2feb0192 WHIRLPOOL dcf1b84d1035bc53e6d967116af595a2887a1f65ce572ee65d01dd82e5146787d69743930368ed85ba39d542f7e6d9f2199c3f1e0d5e812614de2e4bc5fa5d5d
 EBUILD netbeans-9999_p20160708.ebuild 6939 SHA256 a59a0c4ae6651352cd4a8c4f57552dfa0aad0c129ce582b65187a4b54aeed6b4 SHA512 bcbd5050f30f8111cb0c5b622ae2729c713e59b281bcfb933c46d8841e01f9c07019070b38b5740121ec8b41d6f5d6dc1513a7994b553869d31919d86bf05807 WHIRLPOOL f97c7342effbcba19833004a404b7be7d8980300fc04c495cd6bfa203adda49b4c54dfdac38b1747df5ef37b5b4c6366f8852bf29c4a69b1b3401bf6c75d94aa
 EBUILD netbeans-9999_p20160709.ebuild 6939 SHA256 db83b4c223721b239016d7b341968fe390291fe4824ee9345acbbdecf1f379b0 SHA512 cf6083ea94225af798084f8916fad5a831900d20e5c0256e803d02b0efbce97e22a408ac37132114e7851a46c7246041a808e1d31a141ca103279b8d90fee5b3 WHIRLPOOL 159876be31c88427f5003209d8218d6ed8627d967a4e3444d01d0bba686f019bc6ea4b8211b6c3f37c0e6b1c0aeb4a08811fcb6f3e517b6bb4bf5b37ffe3bc50
+EBUILD netbeans-9999_p20160711.ebuild 6939 SHA256 3984c53de0a417dc679d6decea66fc1ba65fa7e21a15aca4151787a1108d7bc7 SHA512 92d5f2dec966fd5abe9c028266a7fe1e14e90cb9f3f18e4b5d2f3615b101e9f6e29bd2c202f8e771ce9a46f06d7a62cdd9d54fe6992e3447a4dcd0247806aaa6 WHIRLPOOL 3e53745cae04d951d4993f52663e21f57b74f909232b3cf4f1448963aa2662891c525719aa61965fe40a435a609cebdd9273eaae6c37ee84103861318ba88cb2
 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834

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


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

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-enterprise/, dev-java/netbeans-javadoc/, ...
@ 2016-09-19  9:11 Miroslav Šulc
  0 siblings, 0 replies; 4+ messages in thread
From: Miroslav Šulc @ 2016-09-19  9:11 UTC (permalink / raw
  To: gentoo-commits

commit:     e520e46afaa90dbab33f9626f76b32a54bf27f9c
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 19 06:48:12 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Sep 19 06:48:12 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=e520e46a

netbeans: removed obsolete ebuilds

Package-Manager: portage-2.3.0

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 7dd1db1..f9cc230 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-201608170002-src.zip 217171456 SHA256 92e2c114eb48f8a57a2eb0baa4f3b376386ae929952c276c5bfd2884c39e7687 SHA512 95d7a428999212ba0057f4d032ed43c57e4f7c65305aa87a64429b92af26699d34da7f52f5431b11c86f39bcd3163ec99c1b9f8c8f8903375de8c64b4565aa48 WHIRLPOOL ba6e5a8ff6d768e4ea9624956dc5059ed851b6e6754e567120e147a958080c8de8f2e924ae9d78daec2ac0b12c542d1b1da019be7df48dbc1b0b8ace35d371f7
 DIST netbeans-trunk-nightly-201608180002-src.zip 217176983 SHA256 399cd4897319eec9be51a12f78dc5d426c9e2998a2998714f02270628a25ef2a SHA512 1e91df2bd0d93512a8c6feaed669e851a43cdd8beffade2645327ed18555f6bcac1575e3e841bc0968f1b92c059d0929579215ad1ba7e1d0e619c642a87196e7 WHIRLPOOL a957bf53993cef447782ab81a3362a38f44902306e7a2e531f9ae9b19fd87f052db752acdc08a0879e09c0f4b71264e5dafc39f8ebff82dbf2fa984d5ebf6ab4
 DIST netbeans-trunk-nightly-201608190002-src.zip 217183203 SHA256 f6713dea080556eb625aedb6f666a701e414dc1046870b7bd20b03ec36272894 SHA512 8e5626cf8f2d165f0ae7e6a19f8a7b1c72cd8fd74f4fad8577fad479bb30279c681e2c99cc43f4280f493cff0b5ec1b237c9bbbbebed14e383fa762000cc996e WHIRLPOOL aeb17d882bef504580a61976b63ee1e28e88703ac8f486efc699203e1c5e1985758009679bc6b8407699d6645137060c97089b3efe742aa47d98d7bb47603ac0
 DIST netbeans-trunk-nightly-201608200002-src.zip 217192695 SHA256 58c11bc929ec29edace69c12ba7fd0c71b5d4386c20ab02e7f9dab0962d7752f SHA512 0ec2bc6e3298c1bf38f4217db43cc7a8221dd360cdac72b012d65aa924ff69f81a41267d58d207e80ff6a875a196064a29f6bde41ee6ce1ef1b04da238ae4185 WHIRLPOOL f64160c449ad5a19d7975f5b5d1694149d3f3afa2614adaedaebc5f2f7c490ff35be196ce287ff244936061b10b53868ddf31cf28e9ac50cdcc95b491a01c8fb
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b257858522
 DIST netbeans-trunk-nightly-201609180002-src.zip 218003305 SHA256 fedad6cff03b24535492371a2c85a88680925659e3829ef2e0989f1ff17bae5a SHA512 278a4b6cdc5c3c7243e81d39796467631aab2539671dd5ec81a53d78b4e2dbe495a5390c9950c965b09ec7dcaa1ee3a83a58c686bebf392be6e22fe88c5fcd9b WHIRLPOOL 1562ad89b2ab3c18b649611cb80014b1c3fc0c48eff3315b186cea83bd7a710e9e58ce86250607591b9fe89eefa94ef2327d03405ec73c2225f5588d550b41dd
 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_p20160817.ebuild 3384 SHA256 c1a4cc3b7e905a0edec7070dda644a1a0282726d8e4bf795086845b6ee9520fc SHA512 739c45ed3116712159e7c5dcb7c272370cefed40aff6e09a50c175633ac8aa973cf5441f8e814386f67e8677d0e6e2f4197c121bc93b5a28c5f61fb7e47ba174 WHIRLPOOL b80f55dad5bd9b1831cfbf3cb3ecf208fe51f6e6cc49bf8c8fb3c0d692cd666feb05a7d69e5c55056923f19578d1367eed28d747f30dc7a4a4e18e1c6d8295f7
 EBUILD netbeans-apisupport-9999_p20160818.ebuild 3384 SHA256 c0fa361177c78f81f82aa5dd9ea987b270b91cc3dc8b95f6a76f1903a7f7ae8a SHA512 a8f807a38a5a4be7a34b052df1ba7d193c4ca21f9dc0aab6b30a4c21883a3fc7af939a61f0b628a217fa7ef85799b2e3f72be7b3350c513948421cf399d8e453 WHIRLPOOL 8f0770f4d3be5fdb83898957fbf407ff29d682f9c49189d091437fa0b3718a6eac92021c1ef6e4f22a833fc539af83c5a4f39c02ee2d21e16af0c0a2b3f83d9d
 EBUILD netbeans-apisupport-9999_p20160819.ebuild 3384 SHA256 f95f81b32aefa21767eb4091bab215c80d48cd151859d49c7fad6a839c3456ea SHA512 751bde3563a20933200aa13e9407354de7a6ea6ffede7a4cf524160e546a65e0596292ebac23635cd48c2ed8d5c366cf5dd52facd37888c3cc704124afff48dd WHIRLPOOL f67cbe6ffe60896414a45f6b03a7d669a25828710d1492d0e7ccb44f7c1658b3bf83a80b84e1a6f3f7f27db64f1b73662622f06004e875bb35c3035385f73370
 EBUILD netbeans-apisupport-9999_p20160820.ebuild 3384 SHA256 a20db52c4984fe1cff0fae0c979256018ae5fee0bd8b4f04f672ade911668aa6 SHA512 6f92888bf9f37b411126636f873f9ed6d3d9f99b0a856b4976eb0e66121251dc7e17983e60e106f505cee105791597cb097c51fe4dad95d046b45459c4c90e00 WHIRLPOOL 00dd0833bf4e57937978b3cb7244ebe5c8a7a08da9ead7c40b7468c67069a2093b53b8c4c2532c6397fc46ba7c2e7285a65099ca2ebf7c47b51ad293c0f56830

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160817.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160817.ebuild
deleted file mode 100644
index f8ddf40..0000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160817.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-08-17_00-02-33/zip/netbeans-trunk-nightly-201608170002-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 e2869ad..bb21801 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -18,7 +18,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201608170002-src.zip 217171456 SHA256 92e2c114eb48f8a57a2eb0baa4f3b376386ae929952c276c5bfd2884c39e7687 SHA512 95d7a428999212ba0057f4d032ed43c57e4f7c65305aa87a64429b92af26699d34da7f52f5431b11c86f39bcd3163ec99c1b9f8c8f8903375de8c64b4565aa48 WHIRLPOOL ba6e5a8ff6d768e4ea9624956dc5059ed851b6e6754e567120e147a958080c8de8f2e924ae9d78daec2ac0b12c542d1b1da019be7df48dbc1b0b8ace35d371f7
 DIST netbeans-trunk-nightly-201608180002-src.zip 217176983 SHA256 399cd4897319eec9be51a12f78dc5d426c9e2998a2998714f02270628a25ef2a SHA512 1e91df2bd0d93512a8c6feaed669e851a43cdd8beffade2645327ed18555f6bcac1575e3e841bc0968f1b92c059d0929579215ad1ba7e1d0e619c642a87196e7 WHIRLPOOL a957bf53993cef447782ab81a3362a38f44902306e7a2e531f9ae9b19fd87f052db752acdc08a0879e09c0f4b71264e5dafc39f8ebff82dbf2fa984d5ebf6ab4
 DIST netbeans-trunk-nightly-201608190002-src.zip 217183203 SHA256 f6713dea080556eb625aedb6f666a701e414dc1046870b7bd20b03ec36272894 SHA512 8e5626cf8f2d165f0ae7e6a19f8a7b1c72cd8fd74f4fad8577fad479bb30279c681e2c99cc43f4280f493cff0b5ec1b237c9bbbbebed14e383fa762000cc996e WHIRLPOOL aeb17d882bef504580a61976b63ee1e28e88703ac8f486efc699203e1c5e1985758009679bc6b8407699d6645137060c97089b3efe742aa47d98d7bb47603ac0
 DIST netbeans-trunk-nightly-201608200002-src.zip 217192695 SHA256 58c11bc929ec29edace69c12ba7fd0c71b5d4386c20ab02e7f9dab0962d7752f SHA512 0ec2bc6e3298c1bf38f4217db43cc7a8221dd360cdac72b012d65aa924ff69f81a41267d58d207e80ff6a875a196064a29f6bde41ee6ce1ef1b04da238ae4185 WHIRLPOOL f64160c449ad5a19d7975f5b5d1694149d3f3afa2614adaedaebc5f2f7c490ff35be196ce287ff244936061b10b53868ddf31cf28e9ac50cdcc95b491a01c8fb
@@ -49,7 +48,6 @@ DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b257858522
 DIST netbeans-trunk-nightly-201609180002-src.zip 218003305 SHA256 fedad6cff03b24535492371a2c85a88680925659e3829ef2e0989f1ff17bae5a SHA512 278a4b6cdc5c3c7243e81d39796467631aab2539671dd5ec81a53d78b4e2dbe495a5390c9950c965b09ec7dcaa1ee3a83a58c686bebf392be6e22fe88c5fcd9b WHIRLPOOL 1562ad89b2ab3c18b649611cb80014b1c3fc0c48eff3315b186cea83bd7a710e9e58ce86250607591b9fe89eefa94ef2327d03405ec73c2225f5588d550b41dd
 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_p20160817.ebuild 4790 SHA256 0e7cd2b152ca5ed0b8abdb5d86c4afbd54587e8da930a983fc149d254d50a9ce SHA512 21c99d2c597bf55b010f56cbaa44a4aea953f8464fdc2c00b2d32262e31395cb43e763ebf4596ef750567ebd7dccc2fdd0b418e64efc3631343d0726ce8e1960 WHIRLPOOL f02430d17bd2f7314040961805cf55c3ebc460e494a18c7854b237348ca9e318a742b5e4815af144d94eeb2fc28b6bf0266561d91f7009d8d400e59477017b58
 EBUILD netbeans-cnd-9999_p20160818.ebuild 4790 SHA256 cd206aabb044f6c512f8b94cbc66214217289bbbb313aafefae98581425cf3bc SHA512 dc49fef9c0724a362dea7b633034ab8e725cd95f5f242a73ef2af0a514010c859d8cb968d7badb0360b863d1689850218edf4a85a65cb467a2136c2764eae38b WHIRLPOOL 01f16cedabdab61ec6c508c00374b9dc786b2a36dc70f2cf97b5daffdf913afb30e87b76af168d820f5520794bf09febd8e1e64fc8f901ea1ab4f56013997ef4
 EBUILD netbeans-cnd-9999_p20160819.ebuild 4790 SHA256 ef0ed48ff965a1dcddf501b741b6b0fd852e7957377f86c74719e307af03f239 SHA512 49de20cf6518563a90743aafe17419a7046762869b20dce898d0c5602bc52168b4d14ce4dd3b5fc5633d60d5ed6b268d37e98465ca8ec5d458047e28f88529bc WHIRLPOOL d3afd199e67fe163351c4af8d1c48fa29f1293ce6b4e89bfc7ade2df2392bd5b1463c0459050151a01f4fa211af2ffd0d8a784c78000d9738e7c001290f42982
 EBUILD netbeans-cnd-9999_p20160820.ebuild 4790 SHA256 572fb6989ccc55ecff74a7d88ca089b5fe78fae3100d709602a40f78d1319e63 SHA512 ad30f35f2f57503e37d338b0094475af35c712b05650f66b49cb991e84ebad92444c2f6314be7d4c9c4c1a49274fddd132268284519e8ead144bc730c382deee WHIRLPOOL b1590f5bdcb22266b06920a05e1b0fe8500a129510b0f21f9de740da13fbd63d1272cacd6e16020479ae139757d2fef30a41e1b57381de2e575d9bb400057a7b

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160817.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160817.ebuild
deleted file mode 100644
index e03384c..0000000
--- a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160817.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-08-17_00-02-33/zip/netbeans-trunk-nightly-201608170002-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 0f24e6b..ffe3355 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/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-201608170002-src.zip 217171456 SHA256 92e2c114eb48f8a57a2eb0baa4f3b376386ae929952c276c5bfd2884c39e7687 SHA512 95d7a428999212ba0057f4d032ed43c57e4f7c65305aa87a64429b92af26699d34da7f52f5431b11c86f39bcd3163ec99c1b9f8c8f8903375de8c64b4565aa48 WHIRLPOOL ba6e5a8ff6d768e4ea9624956dc5059ed851b6e6754e567120e147a958080c8de8f2e924ae9d78daec2ac0b12c542d1b1da019be7df48dbc1b0b8ace35d371f7
 DIST netbeans-trunk-nightly-201608180002-src.zip 217176983 SHA256 399cd4897319eec9be51a12f78dc5d426c9e2998a2998714f02270628a25ef2a SHA512 1e91df2bd0d93512a8c6feaed669e851a43cdd8beffade2645327ed18555f6bcac1575e3e841bc0968f1b92c059d0929579215ad1ba7e1d0e619c642a87196e7 WHIRLPOOL a957bf53993cef447782ab81a3362a38f44902306e7a2e531f9ae9b19fd87f052db752acdc08a0879e09c0f4b71264e5dafc39f8ebff82dbf2fa984d5ebf6ab4
 DIST netbeans-trunk-nightly-201608190002-src.zip 217183203 SHA256 f6713dea080556eb625aedb6f666a701e414dc1046870b7bd20b03ec36272894 SHA512 8e5626cf8f2d165f0ae7e6a19f8a7b1c72cd8fd74f4fad8577fad479bb30279c681e2c99cc43f4280f493cff0b5ec1b237c9bbbbebed14e383fa762000cc996e WHIRLPOOL aeb17d882bef504580a61976b63ee1e28e88703ac8f486efc699203e1c5e1985758009679bc6b8407699d6645137060c97089b3efe742aa47d98d7bb47603ac0
 DIST netbeans-trunk-nightly-201608200002-src.zip 217192695 SHA256 58c11bc929ec29edace69c12ba7fd0c71b5d4386c20ab02e7f9dab0962d7752f SHA512 0ec2bc6e3298c1bf38f4217db43cc7a8221dd360cdac72b012d65aa924ff69f81a41267d58d207e80ff6a875a196064a29f6bde41ee6ce1ef1b04da238ae4185 WHIRLPOOL f64160c449ad5a19d7975f5b5d1694149d3f3afa2614adaedaebc5f2f7c490ff35be196ce287ff244936061b10b53868ddf31cf28e9ac50cdcc95b491a01c8fb
@@ -39,7 +38,6 @@ DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b257858522
 DIST netbeans-trunk-nightly-201609180002-src.zip 218003305 SHA256 fedad6cff03b24535492371a2c85a88680925659e3829ef2e0989f1ff17bae5a SHA512 278a4b6cdc5c3c7243e81d39796467631aab2539671dd5ec81a53d78b4e2dbe495a5390c9950c965b09ec7dcaa1ee3a83a58c686bebf392be6e22fe88c5fcd9b WHIRLPOOL 1562ad89b2ab3c18b649611cb80014b1c3fc0c48eff3315b186cea83bd7a710e9e58ce86250607591b9fe89eefa94ef2327d03405ec73c2225f5588d550b41dd
 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_p20160817.ebuild 2968 SHA256 0b4a4640e0427ce6b87dcb7a2dd9c9eb14ae77c16c271ebb8ac91f8f064a221a SHA512 31a724e30839a62d01cea492cdff0a5276f2ba116275b4680fb16cfb491d833188da875bf0bac120c831139636d49ed0a5863d08a1e7eccd3dde01bb260bffa7 WHIRLPOOL 69bb48bb6ab3c4a969e14b8b8ea2624b3f83d47e739bce953222a622d4559c5bce4cbf9de302bd50a929e145be4d6d643ff7339d958db222738be805af463097
 EBUILD netbeans-dlight-9999_p20160818.ebuild 2968 SHA256 10337e4b77d612d4d1a617f0ad663b65cccfdf3df5672f4c315bfb91dc51ad87 SHA512 89447e4f69062b7f12b9b4152fb7c409c5c2d60287427b80e10bbfb37038935d4e0c22206cd218075fd9719a1dc149836c21ad5739679c6e6acff89f922a0e98 WHIRLPOOL af072a69170f68d07cbf9ac7771f448dcb6eb4e62fe76ed6000fcf6f109639b0f463acfefcc95aa49ab71e78cc1b6c9b84a101b3926e39fc06c70dab154d2691
 EBUILD netbeans-dlight-9999_p20160819.ebuild 2968 SHA256 bf9bfa213132c3d691cdd2d581788193351f12a9e663f123f239608c4815ce03 SHA512 bb524b1fe96b3e1f74bcdc1171c3e72759d2e839c4c3e280e2594fa325449e2de9806683f33808e71a74fd4a8802d66f5af8cd8d0c89725b2a18f24bcb33ef71 WHIRLPOOL 93a74d5023ae725e6581ce7f96402e06e34e555e7a09a0351be92f9707b13ec917422cbc19cd411dde52cbcd7bab6037ff9c2011f0f59361cc3ee78605528c30
 EBUILD netbeans-dlight-9999_p20160820.ebuild 2968 SHA256 a97c1eb5d24936553c76a781782caf420a09f58052d8e8064b15b552082e5a38 SHA512 f7f63052f3694824baa4fee963bdd0775bdf1b7fae0e8f880a11ea44e6b28520d0f3234146bb264c9e9a5d4f6c061e1bef3037188cbcc66180e7e13d616cdfaa WHIRLPOOL ae0baa95ecf4618062f7b94b79a623273e35bc7b350ef0edf07d31c1dd3008d7b6587e28d0fd9d30912217776c58ce1a149ecb6a2c7cd5d4541a814eb136b27c

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160817.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160817.ebuild
deleted file mode 100644
index 0260d3f..0000000
--- a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160817.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-08-17_00-02-33/zip/netbeans-trunk-nightly-201608170002-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 17b990b..0822e7d 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-201608170002-src.zip 217171456 SHA256 92e2c114eb48f8a57a2eb0baa4f3b376386ae929952c276c5bfd2884c39e7687 SHA512 95d7a428999212ba0057f4d032ed43c57e4f7c65305aa87a64429b92af26699d34da7f52f5431b11c86f39bcd3163ec99c1b9f8c8f8903375de8c64b4565aa48 WHIRLPOOL ba6e5a8ff6d768e4ea9624956dc5059ed851b6e6754e567120e147a958080c8de8f2e924ae9d78daec2ac0b12c542d1b1da019be7df48dbc1b0b8ace35d371f7
 DIST netbeans-trunk-nightly-201608180002-src.zip 217176983 SHA256 399cd4897319eec9be51a12f78dc5d426c9e2998a2998714f02270628a25ef2a SHA512 1e91df2bd0d93512a8c6feaed669e851a43cdd8beffade2645327ed18555f6bcac1575e3e841bc0968f1b92c059d0929579215ad1ba7e1d0e619c642a87196e7 WHIRLPOOL a957bf53993cef447782ab81a3362a38f44902306e7a2e531f9ae9b19fd87f052db752acdc08a0879e09c0f4b71264e5dafc39f8ebff82dbf2fa984d5ebf6ab4
 DIST netbeans-trunk-nightly-201608190002-src.zip 217183203 SHA256 f6713dea080556eb625aedb6f666a701e414dc1046870b7bd20b03ec36272894 SHA512 8e5626cf8f2d165f0ae7e6a19f8a7b1c72cd8fd74f4fad8577fad479bb30279c681e2c99cc43f4280f493cff0b5ec1b237c9bbbbebed14e383fa762000cc996e WHIRLPOOL aeb17d882bef504580a61976b63ee1e28e88703ac8f486efc699203e1c5e1985758009679bc6b8407699d6645137060c97089b3efe742aa47d98d7bb47603ac0
 DIST netbeans-trunk-nightly-201608200002-src.zip 217192695 SHA256 58c11bc929ec29edace69c12ba7fd0c71b5d4386c20ab02e7f9dab0962d7752f SHA512 0ec2bc6e3298c1bf38f4217db43cc7a8221dd360cdac72b012d65aa924ff69f81a41267d58d207e80ff6a875a196064a29f6bde41ee6ce1ef1b04da238ae4185 WHIRLPOOL f64160c449ad5a19d7975f5b5d1694149d3f3afa2614adaedaebc5f2f7c490ff35be196ce287ff244936061b10b53868ddf31cf28e9ac50cdcc95b491a01c8fb
@@ -66,7 +65,6 @@ DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b257858522
 DIST netbeans-trunk-nightly-201609180002-src.zip 218003305 SHA256 fedad6cff03b24535492371a2c85a88680925659e3829ef2e0989f1ff17bae5a SHA512 278a4b6cdc5c3c7243e81d39796467631aab2539671dd5ec81a53d78b4e2dbe495a5390c9950c965b09ec7dcaa1ee3a83a58c686bebf392be6e22fe88c5fcd9b WHIRLPOOL 1562ad89b2ab3c18b649611cb80014b1c3fc0c48eff3315b186cea83bd7a710e9e58ce86250607591b9fe89eefa94ef2327d03405ec73c2225f5588d550b41dd
 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_p20160817.ebuild 15825 SHA256 48b679dd5dd583e239cec3972726b2d872449b1f416da6aaa4046b9463717816 SHA512 daa333f6d5670373b40b1d81b1b4e8b1575359d89050063aae49860749b58398aa92e145d6043a16a3963a9752fbbd98faa0234b43d3ec90dda09de8587b1600 WHIRLPOOL fa9dca1cbc8cfeb844d73eb701e1c2ba764519931e64e18f435ce630c00d2f1d9a7861c063d4b36f084e64266eae596567e0be65bc41bbb0594a338ceb9b1d51
 EBUILD netbeans-enterprise-9999_p20160818.ebuild 15825 SHA256 a3221060ab817a926ef47d8ab95e6de56f642d87c1600ad5aaaad529b517fe0f SHA512 a22a8fff6e771487eda25db37aec1155366a5e8ab61f01572969ed43e8c8d4ec5b89d9da4381d6485e4aea8fa9faf0f6384b052bb48ba709d4a89843f2c8a431 WHIRLPOOL 88aa8944ecd507c500e827ba92f8013316105d882e7a826e2844bd1ce9c6ec3188ad859dc1631c511187396942b51f76e3972b4033815f85b35b44fa4e98bd3b
 EBUILD netbeans-enterprise-9999_p20160819.ebuild 15825 SHA256 d6de14c1343a08aa5bd390eb6a760e9b049080aadb257ea2759c9ea21ec3141a SHA512 d3a35dfb9d9f97df84930e069985ebf6cb83db6ad9d2e30949a8feefd396c93b1bbde65fd8b7d0581ec0436d080b788cf7c90477bdd0e3d9150fcbbfd69d24eb WHIRLPOOL 80ed833092d7fe0be627a1d7da5b20453aafdf97db57f1d27c2adf7c7243b08d934294150e3f8d6fcabfea54ad5c717e914e4f2a2515bdb18e7ffbef2cff7c40
 EBUILD netbeans-enterprise-9999_p20160820.ebuild 15825 SHA256 537dd95d179efc7f55d89e9390a61f9601f5c0f3007ba3780ad51a4dd9ef7618 SHA512 a45b116622f50681d53a85a9e17ec8e772f0d0729aad75ba47d1202e3004f3ec5380488ccf1a4f068c69dd4049ffb5a8e1d965ac2c8b189fbf18131f719e1976 WHIRLPOOL 146442ae50998693ebb746ec3a8c82146b79e59ffade0c313e6d64c89fdd96ba7761b5b34eff55a5bfcba843f9bbe5469a1d37ddcd9dd5d2f75db3a34914797d

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160817.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160817.ebuild
deleted file mode 100644
index 0dd728c..0000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160817.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-08-17_00-02-33/zip/netbeans-trunk-nightly-201608170002-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 e727b3e..0c8b4eb 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-201608170002-src.zip 217171456 SHA256 92e2c114eb48f8a57a2eb0baa4f3b376386ae929952c276c5bfd2884c39e7687 SHA512 95d7a428999212ba0057f4d032ed43c57e4f7c65305aa87a64429b92af26699d34da7f52f5431b11c86f39bcd3163ec99c1b9f8c8f8903375de8c64b4565aa48 WHIRLPOOL ba6e5a8ff6d768e4ea9624956dc5059ed851b6e6754e567120e147a958080c8de8f2e924ae9d78daec2ac0b12c542d1b1da019be7df48dbc1b0b8ace35d371f7
 DIST netbeans-trunk-nightly-201608180002-src.zip 217176983 SHA256 399cd4897319eec9be51a12f78dc5d426c9e2998a2998714f02270628a25ef2a SHA512 1e91df2bd0d93512a8c6feaed669e851a43cdd8beffade2645327ed18555f6bcac1575e3e841bc0968f1b92c059d0929579215ad1ba7e1d0e619c642a87196e7 WHIRLPOOL a957bf53993cef447782ab81a3362a38f44902306e7a2e531f9ae9b19fd87f052db752acdc08a0879e09c0f4b71264e5dafc39f8ebff82dbf2fa984d5ebf6ab4
 DIST netbeans-trunk-nightly-201608190002-src.zip 217183203 SHA256 f6713dea080556eb625aedb6f666a701e414dc1046870b7bd20b03ec36272894 SHA512 8e5626cf8f2d165f0ae7e6a19f8a7b1c72cd8fd74f4fad8577fad479bb30279c681e2c99cc43f4280f493cff0b5ec1b237c9bbbbebed14e383fa762000cc996e WHIRLPOOL aeb17d882bef504580a61976b63ee1e28e88703ac8f486efc699203e1c5e1985758009679bc6b8407699d6645137060c97089b3efe742aa47d98d7bb47603ac0
 DIST netbeans-trunk-nightly-201608200002-src.zip 217192695 SHA256 58c11bc929ec29edace69c12ba7fd0c71b5d4386c20ab02e7f9dab0962d7752f SHA512 0ec2bc6e3298c1bf38f4217db43cc7a8221dd360cdac72b012d65aa924ff69f81a41267d58d207e80ff6a875a196064a29f6bde41ee6ce1ef1b04da238ae4185 WHIRLPOOL f64160c449ad5a19d7975f5b5d1694149d3f3afa2614adaedaebc5f2f7c490ff35be196ce287ff244936061b10b53868ddf31cf28e9ac50cdcc95b491a01c8fb
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b257858522
 DIST netbeans-trunk-nightly-201609180002-src.zip 218003305 SHA256 fedad6cff03b24535492371a2c85a88680925659e3829ef2e0989f1ff17bae5a SHA512 278a4b6cdc5c3c7243e81d39796467631aab2539671dd5ec81a53d78b4e2dbe495a5390c9950c965b09ec7dcaa1ee3a83a58c686bebf392be6e22fe88c5fcd9b WHIRLPOOL 1562ad89b2ab3c18b649611cb80014b1c3fc0c48eff3315b186cea83bd7a710e9e58ce86250607591b9fe89eefa94ef2327d03405ec73c2225f5588d550b41dd
 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_p20160817.ebuild 2913 SHA256 c58cb594867fc6c734d2b199adf77c057d6854cccd9bbd0b483147d7a3e894d0 SHA512 e5aaae4b99d8782303a9188ada1d4a362c2e4ad33923924f886824a9273e3b53ece0a0f5382ca5cc56aca56c19faef7650a4ad5838dfb7a82cbe198d9e5067d8 WHIRLPOOL 2e963beb9f1fe54ca35ac454cddde5aed76bbd6cbb8846ec045439fc981d89c2af52003643c15875d8aa3eccc1d8ec76d85a4e4f5189e4ce8fef320462d67f74
 EBUILD netbeans-ergonomics-9999_p20160818.ebuild 2913 SHA256 87bd04e176ff9d66f84044c13c20e5c45419eb84d79e42cac40e4d350035365a SHA512 d2593e8d11da1795788aeb250d8f4a3187238817cda0afa6405d80aeca1c515fa56344e02322506d9b162e0e1c72d211a2bf24a2481e8e744aaf6c9f283e941c WHIRLPOOL cb6a1b3c644de7019d98bdf7eea08e6a12a774ef2403f41171eb6f414f24b26eb10a978c9dcddbe1237cd3949d875308dc04a4ebe5f447c193c9746592c17787
 EBUILD netbeans-ergonomics-9999_p20160819.ebuild 2913 SHA256 463c40e877146d72422317134e1f801d9155bf74edb61d17b791e93e412cd73f SHA512 4df92043b36c1708c4c11cd67de21d544791ccace28dbeaa0388fdf820bfbac3aa49f68a2859156760ac9edddc27892172135747a286d512cb74f28b5deb6b2c WHIRLPOOL da8ef9e15f5ea1508aa1724c539049f9cc024b2c3cb943b26713c9123b6a8614079811b4444a9c714a42b760d8d810334e3b477a6730a7e85c3ccd98448471f6
 EBUILD netbeans-ergonomics-9999_p20160820.ebuild 2913 SHA256 9b9b2a588bd9c83f5ba76a19974c5caaf3d5263fef26dfa6171e066ea134af8e SHA512 8cc3e3ae095c35b20f6d0a31f1ca8857daacbf426f647487ae13874c1f3f7b5d55d1f935535080474d7b39cf6c0757d8e218d04bd204232d6733a3590762e059 WHIRLPOOL a796e9acb09b10316b1e9e7d9ea9d859218e38394e462fda8ff347af25db2b1f923921b3a37a50161cca8a24f7b067559686537fb9d03a6d3973a7edc129fc56

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160817.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160817.ebuild
deleted file mode 100644
index 3435378..0000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160817.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-08-17_00-02-33/zip/netbeans-trunk-nightly-201608170002-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 e582fac..20f8d97 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-201608170002-src.zip 217171456 SHA256 92e2c114eb48f8a57a2eb0baa4f3b376386ae929952c276c5bfd2884c39e7687 SHA512 95d7a428999212ba0057f4d032ed43c57e4f7c65305aa87a64429b92af26699d34da7f52f5431b11c86f39bcd3163ec99c1b9f8c8f8903375de8c64b4565aa48 WHIRLPOOL ba6e5a8ff6d768e4ea9624956dc5059ed851b6e6754e567120e147a958080c8de8f2e924ae9d78daec2ac0b12c542d1b1da019be7df48dbc1b0b8ace35d371f7
 DIST netbeans-trunk-nightly-201608180002-src.zip 217176983 SHA256 399cd4897319eec9be51a12f78dc5d426c9e2998a2998714f02270628a25ef2a SHA512 1e91df2bd0d93512a8c6feaed669e851a43cdd8beffade2645327ed18555f6bcac1575e3e841bc0968f1b92c059d0929579215ad1ba7e1d0e619c642a87196e7 WHIRLPOOL a957bf53993cef447782ab81a3362a38f44902306e7a2e531f9ae9b19fd87f052db752acdc08a0879e09c0f4b71264e5dafc39f8ebff82dbf2fa984d5ebf6ab4
 DIST netbeans-trunk-nightly-201608190002-src.zip 217183203 SHA256 f6713dea080556eb625aedb6f666a701e414dc1046870b7bd20b03ec36272894 SHA512 8e5626cf8f2d165f0ae7e6a19f8a7b1c72cd8fd74f4fad8577fad479bb30279c681e2c99cc43f4280f493cff0b5ec1b237c9bbbbebed14e383fa762000cc996e WHIRLPOOL aeb17d882bef504580a61976b63ee1e28e88703ac8f486efc699203e1c5e1985758009679bc6b8407699d6645137060c97089b3efe742aa47d98d7bb47603ac0
 DIST netbeans-trunk-nightly-201608200002-src.zip 217192695 SHA256 58c11bc929ec29edace69c12ba7fd0c71b5d4386c20ab02e7f9dab0962d7752f SHA512 0ec2bc6e3298c1bf38f4217db43cc7a8221dd360cdac72b012d65aa924ff69f81a41267d58d207e80ff6a875a196064a29f6bde41ee6ce1ef1b04da238ae4185 WHIRLPOOL f64160c449ad5a19d7975f5b5d1694149d3f3afa2614adaedaebc5f2f7c490ff35be196ce287ff244936061b10b53868ddf31cf28e9ac50cdcc95b491a01c8fb
@@ -38,7 +37,6 @@ DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b257858522
 DIST netbeans-trunk-nightly-201609180002-src.zip 218003305 SHA256 fedad6cff03b24535492371a2c85a88680925659e3829ef2e0989f1ff17bae5a SHA512 278a4b6cdc5c3c7243e81d39796467631aab2539671dd5ec81a53d78b4e2dbe495a5390c9950c965b09ec7dcaa1ee3a83a58c686bebf392be6e22fe88c5fcd9b WHIRLPOOL 1562ad89b2ab3c18b649611cb80014b1c3fc0c48eff3315b186cea83bd7a710e9e58ce86250607591b9fe89eefa94ef2327d03405ec73c2225f5588d550b41dd
 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_p20160817.ebuild 3377 SHA256 6867b9ef515e7e96248a6440745a84439b997846ba08377e8510c65fa034d3a4 SHA512 a53f16771135c6050bd58e16e3d5bf6ef8db3ef0a908c1f17a924fb4f3f53498fbada36dbfdbecf6824de94db71978cd212dd5fc68e0450b2f1a556144fecb76 WHIRLPOOL ac56fe36ad06fa71aaf3c70da621d38210ddc32db21cd929189882fda5dde4398ca3630d04016e096eb3fc9b386d0035065c21f22fb4b10771f71cc3e4d70d4a
 EBUILD netbeans-extide-9999_p20160818.ebuild 3377 SHA256 4cecb3827abbda86a7729865fb4f638d9213e081b54f36f78976056f36a1b86a SHA512 20df42de65478421304bfc96c425ee075777ab9786cf5c431e91f3cf2c8aef52ff8c0b5ea77eedf7ff48675cbd03b54e03cd15078e6a880a2502b80f8cef49eb WHIRLPOOL 831c07d8a934d5229a4878ec38a92930e8305f984e23139b8a2e928c59df774af69ce577257d90a6eaee3f829c8d9fb4f4f468e803a3a4448b1bab14ffb5c4c5
 EBUILD netbeans-extide-9999_p20160819.ebuild 3377 SHA256 c9f5dd0c9380b44f91a6846c837c826463cf186a5d52d469bfa6d4503f8bdadd SHA512 c7a4dc0f566e28b13fa4360adff1c431b2295018d65a5c803a7a26f8e09b0a565c3a3ef7de508218ac7b81f7dd42302841f41eceb6d1872fc9a34a87a20b5649 WHIRLPOOL 786aa646f58c88c0a9b98a253f9db0bb0691940673b711a6c0c2e3b34c7fc708923e0c28ca5018fe0f467ed55861b9b504bcf5066134551d58fd9fe3f28e9cb8
 EBUILD netbeans-extide-9999_p20160820.ebuild 3377 SHA256 411dadff32a095c84255c1ecb2e5f82ef24e697654cbded4e107e7d293a7cb71 SHA512 dfaccf32d1120e0d12ed1658499648c6a354b077688a93d1f2f365092849f60f4416d7da41772cdd51e85fa7924b6c0a015edfebf47efb26595fa19ed97b8cf5 WHIRLPOOL 92dc48c84b5309c05ae5778423a1a324c4491318fc9e057be272e568f267fa92fd69b801b5c934332838857171e3e30dddfa063921e801d10fa2c109b3bbadb8

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160817.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160817.ebuild
deleted file mode 100644
index 586fc3a..0000000
--- a/dev-java/netbeans-extide/netbeans-extide-9999_p20160817.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-08-17_00-02-33/zip/netbeans-trunk-nightly-201608170002-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 79ef726..957b14d 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-201608170002-src.zip 217171456 SHA256 92e2c114eb48f8a57a2eb0baa4f3b376386ae929952c276c5bfd2884c39e7687 SHA512 95d7a428999212ba0057f4d032ed43c57e4f7c65305aa87a64429b92af26699d34da7f52f5431b11c86f39bcd3163ec99c1b9f8c8f8903375de8c64b4565aa48 WHIRLPOOL ba6e5a8ff6d768e4ea9624956dc5059ed851b6e6754e567120e147a958080c8de8f2e924ae9d78daec2ac0b12c542d1b1da019be7df48dbc1b0b8ace35d371f7
 DIST netbeans-trunk-nightly-201608180002-src.zip 217176983 SHA256 399cd4897319eec9be51a12f78dc5d426c9e2998a2998714f02270628a25ef2a SHA512 1e91df2bd0d93512a8c6feaed669e851a43cdd8beffade2645327ed18555f6bcac1575e3e841bc0968f1b92c059d0929579215ad1ba7e1d0e619c642a87196e7 WHIRLPOOL a957bf53993cef447782ab81a3362a38f44902306e7a2e531f9ae9b19fd87f052db752acdc08a0879e09c0f4b71264e5dafc39f8ebff82dbf2fa984d5ebf6ab4
 DIST netbeans-trunk-nightly-201608190002-src.zip 217183203 SHA256 f6713dea080556eb625aedb6f666a701e414dc1046870b7bd20b03ec36272894 SHA512 8e5626cf8f2d165f0ae7e6a19f8a7b1c72cd8fd74f4fad8577fad479bb30279c681e2c99cc43f4280f493cff0b5ec1b237c9bbbbebed14e383fa762000cc996e WHIRLPOOL aeb17d882bef504580a61976b63ee1e28e88703ac8f486efc699203e1c5e1985758009679bc6b8407699d6645137060c97089b3efe742aa47d98d7bb47603ac0
 DIST netbeans-trunk-nightly-201608200002-src.zip 217192695 SHA256 58c11bc929ec29edace69c12ba7fd0c71b5d4386c20ab02e7f9dab0962d7752f SHA512 0ec2bc6e3298c1bf38f4217db43cc7a8221dd360cdac72b012d65aa924ff69f81a41267d58d207e80ff6a875a196064a29f6bde41ee6ce1ef1b04da238ae4185 WHIRLPOOL f64160c449ad5a19d7975f5b5d1694149d3f3afa2614adaedaebc5f2f7c490ff35be196ce287ff244936061b10b53868ddf31cf28e9ac50cdcc95b491a01c8fb
@@ -36,7 +35,6 @@ DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b257858522
 DIST netbeans-trunk-nightly-201609180002-src.zip 218003305 SHA256 fedad6cff03b24535492371a2c85a88680925659e3829ef2e0989f1ff17bae5a SHA512 278a4b6cdc5c3c7243e81d39796467631aab2539671dd5ec81a53d78b4e2dbe495a5390c9950c965b09ec7dcaa1ee3a83a58c686bebf392be6e22fe88c5fcd9b WHIRLPOOL 1562ad89b2ab3c18b649611cb80014b1c3fc0c48eff3315b186cea83bd7a710e9e58ce86250607591b9fe89eefa94ef2327d03405ec73c2225f5588d550b41dd
 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_p20160817.ebuild 3416 SHA256 9f90a69059aafb7194a2a09ae21db4f592049f031b5cbd6109b225b5a2bbb60f SHA512 57fe79403b630fa8c41e0547616869f40c34c0067f2903925e828e566d51fce0fbdd8f950d8718a2f2c313b0c091be428cc83f1e68ec0194b63e25f060c291a0 WHIRLPOOL 39fa4e7cfc1dc766513fd7388bfdcb1987e6f5e50d12d7ccf2385dac93233c3d863116fed20d8afee9fc1be883de3c3f00b243b5a0e56624a5b5608bdb1aa0ef
 EBUILD netbeans-groovy-9999_p20160818.ebuild 3416 SHA256 aa3ce0f9c17b6d1aad07484c44698de0234c8ca47342b8479dee1a31b3685a6a SHA512 fb4a2027cd51f3217602cc26ca4dabfbe5c058e7ed343645641ef78d90184784d78f4b506b71ac362b83a5820357c0ed2df293696236dedae2b1bf1428f13250 WHIRLPOOL 8981e5e6e5fd0d75fae6482ef206311aef3b7f10a8cd1269f4b8a8d958604af6647c8f4db60e010a2919ae24102c59531471bcb1d8876a3568d45a4f9782e762
 EBUILD netbeans-groovy-9999_p20160819.ebuild 3416 SHA256 12feb31cfb3510884286756f86cc8adb240e9a5746225af0aa45704bf693cf0f SHA512 45069e246b71866a6da78d804f055b387f9f1a05a643f418ef814629db73d71143a15c37c9a4bbd355db807b1bff008f3a9c0e414a2fab851f07da67b40bbf61 WHIRLPOOL 0a49ccdeb031c64736cea057660180a1559113768e202f1ad2eb37c2694a11495b9b03159fc44eeab55f01352b6fb9b8fc2863374521b2dc6a4133963c58f15e
 EBUILD netbeans-groovy-9999_p20160820.ebuild 3416 SHA256 a33e4d7d8c28ef2bcbcc4120782a926843412ebe0884fe603d21770d333be69a SHA512 6553e66520bb038fad30eb58dd10f30e9e9fe5118e5c19fd86f488054e2eeaeb6b05dc8135ac11a4fbc6261d8d5a6e86e3bf6926b786a999cf0b488b7a67db0b WHIRLPOOL a0081d2dfde742ff62e78ca4dfab22ec98dc22111b2b97b883d7a2d3010c731fa72d33254944e28dac967a99960cf23df79c0c1f6f5fc49ed3d54378ed24001f

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160817.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160817.ebuild
deleted file mode 100644
index e045f09..0000000
--- a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160817.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-08-17_00-02-33/zip/netbeans-trunk-nightly-201608170002-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 d670210..f362a6c 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-201608170002-src.zip 217171456 SHA256 92e2c114eb48f8a57a2eb0baa4f3b376386ae929952c276c5bfd2884c39e7687 SHA512 95d7a428999212ba0057f4d032ed43c57e4f7c65305aa87a64429b92af26699d34da7f52f5431b11c86f39bcd3163ec99c1b9f8c8f8903375de8c64b4565aa48 WHIRLPOOL ba6e5a8ff6d768e4ea9624956dc5059ed851b6e6754e567120e147a958080c8de8f2e924ae9d78daec2ac0b12c542d1b1da019be7df48dbc1b0b8ace35d371f7
 DIST netbeans-trunk-nightly-201608180002-src.zip 217176983 SHA256 399cd4897319eec9be51a12f78dc5d426c9e2998a2998714f02270628a25ef2a SHA512 1e91df2bd0d93512a8c6feaed669e851a43cdd8beffade2645327ed18555f6bcac1575e3e841bc0968f1b92c059d0929579215ad1ba7e1d0e619c642a87196e7 WHIRLPOOL a957bf53993cef447782ab81a3362a38f44902306e7a2e531f9ae9b19fd87f052db752acdc08a0879e09c0f4b71264e5dafc39f8ebff82dbf2fa984d5ebf6ab4
 DIST netbeans-trunk-nightly-201608190002-src.zip 217183203 SHA256 f6713dea080556eb625aedb6f666a701e414dc1046870b7bd20b03ec36272894 SHA512 8e5626cf8f2d165f0ae7e6a19f8a7b1c72cd8fd74f4fad8577fad479bb30279c681e2c99cc43f4280f493cff0b5ec1b237c9bbbbebed14e383fa762000cc996e WHIRLPOOL aeb17d882bef504580a61976b63ee1e28e88703ac8f486efc699203e1c5e1985758009679bc6b8407699d6645137060c97089b3efe742aa47d98d7bb47603ac0
 DIST netbeans-trunk-nightly-201608200002-src.zip 217192695 SHA256 58c11bc929ec29edace69c12ba7fd0c71b5d4386c20ab02e7f9dab0962d7752f SHA512 0ec2bc6e3298c1bf38f4217db43cc7a8221dd360cdac72b012d65aa924ff69f81a41267d58d207e80ff6a875a196064a29f6bde41ee6ce1ef1b04da238ae4185 WHIRLPOOL f64160c449ad5a19d7975f5b5d1694149d3f3afa2614adaedaebc5f2f7c490ff35be196ce287ff244936061b10b53868ddf31cf28e9ac50cdcc95b491a01c8fb
@@ -39,7 +38,6 @@ DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b257858522
 DIST netbeans-trunk-nightly-201609180002-src.zip 218003305 SHA256 fedad6cff03b24535492371a2c85a88680925659e3829ef2e0989f1ff17bae5a SHA512 278a4b6cdc5c3c7243e81d39796467631aab2539671dd5ec81a53d78b4e2dbe495a5390c9950c965b09ec7dcaa1ee3a83a58c686bebf392be6e22fe88c5fcd9b WHIRLPOOL 1562ad89b2ab3c18b649611cb80014b1c3fc0c48eff3315b186cea83bd7a710e9e58ce86250607591b9fe89eefa94ef2327d03405ec73c2225f5588d550b41dd
 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_p20160817.ebuild 4126 SHA256 17764da1bdfa5d00b07a42527fc20efc5a754c1a4e939c4fdd1f02227b463ea8 SHA512 72f287d71d159d5d3b89be82365b31b2e0223d279702efe67d8ffd8d5543a07e8d5687b207500f13faa86abe3213a85ea109371d7b2a4e250dfbf0f101131fd5 WHIRLPOOL 27f9dde774f1d73360eb104a6418ca4e24e3a2db070b8ab2c326937f37905f93e3b16004153aa3798e002dc895a84a5e29870c8256792a71fca5e9907dbe2e55
 EBUILD netbeans-harness-9999_p20160818.ebuild 4126 SHA256 2ee60f7a7074ac248dc0b792d26ef997736402247e8ae6bc0bf565a7b5b83755 SHA512 99ca33a76e473382ea0818392470bafa0e0d4933b324b61f7228f2ccaba1690d464bef05008d2cf938daf08087fb876b64be1b582bdcfeb70b19e0aab92474a7 WHIRLPOOL 360369848ba11c471a19ac80900966f97ed955ee67cad3a03b95b70f784e40b2258615a823c24c49394566ecc162fda51400036945604de206d85a418eb3eb4a
 EBUILD netbeans-harness-9999_p20160819.ebuild 4126 SHA256 6f498908b174c8839a2c2003bbbfdbf046f2a876472cb7df0aaf00e1efcbe0f9 SHA512 136e6ab491bb70a3219a6873e12daf1014a9125a5affaaf7c1b904721649ad7f5e2376e9ecaae7c890af64327c9a38cda16ed2d18b8e5a1c4add57c2501f8326 WHIRLPOOL 49095cdfba3af80f0612b35586a921330aa2be1464d322bb6029984db82cd181fcd0154fba1197501a79c8d9b4bbb7791c2f490d09b134d513a9f226e82b948a
 EBUILD netbeans-harness-9999_p20160820.ebuild 4126 SHA256 4cbd53d74f049c2b5c20a4e6976f820612a1047c49ef29ac563e62319504c112 SHA512 a30cc324d6ecc607ede856a539fd8fa43a42932fb679bb23af0955f25df5d0eec9adba070e4d97597478dc4a2a9e8174608bc8c6228e8d59c1d9c997cfdec667 WHIRLPOOL 9eefcbba414ed8ee73b19b1d8035920f938b7d59dbe30740ac4b349224fe1b3e78f106b7b89aa88e7cd7d7155fffa3c57d8abe92ec5f070f59e981899577f0c0

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160817.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160817.ebuild
deleted file mode 100644
index e816dc3..0000000
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20160817.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-08-17_00-02-33/zip/netbeans-trunk-nightly-201608170002-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 4ad7f91..a0d4963 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-201608170002-src.zip 217171456 SHA256 92e2c114eb48f8a57a2eb0baa4f3b376386ae929952c276c5bfd2884c39e7687 SHA512 95d7a428999212ba0057f4d032ed43c57e4f7c65305aa87a64429b92af26699d34da7f52f5431b11c86f39bcd3163ec99c1b9f8c8f8903375de8c64b4565aa48 WHIRLPOOL ba6e5a8ff6d768e4ea9624956dc5059ed851b6e6754e567120e147a958080c8de8f2e924ae9d78daec2ac0b12c542d1b1da019be7df48dbc1b0b8ace35d371f7
 DIST netbeans-trunk-nightly-201608180002-src.zip 217176983 SHA256 399cd4897319eec9be51a12f78dc5d426c9e2998a2998714f02270628a25ef2a SHA512 1e91df2bd0d93512a8c6feaed669e851a43cdd8beffade2645327ed18555f6bcac1575e3e841bc0968f1b92c059d0929579215ad1ba7e1d0e619c642a87196e7 WHIRLPOOL a957bf53993cef447782ab81a3362a38f44902306e7a2e531f9ae9b19fd87f052db752acdc08a0879e09c0f4b71264e5dafc39f8ebff82dbf2fa984d5ebf6ab4
 DIST netbeans-trunk-nightly-201608190002-src.zip 217183203 SHA256 f6713dea080556eb625aedb6f666a701e414dc1046870b7bd20b03ec36272894 SHA512 8e5626cf8f2d165f0ae7e6a19f8a7b1c72cd8fd74f4fad8577fad479bb30279c681e2c99cc43f4280f493cff0b5ec1b237c9bbbbebed14e383fa762000cc996e WHIRLPOOL aeb17d882bef504580a61976b63ee1e28e88703ac8f486efc699203e1c5e1985758009679bc6b8407699d6645137060c97089b3efe742aa47d98d7bb47603ac0
 DIST netbeans-trunk-nightly-201608200002-src.zip 217192695 SHA256 58c11bc929ec29edace69c12ba7fd0c71b5d4386c20ab02e7f9dab0962d7752f SHA512 0ec2bc6e3298c1bf38f4217db43cc7a8221dd360cdac72b012d65aa924ff69f81a41267d58d207e80ff6a875a196064a29f6bde41ee6ce1ef1b04da238ae4185 WHIRLPOOL f64160c449ad5a19d7975f5b5d1694149d3f3afa2614adaedaebc5f2f7c490ff35be196ce287ff244936061b10b53868ddf31cf28e9ac50cdcc95b491a01c8fb
@@ -173,7 +172,6 @@ DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b257858522
 DIST netbeans-trunk-nightly-201609180002-src.zip 218003305 SHA256 fedad6cff03b24535492371a2c85a88680925659e3829ef2e0989f1ff17bae5a SHA512 278a4b6cdc5c3c7243e81d39796467631aab2539671dd5ec81a53d78b4e2dbe495a5390c9950c965b09ec7dcaa1ee3a83a58c686bebf392be6e22fe88c5fcd9b WHIRLPOOL 1562ad89b2ab3c18b649611cb80014b1c3fc0c48eff3315b186cea83bd7a710e9e58ce86250607591b9fe89eefa94ef2327d03405ec73c2225f5588d550b41dd
 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_p20160817.ebuild 29867 SHA256 6751ee1427a39980ac47ce6ab718b44eb9938014c22cdbebcd8a1e744bb6ef2d SHA512 c0ebf7c65663e07cfcfbeefa3f327a9f15e5e565d5193fff9064efe88b5ea98e605a6ef075e7e62e95a529a055ec3f762265ee1e6ca11df94d873e247abcbcbd WHIRLPOOL 5a2ac60e347288368e9761a58c0470217e58c27155e6b151b433e09903374f1ceb42797b5f2fb63266dc5d68a3bd9b3a31f6c14ce0f251da6618268cfc7e9c07
 EBUILD netbeans-ide-9999_p20160818.ebuild 29867 SHA256 98e18fd1f56089ef52cf20b562bca3ea703270e20751fea127a79bc5095f9038 SHA512 c90da6a77f9cdc24cbe3e43652fc620a54f7667a827c53a61edeecafac4ba8745b344ce03e589439762653eb1be36e974394d089fdfe283b4ba4e768ba08480f WHIRLPOOL b023349d63127743f14ca5b13440051782b2c7ead1a84203d8672f0aab916b0a6256dd19bf03a76f60e3152ed9b1b2cae5f964e4884c430909b550a36356af63
 EBUILD netbeans-ide-9999_p20160819.ebuild 29867 SHA256 c15c2597ebc72c94fb6720deb918987ba223e6b1ec6693150baa192cd2be7613 SHA512 c932411e99a72a19a7b6e9f2d0e71d2ccff127f64525376c3b386b847c4eb746065c60550866d1cc33d6fd9dde08283b88efc471820fc642587ab65d6a02fb19 WHIRLPOOL dc9121de602806fe04256b0aa4aec8f5cf5bbb226126aeec63df24d4b2e3e5e6ecd000749c3a0aaa0042b48198b64d72e9315bd7fb054d3da3205819062e9019
 EBUILD netbeans-ide-9999_p20160820.ebuild 29867 SHA256 a60e28abdada7ff0f68e270546c643d99140c5675d61a6079713aa2ca3917065 SHA512 24165116933867617381e0b65b3aeb3e1bd7593cb67b1a7d9264f891f56a28c6387d540c5efc397841eef7f963225f2aa993bb8aa2bb95e3d848f67472dc24fd WHIRLPOOL 59fdc24b33e5a0921bb78fc9458d8cb96e8ca3c6f28192a3dd89192cfb0f120efde8d1f18d1400ddfdd3c3882bd3e6269aa3120a2dac59c7f484923a76efa3aa

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160817.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160817.ebuild
deleted file mode 100644
index 01ea9f6..0000000
--- a/dev-java/netbeans-ide/netbeans-ide-9999_p20160817.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-08-17_00-02-33/zip/netbeans-trunk-nightly-201608170002-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 ec212f9..820598a 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -40,7 +40,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-201608170002-src.zip 217171456 SHA256 92e2c114eb48f8a57a2eb0baa4f3b376386ae929952c276c5bfd2884c39e7687 SHA512 95d7a428999212ba0057f4d032ed43c57e4f7c65305aa87a64429b92af26699d34da7f52f5431b11c86f39bcd3163ec99c1b9f8c8f8903375de8c64b4565aa48 WHIRLPOOL ba6e5a8ff6d768e4ea9624956dc5059ed851b6e6754e567120e147a958080c8de8f2e924ae9d78daec2ac0b12c542d1b1da019be7df48dbc1b0b8ace35d371f7
 DIST netbeans-trunk-nightly-201608180002-src.zip 217176983 SHA256 399cd4897319eec9be51a12f78dc5d426c9e2998a2998714f02270628a25ef2a SHA512 1e91df2bd0d93512a8c6feaed669e851a43cdd8beffade2645327ed18555f6bcac1575e3e841bc0968f1b92c059d0929579215ad1ba7e1d0e619c642a87196e7 WHIRLPOOL a957bf53993cef447782ab81a3362a38f44902306e7a2e531f9ae9b19fd87f052db752acdc08a0879e09c0f4b71264e5dafc39f8ebff82dbf2fa984d5ebf6ab4
 DIST netbeans-trunk-nightly-201608190002-src.zip 217183203 SHA256 f6713dea080556eb625aedb6f666a701e414dc1046870b7bd20b03ec36272894 SHA512 8e5626cf8f2d165f0ae7e6a19f8a7b1c72cd8fd74f4fad8577fad479bb30279c681e2c99cc43f4280f493cff0b5ec1b237c9bbbbebed14e383fa762000cc996e WHIRLPOOL aeb17d882bef504580a61976b63ee1e28e88703ac8f486efc699203e1c5e1985758009679bc6b8407699d6645137060c97089b3efe742aa47d98d7bb47603ac0
 DIST netbeans-trunk-nightly-201608200002-src.zip 217192695 SHA256 58c11bc929ec29edace69c12ba7fd0c71b5d4386c20ab02e7f9dab0962d7752f SHA512 0ec2bc6e3298c1bf38f4217db43cc7a8221dd360cdac72b012d65aa924ff69f81a41267d58d207e80ff6a875a196064a29f6bde41ee6ce1ef1b04da238ae4185 WHIRLPOOL f64160c449ad5a19d7975f5b5d1694149d3f3afa2614adaedaebc5f2f7c490ff35be196ce287ff244936061b10b53868ddf31cf28e9ac50cdcc95b491a01c8fb
@@ -71,7 +70,6 @@ DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b257858522
 DIST netbeans-trunk-nightly-201609180002-src.zip 218003305 SHA256 fedad6cff03b24535492371a2c85a88680925659e3829ef2e0989f1ff17bae5a SHA512 278a4b6cdc5c3c7243e81d39796467631aab2539671dd5ec81a53d78b4e2dbe495a5390c9950c965b09ec7dcaa1ee3a83a58c686bebf392be6e22fe88c5fcd9b WHIRLPOOL 1562ad89b2ab3c18b649611cb80014b1c3fc0c48eff3315b186cea83bd7a710e9e58ce86250607591b9fe89eefa94ef2327d03405ec73c2225f5588d550b41dd
 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_p20160817.ebuild 15656 SHA256 9d0b834907b9ce1af0f5d32f9993c08857fd99f084fdf78672fa3057ae9f25a4 SHA512 3e7c4cf0ee1366b7e4634164335017860f1b75c728f5a9e0be904acd844d9a60054e0d4047611b6cf067f7887e26a67959358cb4595210e295bf520a83258232 WHIRLPOOL b5a14a7235cc137b27c6014c01d934648ed501f3a10a7bc4dbdb192bcec1795dfe7209e9af3b7f45a481620b190af7cb7489d447f13af0271ab2713f34889f33
 EBUILD netbeans-java-9999_p20160818.ebuild 15656 SHA256 62cee03f9ff772ab9fbf36ddbf3ee1ae62a3325021a001cf3d6d5858a3656df1 SHA512 58da9a3a5cf4879aec9ed54755d51089aa0f0b6218915fce8366880a90235162b656fcc4412c46cd03bcd819ac287d8fa4d09ad912741b00b3f6b664db373399 WHIRLPOOL 363c2b313ac9eb482a1219de649b9c38241726df99525f42de0fb68b480186b8ca807fb710b9f7407759c96083487f7e1b39c36b3eef2f56c2b309642c68a457
 EBUILD netbeans-java-9999_p20160819.ebuild 15656 SHA256 5d1b7a3f616a86f7eec4c2d900616b688313647e0149915888ed411394bbd49d SHA512 e9ff6facda39bb1ff77bc59388d5534a5e9fe88c65cad5079c7c5f7bb0c3572baaede87ad576a40e45f81208e0d796016f6fadfc0cf771bf34b6045e5b474dfb WHIRLPOOL dcaa98b1d14fdc79cfdf296b1e66bada6dbaf5347c5c74959d7f9a072cfc6b7e3ca78ff0447cd05dd60249ec40c430ccd6f6a136a934e1112dfcf633db0993e4
 EBUILD netbeans-java-9999_p20160820.ebuild 15656 SHA256 0406c77d416db72491f8ea7a7b189139ec4bf180b2c6a9d45d373e9a8bb5da3f SHA512 ddae40bff0d4e11e08897ddc8b599ba5361df102a6320fa36fd26e973e57543ab2bd24eb9b693413ff3b87ef4155c15d7770b6f6d8c2b82460e3775c20dcaf0c WHIRLPOOL a0ecb22da57ac4281cc3a87b0f26f6514e198498923b70a8503418cf7e6021ceff5fdcb5efece0c41c3b4b5819cbdf7ad22d1f6f3b9c6b962608428143d090c8

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160817.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160817.ebuild
deleted file mode 100644
index a24c723..0000000
--- a/dev-java/netbeans-java/netbeans-java-9999_p20160817.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-08-17_00-02-33/zip/netbeans-trunk-nightly-201608170002-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 137f7c8..73aae8d 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-201608170002-src.zip 217171456 SHA256 92e2c114eb48f8a57a2eb0baa4f3b376386ae929952c276c5bfd2884c39e7687 SHA512 95d7a428999212ba0057f4d032ed43c57e4f7c65305aa87a64429b92af26699d34da7f52f5431b11c86f39bcd3163ec99c1b9f8c8f8903375de8c64b4565aa48 WHIRLPOOL ba6e5a8ff6d768e4ea9624956dc5059ed851b6e6754e567120e147a958080c8de8f2e924ae9d78daec2ac0b12c542d1b1da019be7df48dbc1b0b8ace35d371f7
 DIST netbeans-trunk-nightly-201608180002-src.zip 217176983 SHA256 399cd4897319eec9be51a12f78dc5d426c9e2998a2998714f02270628a25ef2a SHA512 1e91df2bd0d93512a8c6feaed669e851a43cdd8beffade2645327ed18555f6bcac1575e3e841bc0968f1b92c059d0929579215ad1ba7e1d0e619c642a87196e7 WHIRLPOOL a957bf53993cef447782ab81a3362a38f44902306e7a2e531f9ae9b19fd87f052db752acdc08a0879e09c0f4b71264e5dafc39f8ebff82dbf2fa984d5ebf6ab4
 DIST netbeans-trunk-nightly-201608190002-src.zip 217183203 SHA256 f6713dea080556eb625aedb6f666a701e414dc1046870b7bd20b03ec36272894 SHA512 8e5626cf8f2d165f0ae7e6a19f8a7b1c72cd8fd74f4fad8577fad479bb30279c681e2c99cc43f4280f493cff0b5ec1b237c9bbbbebed14e383fa762000cc996e WHIRLPOOL aeb17d882bef504580a61976b63ee1e28e88703ac8f486efc699203e1c5e1985758009679bc6b8407699d6645137060c97089b3efe742aa47d98d7bb47603ac0
 DIST netbeans-trunk-nightly-201608200002-src.zip 217192695 SHA256 58c11bc929ec29edace69c12ba7fd0c71b5d4386c20ab02e7f9dab0962d7752f SHA512 0ec2bc6e3298c1bf38f4217db43cc7a8221dd360cdac72b012d65aa924ff69f81a41267d58d207e80ff6a875a196064a29f6bde41ee6ce1ef1b04da238ae4185 WHIRLPOOL f64160c449ad5a19d7975f5b5d1694149d3f3afa2614adaedaebc5f2f7c490ff35be196ce287ff244936061b10b53868ddf31cf28e9ac50cdcc95b491a01c8fb
@@ -37,7 +36,6 @@ DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b257858522
 DIST netbeans-trunk-nightly-201609180002-src.zip 218003305 SHA256 fedad6cff03b24535492371a2c85a88680925659e3829ef2e0989f1ff17bae5a SHA512 278a4b6cdc5c3c7243e81d39796467631aab2539671dd5ec81a53d78b4e2dbe495a5390c9950c965b09ec7dcaa1ee3a83a58c686bebf392be6e22fe88c5fcd9b WHIRLPOOL 1562ad89b2ab3c18b649611cb80014b1c3fc0c48eff3315b186cea83bd7a710e9e58ce86250607591b9fe89eefa94ef2327d03405ec73c2225f5588d550b41dd
 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_p20160817.ebuild 4971 SHA256 8b2d1e493dd3ef9a7a0fb0bbcb3c6a56f99db2f664c62c77c9ec40527b2e434c SHA512 846666a1a1aab0e7be9946c828e5501fb73bb8b017a6a536b84cc4cdc19edac5ca728ff808dd2e9d84cecdeb391799d0b27761f728afc7756e80c38b05816ceb WHIRLPOOL fe0e8c7e84a4423a3e87ddbba03155514ca47167faf20cd0d15cc99c3a980da18096564047f5b898a468de43aa543ca7b1c4f9ec04df673f95466353d0d59896
 EBUILD netbeans-javacard-9999_p20160818.ebuild 4971 SHA256 7d69ccaba2a38993d4a27dec86f43d12c1ef76ad6f4b97bf8e07162bfb4f32f6 SHA512 0e3252a2ae23ec11134046e6eab10a88f27b282c9933c770c82f610bb502df7a2ed778bf51754dd4f4aebf44b633d69a49fef9301b48f7e0ea0eee61b778d7eb WHIRLPOOL 32d73ffd70c066a237a88ae2442bec95dc67f034dedee516818b36b855a50f33cebca8d3c38309129f58acc4affea870c803abc46727443f79033641e44dd214
 EBUILD netbeans-javacard-9999_p20160819.ebuild 4971 SHA256 0d1e16917e6fdf9785fadb90f9d767b460c3c005d32311bebd8eb30566f8a9e7 SHA512 2cb812aabf24ddf79edef84efd05c558b70d21bb113cb3aa938aafe3e93de893d334c15cfbaf5d88d12be6e6e72b5c9b768854fae70d456d456c4cc209a07580 WHIRLPOOL 7fc0706cf7d58016ccaf4d0f48c77dbc3c0c01d2bdd6a7e98de690f42b4a09b0a9f17eeacbbd8a9a7c525ae3d6b538d6b028e17781f92f9429b58ee09e9fe0f3
 EBUILD netbeans-javacard-9999_p20160820.ebuild 4971 SHA256 a62ce1b51f97b6f363032674d3e203ba184acabe9ef703daecf4c202fdacb082 SHA512 c3cb3b44d12f35e07b164fff38bf017214a25f628dc167d13429afcf61d366ff51db13a392a07dd4cedeea56763846f16f5f2b02f3640522360e6d86b7f6e38f WHIRLPOOL 7e9fd7879d46e772dae401855caf6f8832f79bd8ac0096f1c94b30fbb59a4b4d7b2d0af2281a66c5cb03d95f5a5589a51ad59a2fe1893641cac4afa350848739

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160817.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160817.ebuild
deleted file mode 100644
index 1933f43..0000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160817.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-08-17_00-02-33/zip/netbeans-trunk-nightly-201608170002-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 1d67116..82c4dc4 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-201608170002-src.zip 217171456 SHA256 92e2c114eb48f8a57a2eb0baa4f3b376386ae929952c276c5bfd2884c39e7687 SHA512 95d7a428999212ba0057f4d032ed43c57e4f7c65305aa87a64429b92af26699d34da7f52f5431b11c86f39bcd3163ec99c1b9f8c8f8903375de8c64b4565aa48 WHIRLPOOL ba6e5a8ff6d768e4ea9624956dc5059ed851b6e6754e567120e147a958080c8de8f2e924ae9d78daec2ac0b12c542d1b1da019be7df48dbc1b0b8ace35d371f7
 DIST netbeans-trunk-nightly-201608180002-src.zip 217176983 SHA256 399cd4897319eec9be51a12f78dc5d426c9e2998a2998714f02270628a25ef2a SHA512 1e91df2bd0d93512a8c6feaed669e851a43cdd8beffade2645327ed18555f6bcac1575e3e841bc0968f1b92c059d0929579215ad1ba7e1d0e619c642a87196e7 WHIRLPOOL a957bf53993cef447782ab81a3362a38f44902306e7a2e531f9ae9b19fd87f052db752acdc08a0879e09c0f4b71264e5dafc39f8ebff82dbf2fa984d5ebf6ab4
 DIST netbeans-trunk-nightly-201608190002-src.zip 217183203 SHA256 f6713dea080556eb625aedb6f666a701e414dc1046870b7bd20b03ec36272894 SHA512 8e5626cf8f2d165f0ae7e6a19f8a7b1c72cd8fd74f4fad8577fad479bb30279c681e2c99cc43f4280f493cff0b5ec1b237c9bbbbebed14e383fa762000cc996e WHIRLPOOL aeb17d882bef504580a61976b63ee1e28e88703ac8f486efc699203e1c5e1985758009679bc6b8407699d6645137060c97089b3efe742aa47d98d7bb47603ac0
 DIST netbeans-trunk-nightly-201608200002-src.zip 217192695 SHA256 58c11bc929ec29edace69c12ba7fd0c71b5d4386c20ab02e7f9dab0962d7752f SHA512 0ec2bc6e3298c1bf38f4217db43cc7a8221dd360cdac72b012d65aa924ff69f81a41267d58d207e80ff6a875a196064a29f6bde41ee6ce1ef1b04da238ae4185 WHIRLPOOL f64160c449ad5a19d7975f5b5d1694149d3f3afa2614adaedaebc5f2f7c490ff35be196ce287ff244936061b10b53868ddf31cf28e9ac50cdcc95b491a01c8fb
@@ -36,7 +35,6 @@ DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b257858522
 DIST netbeans-trunk-nightly-201609180002-src.zip 218003305 SHA256 fedad6cff03b24535492371a2c85a88680925659e3829ef2e0989f1ff17bae5a SHA512 278a4b6cdc5c3c7243e81d39796467631aab2539671dd5ec81a53d78b4e2dbe495a5390c9950c965b09ec7dcaa1ee3a83a58c686bebf392be6e22fe88c5fcd9b WHIRLPOOL 1562ad89b2ab3c18b649611cb80014b1c3fc0c48eff3315b186cea83bd7a710e9e58ce86250607591b9fe89eefa94ef2327d03405ec73c2225f5588d550b41dd
 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_p20160817.ebuild 6293 SHA256 7488b5ae3c325128e7fea59a1939e2ce958aceec1bc6dfe054cc06b603940acc SHA512 e7ebc67d84c96ba424c6e8a81f5ac76a823c071e88a9b4a5d8b0dc9055e6da4de8deea9a4bd1754cb4e9c474c15f6d1f807c0101949d9cbad07d05a66cfe2fad WHIRLPOOL a63643fc71c42286e83b9cee0deffe855ecea1acc4f19ed5cd47e4f3d40ff41e420ced2a5c6fc6c20dbf01ac1b93cbdbcf18daf06645bf0b762c5f5cb03d524f
 EBUILD netbeans-javadoc-9999_p20160818.ebuild 6293 SHA256 43c299153ab74a2cdf264c904f4e646678118e3be4d347fb1882737bea0604c1 SHA512 b5696dfcf75c485e9b63b7f473870fb905497e20e0b9bedc78675ca2da3f85249d8dd0b57027ffd87cd8c07c5d40542e85c12c6d98244807915ce7c44100f131 WHIRLPOOL c5067013ad7232da5841210f3e15e01be1f09f83a1bdae0fe069802d0d5f5776dcee01a2430b2a0c1728708160fd14acc776b9ba151e2343d33de6b540fdcacd
 EBUILD netbeans-javadoc-9999_p20160819.ebuild 6293 SHA256 1e295d4f253e0e294a2cd1caa3bbdc11ef2d56bfde2d8ae82512b07f78c51cd3 SHA512 bfb78f2762a087f63dfb2ca35a23526558010c725bdb562d280cac5a461d923eb7db8708ced65ef9456b4ff8659ecb8bc5dcd3e5376e3949e44617f2ea6b2c51 WHIRLPOOL 5efd54f7c42eeb2f3456cee2479a36e017279d040090c20dd5dc0ea52e0e8117c8fcd52bd08c507454d4e744346815e6f0e8f38688793151c47ee79e1327d4d5
 EBUILD netbeans-javadoc-9999_p20160820.ebuild 6293 SHA256 27773f59e9f6e35f9d0bd1640436edcf81b3c2013f25e69957cf796422b68954 SHA512 11add05f347f4f73adabcab5af9257bb1f8d1bae71df77337a76080aedf5372f445bad9d0a28f18753e8f63276857e27e83c400aca596323d0936488877478e6 WHIRLPOOL 08bb54c0a909946cdaf06e2313396a4672dc20e791f3654921ddbbcb51b5e643beb425b30759c3729f52e64ce53f47aee982529f47f0d7945eba3ec6f5392909

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160817.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160817.ebuild
deleted file mode 100644
index 003cc8a..0000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160817.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-08-17_00-02-33/zip/netbeans-trunk-nightly-201608170002-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 8b54965..a2f5b60 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-201608170002-src.zip 217171456 SHA256 92e2c114eb48f8a57a2eb0baa4f3b376386ae929952c276c5bfd2884c39e7687 SHA512 95d7a428999212ba0057f4d032ed43c57e4f7c65305aa87a64429b92af26699d34da7f52f5431b11c86f39bcd3163ec99c1b9f8c8f8903375de8c64b4565aa48 WHIRLPOOL ba6e5a8ff6d768e4ea9624956dc5059ed851b6e6754e567120e147a958080c8de8f2e924ae9d78daec2ac0b12c542d1b1da019be7df48dbc1b0b8ace35d371f7
 DIST netbeans-trunk-nightly-201608180002-src.zip 217176983 SHA256 399cd4897319eec9be51a12f78dc5d426c9e2998a2998714f02270628a25ef2a SHA512 1e91df2bd0d93512a8c6feaed669e851a43cdd8beffade2645327ed18555f6bcac1575e3e841bc0968f1b92c059d0929579215ad1ba7e1d0e619c642a87196e7 WHIRLPOOL a957bf53993cef447782ab81a3362a38f44902306e7a2e531f9ae9b19fd87f052db752acdc08a0879e09c0f4b71264e5dafc39f8ebff82dbf2fa984d5ebf6ab4
 DIST netbeans-trunk-nightly-201608190002-src.zip 217183203 SHA256 f6713dea080556eb625aedb6f666a701e414dc1046870b7bd20b03ec36272894 SHA512 8e5626cf8f2d165f0ae7e6a19f8a7b1c72cd8fd74f4fad8577fad479bb30279c681e2c99cc43f4280f493cff0b5ec1b237c9bbbbebed14e383fa762000cc996e WHIRLPOOL aeb17d882bef504580a61976b63ee1e28e88703ac8f486efc699203e1c5e1985758009679bc6b8407699d6645137060c97089b3efe742aa47d98d7bb47603ac0
 DIST netbeans-trunk-nightly-201608200002-src.zip 217192695 SHA256 58c11bc929ec29edace69c12ba7fd0c71b5d4386c20ab02e7f9dab0962d7752f SHA512 0ec2bc6e3298c1bf38f4217db43cc7a8221dd360cdac72b012d65aa924ff69f81a41267d58d207e80ff6a875a196064a29f6bde41ee6ce1ef1b04da238ae4185 WHIRLPOOL f64160c449ad5a19d7975f5b5d1694149d3f3afa2614adaedaebc5f2f7c490ff35be196ce287ff244936061b10b53868ddf31cf28e9ac50cdcc95b491a01c8fb
@@ -42,7 +41,6 @@ DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b257858522
 DIST netbeans-trunk-nightly-201609180002-src.zip 218003305 SHA256 fedad6cff03b24535492371a2c85a88680925659e3829ef2e0989f1ff17bae5a SHA512 278a4b6cdc5c3c7243e81d39796467631aab2539671dd5ec81a53d78b4e2dbe495a5390c9950c965b09ec7dcaa1ee3a83a58c686bebf392be6e22fe88c5fcd9b WHIRLPOOL 1562ad89b2ab3c18b649611cb80014b1c3fc0c48eff3315b186cea83bd7a710e9e58ce86250607591b9fe89eefa94ef2327d03405ec73c2225f5588d550b41dd
 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_p20160817.ebuild 4717 SHA256 b899a892307af9da75649baa424fa8948b3f98da96a25de7bbdaa82fdcd1673e SHA512 8cf2b20841aa353097adc0de412f7ae7729e09fb5a79a7c16051f364eb9414c3313424466ec49d895a58c2e75362dc21b51aee374199de2847eee8eefdfd9d47 WHIRLPOOL ff728a2f08f059f26545bae39ae30268579011b0bd59e5e07397df46cdf8f922ace4e207402ceda83f70cc13fa09bed163af6d429fe040c034f144ee0ffefeb0
 EBUILD netbeans-javafx-9999_p20160818.ebuild 4717 SHA256 eebf8789920fc8fffb4c6e279871b86f33805401b1d050b168b9f5602c3dffd0 SHA512 1ff696528e2136b554102ac443668c4b7b5c3fcbaa95ea914a08e6b8100d81c1dc434e52477244a880ad915d9b83a6efd6c16824b43a8bbbf120129498a443b0 WHIRLPOOL 6955fcb6651d6b2ae140458ab8dc4043150215b7ab119dd55e02de6629539fb64f7ba1f22115390a58c5005f5fef67847fa27092088ee500a422337385174f45
 EBUILD netbeans-javafx-9999_p20160819.ebuild 4717 SHA256 d07e87314d59b2f696e02291ef910278e9a68548e19977a8f74b2a71817e226c SHA512 3c1880cef3b70d29bfe965bed0872aad85416083fb147be5b8687049c344f3256c840d0c62ac20d58682e6127c1e54c682d4fe460a776abab55dbc413d46aedc WHIRLPOOL 42a2475cf3976dac02bdbc0623c8e17a83d0f5fdbf17e4b500199e8aabff74e1023ffa78e899cdd99f49349dc2a9959e01cac07ad0e18cb887651f39caa42e88
 EBUILD netbeans-javafx-9999_p20160820.ebuild 4717 SHA256 a7aa23953fba456175e7775363b4183724135a676e13f8a53598eff9d43a48c6 SHA512 af7442fbfb60b520e84e9574769a1356194147ccf28c80945fb407cf5ee09ccc5d6da26d4393fc38f10d013fb7ed1a12d06fac34da002e097fcb7d5b24d9ec6b WHIRLPOOL 274e0d6353d70c95f657343d68bf36acf89b1c291f0731db50c45273d16b34392ae91903092598fbb154b1ef57724be2537d8a81f695dfc0925c221d4c3b48ba

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160817.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160817.ebuild
deleted file mode 100644
index 26c4c5c..0000000
--- a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160817.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-08-17_00-02-33/zip/netbeans-trunk-nightly-201608170002-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 8d13f09..4a69ecb 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-201608170002-src.zip 217171456 SHA256 92e2c114eb48f8a57a2eb0baa4f3b376386ae929952c276c5bfd2884c39e7687 SHA512 95d7a428999212ba0057f4d032ed43c57e4f7c65305aa87a64429b92af26699d34da7f52f5431b11c86f39bcd3163ec99c1b9f8c8f8903375de8c64b4565aa48 WHIRLPOOL ba6e5a8ff6d768e4ea9624956dc5059ed851b6e6754e567120e147a958080c8de8f2e924ae9d78daec2ac0b12c542d1b1da019be7df48dbc1b0b8ace35d371f7
 DIST netbeans-trunk-nightly-201608180002-src.zip 217176983 SHA256 399cd4897319eec9be51a12f78dc5d426c9e2998a2998714f02270628a25ef2a SHA512 1e91df2bd0d93512a8c6feaed669e851a43cdd8beffade2645327ed18555f6bcac1575e3e841bc0968f1b92c059d0929579215ad1ba7e1d0e619c642a87196e7 WHIRLPOOL a957bf53993cef447782ab81a3362a38f44902306e7a2e531f9ae9b19fd87f052db752acdc08a0879e09c0f4b71264e5dafc39f8ebff82dbf2fa984d5ebf6ab4
 DIST netbeans-trunk-nightly-201608190002-src.zip 217183203 SHA256 f6713dea080556eb625aedb6f666a701e414dc1046870b7bd20b03ec36272894 SHA512 8e5626cf8f2d165f0ae7e6a19f8a7b1c72cd8fd74f4fad8577fad479bb30279c681e2c99cc43f4280f493cff0b5ec1b237c9bbbbebed14e383fa762000cc996e WHIRLPOOL aeb17d882bef504580a61976b63ee1e28e88703ac8f486efc699203e1c5e1985758009679bc6b8407699d6645137060c97089b3efe742aa47d98d7bb47603ac0
 DIST netbeans-trunk-nightly-201608200002-src.zip 217192695 SHA256 58c11bc929ec29edace69c12ba7fd0c71b5d4386c20ab02e7f9dab0962d7752f SHA512 0ec2bc6e3298c1bf38f4217db43cc7a8221dd360cdac72b012d65aa924ff69f81a41267d58d207e80ff6a875a196064a29f6bde41ee6ce1ef1b04da238ae4185 WHIRLPOOL f64160c449ad5a19d7975f5b5d1694149d3f3afa2614adaedaebc5f2f7c490ff35be196ce287ff244936061b10b53868ddf31cf28e9ac50cdcc95b491a01c8fb
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b257858522
 DIST netbeans-trunk-nightly-201609180002-src.zip 218003305 SHA256 fedad6cff03b24535492371a2c85a88680925659e3829ef2e0989f1ff17bae5a SHA512 278a4b6cdc5c3c7243e81d39796467631aab2539671dd5ec81a53d78b4e2dbe495a5390c9950c965b09ec7dcaa1ee3a83a58c686bebf392be6e22fe88c5fcd9b WHIRLPOOL 1562ad89b2ab3c18b649611cb80014b1c3fc0c48eff3315b186cea83bd7a710e9e58ce86250607591b9fe89eefa94ef2327d03405ec73c2225f5588d550b41dd
 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_p20160817.ebuild 4412 SHA256 7b459199d7bbd2a5da412a4ffbeba837a68d47ed3c24126336f80b515a92a3c2 SHA512 875183fb44ea34243061c9eb755d16f3759a0936d98069a38d0e518cffaae6ac15d536547863ea900fd128e5c5148fb9e7fbaf610147d84de49455b00a31454e WHIRLPOOL b8a9a1a442110ca791d097721fa4fe2b05e005725aae9bfd920d41abc39257f1918477bb9caee1aeadeff8b7f8e7cd7466ab62d1feccdb93be6ea02dce01e735
 EBUILD netbeans-mobility-9999_p20160818.ebuild 4412 SHA256 63387e8024b4d1c5198efa63a892dc953a11576d9737fc64ec311b7cbb6ffb5e SHA512 d78420802b89b469b26ef0133c639ec25a42454ee1ac49309d34b995e60f0364ba033dbad591e3df984bc0675b8bfecaf9981d2b47f6f4a3a62f2380a2d629e7 WHIRLPOOL 636e09631437639da1cbf1540f7c1310c0bac7b65402ac3f77f7f7f7246e43f9d91685a35834a26eb372265bf20856d14b6526304b75e1b843a70451f2dbd458
 EBUILD netbeans-mobility-9999_p20160819.ebuild 4412 SHA256 e5d355a9b9d71d46bfa5cb06def75f55c46bd311a0d80cb7518638699964df82 SHA512 15c3c524d66105959477ce4baed432404cb896b603374da293480a6fc44841e0fbbda5b2d083e48b3da175900fcdf1dd8f26be2ac67eaaf4a9c09dcfb4729f28 WHIRLPOOL 306f95b57b03e0e47cee9628c769a1a95f37ed03839814bdd19d85581678d88dedc48261155b56fd96ea73ca56bda0821a8df77ce14b6c925fdcb1e819548aaa
 EBUILD netbeans-mobility-9999_p20160820.ebuild 4412 SHA256 c22db6dc09146550f6610fa84f4db3837bb3afe9c23c20e033eb711415638637 SHA512 17d1a84f8b13cd6d1abb0452bf70ab315afa0d715949922d70b5f105610eca67f0f1e5ee786251e71ff48fb84737ebbb9226e825f4c43fc01638c42a46b1e3c4 WHIRLPOOL 8de0bf9eda2b1ca25b71e06143284c135f794e317f2c4c3beee092d1ecd96b4239f30371823de4440ca617cac32e627dcb0682538c7c9334ecd87b825737e854

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160817.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160817.ebuild
deleted file mode 100644
index f0dbc80..0000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160817.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-08-17_00-02-33/zip/netbeans-trunk-nightly-201608170002-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 68bc1bc..af6b53d 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-201608170002-src.zip 217171456 SHA256 92e2c114eb48f8a57a2eb0baa4f3b376386ae929952c276c5bfd2884c39e7687 SHA512 95d7a428999212ba0057f4d032ed43c57e4f7c65305aa87a64429b92af26699d34da7f52f5431b11c86f39bcd3163ec99c1b9f8c8f8903375de8c64b4565aa48 WHIRLPOOL ba6e5a8ff6d768e4ea9624956dc5059ed851b6e6754e567120e147a958080c8de8f2e924ae9d78daec2ac0b12c542d1b1da019be7df48dbc1b0b8ace35d371f7
 DIST netbeans-trunk-nightly-201608180002-src.zip 217176983 SHA256 399cd4897319eec9be51a12f78dc5d426c9e2998a2998714f02270628a25ef2a SHA512 1e91df2bd0d93512a8c6feaed669e851a43cdd8beffade2645327ed18555f6bcac1575e3e841bc0968f1b92c059d0929579215ad1ba7e1d0e619c642a87196e7 WHIRLPOOL a957bf53993cef447782ab81a3362a38f44902306e7a2e531f9ae9b19fd87f052db752acdc08a0879e09c0f4b71264e5dafc39f8ebff82dbf2fa984d5ebf6ab4
 DIST netbeans-trunk-nightly-201608190002-src.zip 217183203 SHA256 f6713dea080556eb625aedb6f666a701e414dc1046870b7bd20b03ec36272894 SHA512 8e5626cf8f2d165f0ae7e6a19f8a7b1c72cd8fd74f4fad8577fad479bb30279c681e2c99cc43f4280f493cff0b5ec1b237c9bbbbebed14e383fa762000cc996e WHIRLPOOL aeb17d882bef504580a61976b63ee1e28e88703ac8f486efc699203e1c5e1985758009679bc6b8407699d6645137060c97089b3efe742aa47d98d7bb47603ac0
 DIST netbeans-trunk-nightly-201608200002-src.zip 217192695 SHA256 58c11bc929ec29edace69c12ba7fd0c71b5d4386c20ab02e7f9dab0962d7752f SHA512 0ec2bc6e3298c1bf38f4217db43cc7a8221dd360cdac72b012d65aa924ff69f81a41267d58d207e80ff6a875a196064a29f6bde41ee6ce1ef1b04da238ae4185 WHIRLPOOL f64160c449ad5a19d7975f5b5d1694149d3f3afa2614adaedaebc5f2f7c490ff35be196ce287ff244936061b10b53868ddf31cf28e9ac50cdcc95b491a01c8fb
@@ -37,7 +36,6 @@ DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b257858522
 DIST netbeans-trunk-nightly-201609180002-src.zip 218003305 SHA256 fedad6cff03b24535492371a2c85a88680925659e3829ef2e0989f1ff17bae5a SHA512 278a4b6cdc5c3c7243e81d39796467631aab2539671dd5ec81a53d78b4e2dbe495a5390c9950c965b09ec7dcaa1ee3a83a58c686bebf392be6e22fe88c5fcd9b WHIRLPOOL 1562ad89b2ab3c18b649611cb80014b1c3fc0c48eff3315b186cea83bd7a710e9e58ce86250607591b9fe89eefa94ef2327d03405ec73c2225f5588d550b41dd
 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_p20160817.ebuild 4111 SHA256 fc478ebd158819f736bc66b5f89938910d5533463f0ab7ca1d982f9963e66303 SHA512 466185888752187e9c8ad19675699c0fcde2ae48767084ae5242fff601bed6c012bafb3ccb8d970cdce34e8dab00e23cb4e8c276bd8acd489b778cc6862332ef WHIRLPOOL 0c4161ff92b1ac2614f2371ed961ed346fe4387f742bee61b49d67b1fff8e77a497fc1c234ceb9e550f3287d25833e19c5f884847b740f13f185e6516c129500
 EBUILD netbeans-nb-9999_p20160818.ebuild 4111 SHA256 46c7ceff2932166559422633487c9a7567cc8925dc6b642d0c173c904062ac38 SHA512 137e7e5ebc86851c8589ec97b5619546a1844ace3347ded34dc91eae18569b5b28153d204db92a7a766ac705c81aca74be2926ba3c96f33251eb6585a48e4adc WHIRLPOOL 5a7a0af10bf12fd0e25f7d8a88e2af606b8d6b5f3e6c75e6df051ec4b4b571d3fe1c6ab50f0842ee1571b3d57d71488c5bdbce6fc95289b7e5eb304e1f9eb232
 EBUILD netbeans-nb-9999_p20160819.ebuild 4111 SHA256 5b5a1a19deb80f84cdb575c9a1b8e0a3a679a279f1531ff6417e40a350d4cda2 SHA512 f3a63ad827e0cba74b3da4f588cb0f1bd910c98f55f6c2a647527f4cf404b4fd9163e895fe29c0abb1e134380928cfa68d15bf63f51709162025c22314e236d8 WHIRLPOOL ba602526c56d44bca2c9e6b0f7d160f5a221af2155b4be4e9355cb4d889cce49031a3f19280b74a20470bdead677e01e6aedb45fcba38490b3af02486de121e0
 EBUILD netbeans-nb-9999_p20160820.ebuild 4111 SHA256 70d515cb94222a4a2b4b34ae66c1ad9ebe4fdae926d8d0499579e40f7051e099 SHA512 fa6ad5be9d51ea91766bfe238a76f358435e617b065dfc694b5c5e4b5b6be4000e8df2d91886d4ed0178259479edcf1017f2d9871386c64fb947b73eab538e9d WHIRLPOOL e3b25800734ceb909cdf19bd33ce3c6a188e33a1ede714fca5f530fd5619c734cc679aa9ec6561ea97280fbd0d20b9c091614374aa27a0199578af0849aed552

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160817.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160817.ebuild
deleted file mode 100644
index 7ff7aeb..0000000
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20160817.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-08-17_00-02-33/zip/netbeans-trunk-nightly-201608170002-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 af735a4..5e62f20 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-201608170002-src.zip 217171456 SHA256 92e2c114eb48f8a57a2eb0baa4f3b376386ae929952c276c5bfd2884c39e7687 SHA512 95d7a428999212ba0057f4d032ed43c57e4f7c65305aa87a64429b92af26699d34da7f52f5431b11c86f39bcd3163ec99c1b9f8c8f8903375de8c64b4565aa48 WHIRLPOOL ba6e5a8ff6d768e4ea9624956dc5059ed851b6e6754e567120e147a958080c8de8f2e924ae9d78daec2ac0b12c542d1b1da019be7df48dbc1b0b8ace35d371f7
 DIST netbeans-trunk-nightly-201608180002-src.zip 217176983 SHA256 399cd4897319eec9be51a12f78dc5d426c9e2998a2998714f02270628a25ef2a SHA512 1e91df2bd0d93512a8c6feaed669e851a43cdd8beffade2645327ed18555f6bcac1575e3e841bc0968f1b92c059d0929579215ad1ba7e1d0e619c642a87196e7 WHIRLPOOL a957bf53993cef447782ab81a3362a38f44902306e7a2e531f9ae9b19fd87f052db752acdc08a0879e09c0f4b71264e5dafc39f8ebff82dbf2fa984d5ebf6ab4
 DIST netbeans-trunk-nightly-201608190002-src.zip 217183203 SHA256 f6713dea080556eb625aedb6f666a701e414dc1046870b7bd20b03ec36272894 SHA512 8e5626cf8f2d165f0ae7e6a19f8a7b1c72cd8fd74f4fad8577fad479bb30279c681e2c99cc43f4280f493cff0b5ec1b237c9bbbbebed14e383fa762000cc996e WHIRLPOOL aeb17d882bef504580a61976b63ee1e28e88703ac8f486efc699203e1c5e1985758009679bc6b8407699d6645137060c97089b3efe742aa47d98d7bb47603ac0
 DIST netbeans-trunk-nightly-201608200002-src.zip 217192695 SHA256 58c11bc929ec29edace69c12ba7fd0c71b5d4386c20ab02e7f9dab0962d7752f SHA512 0ec2bc6e3298c1bf38f4217db43cc7a8221dd360cdac72b012d65aa924ff69f81a41267d58d207e80ff6a875a196064a29f6bde41ee6ce1ef1b04da238ae4185 WHIRLPOOL f64160c449ad5a19d7975f5b5d1694149d3f3afa2614adaedaebc5f2f7c490ff35be196ce287ff244936061b10b53868ddf31cf28e9ac50cdcc95b491a01c8fb
@@ -39,7 +38,6 @@ DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b257858522
 DIST netbeans-trunk-nightly-201609180002-src.zip 218003305 SHA256 fedad6cff03b24535492371a2c85a88680925659e3829ef2e0989f1ff17bae5a SHA512 278a4b6cdc5c3c7243e81d39796467631aab2539671dd5ec81a53d78b4e2dbe495a5390c9950c965b09ec7dcaa1ee3a83a58c686bebf392be6e22fe88c5fcd9b WHIRLPOOL 1562ad89b2ab3c18b649611cb80014b1c3fc0c48eff3315b186cea83bd7a710e9e58ce86250607591b9fe89eefa94ef2327d03405ec73c2225f5588d550b41dd
 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_p20160817.ebuild 4418 SHA256 24202510f834d9f78673e01f15e5f82d3ad15c1d7edb9ced3e8bedcf473af617 SHA512 29efbc132d35e22bdfc95670c84deab3f76eacc9be05ed5dcb13fcba46b188c0509b5cbb9f1756a8a7b7b6f8e9bd2f1b9b5f5ad8013e782b0bd536a5def69717 WHIRLPOOL 6efb9b4d7d61b6814be54f72878fed44cffa67f0cd0534c5befd39e0034f94ef3b1702f4d87496de95a42391a91c0e294bc6ca5408e5e23acbe4e388fdc4af6f
 EBUILD netbeans-php-9999_p20160818.ebuild 4418 SHA256 a3825788b7ca0cd90363edd8d901811b8b4417eccab76350e71e3e95d355c7ca SHA512 0a13baa4a5ecff33be4a0050a2d9b5ed48bc54c734aa29bf2b6f0040f3a32936d6227cdf6983ad3899c2a3c5f178ac4485cb0c3c3a457d70091dab9437f24140 WHIRLPOOL f783e1e3a7ae10ea1d86b9744bc713b525e1123460d7cca486916166b16f0238d0766ab798a3862f6aa701f1bd8b5537d3728701364faa7233d8bd9a3bba10f5
 EBUILD netbeans-php-9999_p20160819.ebuild 4418 SHA256 c49b05e107987f835f48880c770c8c162009403771acaf8d973b9915dfb12fee SHA512 b51822691a5b53f73225191df6b1f551e3a9227ee08c34dc38bd7d2a54cf704079d159bf1698df2a95e81e510316e29a0e63113979bcefa8f9aaae3dd60e9dfd WHIRLPOOL c398d40a39babe6217142a5b104f46939982e7bdbd694747f0a57a861e313e142225a647578454a586b96e48e5d6abb346d1c4bd9e26dc8a4bcb901f466f8edf
 EBUILD netbeans-php-9999_p20160820.ebuild 4418 SHA256 a02dfa8d111ab2251826a90fa59e4a7e09afaddb88bd5ec565db34e263a877ee SHA512 6d79e434e5f765dcbc5800533d5dd2904f18709e37331f87017303179a678bdc1ff63696931fb168b5c55af4c297937c551be1f8552c89a4f265ac6bd4c0ab4a WHIRLPOOL 6cb33d051ee18cdf1fb684771e1e4362da426a5ba590ce1946125a6c4228b7fc2371652cedba7a95f3debec3a6c1a23657267ac2c78443599c96fa652cea90bc

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160817.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160817.ebuild
deleted file mode 100644
index 3a218d9..0000000
--- a/dev-java/netbeans-php/netbeans-php-9999_p20160817.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-08-17_00-02-33/zip/netbeans-trunk-nightly-201608170002-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 a5a251b..052a0e9 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-201608170002-src.zip 217171456 SHA256 92e2c114eb48f8a57a2eb0baa4f3b376386ae929952c276c5bfd2884c39e7687 SHA512 95d7a428999212ba0057f4d032ed43c57e4f7c65305aa87a64429b92af26699d34da7f52f5431b11c86f39bcd3163ec99c1b9f8c8f8903375de8c64b4565aa48 WHIRLPOOL ba6e5a8ff6d768e4ea9624956dc5059ed851b6e6754e567120e147a958080c8de8f2e924ae9d78daec2ac0b12c542d1b1da019be7df48dbc1b0b8ace35d371f7
 DIST netbeans-trunk-nightly-201608180002-src.zip 217176983 SHA256 399cd4897319eec9be51a12f78dc5d426c9e2998a2998714f02270628a25ef2a SHA512 1e91df2bd0d93512a8c6feaed669e851a43cdd8beffade2645327ed18555f6bcac1575e3e841bc0968f1b92c059d0929579215ad1ba7e1d0e619c642a87196e7 WHIRLPOOL a957bf53993cef447782ab81a3362a38f44902306e7a2e531f9ae9b19fd87f052db752acdc08a0879e09c0f4b71264e5dafc39f8ebff82dbf2fa984d5ebf6ab4
 DIST netbeans-trunk-nightly-201608190002-src.zip 217183203 SHA256 f6713dea080556eb625aedb6f666a701e414dc1046870b7bd20b03ec36272894 SHA512 8e5626cf8f2d165f0ae7e6a19f8a7b1c72cd8fd74f4fad8577fad479bb30279c681e2c99cc43f4280f493cff0b5ec1b237c9bbbbebed14e383fa762000cc996e WHIRLPOOL aeb17d882bef504580a61976b63ee1e28e88703ac8f486efc699203e1c5e1985758009679bc6b8407699d6645137060c97089b3efe742aa47d98d7bb47603ac0
 DIST netbeans-trunk-nightly-201608200002-src.zip 217192695 SHA256 58c11bc929ec29edace69c12ba7fd0c71b5d4386c20ab02e7f9dab0962d7752f SHA512 0ec2bc6e3298c1bf38f4217db43cc7a8221dd360cdac72b012d65aa924ff69f81a41267d58d207e80ff6a875a196064a29f6bde41ee6ce1ef1b04da238ae4185 WHIRLPOOL f64160c449ad5a19d7975f5b5d1694149d3f3afa2614adaedaebc5f2f7c490ff35be196ce287ff244936061b10b53868ddf31cf28e9ac50cdcc95b491a01c8fb
@@ -60,7 +59,6 @@ DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b257858522
 DIST netbeans-trunk-nightly-201609180002-src.zip 218003305 SHA256 fedad6cff03b24535492371a2c85a88680925659e3829ef2e0989f1ff17bae5a SHA512 278a4b6cdc5c3c7243e81d39796467631aab2539671dd5ec81a53d78b4e2dbe495a5390c9950c965b09ec7dcaa1ee3a83a58c686bebf392be6e22fe88c5fcd9b WHIRLPOOL 1562ad89b2ab3c18b649611cb80014b1c3fc0c48eff3315b186cea83bd7a710e9e58ce86250607591b9fe89eefa94ef2327d03405ec73c2225f5588d550b41dd
 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_p20160817.ebuild 9520 SHA256 9631a9df2c5689ca48a68b208c82dcc9d47de81096c79299f7cb753811cf969f SHA512 fe5f6b03e33f7aee30cae728eac4f267a6cef002202fa49b1fbdc5c19b97dfa61b763d3e25a5365788a0641716d8975c01e0425f4f33b8e92f3e984f71d51203 WHIRLPOOL e80b1e42a20caa6409ef170666a268924381037453bb64a3fb83447aa9d4fd5d6c191889c5ef40e6fc4c5b129b4be5dc0138deec335c0b2b126db1cf88c0d5da
 EBUILD netbeans-platform-9999_p20160818.ebuild 9520 SHA256 93551bd7b264d00e0632e35a1b464cb9259623d9f0ebaa21a701607e79434efa SHA512 6cf6a742b629ded018280be860a1f4f65c96d1c71029c10bce2606c7c77425bec2c4fb95423efbe6bf7ad17faa71b4241244777377c878eed0b958fd8dd8e866 WHIRLPOOL e45e4a20b8805bba0053e44c0a4b4342be80bfd3259f023de727b615d11a4719cb68741d571764c6ae41694fb835eb8ff9b61d325ac4adca3ed8436de9954319
 EBUILD netbeans-platform-9999_p20160819.ebuild 9520 SHA256 467a96bcdf19080213cd6431671979a120306d3cb4995d58e0cb25e07f13ebb4 SHA512 d5c9cf78af066224ef5363ccf83b8cae13d64f9f8b0bdda215ba189f2c388dfc1fa4b4c37d3eb865261fbc4eb87300d24e8f5bfe336b3148550c7b827464c50a WHIRLPOOL d3850b409dd1d15bdd5bb46fd2192d413e921aa8534783b0be98379e3667068c9c92e561d6bd0ee9a2c7c6ac58b58f501c6368cf351d5c2962067ec91fc1fa5e
 EBUILD netbeans-platform-9999_p20160820.ebuild 9520 SHA256 237f0d2de3ba373d83cac27c102534d31c7a5f8770cb1a68299fa60a457678d0 SHA512 f92ad71d1392a569b51a5b54dfb37947d812515de896192acc11a788503c8aa7f39305e7458053e88cfd9593a2a31ec4743fdacecf1454b2ac63b53222544a98 WHIRLPOOL 2a851ea18149104bd1ff53448fc53bbe12c32c04299797f24e05f05e95bd08fbc0349faece0dbee49dedf1fd6b646575feecc744a6270b0c1d23e931e042f1e5

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160817.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160817.ebuild
deleted file mode 100644
index f813846..0000000
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20160817.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-08-17_00-02-33/zip/netbeans-trunk-nightly-201608170002-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 076c269..048909a 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-201608170002-src.zip 217171456 SHA256 92e2c114eb48f8a57a2eb0baa4f3b376386ae929952c276c5bfd2884c39e7687 SHA512 95d7a428999212ba0057f4d032ed43c57e4f7c65305aa87a64429b92af26699d34da7f52f5431b11c86f39bcd3163ec99c1b9f8c8f8903375de8c64b4565aa48 WHIRLPOOL ba6e5a8ff6d768e4ea9624956dc5059ed851b6e6754e567120e147a958080c8de8f2e924ae9d78daec2ac0b12c542d1b1da019be7df48dbc1b0b8ace35d371f7
 DIST netbeans-trunk-nightly-201608180002-src.zip 217176983 SHA256 399cd4897319eec9be51a12f78dc5d426c9e2998a2998714f02270628a25ef2a SHA512 1e91df2bd0d93512a8c6feaed669e851a43cdd8beffade2645327ed18555f6bcac1575e3e841bc0968f1b92c059d0929579215ad1ba7e1d0e619c642a87196e7 WHIRLPOOL a957bf53993cef447782ab81a3362a38f44902306e7a2e531f9ae9b19fd87f052db752acdc08a0879e09c0f4b71264e5dafc39f8ebff82dbf2fa984d5ebf6ab4
 DIST netbeans-trunk-nightly-201608190002-src.zip 217183203 SHA256 f6713dea080556eb625aedb6f666a701e414dc1046870b7bd20b03ec36272894 SHA512 8e5626cf8f2d165f0ae7e6a19f8a7b1c72cd8fd74f4fad8577fad479bb30279c681e2c99cc43f4280f493cff0b5ec1b237c9bbbbebed14e383fa762000cc996e WHIRLPOOL aeb17d882bef504580a61976b63ee1e28e88703ac8f486efc699203e1c5e1985758009679bc6b8407699d6645137060c97089b3efe742aa47d98d7bb47603ac0
 DIST netbeans-trunk-nightly-201608200002-src.zip 217192695 SHA256 58c11bc929ec29edace69c12ba7fd0c71b5d4386c20ab02e7f9dab0962d7752f SHA512 0ec2bc6e3298c1bf38f4217db43cc7a8221dd360cdac72b012d65aa924ff69f81a41267d58d207e80ff6a875a196064a29f6bde41ee6ce1ef1b04da238ae4185 WHIRLPOOL f64160c449ad5a19d7975f5b5d1694149d3f3afa2614adaedaebc5f2f7c490ff35be196ce287ff244936061b10b53868ddf31cf28e9ac50cdcc95b491a01c8fb
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b257858522
 DIST netbeans-trunk-nightly-201609180002-src.zip 218003305 SHA256 fedad6cff03b24535492371a2c85a88680925659e3829ef2e0989f1ff17bae5a SHA512 278a4b6cdc5c3c7243e81d39796467631aab2539671dd5ec81a53d78b4e2dbe495a5390c9950c965b09ec7dcaa1ee3a83a58c686bebf392be6e22fe88c5fcd9b WHIRLPOOL 1562ad89b2ab3c18b649611cb80014b1c3fc0c48eff3315b186cea83bd7a710e9e58ce86250607591b9fe89eefa94ef2327d03405ec73c2225f5588d550b41dd
 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_p20160817.ebuild 3472 SHA256 dcef2cb007b3bebd393c0a2bd71ac747f146b6e6c77ec2787af1d088cd0d73b5 SHA512 ccc7f52b7186f4a3444466abf7b0c8fd6b3e16940da843019d6d411210becd2acf881ff6b8f4b912ebfa415c5d2f5a0cc2327f1db8a985bd3f152529bf876cbf WHIRLPOOL 57991935e467572843e60fa1bd478ab01adf249eaf1377f6580479121516c1117a086ad87f908863acb999c79d4bf45a86156e870b4ce5a6cc7b51cad9c46cb2
 EBUILD netbeans-profiler-9999_p20160818.ebuild 3472 SHA256 9657770c174624553ddde7f6a1ef54cfc90bdc285cc1138e3aeb324e8981b135 SHA512 21c03435bc3ce441840e5e554d307d1a4a7439c130426169c6b5b88bb7817de30547fb5a77e03032269cb413c10ee82b0880f0608d4fca21eca01bbdc410e5fe WHIRLPOOL 69172ad7ce81fe7be5b673ddcd1a34f617325c64b0ec62ea2c6651f2d4eb222a8b79f27f55e2bcdc1cf7c8cff45e879670aae88f66212f757823d2b73760b946
 EBUILD netbeans-profiler-9999_p20160819.ebuild 3472 SHA256 a78c557594434faeed55755bf97f6c37d7c85d7f9bdf1ead5d05ccf91ced282c SHA512 65755397ee56b849c28087ba79dd072d20c3b89fbf069115ff60cef1a0d3047232437cb31c838232df9d2953efb38293ab961b9ce2d133065a0ddc1ff87901e9 WHIRLPOOL 0ee59e0048651bd1626e952b3434b38809b332bdab8469bf598e288ca95df993962f89d5658cf04d1d87438440a3fb4e275044c599bc35bdc490a287358f7ee9
 EBUILD netbeans-profiler-9999_p20160820.ebuild 3472 SHA256 495d79a036458942ccf1e0973b4d66038db634977abf82aea51cc77725578194 SHA512 a58c7228f632db14e813be3d635c2fb0ff21c629e6f6c36846a8093a1d84543c87f5a31c30f33fb368f74d678fc42a098c31712e1acdd0352efcdb92ac97615a WHIRLPOOL 77a7e5e69a54f5186d6b21383dd369140c46b7e523fcc37622e853f36199a238272da9465de3636cd1e6570213c0cffc398f7766dbb94c6c3e465b218b84f1b7

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160817.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160817.ebuild
deleted file mode 100644
index 3bde24a..0000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160817.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-08-17_00-02-33/zip/netbeans-trunk-nightly-201608170002-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 0e0a473..a429ab7 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-201608170002-src.zip 217171456 SHA256 92e2c114eb48f8a57a2eb0baa4f3b376386ae929952c276c5bfd2884c39e7687 SHA512 95d7a428999212ba0057f4d032ed43c57e4f7c65305aa87a64429b92af26699d34da7f52f5431b11c86f39bcd3163ec99c1b9f8c8f8903375de8c64b4565aa48 WHIRLPOOL ba6e5a8ff6d768e4ea9624956dc5059ed851b6e6754e567120e147a958080c8de8f2e924ae9d78daec2ac0b12c542d1b1da019be7df48dbc1b0b8ace35d371f7
 DIST netbeans-trunk-nightly-201608180002-src.zip 217176983 SHA256 399cd4897319eec9be51a12f78dc5d426c9e2998a2998714f02270628a25ef2a SHA512 1e91df2bd0d93512a8c6feaed669e851a43cdd8beffade2645327ed18555f6bcac1575e3e841bc0968f1b92c059d0929579215ad1ba7e1d0e619c642a87196e7 WHIRLPOOL a957bf53993cef447782ab81a3362a38f44902306e7a2e531f9ae9b19fd87f052db752acdc08a0879e09c0f4b71264e5dafc39f8ebff82dbf2fa984d5ebf6ab4
 DIST netbeans-trunk-nightly-201608190002-src.zip 217183203 SHA256 f6713dea080556eb625aedb6f666a701e414dc1046870b7bd20b03ec36272894 SHA512 8e5626cf8f2d165f0ae7e6a19f8a7b1c72cd8fd74f4fad8577fad479bb30279c681e2c99cc43f4280f493cff0b5ec1b237c9bbbbebed14e383fa762000cc996e WHIRLPOOL aeb17d882bef504580a61976b63ee1e28e88703ac8f486efc699203e1c5e1985758009679bc6b8407699d6645137060c97089b3efe742aa47d98d7bb47603ac0
 DIST netbeans-trunk-nightly-201608200002-src.zip 217192695 SHA256 58c11bc929ec29edace69c12ba7fd0c71b5d4386c20ab02e7f9dab0962d7752f SHA512 0ec2bc6e3298c1bf38f4217db43cc7a8221dd360cdac72b012d65aa924ff69f81a41267d58d207e80ff6a875a196064a29f6bde41ee6ce1ef1b04da238ae4185 WHIRLPOOL f64160c449ad5a19d7975f5b5d1694149d3f3afa2614adaedaebc5f2f7c490ff35be196ce287ff244936061b10b53868ddf31cf28e9ac50cdcc95b491a01c8fb
@@ -53,7 +52,6 @@ DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b257858522
 DIST netbeans-trunk-nightly-201609180002-src.zip 218003305 SHA256 fedad6cff03b24535492371a2c85a88680925659e3829ef2e0989f1ff17bae5a SHA512 278a4b6cdc5c3c7243e81d39796467631aab2539671dd5ec81a53d78b4e2dbe495a5390c9950c965b09ec7dcaa1ee3a83a58c686bebf392be6e22fe88c5fcd9b WHIRLPOOL 1562ad89b2ab3c18b649611cb80014b1c3fc0c48eff3315b186cea83bd7a710e9e58ce86250607591b9fe89eefa94ef2327d03405ec73c2225f5588d550b41dd
 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_p20160817.ebuild 6242 SHA256 1fb671304c8287ca3e256d530d3c5abbd3a40a553d9f912abde7e6cb563a0a9c SHA512 6b960ccebd851b755f23938ecac41aa41ddd361cba6f4716f20d5ab2a328dc05000f7a102224e475b8a952f600374e446e3a191a4566801c253fd431653f5316 WHIRLPOOL f57955a57af90f8d6cb68f17567069d31e30dd60d5f9bb31d9dbff59287a68f9e8f9fcd77fceb453c4e237d596409c034b35770ef8ea5a3f0c0ae1c8c7c7aca4
 EBUILD netbeans-webcommon-9999_p20160818.ebuild 6242 SHA256 7b9f74bbeb9be47bbc9df8c1f1b3add3869b466fdfd65fa12b46dd77284ad3c2 SHA512 17c25c35372d3b1e9947f33c1369139113311491ddee03b2cf3d3132731269e7211b9c0da0ee733cb3c53f82997b330cccc331258c9b7139f0a3ceca76191d05 WHIRLPOOL 23257ee779ee85e1530fc2546c3c106b666d686a487eea85544f87347869edf5d23151886af63821da571075a2deec61957a087070a7d1c564c64df243ce2f6c
 EBUILD netbeans-webcommon-9999_p20160819.ebuild 6242 SHA256 186c796b327ba19eae619f25019923da146bd331c912e30b7b672e741c168643 SHA512 b87f8069224a66f0ac92224ec4b76990279b1524718a7833b5e515d1df6da4b5d4fc7b7151aadfbfb7b7f949ee69dae1745990a08ce7f9e6e60bd418ca80cddd WHIRLPOOL e84525c664665e3bb4fa8d8c257e144fd663a9094a692d92e2bbebae3f3539c6b4d549a2bedd4f2a462e431819826a6bdeaa13c4a28a2c007425dba9292fbdd0
 EBUILD netbeans-webcommon-9999_p20160820.ebuild 6242 SHA256 8362d56194d241cf8714b25fe233f548c1231315d2fc78b59935e35e116aff71 SHA512 e13e7f4e9e89431763a6108c80aef7a872416c8b41e4ed1227ca7e0f6ea875f89e02484a7a55df3044ab3590f0bb9755605b1542050b3ff7ae352be25e28e474 WHIRLPOOL e775b08a4500140ae79e8360219075b87b3817e3093bf78b1272f9c4fb0b2ec3e3fcb2036da3cfff728c4cd36484dfee268f9b390856f3a530072727fbec818a

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160817.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160817.ebuild
deleted file mode 100644
index d3b7802..0000000
--- a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160817.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-08-17_00-02-33/zip/netbeans-trunk-nightly-201608170002-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 8d99e35..449a439 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-201608170002-src.zip 217171456 SHA256 92e2c114eb48f8a57a2eb0baa4f3b376386ae929952c276c5bfd2884c39e7687 SHA512 95d7a428999212ba0057f4d032ed43c57e4f7c65305aa87a64429b92af26699d34da7f52f5431b11c86f39bcd3163ec99c1b9f8c8f8903375de8c64b4565aa48 WHIRLPOOL ba6e5a8ff6d768e4ea9624956dc5059ed851b6e6754e567120e147a958080c8de8f2e924ae9d78daec2ac0b12c542d1b1da019be7df48dbc1b0b8ace35d371f7
 DIST netbeans-trunk-nightly-201608180002-src.zip 217176983 SHA256 399cd4897319eec9be51a12f78dc5d426c9e2998a2998714f02270628a25ef2a SHA512 1e91df2bd0d93512a8c6feaed669e851a43cdd8beffade2645327ed18555f6bcac1575e3e841bc0968f1b92c059d0929579215ad1ba7e1d0e619c642a87196e7 WHIRLPOOL a957bf53993cef447782ab81a3362a38f44902306e7a2e531f9ae9b19fd87f052db752acdc08a0879e09c0f4b71264e5dafc39f8ebff82dbf2fa984d5ebf6ab4
 DIST netbeans-trunk-nightly-201608190002-src.zip 217183203 SHA256 f6713dea080556eb625aedb6f666a701e414dc1046870b7bd20b03ec36272894 SHA512 8e5626cf8f2d165f0ae7e6a19f8a7b1c72cd8fd74f4fad8577fad479bb30279c681e2c99cc43f4280f493cff0b5ec1b237c9bbbbebed14e383fa762000cc996e WHIRLPOOL aeb17d882bef504580a61976b63ee1e28e88703ac8f486efc699203e1c5e1985758009679bc6b8407699d6645137060c97089b3efe742aa47d98d7bb47603ac0
 DIST netbeans-trunk-nightly-201608200002-src.zip 217192695 SHA256 58c11bc929ec29edace69c12ba7fd0c71b5d4386c20ab02e7f9dab0962d7752f SHA512 0ec2bc6e3298c1bf38f4217db43cc7a8221dd360cdac72b012d65aa924ff69f81a41267d58d207e80ff6a875a196064a29f6bde41ee6ce1ef1b04da238ae4185 WHIRLPOOL f64160c449ad5a19d7975f5b5d1694149d3f3afa2614adaedaebc5f2f7c490ff35be196ce287ff244936061b10b53868ddf31cf28e9ac50cdcc95b491a01c8fb
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b257858522
 DIST netbeans-trunk-nightly-201609180002-src.zip 218003305 SHA256 fedad6cff03b24535492371a2c85a88680925659e3829ef2e0989f1ff17bae5a SHA512 278a4b6cdc5c3c7243e81d39796467631aab2539671dd5ec81a53d78b4e2dbe495a5390c9950c965b09ec7dcaa1ee3a83a58c686bebf392be6e22fe88c5fcd9b WHIRLPOOL 1562ad89b2ab3c18b649611cb80014b1c3fc0c48eff3315b186cea83bd7a710e9e58ce86250607591b9fe89eefa94ef2327d03405ec73c2225f5588d550b41dd
 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_p20160817.ebuild 2721 SHA256 a16f4a7c9c0a480d6862046a5a0be79adf710a95e516c78c09e2567a19ac49b8 SHA512 016ca95de81792d71393bec96e8c280d3b815d60bd58a760d3882c85fa7d790c6e2123a94d9e391f8355f21197082c0920d91b2140948ce5502a85c060be07f2 WHIRLPOOL 18d49b08327e8af6da48269283446b61d05b3b97408545c8ef2faba26e3c525e6b3712fe9a8260f1f1d50c7a79a21f1df50abe9a2a6d912186cad9e2072f3809
 EBUILD netbeans-websvccommon-9999_p20160818.ebuild 2721 SHA256 4dd81fae6b29485b78baae91b3cc544ab58d4429fc2a7064ba91ae05a7227f16 SHA512 a36bd355acd387e9f45fe21b91432e8036199d18ddf2530dcc620ea0e657ab16ce9185d8481bfc64edc8b0f2fff60ab5a2070134e275c92d66d8fbac76fe234c WHIRLPOOL 84cbca2ef66319f65bcf31e0ef43eef4f58ff9650cced39a0b9a08de2fe86145264da26f21701aee55d04604ad7a9855c060a7c3015a878f8cd28a0dcc09ba7d
 EBUILD netbeans-websvccommon-9999_p20160819.ebuild 2721 SHA256 1d880fd90b5b1ec2d50ac8b394006a5352f0bcf4a8907018ce0aec0a53b4d21e SHA512 d4beae145a7ee5ffb5631015309c1e18c37f92af3700568362fa7457fa3b1bcfbe0e9ce4c73984978c44366c6f0fbae5bd20aef744cfa8ff7c99dc8e8c0a8a87 WHIRLPOOL 7cd85b3b46efae362b8cad50877dffdf915c4bcfd37024c6915bfd3501bdc2e53376fd0e171b611f97c172daa2cccebde6ba85422daa313e63c65f83a89fa2a2
 EBUILD netbeans-websvccommon-9999_p20160820.ebuild 2721 SHA256 e826b7b5f69b1bdfd2a81448905f9d85178404a7516eefa44f6e7cf2215a2a1f SHA512 3c3ee34907f65d7c3a18fd71ec935c8dcafa31b2e3470d10a29d69d44bf0266f1b775307435a683e116d5b51283fdd4152bfc1ea9e6ba0ee7297678ed5c05d4f WHIRLPOOL c6217999392726563069d179e438e7857f684cd5cd4469992f9ee144ed752e35ad2634cbdca64a4a00971a9215731ad47b895881287d80a311f5099c266096b5

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160817.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160817.ebuild
deleted file mode 100644
index c8a2a29..0000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160817.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-08-17_00-02-33/zip/netbeans-trunk-nightly-201608170002-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 582aff4..b1b4521 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-201608170002-src.zip 217171456 SHA256 92e2c114eb48f8a57a2eb0baa4f3b376386ae929952c276c5bfd2884c39e7687 SHA512 95d7a428999212ba0057f4d032ed43c57e4f7c65305aa87a64429b92af26699d34da7f52f5431b11c86f39bcd3163ec99c1b9f8c8f8903375de8c64b4565aa48 WHIRLPOOL ba6e5a8ff6d768e4ea9624956dc5059ed851b6e6754e567120e147a958080c8de8f2e924ae9d78daec2ac0b12c542d1b1da019be7df48dbc1b0b8ace35d371f7
 DIST netbeans-trunk-nightly-201608180002-src.zip 217176983 SHA256 399cd4897319eec9be51a12f78dc5d426c9e2998a2998714f02270628a25ef2a SHA512 1e91df2bd0d93512a8c6feaed669e851a43cdd8beffade2645327ed18555f6bcac1575e3e841bc0968f1b92c059d0929579215ad1ba7e1d0e619c642a87196e7 WHIRLPOOL a957bf53993cef447782ab81a3362a38f44902306e7a2e531f9ae9b19fd87f052db752acdc08a0879e09c0f4b71264e5dafc39f8ebff82dbf2fa984d5ebf6ab4
 DIST netbeans-trunk-nightly-201608190002-src.zip 217183203 SHA256 f6713dea080556eb625aedb6f666a701e414dc1046870b7bd20b03ec36272894 SHA512 8e5626cf8f2d165f0ae7e6a19f8a7b1c72cd8fd74f4fad8577fad479bb30279c681e2c99cc43f4280f493cff0b5ec1b237c9bbbbebed14e383fa762000cc996e WHIRLPOOL aeb17d882bef504580a61976b63ee1e28e88703ac8f486efc699203e1c5e1985758009679bc6b8407699d6645137060c97089b3efe742aa47d98d7bb47603ac0
 DIST netbeans-trunk-nightly-201608200002-src.zip 217192695 SHA256 58c11bc929ec29edace69c12ba7fd0c71b5d4386c20ab02e7f9dab0962d7752f SHA512 0ec2bc6e3298c1bf38f4217db43cc7a8221dd360cdac72b012d65aa924ff69f81a41267d58d207e80ff6a875a196064a29f6bde41ee6ce1ef1b04da238ae4185 WHIRLPOOL f64160c449ad5a19d7975f5b5d1694149d3f3afa2614adaedaebc5f2f7c490ff35be196ce287ff244936061b10b53868ddf31cf28e9ac50cdcc95b491a01c8fb
@@ -37,7 +36,6 @@ DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b257858522
 DIST netbeans-trunk-nightly-201609180002-src.zip 218003305 SHA256 fedad6cff03b24535492371a2c85a88680925659e3829ef2e0989f1ff17bae5a SHA512 278a4b6cdc5c3c7243e81d39796467631aab2539671dd5ec81a53d78b4e2dbe495a5390c9950c965b09ec7dcaa1ee3a83a58c686bebf392be6e22fe88c5fcd9b WHIRLPOOL 1562ad89b2ab3c18b649611cb80014b1c3fc0c48eff3315b186cea83bd7a710e9e58ce86250607591b9fe89eefa94ef2327d03405ec73c2225f5588d550b41dd
 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_p20160817.ebuild 6939 SHA256 8c49c8a050378d29c13d679b250f06c94b5b82a42e93237bb159446e5018c369 SHA512 79b092f5fde288ca0878cf415a6f1e7eff33d5ed3dd32b697eee8a1dda19d9e062a0786f3159fee1f38487d20c76a38442c57d3f732655d6eea0f71c8ad02b81 WHIRLPOOL 829147c10d51d4c4d0ae6bdafa2d25678a9f2af3b902d634423629a3af75ffc1c5bf697bcfd07626171503911b37b422e1dcc4de49454549bcd04efcec10bac5
 EBUILD netbeans-9999_p20160818.ebuild 6939 SHA256 a4000efc4bcd7ff9e8390b4b872cf6cf4074e05dfaf8334e95decaf1c776afda SHA512 55d43cac6ad7d3bf5aa65ae15a7bef222de0ec1700a2ac81c4341c1deecbe22e28e7b90986f5d17a8230ab0a754276148b327a0a1faaf23dc9b7915291d22035 WHIRLPOOL 37ae67a406cdb75f4f618c42be4141bb1f58ab335338a126a27dc42cd518ded5edc7205f052f0b48ff5a1c786cc7b481693f01cb2ce6cb84b151fd2ef900b39e
 EBUILD netbeans-9999_p20160819.ebuild 6939 SHA256 a6afce49f4695af09e951402f6be4cf70db6c528c97f54ec9e92de7b1a5fe493 SHA512 225a1c91a5951784c02955fa0e562845dfc543459869bd5db0eb580315b0e37c3acab594bf28812c13b3b9a01d3cdbf08568e1eff16ee87f644b897ad3ac54b6 WHIRLPOOL 2dfbf7de2d859c17401975c3bcac5fe06051c4111e296daa0226a50a66d76a8833d02a2e3d41eab3cbb35130687ff618dcab66692e905b3c126c06fb8561e8fe
 EBUILD netbeans-9999_p20160820.ebuild 6939 SHA256 2e72bdb8796ed05ccbf2aa3a59d44961b429ab4ab6d78e40682e699d2ff4c679 SHA512 c8f407747102ceafe8b6987fe5cdbee52e98d166368fadd9d3a18ca7f10bc31de2a0305172527f5891f561a2bfba59a28b56f1c59225a9c98e489ab0504796ec WHIRLPOOL d5eaac4b5153edda526645cf7ad8ac6dee20c6243dfc0981a969434e90f5652b38f062f79680df75121bdb661af9ee33b926cc5a3fecfff2a5f33d6d1ab80243

diff --git a/dev-util/netbeans/netbeans-9999_p20160817.ebuild b/dev-util/netbeans/netbeans-9999_p20160817.ebuild
deleted file mode 100644
index 5e11822..0000000
--- a/dev-util/netbeans/netbeans-9999_p20160817.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-08-17_00-02-33/zip/netbeans-trunk-nightly-201608170002-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] 4+ messages in thread

end of thread, other threads:[~2016-09-19  9:12 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-19  9:11 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-enterprise/, dev-java/netbeans-javadoc/, Miroslav Šulc
  -- strict thread matches above, loose matches on Subject: below --
2016-07-11  7:55 Miroslav Šulc
2016-06-30  8:27 Miroslav Šulc
2016-05-08  6:34 Miroslav Šulc

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