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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

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

commit:     59605d71c93f5e68f93e6dc5c62b8bb8ced7fd5d
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 18 11:19:39 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Sep 18 11:19:39 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=59605d71

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.3.0

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 84afe8a..7dd1db1 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318b
 DIST netbeans-trunk-nightly-201609150002-src.zip 218016283 SHA256 90b7a4a97f9328512ad9388caab30b88290338dcd87e90d7b20c1568b679a11e SHA512 bc398e865c55547752f8ac05ed2de3c22eff9d5b7c204f28ecd30d1a1d11bda9276454d505d12f5a951d88c40a160a1dad15fc62ab39a6d350d0ba45af4df299 WHIRLPOOL 283749fe3c678341d9489fea580e7af7bec404507be57bd264d4a3673b8b5660a729c5a3f96da2adbeee1fa10fe3205e486c6186f01dcb5fa05f93627bc646de
 DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72fbb6102c07095a61e6cc10066c5fff94a3abfebe2852484e31e SHA512 e41d80df015b84f2faf8811a8fd242f85c72e39867161d236ef0242062568c6fd163bf46a623f4a14779e9d89a49b6a2d88691487a5ec785eece6c7f70459ffa WHIRLPOOL e42fac6f885c4fd1c2bc030cf47aa82ec4e35f66d305e8dd06d6a439ca958074ce57ae761b7ee16e4612dc5f94bedd7fe4655463ab4a7c095e03f41d4fc686f1
 DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b2578585227423c94ebeb38b7bdfacac7a284cd29808d0d63373c845f55b SHA512 73d44db142dadeb4df6cba0b4c0308de49620f4f08d07297eb31b171a8923c0515bbcd45eea8c4b30ca8919b6b169a61e1c696d3381e303dd3249ad4c864d2f6 WHIRLPOOL 88be2575993c7773534f1c20d52ce9cc56d57ab7abcb31276e4d64f9d89c0df1bc2545294a7b7d7ac1bf043cb9c890f61a05f7d9648c7a83fa0f2171cad91a74
+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
@@ -61,4 +62,5 @@ EBUILD netbeans-apisupport-9999_p20160914.ebuild 3384 SHA256 4537e6cfee06dc9a578
 EBUILD netbeans-apisupport-9999_p20160915.ebuild 3384 SHA256 aed29e4d1d8f81085aa769f4cac54ec863a96abd448243215356f51ec1b06c3a SHA512 811077f6630288c9c2cd0db91a2f0ac2ae1cf445e3f46ffe3ff60bb30b0a2599dcdf2a101aa68a14b3e70cd445db6b15bdca307aef0ec7404ba11fb0a13c8a29 WHIRLPOOL 405a5b317abee07646a317c66e448a3a7177b1ed264883032ec72e8ef81d0fb984173d47e0c1da18ca54b802480245b75ae1ca9fada8c518c0d1590aa4de6a0e
 EBUILD netbeans-apisupport-9999_p20160916.ebuild 3384 SHA256 3889204ea270ade6c09602136094ed819c25293a329c90010e0d34b94cf424c7 SHA512 7e31e9800d0b9ca39222d282b8944a494df33d3966f80d5d5141872126ad3e9b826a5a773cb9c6032a12783f0e3e7294f9460aa823ac4d6e1568b1aaab2cdc07 WHIRLPOOL 2dc79881999b33c33bdf5ad514a0a958cc85cf113686dc3835ddcde9ea4ac714932a62cd8b59de91500c770590fffb2bdd9f00883c08a7ac69016df5cf5b9be3
 EBUILD netbeans-apisupport-9999_p20160917.ebuild 3384 SHA256 2e6a95690703a542f0da950bb97c9873e6fc9e3538b1fb66924f7697bbb7e4d3 SHA512 322d8e3769b55deb3311b434339cf2a5fe74af0a5a5c5db87316e81d797c507a47457e7faa04c120caf4f01abd5328486122f27f28d82f167b8e1361c4d8c129 WHIRLPOOL 205d12177c4397de70e454d8f881a312aa1e1259d5802b574a10219ead62714a6ba9d8bb0dd009ca2e6bf22686e93f963032986a54b5895d5ade1c098c79d2ee
+EBUILD netbeans-apisupport-9999_p20160918.ebuild 3384 SHA256 7bdd9f10c955d44eeee19ddc6a1b0cb2f421e4a96ed9a0939dd638f53f4c2f8e SHA512 adc91f7d97eec1419f6798609de9f3f1d1fe02a3dc0868eb1581c81d618831a4c53cb48e2abcb3e6bb88bf0feaf7963a01b5245296ea5a886cceda0af0cbeb15 WHIRLPOOL 5c480767694fe2b15384d377d00a49080875b5a4f1db33e0151beee0fa6cd923aaf8a8ba6e45ffcd7c3e6c53c6191add8def247bc6656f83055f0c7f50b4517e
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160918.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160918.ebuild
new file mode 100644
index 0000000..2500644
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160918.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-09-18_00-02-33/zip/netbeans-trunk-nightly-201609180002-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 d60e114..e2869ad 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -46,6 +46,7 @@ DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318b
 DIST netbeans-trunk-nightly-201609150002-src.zip 218016283 SHA256 90b7a4a97f9328512ad9388caab30b88290338dcd87e90d7b20c1568b679a11e SHA512 bc398e865c55547752f8ac05ed2de3c22eff9d5b7c204f28ecd30d1a1d11bda9276454d505d12f5a951d88c40a160a1dad15fc62ab39a6d350d0ba45af4df299 WHIRLPOOL 283749fe3c678341d9489fea580e7af7bec404507be57bd264d4a3673b8b5660a729c5a3f96da2adbeee1fa10fe3205e486c6186f01dcb5fa05f93627bc646de
 DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72fbb6102c07095a61e6cc10066c5fff94a3abfebe2852484e31e SHA512 e41d80df015b84f2faf8811a8fd242f85c72e39867161d236ef0242062568c6fd163bf46a623f4a14779e9d89a49b6a2d88691487a5ec785eece6c7f70459ffa WHIRLPOOL e42fac6f885c4fd1c2bc030cf47aa82ec4e35f66d305e8dd06d6a439ca958074ce57ae761b7ee16e4612dc5f94bedd7fe4655463ab4a7c095e03f41d4fc686f1
 DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b2578585227423c94ebeb38b7bdfacac7a284cd29808d0d63373c845f55b SHA512 73d44db142dadeb4df6cba0b4c0308de49620f4f08d07297eb31b171a8923c0515bbcd45eea8c4b30ca8919b6b169a61e1c696d3381e303dd3249ad4c864d2f6 WHIRLPOOL 88be2575993c7773534f1c20d52ce9cc56d57ab7abcb31276e4d64f9d89c0df1bc2545294a7b7d7ac1bf043cb9c890f61a05f7d9648c7a83fa0f2171cad91a74
+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
@@ -76,4 +77,5 @@ EBUILD netbeans-cnd-9999_p20160914.ebuild 4790 SHA256 b510ebf0cbb0c05ddd00d1d628
 EBUILD netbeans-cnd-9999_p20160915.ebuild 4790 SHA256 cf96614d95d6f6db17b622f13460846d133bdd23e2a2b6ab3a548721bac2548d SHA512 b04a36e9fb6e16c5fda9ed8e582bf6bea38521200af9ed82438f6493c261108dbcfc448c2109ffb7e189405a3ed2844c13111e80dca64e9fc4aa2f28dba5ab47 WHIRLPOOL cc48361d8fd145b090fe035a36c80ac1d49f6c9a85e38594d4e5fce49a77595aed337c94f50d2a8d6a8b8ddcfb777b18a08931ef6797bbbde7f8c7ef33e9d009
 EBUILD netbeans-cnd-9999_p20160916.ebuild 4790 SHA256 d25ea0c2be63b12e629d0563636b43d52136995f3965233081a905aeb2edb578 SHA512 e23212e59722eb46cc133da77d124e1f842ccac6d496effe88d3a55ce3ec85583594b6f6197b144f1548e37634830fa62a0cfeff538a430bb6843f357b2a3061 WHIRLPOOL 3c3befa6f7dfe21151aeb43c2ac10facb988db6175b3a6995f126b661c7c2fa14516e5998244a893cebc4d1b8980bcf43976dc9321d44f3a22bfdc7eab885ff2
 EBUILD netbeans-cnd-9999_p20160917.ebuild 4790 SHA256 54ed2e83b69414926855bea633f4b995a7f3b30730e35829de1ff25912c2878c SHA512 6a7e047f2e49c27be5e1710660492204fa2490d3c0b0c79a7a547e865ec4a0639c9394063381a27b3e1d637af4cb001d2fc58ce52e0518c3d7abb8143a29463d WHIRLPOOL c19ba7621b962cdf9d3d0d73c20f33d26b587d0456105486b8743c7ef3594602289736df7f4edd99617a9ba391d6ed3e18d0f3121d83657b10f252e07060e5fb
+EBUILD netbeans-cnd-9999_p20160918.ebuild 4790 SHA256 536465e04ce620e332ce9d492ca8eca99fe97d2e3ad8f0767b80dadfa02c85c0 SHA512 953ad6fb57df82a0fb2efb29a590654be9d57f8d34cc50f3a39d0112797acd08c6017c5ec525efb869e65f8a950827f7c378e6f23cb89581cd665c841909202f WHIRLPOOL 438caf5d5044c6e107e03620cb9de091171161bcc585ff602ab207d67dbf35b8dafb9a2e2eb3a2f0eb0ddb15b2907fe32210e8a88df78265176fabf29e5a2920
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160918.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160918.ebuild
new file mode 100644
index 0000000..3ba6d1a
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160918.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-09-18_00-02-33/zip/netbeans-trunk-nightly-201609180002-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/D43D5D67A1D7DC1E62ABA7C01F90BEFFD8A74A65-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}"/D43D5D67A1D7DC1E62ABA7C01F90BEFFD8A74A65-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 3af4282..0f24e6b 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318b
 DIST netbeans-trunk-nightly-201609150002-src.zip 218016283 SHA256 90b7a4a97f9328512ad9388caab30b88290338dcd87e90d7b20c1568b679a11e SHA512 bc398e865c55547752f8ac05ed2de3c22eff9d5b7c204f28ecd30d1a1d11bda9276454d505d12f5a951d88c40a160a1dad15fc62ab39a6d350d0ba45af4df299 WHIRLPOOL 283749fe3c678341d9489fea580e7af7bec404507be57bd264d4a3673b8b5660a729c5a3f96da2adbeee1fa10fe3205e486c6186f01dcb5fa05f93627bc646de
 DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72fbb6102c07095a61e6cc10066c5fff94a3abfebe2852484e31e SHA512 e41d80df015b84f2faf8811a8fd242f85c72e39867161d236ef0242062568c6fd163bf46a623f4a14779e9d89a49b6a2d88691487a5ec785eece6c7f70459ffa WHIRLPOOL e42fac6f885c4fd1c2bc030cf47aa82ec4e35f66d305e8dd06d6a439ca958074ce57ae761b7ee16e4612dc5f94bedd7fe4655463ab4a7c095e03f41d4fc686f1
 DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b2578585227423c94ebeb38b7bdfacac7a284cd29808d0d63373c845f55b SHA512 73d44db142dadeb4df6cba0b4c0308de49620f4f08d07297eb31b171a8923c0515bbcd45eea8c4b30ca8919b6b169a61e1c696d3381e303dd3249ad4c864d2f6 WHIRLPOOL 88be2575993c7773534f1c20d52ce9cc56d57ab7abcb31276e4d64f9d89c0df1bc2545294a7b7d7ac1bf043cb9c890f61a05f7d9648c7a83fa0f2171cad91a74
+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
@@ -66,4 +67,5 @@ EBUILD netbeans-dlight-9999_p20160914.ebuild 2968 SHA256 072e43985e31ca09e34d5aa
 EBUILD netbeans-dlight-9999_p20160915.ebuild 2968 SHA256 dca99b70790183cea4149fed0864b1aaac3dcd95dddb02eccea960d8c9604765 SHA512 d6afa671a26ceb31bd7f877df9942f783b6d2c322cee8be35a18b48227fa748062436381fef8347347e90d1a806e24c2a400018c93d166fd75f129f074005605 WHIRLPOOL d66fbe2a91ec249f697e0fea3e099d61f8e08ee5352c7ead10c12c1571bb9cf646ee9a4da9884c9e9b61382e6626c958613bc3c25f568f00be144e35f56ba00a
 EBUILD netbeans-dlight-9999_p20160916.ebuild 2968 SHA256 8e252c6856e0f8b68d44bfd785f6588974ba79dfd52f10ec3e8f6516fc044faf SHA512 1618f85689b552992b632286ae6189147ef198afdbc109bbb2e0289535604b77c48c7899ebfa4b41e7c7d725898b34a56ff1e31c233134b185e2dc34596db152 WHIRLPOOL 8806afd784fe0a4ead3d18fcb47a23ffffb16d1ed5f0493d7d2840145c73b40106f00af5b229b9b7588a2c109d8c90bc497ae41f5d63017fad1e2ca9441331f9
 EBUILD netbeans-dlight-9999_p20160917.ebuild 2968 SHA256 487daa43b1784c78e0a28091cc0348e9f126014c830a6e305aff88fe24bd4c1e SHA512 94fb4b34302227dca3753baa85380a21d37b1b60300eeff5b4df600709c39a5769cf29a6820f73640f1645129f9f9e77ad86e7556df1409641e7e5cfc690ffbc WHIRLPOOL a637afc7282197c30fe35e9342e5ba5cd96a4794010a75561c5011e5a34c5b33078199354b094b94fa0744f4fa8213fccc17c14679d834114e673e775167ed10
+EBUILD netbeans-dlight-9999_p20160918.ebuild 2968 SHA256 d03049c78bcbce44760a6f0a183a996552ac12677d35183934db13eb2f33ea8f SHA512 cde7ffc171c2a5d4452464e8cb76bb1509fb6efe17b0eca62c4045638c8d38e4692cef9d3279d8f1e88b4ddda97b5108b56bdc5866c4696743f1c9ebede6df63 WHIRLPOOL 034e2e588dbd077f809f20571da613ccc883455a6c86c2e73a649a2eec15e1d9e482432e96dea91a0dacf4d3e472b407b17d1ec65ce88afce5f43aee9f96cbb8
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160918.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160918.ebuild
new file mode 100644
index 0000000..e2bc95c
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160918.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-09-18_00-02-33/zip/netbeans-trunk-nightly-201609180002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/18E39A0D10357B72EDB76F2070E27019317792F1-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}"/18E39A0D10357B72EDB76F2070E27019317792F1-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 b613956..17b990b 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -63,6 +63,7 @@ DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318b
 DIST netbeans-trunk-nightly-201609150002-src.zip 218016283 SHA256 90b7a4a97f9328512ad9388caab30b88290338dcd87e90d7b20c1568b679a11e SHA512 bc398e865c55547752f8ac05ed2de3c22eff9d5b7c204f28ecd30d1a1d11bda9276454d505d12f5a951d88c40a160a1dad15fc62ab39a6d350d0ba45af4df299 WHIRLPOOL 283749fe3c678341d9489fea580e7af7bec404507be57bd264d4a3673b8b5660a729c5a3f96da2adbeee1fa10fe3205e486c6186f01dcb5fa05f93627bc646de
 DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72fbb6102c07095a61e6cc10066c5fff94a3abfebe2852484e31e SHA512 e41d80df015b84f2faf8811a8fd242f85c72e39867161d236ef0242062568c6fd163bf46a623f4a14779e9d89a49b6a2d88691487a5ec785eece6c7f70459ffa WHIRLPOOL e42fac6f885c4fd1c2bc030cf47aa82ec4e35f66d305e8dd06d6a439ca958074ce57ae761b7ee16e4612dc5f94bedd7fe4655463ab4a7c095e03f41d4fc686f1
 DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b2578585227423c94ebeb38b7bdfacac7a284cd29808d0d63373c845f55b SHA512 73d44db142dadeb4df6cba0b4c0308de49620f4f08d07297eb31b171a8923c0515bbcd45eea8c4b30ca8919b6b169a61e1c696d3381e303dd3249ad4c864d2f6 WHIRLPOOL 88be2575993c7773534f1c20d52ce9cc56d57ab7abcb31276e4d64f9d89c0df1bc2545294a7b7d7ac1bf043cb9c890f61a05f7d9648c7a83fa0f2171cad91a74
+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
@@ -93,4 +94,5 @@ EBUILD netbeans-enterprise-9999_p20160914.ebuild 15825 SHA256 4722d9a985c9d7bf58
 EBUILD netbeans-enterprise-9999_p20160915.ebuild 15825 SHA256 5414838dbe7088dd34ad12b971fef3a1c78da638b2f24ddc36a468bc7ab9ed52 SHA512 d1e89c30f234e04c33d6f851fe2659e9f57aab3bb17a32036d9854d4486a6ebc3d7b6afaf77a83f19f79dadf488886719332975108faeff4cdd0aaca9ba3f5cc WHIRLPOOL f86e3a30a7c40232fc9594f4703a11c54136f70108a5030547095e1ca1558643822ea718a333d6781323859c424c52c5426416c53c944a5bafca74ff17982ac3
 EBUILD netbeans-enterprise-9999_p20160916.ebuild 15825 SHA256 19455e1cb76add7c4d05072ad33b0d1a1381addd1f9bc99d2c34540d0104612a SHA512 592fac9697b0ebb382b3eb9e1d45ff5a18ecf30b4c7f715ba710f7937352a0205235c5cd31430c82134682d5411f4a66d320086301dcaf152976499077c4169b WHIRLPOOL 521b9f36584b51c16697b9d200c162497bd08f3279d3550d7cbb5353bcd29888322d48bbbec50ce1e38c830f33bbd67460d1c5d9defeb442907375b06ab4093b
 EBUILD netbeans-enterprise-9999_p20160917.ebuild 15825 SHA256 fa807c876ccd65b02e6eceee2e9b437895a663b50f29dc1d17fe30b5fb83d618 SHA512 13f37dfc84cbb4cb194f11f934e9d19a2b173e38f89338178fef0a4e3ac1dde131035512a3b57975b3d10a7b7cd4da4a74cdc4971dda438443334e3991b8d8a5 WHIRLPOOL 30e206b3a656e22b01305b1a44fbd7bb4205add60757271e027fddeeac587c4ae602e4f3a77d3728ff14e42920ed0ad2f593db993162510b749a485552c7a19a
+EBUILD netbeans-enterprise-9999_p20160918.ebuild 15825 SHA256 a514267461be00ace297f70b1538fc604eebc311b1c02bf725bd12ee5d2352a1 SHA512 74d5bb6f5ad016cd3d719a99a816a25eedd46693d6cc2c336315240ca573a8e14e9bb00468dc2eb10cf124d6a30bac0c0e1432e6f3de57d9f7b688310ea697f5 WHIRLPOOL ccdcae7ac18d2ba3e1c0054b7a1a8cb2a916ce73f8b5327c21af1bd9deb3c9e5c853bb800cd65d304236a0bb0b0a8b0579819033227f203effa318fc2ef98177
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160918.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160918.ebuild
new file mode 100644
index 0000000..206e77c
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160918.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-09-18_00-02-33/zip/netbeans-trunk-nightly-201609180002-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 4842fc9..e727b3e 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318b
 DIST netbeans-trunk-nightly-201609150002-src.zip 218016283 SHA256 90b7a4a97f9328512ad9388caab30b88290338dcd87e90d7b20c1568b679a11e SHA512 bc398e865c55547752f8ac05ed2de3c22eff9d5b7c204f28ecd30d1a1d11bda9276454d505d12f5a951d88c40a160a1dad15fc62ab39a6d350d0ba45af4df299 WHIRLPOOL 283749fe3c678341d9489fea580e7af7bec404507be57bd264d4a3673b8b5660a729c5a3f96da2adbeee1fa10fe3205e486c6186f01dcb5fa05f93627bc646de
 DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72fbb6102c07095a61e6cc10066c5fff94a3abfebe2852484e31e SHA512 e41d80df015b84f2faf8811a8fd242f85c72e39867161d236ef0242062568c6fd163bf46a623f4a14779e9d89a49b6a2d88691487a5ec785eece6c7f70459ffa WHIRLPOOL e42fac6f885c4fd1c2bc030cf47aa82ec4e35f66d305e8dd06d6a439ca958074ce57ae761b7ee16e4612dc5f94bedd7fe4655463ab4a7c095e03f41d4fc686f1
 DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b2578585227423c94ebeb38b7bdfacac7a284cd29808d0d63373c845f55b SHA512 73d44db142dadeb4df6cba0b4c0308de49620f4f08d07297eb31b171a8923c0515bbcd45eea8c4b30ca8919b6b169a61e1c696d3381e303dd3249ad4c864d2f6 WHIRLPOOL 88be2575993c7773534f1c20d52ce9cc56d57ab7abcb31276e4d64f9d89c0df1bc2545294a7b7d7ac1bf043cb9c890f61a05f7d9648c7a83fa0f2171cad91a74
+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
@@ -61,4 +62,5 @@ EBUILD netbeans-ergonomics-9999_p20160914.ebuild 2913 SHA256 bbfa27ae0ddaf8e30c6
 EBUILD netbeans-ergonomics-9999_p20160915.ebuild 2913 SHA256 01df73a77390625456d9416923bf153ea1020d6d6bea03e9566ccd032a4ac582 SHA512 1579cfd769478b66e6806ab863d57a57a8dba9ed8f638764819c9f62f1ad0d883d7f754989fa70881fd4f0224eb71271eb7240e984a4bcf4cfcf770487c5138b WHIRLPOOL c62b5fc6fe346b443d7970afef256218c7ddecd6cc0db05a0af3aa2651c774c10ff9f5150657672c45625c8ba8586e8d84321f7e9283989130793d31d0cf0d70
 EBUILD netbeans-ergonomics-9999_p20160916.ebuild 2913 SHA256 1055b0a883604ccee294e092b21cc0a92c90bce01395ae5ba69f3d3bb71cce2d SHA512 e1bd56c4831e21084677e48db35080e3c11e3689da2151f00dd00c16d2179d04a8cc0b6d26a891b687cc37c90b4776b62240b2109363b34cbd86922b120a5b06 WHIRLPOOL 9f41b7a84188986b8322fc2ee5c18c1b69daa866a969370612fcec12429c68ba03d6376fbf824e6a82722ebe0a823c362f38ecfa073a4c484902d039d4e2167b
 EBUILD netbeans-ergonomics-9999_p20160917.ebuild 2913 SHA256 a4370075c3f0cdfd032c1001bca6289e23597a4dcdff11a1a2faddea24c2b442 SHA512 024c6b4ea1197d094ada4c72b39c9283cc0ccb628e0950d3cbede040161236c7383eb05c78f4461f5c3d0b299a1a011e1a1e9a60a6de66f9007a00f40cffd776 WHIRLPOOL f4f214400d0e5836cbdf24fd8029838d2fcb1caab6a4a0c9af81c0352cbfe773c767b904725ec564e01aaa684181767b24e790e4b8a8f761fecc84adeac72646
+EBUILD netbeans-ergonomics-9999_p20160918.ebuild 2913 SHA256 245dd99a540dbd273f08aff55218c0cfbcc6e1ca750fa313efe22d526819aa2d SHA512 a6120b046727c79869b32f0cd2e21987eb50fda6555a7c78b9b179349844c5dda89a456b1d168799a78b3d6333e9364b6062efab94976e9581feb38760064eae WHIRLPOOL d01f8eca9070666b7eea9c6d1767f80372d5d0a72607baadbe693ca092329ffdedab1d45e1e276428d27816203051f9dbed634ac5e6a787860b51c0010d6184a
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160918.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160918.ebuild
new file mode 100644
index 0000000..0cb1713
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160918.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-09-18_00-02-33/zip/netbeans-trunk-nightly-201609180002-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 1ac444b..e582fac 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318b
 DIST netbeans-trunk-nightly-201609150002-src.zip 218016283 SHA256 90b7a4a97f9328512ad9388caab30b88290338dcd87e90d7b20c1568b679a11e SHA512 bc398e865c55547752f8ac05ed2de3c22eff9d5b7c204f28ecd30d1a1d11bda9276454d505d12f5a951d88c40a160a1dad15fc62ab39a6d350d0ba45af4df299 WHIRLPOOL 283749fe3c678341d9489fea580e7af7bec404507be57bd264d4a3673b8b5660a729c5a3f96da2adbeee1fa10fe3205e486c6186f01dcb5fa05f93627bc646de
 DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72fbb6102c07095a61e6cc10066c5fff94a3abfebe2852484e31e SHA512 e41d80df015b84f2faf8811a8fd242f85c72e39867161d236ef0242062568c6fd163bf46a623f4a14779e9d89a49b6a2d88691487a5ec785eece6c7f70459ffa WHIRLPOOL e42fac6f885c4fd1c2bc030cf47aa82ec4e35f66d305e8dd06d6a439ca958074ce57ae761b7ee16e4612dc5f94bedd7fe4655463ab4a7c095e03f41d4fc686f1
 DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b2578585227423c94ebeb38b7bdfacac7a284cd29808d0d63373c845f55b SHA512 73d44db142dadeb4df6cba0b4c0308de49620f4f08d07297eb31b171a8923c0515bbcd45eea8c4b30ca8919b6b169a61e1c696d3381e303dd3249ad4c864d2f6 WHIRLPOOL 88be2575993c7773534f1c20d52ce9cc56d57ab7abcb31276e4d64f9d89c0df1bc2545294a7b7d7ac1bf043cb9c890f61a05f7d9648c7a83fa0f2171cad91a74
+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
@@ -65,4 +66,5 @@ EBUILD netbeans-extide-9999_p20160914.ebuild 3377 SHA256 3b2a494b5f54f9e5df538db
 EBUILD netbeans-extide-9999_p20160915.ebuild 3377 SHA256 1974bcf01de6fa122c4eb227494e4ccfbbc2fc143278e00fc9de2f149e5b0c01 SHA512 4af70e7ca81f129d82b1e4297945eb9a66cfa3ab4a84dff2600d515bb787de640d22ffb1b6d5e44c0bca91532c7486e507e7c62ac29553539713a1c8641d59fd WHIRLPOOL 178f41358f2a83aceef63d9257c277238ba3eb38a13f090b5730f6cb109ea5e17f37513cf01981873f43bc3f41728e06e4ae17940fc7729bb1dcfd2071dae31e
 EBUILD netbeans-extide-9999_p20160916.ebuild 3377 SHA256 8e2402cee3ac258b39799884c083a6587791003ccf4abb9da521c51d60ac245d SHA512 8019447f595b0e4a3c3e2def928eced2d34ab9a5720ab29a97534c8be4fafbdbc8de080acc7e8a89a0b014defda5d3240f2b2c0149526a73cc1dbe4ba7803e40 WHIRLPOOL 5a94644d42d4269473679d16e64aebb22a0086f7f687cffd92998038155f7b3a46e65fb54cda0508815f446b4a6440e1dc82f23d93fae7141a95680da4828c4f
 EBUILD netbeans-extide-9999_p20160917.ebuild 3377 SHA256 998cb41743bc2e89a47b7da248a5db767df51dec51cf24f90f1a3609e848b738 SHA512 aa120aa9c0237c90632041aa8e27df68eacd1cfe8f200eb3669d17e9d8bdc40bdc6cda247a6c11a945e9d6f125d5aba5441df94768356f9e0512d422fc77231b WHIRLPOOL 9bb9ae17d0dfa955e2cc416145a3038a9fe20a44a68de5630d33f8e4b58289affeabed548cda46beb951065c75d495f18a1706675170cae35cdb18dd6127d1d1
+EBUILD netbeans-extide-9999_p20160918.ebuild 3377 SHA256 5e29ae629aee415b2186303b74af3eb026114b6be9cfeba2e238d1d4ced81be5 SHA512 438c0b62237219d72d18f5744e31d85795c69ea9958e86388b124b610478a34d8c8597e9c01c817c27e94eafbedbd5db092f75c8255bf58d4c4ec1841493b6d6 WHIRLPOOL 6ba074d87919e027df2c2bf5d811ef4fe64c8c195651dedb9e7413c0868d730ea2e83248edf6f5172b2be190c9222205df38e46d76643ba8d4e5583aed349801
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160918.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160918.ebuild
new file mode 100644
index 0000000..97a199c
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20160918.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-09-18_00-02-33/zip/netbeans-trunk-nightly-201609180002-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 7783c4a..79ef726 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318b
 DIST netbeans-trunk-nightly-201609150002-src.zip 218016283 SHA256 90b7a4a97f9328512ad9388caab30b88290338dcd87e90d7b20c1568b679a11e SHA512 bc398e865c55547752f8ac05ed2de3c22eff9d5b7c204f28ecd30d1a1d11bda9276454d505d12f5a951d88c40a160a1dad15fc62ab39a6d350d0ba45af4df299 WHIRLPOOL 283749fe3c678341d9489fea580e7af7bec404507be57bd264d4a3673b8b5660a729c5a3f96da2adbeee1fa10fe3205e486c6186f01dcb5fa05f93627bc646de
 DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72fbb6102c07095a61e6cc10066c5fff94a3abfebe2852484e31e SHA512 e41d80df015b84f2faf8811a8fd242f85c72e39867161d236ef0242062568c6fd163bf46a623f4a14779e9d89a49b6a2d88691487a5ec785eece6c7f70459ffa WHIRLPOOL e42fac6f885c4fd1c2bc030cf47aa82ec4e35f66d305e8dd06d6a439ca958074ce57ae761b7ee16e4612dc5f94bedd7fe4655463ab4a7c095e03f41d4fc686f1
 DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b2578585227423c94ebeb38b7bdfacac7a284cd29808d0d63373c845f55b SHA512 73d44db142dadeb4df6cba0b4c0308de49620f4f08d07297eb31b171a8923c0515bbcd45eea8c4b30ca8919b6b169a61e1c696d3381e303dd3249ad4c864d2f6 WHIRLPOOL 88be2575993c7773534f1c20d52ce9cc56d57ab7abcb31276e4d64f9d89c0df1bc2545294a7b7d7ac1bf043cb9c890f61a05f7d9648c7a83fa0f2171cad91a74
+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
@@ -63,4 +64,5 @@ EBUILD netbeans-groovy-9999_p20160914.ebuild 3416 SHA256 8adebe84045dc0ec277c1ed
 EBUILD netbeans-groovy-9999_p20160915.ebuild 3416 SHA256 e2fe01b0fd62f651aeabe0e48ceed9c617f5fa11c40faea528b571889708dfe5 SHA512 6b655b03d76c959656af346b1e0e111d56157152aec79ce9ca2113bb4b2604715a5dab82abfbed601f770b4ae37daa7a175e2fafeb2717520f6f907760c2346e WHIRLPOOL e9ffed9e7d8fb23add1fdfaba08937d4b79396ccfc1dc9428938094cc0888ab08d2075eeccd224f35050fbb15f21589ad72645e3f8320d24f0ddc1d5c1378092
 EBUILD netbeans-groovy-9999_p20160916.ebuild 3416 SHA256 85716f2d27d5229abad1558a5cefa0c37b58dafcc348b854d1002a0ff5c8a45a SHA512 ad09d3295b2ee12c54c67b944b89e7d21ec0b6f3d8bc89f8e72e43dcc02e8ae2f55df5d0bfdf9e1bdf951c8cb886e37c8a5d107610cdd73dad878a946a6e5607 WHIRLPOOL 4a8ba5b1517d7cca22fa041a846de9b74d510a8ac9882ad3227b06cf00c0a9b6a41a90769347c7f4942160ef84b029edaa2347281c52fabe0c0bd5e8b663c418
 EBUILD netbeans-groovy-9999_p20160917.ebuild 3416 SHA256 9a9e4b0be4ce6d13bc57596d04739ae48c470d1020977b01754c077102ffbc86 SHA512 34855b8d3fc9b2668e3f1bb1dbe489bf41c727a51858c229076dfcbaf8989b539712175d19526d256b0d4dc07a54af246d130b00c1ed3829a27a73985ee148bc WHIRLPOOL 09a870c9bb11fdadb45185f90ccba7f64139984fe2a1be02679abed1bee97d3efb95f041b2b473b17957e9beebe68fcc37b0e97b20286238ba9b5ddc153cd7f2
+EBUILD netbeans-groovy-9999_p20160918.ebuild 3416 SHA256 7f696115d9759f07b323b0ed423ea50443e291e1565273724586fffe3f84f53d SHA512 3bd0277933caaf2e0b8dcd44248418d8d5d3d7a68180217b6772bd902185d8e6861e1446bbb32c203e8b30a8cd88c9225c2fce8f996c378105551bd9e45d6c63 WHIRLPOOL 26419b264c9ce438f5b7a3d73ba540d8e6e4233393e4d1d9270a383bba90a10e6576c2b03999f0f1227844a266727159915f1477e858a1ff2aaab2f631059b58
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160918.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160918.ebuild
new file mode 100644
index 0000000..72bc17c
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160918.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-09-18_00-02-33/zip/netbeans-trunk-nightly-201609180002-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 6fc67b5..d670210 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318b
 DIST netbeans-trunk-nightly-201609150002-src.zip 218016283 SHA256 90b7a4a97f9328512ad9388caab30b88290338dcd87e90d7b20c1568b679a11e SHA512 bc398e865c55547752f8ac05ed2de3c22eff9d5b7c204f28ecd30d1a1d11bda9276454d505d12f5a951d88c40a160a1dad15fc62ab39a6d350d0ba45af4df299 WHIRLPOOL 283749fe3c678341d9489fea580e7af7bec404507be57bd264d4a3673b8b5660a729c5a3f96da2adbeee1fa10fe3205e486c6186f01dcb5fa05f93627bc646de
 DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72fbb6102c07095a61e6cc10066c5fff94a3abfebe2852484e31e SHA512 e41d80df015b84f2faf8811a8fd242f85c72e39867161d236ef0242062568c6fd163bf46a623f4a14779e9d89a49b6a2d88691487a5ec785eece6c7f70459ffa WHIRLPOOL e42fac6f885c4fd1c2bc030cf47aa82ec4e35f66d305e8dd06d6a439ca958074ce57ae761b7ee16e4612dc5f94bedd7fe4655463ab4a7c095e03f41d4fc686f1
 DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b2578585227423c94ebeb38b7bdfacac7a284cd29808d0d63373c845f55b SHA512 73d44db142dadeb4df6cba0b4c0308de49620f4f08d07297eb31b171a8923c0515bbcd45eea8c4b30ca8919b6b169a61e1c696d3381e303dd3249ad4c864d2f6 WHIRLPOOL 88be2575993c7773534f1c20d52ce9cc56d57ab7abcb31276e4d64f9d89c0df1bc2545294a7b7d7ac1bf043cb9c890f61a05f7d9648c7a83fa0f2171cad91a74
+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
@@ -66,4 +67,5 @@ EBUILD netbeans-harness-9999_p20160914.ebuild 4126 SHA256 3b48a48dbdf06755ba7605
 EBUILD netbeans-harness-9999_p20160915.ebuild 4126 SHA256 cdda67e6320506785cce5db74f94bcca258a5ab2216cf6bb1c4ed55f3397756d SHA512 3d1b6f3b78ac23d2cacf4750e1df8fbee7b94acd5eeb19cfbcc023e5c6a635abe4e421c716a8a1d3c4ffec0cf8d4b93870907bc9a1c19cbc3fc10742ea165223 WHIRLPOOL c3217683b803da55f1ac51ad28a6be6310fc3299c3bf682d8e541b5e41a64934fee8cf33e0f12bd18154431af41ba40c856d8b7fc3912fcda78a7759072cacb1
 EBUILD netbeans-harness-9999_p20160916.ebuild 4126 SHA256 1a9666e921080563ddb59892f87d62fe2cca482a3cde9bfb6a3dd12518c5740b SHA512 5654aa2f3192fcbff6f516b29dc5f6263ee49a1ced0d25000bec6137e9dd415429825cd03e278c4af0d86aa437a829d14d2db3756f6a609461f99ab86896eeac WHIRLPOOL 3f5285caa8e012a5314de953a889d5baa1a9ed4b88642c19357308ff23842d47c39bec6e677da8d692388bb3be8216ae7b64ec6e0ead583a3d329d8aa4ede2cb
 EBUILD netbeans-harness-9999_p20160917.ebuild 4126 SHA256 4b9618e7503ac2271c85f72e245cd9eaaa47f85cb5a3d21ea0d8ca05f3ce6093 SHA512 440afdd79c3f0bbe146ebb9fcd2cf2e3e7342ff178246cb01f03c86e3cb1b1ceed9c6f910885135f35b4f42cf6f672d542acae0c88a3a3c488bf04a3419d73cd WHIRLPOOL 070ce933e27e8c7b210ae5d0202833c136e5c67c2b7ef3f55a624676c8c029b88b7baefc74ecbebb96242e058ec2cef234847251af823ad27521836e41c25c62
+EBUILD netbeans-harness-9999_p20160918.ebuild 4126 SHA256 b001d12a07c1fa44bbb62eeba2166d0ff395a401916a408550c5f8d85e4370f3 SHA512 c205e35c7f695e16ee8fe3b5a3c74f764f28fd56aa46c96396a0abf85172d848e89324e6c76b6599dbf799c1117c5559c86e6ddcd1f1c87b4f59d1c35d7f7543 WHIRLPOOL d6a626a2631d7e3c5439f2cfe89faa9c52dbffaca43e7a4f00f82c6af8c3091fcbaadfc3c544b2abc1693f4282c9bb8104c1a720ed08dae19ca189ae3f24916b
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160918.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160918.ebuild
new file mode 100644
index 0000000..026a2f1
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20160918.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-09-18_00-02-33/zip/netbeans-trunk-nightly-201609180002-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 f35e224..4ad7f91 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -170,6 +170,7 @@ DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318b
 DIST netbeans-trunk-nightly-201609150002-src.zip 218016283 SHA256 90b7a4a97f9328512ad9388caab30b88290338dcd87e90d7b20c1568b679a11e SHA512 bc398e865c55547752f8ac05ed2de3c22eff9d5b7c204f28ecd30d1a1d11bda9276454d505d12f5a951d88c40a160a1dad15fc62ab39a6d350d0ba45af4df299 WHIRLPOOL 283749fe3c678341d9489fea580e7af7bec404507be57bd264d4a3673b8b5660a729c5a3f96da2adbeee1fa10fe3205e486c6186f01dcb5fa05f93627bc646de
 DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72fbb6102c07095a61e6cc10066c5fff94a3abfebe2852484e31e SHA512 e41d80df015b84f2faf8811a8fd242f85c72e39867161d236ef0242062568c6fd163bf46a623f4a14779e9d89a49b6a2d88691487a5ec785eece6c7f70459ffa WHIRLPOOL e42fac6f885c4fd1c2bc030cf47aa82ec4e35f66d305e8dd06d6a439ca958074ce57ae761b7ee16e4612dc5f94bedd7fe4655463ab4a7c095e03f41d4fc686f1
 DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b2578585227423c94ebeb38b7bdfacac7a284cd29808d0d63373c845f55b SHA512 73d44db142dadeb4df6cba0b4c0308de49620f4f08d07297eb31b171a8923c0515bbcd45eea8c4b30ca8919b6b169a61e1c696d3381e303dd3249ad4c864d2f6 WHIRLPOOL 88be2575993c7773534f1c20d52ce9cc56d57ab7abcb31276e4d64f9d89c0df1bc2545294a7b7d7ac1bf043cb9c890f61a05f7d9648c7a83fa0f2171cad91a74
+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
@@ -200,4 +201,5 @@ EBUILD netbeans-ide-9999_p20160914.ebuild 29849 SHA256 a2f4788195b6723aa8262eae7
 EBUILD netbeans-ide-9999_p20160915.ebuild 29849 SHA256 5b03f076eb77aede16e1be078041901d5abe1496aea7ca4d8961c48ff16b8092 SHA512 507ddac31ebab3dece5705d835a6465e43d990fc6220c91a7c8f97e324a61a8d25f178c97eacd097c0c702493cd95ef32a8fd2779080d10e03b7c960d984b37e WHIRLPOOL 4088b0cedb084fc6d7eb92d96e3e00745b1aedc233bc6aaf1aed96a333c56a89b636e925ade400ded395191876d30467045d9529f5d22f66ee9c15c8def22c13
 EBUILD netbeans-ide-9999_p20160916.ebuild 29849 SHA256 cdeb37a41342d68dab93a04b796eda522c69eb2b26d89f2ad13298fdb871a2ff SHA512 f6e29c04854dba6dd25f6dfccd77237a2b51185d0cc80bbc1c0e09d02d70f5e4dc6cd7cdeb96b79a2fc505cd6247cdb2dd2627f1d477fb6471db1af6ce8a82e3 WHIRLPOOL ce6a3ba92c538dbb9b904314015f9e0c16ab2b00ba2542712eb973cc7feb81d24de64100b9efb7ede5ad3e741a6e765bfb5e7f5abd88bc9dc1cad454a7a5a54f
 EBUILD netbeans-ide-9999_p20160917.ebuild 29849 SHA256 69155406c2187150583697b637da494a5c7b99804a7c20e75eef1b14620b122c SHA512 fb548d5212d504c889494d0d25d27ee478d1f868a3057f4cd813d771e5dd8d982bbc3fdd69823b8d106c961e90b5040cbed90b024582a7bcff6483203d3efb73 WHIRLPOOL 2b9a2c0158ad77441a8394ee8d3c4732e10455250889ba4e44a581435e5f6eae237863f7191f2164cda2bc1d8246ea67c1f465d6e0fa7778c3a8aaa5ca90faf4
+EBUILD netbeans-ide-9999_p20160918.ebuild 29849 SHA256 3d5c630a49077aa232c362c3a3fc3835a46b82f2ef4eaf347283f683ae33a321 SHA512 9ef0ac04c40ecec597cf9792667d458a6a10625a8ad14394e002755bcde97c890e4bc4a55d11c940cea24f944e7cb5fe541f109afb2ef17d0c263b40f6a9ee5a WHIRLPOOL 4f50693b9f1ca6723f7a0b77470f054ed10165d4ee43ba765c5be1dd1b2288ceabbad0a85cf2bd3c59ac1ccff0b2cb81b8fabee50c3353d9c4e1e99fd5576f27
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160918.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160918.ebuild
new file mode 100644
index 0000000..1b04085
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20160918.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-09-18_00-02-33/zip/netbeans-trunk-nightly-201609180002-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.4.1209.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.4.1209.jar && java-pkg_jar-from --into "${instdir}" jdbc-postgresql jdbc-postgresql.jar postgresql-9.4.1209.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 33d9a26..ec212f9 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -68,6 +68,7 @@ DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318b
 DIST netbeans-trunk-nightly-201609150002-src.zip 218016283 SHA256 90b7a4a97f9328512ad9388caab30b88290338dcd87e90d7b20c1568b679a11e SHA512 bc398e865c55547752f8ac05ed2de3c22eff9d5b7c204f28ecd30d1a1d11bda9276454d505d12f5a951d88c40a160a1dad15fc62ab39a6d350d0ba45af4df299 WHIRLPOOL 283749fe3c678341d9489fea580e7af7bec404507be57bd264d4a3673b8b5660a729c5a3f96da2adbeee1fa10fe3205e486c6186f01dcb5fa05f93627bc646de
 DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72fbb6102c07095a61e6cc10066c5fff94a3abfebe2852484e31e SHA512 e41d80df015b84f2faf8811a8fd242f85c72e39867161d236ef0242062568c6fd163bf46a623f4a14779e9d89a49b6a2d88691487a5ec785eece6c7f70459ffa WHIRLPOOL e42fac6f885c4fd1c2bc030cf47aa82ec4e35f66d305e8dd06d6a439ca958074ce57ae761b7ee16e4612dc5f94bedd7fe4655463ab4a7c095e03f41d4fc686f1
 DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b2578585227423c94ebeb38b7bdfacac7a284cd29808d0d63373c845f55b SHA512 73d44db142dadeb4df6cba0b4c0308de49620f4f08d07297eb31b171a8923c0515bbcd45eea8c4b30ca8919b6b169a61e1c696d3381e303dd3249ad4c864d2f6 WHIRLPOOL 88be2575993c7773534f1c20d52ce9cc56d57ab7abcb31276e4d64f9d89c0df1bc2545294a7b7d7ac1bf043cb9c890f61a05f7d9648c7a83fa0f2171cad91a74
+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
@@ -98,4 +99,5 @@ EBUILD netbeans-java-9999_p20160914.ebuild 15656 SHA256 9782e4efa747b476364b378b
 EBUILD netbeans-java-9999_p20160915.ebuild 15656 SHA256 4019c652296eb078c6f4d18021a66ca1d1b2b3d3c1eb8bdc6a32544abcc717c0 SHA512 4fca7c319d743a75f7999677d7e59c5c475be922838b648356d0a1a0beec81de84d4f8e6c8608a65a7368accc69a87dde0ca7da48fa8b1b26b5e69be3e442e29 WHIRLPOOL 8997fc07847c3a2d2e58bff9953a885cf5226934718df396985a12b438254996fc03de2bbe99399f6a2e8898ed1a0d7352f55cf2c5163d6e7823873407daec39
 EBUILD netbeans-java-9999_p20160916.ebuild 15656 SHA256 035d4fe4e912e7c4bff500db6e1831110c020380bda09bb452e6116fad26a704 SHA512 95ef862af41dff03636249a22f3d8d5944e0b3c9635a02afa29bdb5e8540f4ed08c181132d58a3c86b2ac926ffadbaa88b4d8ecd04d158959d6bd6fbc86377fd WHIRLPOOL e4fc212884de03368d0c6e86677b879c27cb88fbac6edcbfd13dec93529763283e71151df6e415be6581b2f809fa27aa695d319b1d8b0a1ce74cfcdca23c98ef
 EBUILD netbeans-java-9999_p20160917.ebuild 15656 SHA256 e13a7c714507904d98d4d7b7c288cdeb630f71d6603bdfaf149db4d9deb69b9f SHA512 3585f04697582c8a03ccd84a52d18a0bd930552db235d4f3417ff67ac119d7be19647b03e63dea59e1bc22167bc9679e41999ff13f19581d1f77fd0f6eb0add1 WHIRLPOOL be301def6c0e967066708e1fab950f5a2f0fd81eb398475054eb3afd11fe1ee01a3c82746c16e3c848afdf6391d26c75f5fd543721dac0389c6ec129411ba7a1
+EBUILD netbeans-java-9999_p20160918.ebuild 15656 SHA256 57fc8e59f57cea6d4458d0f29dff16bb8106327e877f620b6559f2dd77076e08 SHA512 ce228381a85aa4d89853efe787dd64e1b93af0c772d9172154bbf6301a529dc8ee1834e475ab3962a78eaa40c38856958838c8dc57bef8832a60fd33016a45a4 WHIRLPOOL 06dfe203dca508d07b9c7cbb2ab379ba94baf420cff2d1a465cb03465c129a718f64a4ae984f4b8363a146c6432b4d7db1248acb3dd9d85301978e56fd3efbaa
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160918.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160918.ebuild
new file mode 100644
index 0000000..16ce9cc
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20160918.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-09-18_00-02-33/zip/netbeans-trunk-nightly-201609180002-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/5968566A351B28623DE4720B0ACB1E40338074D0-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}"/5968566A351B28623DE4720B0ACB1E40338074D0-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 a1c1edc..137f7c8 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318b
 DIST netbeans-trunk-nightly-201609150002-src.zip 218016283 SHA256 90b7a4a97f9328512ad9388caab30b88290338dcd87e90d7b20c1568b679a11e SHA512 bc398e865c55547752f8ac05ed2de3c22eff9d5b7c204f28ecd30d1a1d11bda9276454d505d12f5a951d88c40a160a1dad15fc62ab39a6d350d0ba45af4df299 WHIRLPOOL 283749fe3c678341d9489fea580e7af7bec404507be57bd264d4a3673b8b5660a729c5a3f96da2adbeee1fa10fe3205e486c6186f01dcb5fa05f93627bc646de
 DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72fbb6102c07095a61e6cc10066c5fff94a3abfebe2852484e31e SHA512 e41d80df015b84f2faf8811a8fd242f85c72e39867161d236ef0242062568c6fd163bf46a623f4a14779e9d89a49b6a2d88691487a5ec785eece6c7f70459ffa WHIRLPOOL e42fac6f885c4fd1c2bc030cf47aa82ec4e35f66d305e8dd06d6a439ca958074ce57ae761b7ee16e4612dc5f94bedd7fe4655463ab4a7c095e03f41d4fc686f1
 DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b2578585227423c94ebeb38b7bdfacac7a284cd29808d0d63373c845f55b SHA512 73d44db142dadeb4df6cba0b4c0308de49620f4f08d07297eb31b171a8923c0515bbcd45eea8c4b30ca8919b6b169a61e1c696d3381e303dd3249ad4c864d2f6 WHIRLPOOL 88be2575993c7773534f1c20d52ce9cc56d57ab7abcb31276e4d64f9d89c0df1bc2545294a7b7d7ac1bf043cb9c890f61a05f7d9648c7a83fa0f2171cad91a74
+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
@@ -64,4 +65,5 @@ EBUILD netbeans-javacard-9999_p20160914.ebuild 4971 SHA256 26a702399b61b8424ed52
 EBUILD netbeans-javacard-9999_p20160915.ebuild 4971 SHA256 02449f078357a6d2d8efa4cf583912baf31361dedaef1de0ae5d694bfa127d6c SHA512 bad1e3013c1d64e3b8d0eccb3bcd6fd8628f8b2674a036ad530b6404229b98b436c6700a3784165488ded469e4d5f60358ee4cdd6f6ae60506f3580c9f7db63b WHIRLPOOL 03f9be102a5fa3e9de928b6963809ea0ef27bb398a7e46efbb6b1c3ec7126f5a303032e01405c5999fa9fb6857a0b6c6f37162501990fd6ecf1491a491e044e8
 EBUILD netbeans-javacard-9999_p20160916.ebuild 4971 SHA256 136fab8897b9605d0cb475800348bb9f8326a683745756769241e6a7768c8681 SHA512 b88d5e3d9a208de83d82c6e486cc367a6f9e97df1cb62010914e84d1519da1660058ac7cca1f7aef20925be8dbba21d2d89144e7342d1abe1a17f4532f7d07a3 WHIRLPOOL 1a33b0908c2d4788e8a301a8444416250dd5bfdac6c2366f44fc54aa51e0d57fa848af4085379fc166398192f8173d54ed180129653cad2ce4464ca57096fad6
 EBUILD netbeans-javacard-9999_p20160917.ebuild 4971 SHA256 db6ec85528c266112af59130c5e4aca32ccd61e5d26dca00b300c46844b426bb SHA512 4f16fbbc8715a2a3e08174253943b3dd9cd04a4352284a805ac3948148c7d522257447fed512f3fa56045b8ed7c95a863e6d0bd63cab21f7876d2b436b6c03e4 WHIRLPOOL bdb29a38d753fd62e7a223fbf45baa63b8d1692403030b819eb3972e3d823513a3e09d0977d73745de84783e873b07a6a2186b0e99aa724299098d5a4f5d7782
+EBUILD netbeans-javacard-9999_p20160918.ebuild 4971 SHA256 6f0d8cb41d9c87f7e578ee69ab227ef0bc7bff21de91ff8a168c12b36c7d581d SHA512 6ccf7e04892f55c3176636880b4cc3f392adeec408b35008d0c7dca4e5672a4113f5dab75692192756e7152cb6d9767d58f8d81e3ed4fe65f97424a04f8b677e WHIRLPOOL d83b5568d0cefb6af6fd255e24114a5fdbc1fdf5afdaeb6a5f5c7f1c5c92a6682757285aa5a632ed306cfaecafcde68e0e97e31f966c593e020b69dc0267d7fe
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160918.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160918.ebuild
new file mode 100644
index 0000000..744476c
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160918.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-09-18_00-02-33/zip/netbeans-trunk-nightly-201609180002-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 a1cb583..1d67116 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318b
 DIST netbeans-trunk-nightly-201609150002-src.zip 218016283 SHA256 90b7a4a97f9328512ad9388caab30b88290338dcd87e90d7b20c1568b679a11e SHA512 bc398e865c55547752f8ac05ed2de3c22eff9d5b7c204f28ecd30d1a1d11bda9276454d505d12f5a951d88c40a160a1dad15fc62ab39a6d350d0ba45af4df299 WHIRLPOOL 283749fe3c678341d9489fea580e7af7bec404507be57bd264d4a3673b8b5660a729c5a3f96da2adbeee1fa10fe3205e486c6186f01dcb5fa05f93627bc646de
 DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72fbb6102c07095a61e6cc10066c5fff94a3abfebe2852484e31e SHA512 e41d80df015b84f2faf8811a8fd242f85c72e39867161d236ef0242062568c6fd163bf46a623f4a14779e9d89a49b6a2d88691487a5ec785eece6c7f70459ffa WHIRLPOOL e42fac6f885c4fd1c2bc030cf47aa82ec4e35f66d305e8dd06d6a439ca958074ce57ae761b7ee16e4612dc5f94bedd7fe4655463ab4a7c095e03f41d4fc686f1
 DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b2578585227423c94ebeb38b7bdfacac7a284cd29808d0d63373c845f55b SHA512 73d44db142dadeb4df6cba0b4c0308de49620f4f08d07297eb31b171a8923c0515bbcd45eea8c4b30ca8919b6b169a61e1c696d3381e303dd3249ad4c864d2f6 WHIRLPOOL 88be2575993c7773534f1c20d52ce9cc56d57ab7abcb31276e4d64f9d89c0df1bc2545294a7b7d7ac1bf043cb9c890f61a05f7d9648c7a83fa0f2171cad91a74
+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
@@ -63,4 +64,5 @@ EBUILD netbeans-javadoc-9999_p20160914.ebuild 6293 SHA256 01431a401ca40330656342
 EBUILD netbeans-javadoc-9999_p20160915.ebuild 6293 SHA256 8dfa150ae7eed2796583433b3cc75464cfd96a9521c3a33de6ef34460e087b72 SHA512 0eb72f777b20297558a893f899871327ab9c5c8836d9d293b5eb1eb19ca284b948859c882915a029841df4af301f369c3d2ceca6c209174b0e815c5b5724b2c9 WHIRLPOOL 85ee4756c8639c2b13a6189542086f43c348966895adb5d9d37a3dfcd6b92d39a4b79ff90b24c15e62102f9dff38284b4d2f6d462ab08d7b0bab7cce7104d4a2
 EBUILD netbeans-javadoc-9999_p20160916.ebuild 6293 SHA256 d1bdff3abcbe080bdce1450ca7b780d21e3ea6d3a9c1efe626d3ca1c57e5434d SHA512 f148c955538272746325090987fe897ff86ce73c85ca0f15e8248ee7c5fabc07a8c1996ec1a33b0653730431272cf017661cfcefb6808805171e2e644174bfa8 WHIRLPOOL 35a2745011098a73fdd5db4ca572a11526e1e4ea18cfbe8d6b36fa7d76e0d9e4c197f406ceaf6ea335ae9f24aea28fd1a554a84f3c2735dc764f9c1d64bf49cf
 EBUILD netbeans-javadoc-9999_p20160917.ebuild 6293 SHA256 8e569aca9ec06be006b626280c82d20bd81e4f77c22d6c299bb269616cf18aef SHA512 a88ba47a74c97fc29e39fbb340326cb24a27107e5fefe22a00b52c3d71b77948f0782d048f399450386d00c5e0a12460dad47d07f5d9a0f6cdea8102ab5671c5 WHIRLPOOL 4109aba8ad4d9614f6cc9adbf4469df63ccf6a38eeef7b65219e349e3c61bb8f1b68a340676401c6f176d2f59826464c1bb07951366c3772e50e19d871dc9d47
+EBUILD netbeans-javadoc-9999_p20160918.ebuild 6293 SHA256 a9b38984fb8ec6ed28dd50753777a42318d4e63850b28b0988990e00becdd1ca SHA512 8cae1e4ac07cae426ca53f2f288c6371d6ae09df6d77ea4d140870acd3beed4c239367ec7967290cccf8828245e7e569f9131f38c047d08615561cb87f3ebb7b WHIRLPOOL c603b62bddfe00f4637d96f92e1ec779dc83a01f6f1d3764944927c8185dd0a989879420dac7a89ef508379b321c90567e4e126a9701387fc787e43ab396ba73
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160918.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160918.ebuild
new file mode 100644
index 0000000..31a185c
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160918.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-09-18_00-02-33/zip/netbeans-trunk-nightly-201609180002-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 8b99c5c..8b54965 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318b
 DIST netbeans-trunk-nightly-201609150002-src.zip 218016283 SHA256 90b7a4a97f9328512ad9388caab30b88290338dcd87e90d7b20c1568b679a11e SHA512 bc398e865c55547752f8ac05ed2de3c22eff9d5b7c204f28ecd30d1a1d11bda9276454d505d12f5a951d88c40a160a1dad15fc62ab39a6d350d0ba45af4df299 WHIRLPOOL 283749fe3c678341d9489fea580e7af7bec404507be57bd264d4a3673b8b5660a729c5a3f96da2adbeee1fa10fe3205e486c6186f01dcb5fa05f93627bc646de
 DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72fbb6102c07095a61e6cc10066c5fff94a3abfebe2852484e31e SHA512 e41d80df015b84f2faf8811a8fd242f85c72e39867161d236ef0242062568c6fd163bf46a623f4a14779e9d89a49b6a2d88691487a5ec785eece6c7f70459ffa WHIRLPOOL e42fac6f885c4fd1c2bc030cf47aa82ec4e35f66d305e8dd06d6a439ca958074ce57ae761b7ee16e4612dc5f94bedd7fe4655463ab4a7c095e03f41d4fc686f1
 DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b2578585227423c94ebeb38b7bdfacac7a284cd29808d0d63373c845f55b SHA512 73d44db142dadeb4df6cba0b4c0308de49620f4f08d07297eb31b171a8923c0515bbcd45eea8c4b30ca8919b6b169a61e1c696d3381e303dd3249ad4c864d2f6 WHIRLPOOL 88be2575993c7773534f1c20d52ce9cc56d57ab7abcb31276e4d64f9d89c0df1bc2545294a7b7d7ac1bf043cb9c890f61a05f7d9648c7a83fa0f2171cad91a74
+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
@@ -69,4 +70,5 @@ EBUILD netbeans-javafx-9999_p20160914.ebuild 4717 SHA256 2f9b6b6b9aa26d29226132a
 EBUILD netbeans-javafx-9999_p20160915.ebuild 4717 SHA256 24f123c9e823e5a73b4dc3c622eba32b56c3c3e26e7f0764c10c96ed7a31666a SHA512 aa0318c318933c0e60b4d12608dfd3b162350a0b4f431ea4797657bf99e00e65512a48100d30fca8286bb43c9e8f179fef9795baed8c21230dfe2371bfe538c6 WHIRLPOOL a254aa6119d7857217e38b9a6189a01817d7ce9cf61183ca37b0cabbc83e3d37a6cb5d4d67a9b1f7371b5e78b485e0b5e5cf09eed1c0cdc3dd2e79568d59cc01
 EBUILD netbeans-javafx-9999_p20160916.ebuild 4717 SHA256 18ea95a8a642d3cfafbe46455faf147f85539fad306a31a88069074687a03431 SHA512 b01c013638f74e079bf965e75cb41ec79d702084ea7e417afcb51a9de73dddc10f80b16dcf6f2163e3f6dd37d3400edeab2ccb2eb23cd3985d74b784b85f775a WHIRLPOOL 016eb0acc2bcbdd7a9e8c4642895bb9e83775f60eb1ba860eec057d3c67d786ee4a9fa0a4b749f7386895cbbf7495b130f5c8eea219e791fd9e493c662ca8ebc
 EBUILD netbeans-javafx-9999_p20160917.ebuild 4717 SHA256 ba81b2a3c3491b3c9f474e285e5ca6580baeb1304626374d550b140e1da1edae SHA512 ef2ba80908e48a061bc1bc3bd4aa6006cd569a6ae2e359d7964e36c16f619d59f60ce6505dc80aa1d86d2ab4ccbe4d8580b6b9efbb072060152b42049495e331 WHIRLPOOL 77a0e8c53755e9e5c51d4c97e623c53610a96e459572d5bfba628cca35c17df3d0f2200ac432de114d913f1c3b74670b9e299d0899621e9e7bf91a3d4d0554d9
+EBUILD netbeans-javafx-9999_p20160918.ebuild 4717 SHA256 900330e4e2c6fe11826dab791e20deda4e06c006f3cbc7e551f9cd2b0caa6ff1 SHA512 8652b5c2c24416444956eb3987385476f589874da7b94e919a72e2546b63bbf4ab8b625e149b1d2f1a138123c43a2f00294aa89160333146f4c86a37043857a5 WHIRLPOOL b8acc2dfeb7508c4d4cd081fea8a297828b4dbac84792f9de9865e9427b3310448bbbc140c9efb705a7e64f0b220a2ea54351b3bc339e1338fbb00cc81211d11
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160918.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160918.ebuild
new file mode 100644
index 0000000..6d5983f
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160918.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-09-18_00-02-33/zip/netbeans-trunk-nightly-201609180002-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 bab7685..8d13f09 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318b
 DIST netbeans-trunk-nightly-201609150002-src.zip 218016283 SHA256 90b7a4a97f9328512ad9388caab30b88290338dcd87e90d7b20c1568b679a11e SHA512 bc398e865c55547752f8ac05ed2de3c22eff9d5b7c204f28ecd30d1a1d11bda9276454d505d12f5a951d88c40a160a1dad15fc62ab39a6d350d0ba45af4df299 WHIRLPOOL 283749fe3c678341d9489fea580e7af7bec404507be57bd264d4a3673b8b5660a729c5a3f96da2adbeee1fa10fe3205e486c6186f01dcb5fa05f93627bc646de
 DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72fbb6102c07095a61e6cc10066c5fff94a3abfebe2852484e31e SHA512 e41d80df015b84f2faf8811a8fd242f85c72e39867161d236ef0242062568c6fd163bf46a623f4a14779e9d89a49b6a2d88691487a5ec785eece6c7f70459ffa WHIRLPOOL e42fac6f885c4fd1c2bc030cf47aa82ec4e35f66d305e8dd06d6a439ca958074ce57ae761b7ee16e4612dc5f94bedd7fe4655463ab4a7c095e03f41d4fc686f1
 DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b2578585227423c94ebeb38b7bdfacac7a284cd29808d0d63373c845f55b SHA512 73d44db142dadeb4df6cba0b4c0308de49620f4f08d07297eb31b171a8923c0515bbcd45eea8c4b30ca8919b6b169a61e1c696d3381e303dd3249ad4c864d2f6 WHIRLPOOL 88be2575993c7773534f1c20d52ce9cc56d57ab7abcb31276e4d64f9d89c0df1bc2545294a7b7d7ac1bf043cb9c890f61a05f7d9648c7a83fa0f2171cad91a74
+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
@@ -61,4 +62,5 @@ EBUILD netbeans-mobility-9999_p20160914.ebuild 4412 SHA256 8b53bc6e01395594dd2b4
 EBUILD netbeans-mobility-9999_p20160915.ebuild 4412 SHA256 9ba508305df8c1f80633f95f79cc8122760378e8a72bd7c375a3d58d4d2f2dfb SHA512 634daddd00667dde16f98f7d3c706a2f0c37872ce4d0c51060d79085a145ee66549ad649cf530b0060b3a4cc189ee9f679f757b2c23d1a5f8f08dbb6f22e8d7d WHIRLPOOL 3c6f18f041474e8c8d9b654f771597cb89d98ce9522ae048106e4d044ff998b5744b3f8e22fc6547c8cf45ebf1c5d4fc69663132c6cff1a90a586e81b0017fe9
 EBUILD netbeans-mobility-9999_p20160916.ebuild 4412 SHA256 5c3099c3f96c618122fe1ef3e29f72b582a0fe5d064afbf82e1e5c20d4fb6744 SHA512 78b72173cd8fbe5269ff381a88380d30556b503982320edb310ffb8db67089d3f210a92d3b0515b0c50135912cb5c4f8cd4db306c9079500812aeda93b725827 WHIRLPOOL db58d0f74520edb4c2046b171e73e57d85be8f692df780da1797f3ce1a8a7f8c911fa4beab09a2596e23eda72fa3ad13b46511523f2167f0af2a73e71a4594b2
 EBUILD netbeans-mobility-9999_p20160917.ebuild 4412 SHA256 229f38b57db7bfea1c4c0e8f183bf205d74f0a05496768f9892cf9ec51c759d4 SHA512 4d8e2d35f2f96a374fd26c39c6befec6a9ac6466275d6a51bbd8aa6c11b2cafa48dc71c1c499801cd42fee684bfc6f8028f0d0fa4e81c5e320df4390e265b766 WHIRLPOOL 5b722b9189468dbc727eade32db574f7b2fe20c2f40bcfe8db2bf49637c4dd1e481f4b8fce1ac1eac048d83e1d2a45c7735f9f85c675754566d0a3890b9cf8e7
+EBUILD netbeans-mobility-9999_p20160918.ebuild 4412 SHA256 8011889e96f4ed022149419e6f2adb62a352b24f908c6b93fdbb0e9df054729b SHA512 404a090fbcd45130ab1ed3f2e90dff1f4a256dd48e56b8b90c782d3292b0aa17a3a349b77c9d3e8b9e2f71594740be2fceff527258f01b32ac9005ee37c74efa WHIRLPOOL b630648f0d6dcefa2341eb21cbef16be71d78230cab8dc387c9fbb93c001cf38a88a0db23834887e7b322ce70de17111f0031246187c447e2f5987d15f4d1eb7
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160918.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160918.ebuild
new file mode 100644
index 0000000..a5de01c
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160918.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-09-18_00-02-33/zip/netbeans-trunk-nightly-201609180002-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 e86bd4b..68bc1bc 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318b
 DIST netbeans-trunk-nightly-201609150002-src.zip 218016283 SHA256 90b7a4a97f9328512ad9388caab30b88290338dcd87e90d7b20c1568b679a11e SHA512 bc398e865c55547752f8ac05ed2de3c22eff9d5b7c204f28ecd30d1a1d11bda9276454d505d12f5a951d88c40a160a1dad15fc62ab39a6d350d0ba45af4df299 WHIRLPOOL 283749fe3c678341d9489fea580e7af7bec404507be57bd264d4a3673b8b5660a729c5a3f96da2adbeee1fa10fe3205e486c6186f01dcb5fa05f93627bc646de
 DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72fbb6102c07095a61e6cc10066c5fff94a3abfebe2852484e31e SHA512 e41d80df015b84f2faf8811a8fd242f85c72e39867161d236ef0242062568c6fd163bf46a623f4a14779e9d89a49b6a2d88691487a5ec785eece6c7f70459ffa WHIRLPOOL e42fac6f885c4fd1c2bc030cf47aa82ec4e35f66d305e8dd06d6a439ca958074ce57ae761b7ee16e4612dc5f94bedd7fe4655463ab4a7c095e03f41d4fc686f1
 DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b2578585227423c94ebeb38b7bdfacac7a284cd29808d0d63373c845f55b SHA512 73d44db142dadeb4df6cba0b4c0308de49620f4f08d07297eb31b171a8923c0515bbcd45eea8c4b30ca8919b6b169a61e1c696d3381e303dd3249ad4c864d2f6 WHIRLPOOL 88be2575993c7773534f1c20d52ce9cc56d57ab7abcb31276e4d64f9d89c0df1bc2545294a7b7d7ac1bf043cb9c890f61a05f7d9648c7a83fa0f2171cad91a74
+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
@@ -64,4 +65,5 @@ EBUILD netbeans-nb-9999_p20160914.ebuild 4111 SHA256 a30a30fdec2907e201c782b9056
 EBUILD netbeans-nb-9999_p20160915.ebuild 4111 SHA256 2db78372b304889b80c07bd1c7b430585d491608a00f3a56f3eb4c951e4f02fe SHA512 ed545db6f4779bb23754e458de8e2a8d987cf28a4cd17c6e117ac3ba0af06957e10d5568ffdf3ee9ef48be1b06dd0bd809c886bd1b4191c3ce6305f922b242c6 WHIRLPOOL 03b3cfecbf37c7465f777d8e0bb636efd8f823896f5a48aa4b8500d0f7d798aafd3acba7a013ca2215fa041ff4bb6af51884f8f751f8371ad30f1f3bfd001569
 EBUILD netbeans-nb-9999_p20160916.ebuild 4111 SHA256 7ef421a178eb1e2e598a0ef7476c073601d29c1c66d240440e73e45fd723ad89 SHA512 ce7bbd3c8761e7911a069e1b8134cac6ad1475c06991e26363e67d2aa5e2f1b1ba688b377da2d6c585dcb9e634dedcbaed6dc3734968482e6d6e193cd8e5b7cc WHIRLPOOL fbcaa28cdeaacecce1cbdce6216741203132462811aa790c9426c9cae55cc1e16c6c85d4d76e3822fd2647f4c1e707357dc6326130483ec40feed81369ee7cfb
 EBUILD netbeans-nb-9999_p20160917.ebuild 4111 SHA256 32e3c57d2fb164cddb076e8e74b8252ad16044a9078b0ca4f8ed883fbadf4144 SHA512 bf900f02fdfd0f5fcaefc69b36eca9b04471dfb95f11ac0d9fc74b05ce2875bc0b780c6fbf16da421f650f026f3abfad551d6b2b2967fabd0b1ee7f7d2d5431d WHIRLPOOL 98f3dd9aa70c59c31e5b4e53af1fca944cecbe817918ee10120ed6eaee334cac8b47a1b09f10a2cefbee23842910f44171e36215eabea8d16605ff91692378cd
+EBUILD netbeans-nb-9999_p20160918.ebuild 4111 SHA256 0499bb0c1c7b82d3023b2bc74fd27c69236a34cd8c3c95d6cfb532cdaa3718d2 SHA512 58bbbe32191bd6c0e5b04d4f1e61abde65c0195fdd03027aa017f65b979c049c79b4640426e4e364944efc9023cdcfcb8a14468b93bc3e60b732c9c084b4887d WHIRLPOOL cf87e41de5bc0cac64dbff10c063330836604dc3c47bdd2be946ef80f7f7fd231baea0494e729f1d0684e27533f27e60cf472f006582f015d3ba367b49287c24
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160918.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160918.ebuild
new file mode 100644
index 0000000..d3995c7
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20160918.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-09-18_00-02-33/zip/netbeans-trunk-nightly-201609180002-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 8b3adf9..af735a4 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318b
 DIST netbeans-trunk-nightly-201609150002-src.zip 218016283 SHA256 90b7a4a97f9328512ad9388caab30b88290338dcd87e90d7b20c1568b679a11e SHA512 bc398e865c55547752f8ac05ed2de3c22eff9d5b7c204f28ecd30d1a1d11bda9276454d505d12f5a951d88c40a160a1dad15fc62ab39a6d350d0ba45af4df299 WHIRLPOOL 283749fe3c678341d9489fea580e7af7bec404507be57bd264d4a3673b8b5660a729c5a3f96da2adbeee1fa10fe3205e486c6186f01dcb5fa05f93627bc646de
 DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72fbb6102c07095a61e6cc10066c5fff94a3abfebe2852484e31e SHA512 e41d80df015b84f2faf8811a8fd242f85c72e39867161d236ef0242062568c6fd163bf46a623f4a14779e9d89a49b6a2d88691487a5ec785eece6c7f70459ffa WHIRLPOOL e42fac6f885c4fd1c2bc030cf47aa82ec4e35f66d305e8dd06d6a439ca958074ce57ae761b7ee16e4612dc5f94bedd7fe4655463ab4a7c095e03f41d4fc686f1
 DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b2578585227423c94ebeb38b7bdfacac7a284cd29808d0d63373c845f55b SHA512 73d44db142dadeb4df6cba0b4c0308de49620f4f08d07297eb31b171a8923c0515bbcd45eea8c4b30ca8919b6b169a61e1c696d3381e303dd3249ad4c864d2f6 WHIRLPOOL 88be2575993c7773534f1c20d52ce9cc56d57ab7abcb31276e4d64f9d89c0df1bc2545294a7b7d7ac1bf043cb9c890f61a05f7d9648c7a83fa0f2171cad91a74
+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
@@ -66,4 +67,5 @@ EBUILD netbeans-php-9999_p20160914.ebuild 4418 SHA256 201ba61bf634cf1b165ea10504
 EBUILD netbeans-php-9999_p20160915.ebuild 4418 SHA256 c3d47bfa48d8a40ba4b56a4c1774ec56daf3f3e754e3cc1c14f21791feab4e69 SHA512 e9b77fc3b4882f27222dcc4653614344003cba987c7b8ccd4a491d636e6bcc6f49d2fe12cbf498daf7f4d962789b2c3aa7c9fd631a8f42c95972cc6d7ab0d087 WHIRLPOOL ae04c3de70bd438b88fe8141156ea698c90b4465ce709cd23cb03880324d83dec496c5b16be18d59b4576bb5132b1cf3750db402a8ad01704793b5583ed3c45f
 EBUILD netbeans-php-9999_p20160916.ebuild 4418 SHA256 5ea660dc7e6fe8685c878fb3f151721a5d95a5bbb22edcf8a081836d5f5bf8b9 SHA512 4ee6fa0a8dd10b93cfc262874eb0928289d089d8b915c72513018a01a206b0c8a5c53efc84a32140afe0c463129d6f823b207a429e8dfb17cc9bca9066908097 WHIRLPOOL 899abafbc5a763dcd94dd4a37458800695c4fe79e888c3c8f240429ea18bd6dcf01f0eb1403c97b8530c930c0a775ee0ebc4b5502871c491fc70f1dbbca7774a
 EBUILD netbeans-php-9999_p20160917.ebuild 4418 SHA256 65d59884940c54377b9420491c2a20d4e39e2c989b410228966d1e6b00e89708 SHA512 9ce001073be4a653d3e3a81891f77615cde79339a611e005bd7564ab9e2a8e0a2fc46723466079e6c3f098b5199d863a5b11b8a2fddfb154912d77a6e7425399 WHIRLPOOL ac5f92c11d503026428bd092689c1e1911ab493c188b4551ce3ec5eb972b15f411d1f3ea14aea543cf0dfb41f3290661b47c91937d668970d678e26c069ae9fd
+EBUILD netbeans-php-9999_p20160918.ebuild 4418 SHA256 f90628e78ad55cfee2dc00bae986926b3cb7f08d13d177cd0e6d3e4cde359080 SHA512 8d09ce4c7f0e71123c302238727f5e2fe48850ff77cbac70282d29d3522d2bd6be7a3baf716bc3ae9ee3215a618e5bd2fb47e6fc34aa001c898832c2da154934 WHIRLPOOL 556f4906868005e28226299f39cd6bb1a438a26a7c1db0354ab08dfb62c8ecae7cb6b4e296d823fb9505875b61a07680cde1eaad98cf76acffd005fcdf817c5c
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160918.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160918.ebuild
new file mode 100644
index 0000000..521d150
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20160918.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-09-18_00-02-33/zip/netbeans-trunk-nightly-201609180002-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 270761f..a5a251b 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -57,6 +57,7 @@ DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318b
 DIST netbeans-trunk-nightly-201609150002-src.zip 218016283 SHA256 90b7a4a97f9328512ad9388caab30b88290338dcd87e90d7b20c1568b679a11e SHA512 bc398e865c55547752f8ac05ed2de3c22eff9d5b7c204f28ecd30d1a1d11bda9276454d505d12f5a951d88c40a160a1dad15fc62ab39a6d350d0ba45af4df299 WHIRLPOOL 283749fe3c678341d9489fea580e7af7bec404507be57bd264d4a3673b8b5660a729c5a3f96da2adbeee1fa10fe3205e486c6186f01dcb5fa05f93627bc646de
 DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72fbb6102c07095a61e6cc10066c5fff94a3abfebe2852484e31e SHA512 e41d80df015b84f2faf8811a8fd242f85c72e39867161d236ef0242062568c6fd163bf46a623f4a14779e9d89a49b6a2d88691487a5ec785eece6c7f70459ffa WHIRLPOOL e42fac6f885c4fd1c2bc030cf47aa82ec4e35f66d305e8dd06d6a439ca958074ce57ae761b7ee16e4612dc5f94bedd7fe4655463ab4a7c095e03f41d4fc686f1
 DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b2578585227423c94ebeb38b7bdfacac7a284cd29808d0d63373c845f55b SHA512 73d44db142dadeb4df6cba0b4c0308de49620f4f08d07297eb31b171a8923c0515bbcd45eea8c4b30ca8919b6b169a61e1c696d3381e303dd3249ad4c864d2f6 WHIRLPOOL 88be2575993c7773534f1c20d52ce9cc56d57ab7abcb31276e4d64f9d89c0df1bc2545294a7b7d7ac1bf043cb9c890f61a05f7d9648c7a83fa0f2171cad91a74
+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
@@ -87,4 +88,5 @@ EBUILD netbeans-platform-9999_p20160914.ebuild 9520 SHA256 6c8459e287602ff8536d9
 EBUILD netbeans-platform-9999_p20160915.ebuild 9520 SHA256 f020a9af2f54e7ae7118262d5beac24ac22ac4154d47e6d808165fbfadad0d84 SHA512 0791323e17d0ad066c7960ee43974201a6c43e3ca4bef60fe681a97c62b71401cc48d3b4d5abf6af3cbb6852fe179771213585a339cccebeb217123c252ff709 WHIRLPOOL 872f42ea603e9add94d2ff885ab5e3ec920b789e5a6bd5d53767e9e6e54d1ebd23d81f48ce62aaa23bd433edc667dd79b0a030e6a692799e57af952835bd2448
 EBUILD netbeans-platform-9999_p20160916.ebuild 9520 SHA256 67113458e022e0e5eaaf86cb03f43b6a98c1dca9bc73ea41654effd1df692af9 SHA512 c940c53846ed31dbe78efdf22993044c4d2232791ca027c6a843c36d1cb1e4eb6f27e59ed6f0fc8414a9ebd987a4732710d408e7f9786201579c2486f0529e61 WHIRLPOOL bb1f2ab9d7b354121f92ea5d65dd71f14882f5518c7fa9c438183a88288f2a35bf8c54c369fd725fc0f768d271026611621736a7c0b803a65417b196ebdf87f6
 EBUILD netbeans-platform-9999_p20160917.ebuild 9520 SHA256 d8cc28770b492e545164eb521c8f21cbe76f300c163c074179e88039763ff3fb SHA512 bcf8bad5bbb289484adb976fc5b2dfcf84d180566743fab4cfe1af4816bab745d49a9d672db8e6e26916d6d22a3c738599e022696a295dd69ea74d7a9b910ec7 WHIRLPOOL 8275e19f1a8ed8b6fcc2ad215b11eb11540feb9dbe750f094e2c1110d7a4b34e5a6bc12bca6b1e6436ea90fa5a71d68c61b147ff746cac1a8ec1f8ba53c57d3f
+EBUILD netbeans-platform-9999_p20160918.ebuild 9520 SHA256 6672a45ebe867e8da7c6dd95540be0951b668c668454c2622371d2857390f49e SHA512 57db075d099db944ec3f13ccea4f9cf9941a749d624273fe607d82ed7910d0393df5d54f3ba31b107a1b459d4b4d0323d553724b250015b26e3639ced5ae7ea5 WHIRLPOOL 9f8d89eea8ee6ebfb0c428501ad93c9e9aec24e45ad9d4414c5e4627b7419c0726ee121ce99591be41b447bc46f916babf69ebd4d22de80881b902f089e0948a
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160918.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160918.ebuild
new file mode 100644
index 0000000..f43b11b
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20160918.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-09-18_00-02-33/zip/netbeans-trunk-nightly-201609180002-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 4235277..076c269 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318b
 DIST netbeans-trunk-nightly-201609150002-src.zip 218016283 SHA256 90b7a4a97f9328512ad9388caab30b88290338dcd87e90d7b20c1568b679a11e SHA512 bc398e865c55547752f8ac05ed2de3c22eff9d5b7c204f28ecd30d1a1d11bda9276454d505d12f5a951d88c40a160a1dad15fc62ab39a6d350d0ba45af4df299 WHIRLPOOL 283749fe3c678341d9489fea580e7af7bec404507be57bd264d4a3673b8b5660a729c5a3f96da2adbeee1fa10fe3205e486c6186f01dcb5fa05f93627bc646de
 DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72fbb6102c07095a61e6cc10066c5fff94a3abfebe2852484e31e SHA512 e41d80df015b84f2faf8811a8fd242f85c72e39867161d236ef0242062568c6fd163bf46a623f4a14779e9d89a49b6a2d88691487a5ec785eece6c7f70459ffa WHIRLPOOL e42fac6f885c4fd1c2bc030cf47aa82ec4e35f66d305e8dd06d6a439ca958074ce57ae761b7ee16e4612dc5f94bedd7fe4655463ab4a7c095e03f41d4fc686f1
 DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b2578585227423c94ebeb38b7bdfacac7a284cd29808d0d63373c845f55b SHA512 73d44db142dadeb4df6cba0b4c0308de49620f4f08d07297eb31b171a8923c0515bbcd45eea8c4b30ca8919b6b169a61e1c696d3381e303dd3249ad4c864d2f6 WHIRLPOOL 88be2575993c7773534f1c20d52ce9cc56d57ab7abcb31276e4d64f9d89c0df1bc2545294a7b7d7ac1bf043cb9c890f61a05f7d9648c7a83fa0f2171cad91a74
+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
@@ -61,4 +62,5 @@ EBUILD netbeans-profiler-9999_p20160914.ebuild 3472 SHA256 b4d694770d5f8b6bba320
 EBUILD netbeans-profiler-9999_p20160915.ebuild 3472 SHA256 8d0c28e57c5c058ff166b514951be420eb2b43dd40767ef2baf2569b19af84ca SHA512 a55c79f652b3581d302692676146695f53713bd5d4844bbda59aa762c418550d1df1bb2a4b62e80063281dc194c954c982502f25a98cfbb4b56ed3fb0a2fe1a2 WHIRLPOOL 6c1966ee52fb140516f7d66a1728577a370c6cb50e1e87d34b801a52c956da060eb44e4d1cb5acb0acd50a5148af4987062af07edb82f489faba7c606ec5df8a
 EBUILD netbeans-profiler-9999_p20160916.ebuild 3472 SHA256 e3b7337297dcf5bb81ae73e384507646384faa730877e57e633d85ad866ac56c SHA512 42fe76145df9840ec17fdde1799c1fd5ac9ed9d812f73f8351005291a48dad92e4ef97aa43879b45b6db823ddcc767a209a7a9cea487a1563ebbf929f744a3e3 WHIRLPOOL abfba7f92b9000947dac7c244b64878ba42f538c28d4dc0d6c22ac1ee6058f07a5073b6aeb0e0604c5973735bcfeb855a96e2b7f953dfb604c436cb0aa10453c
 EBUILD netbeans-profiler-9999_p20160917.ebuild 3472 SHA256 7a1db9965b0478783795e403ac261a134393958f5f06b6b2d14ab293e6eb04cb SHA512 268d714d732748ea96bb9d5510645d64c28b1a64250d775a5a10ba03ac75e79236804c649642e745051a7a9f23cfdd7fa4391e34f39069e9c6e408db5c3e7f5f WHIRLPOOL db4d08cb78b26a6d426b68ed67ebfd6d3f6a3604c845789fd3ca654445aa1d061c6ae6d9675194a45b1f4c39bbf51b2315d9dc150bb7428a245659717c2dccb1
+EBUILD netbeans-profiler-9999_p20160918.ebuild 3472 SHA256 324cf721315d347186d4be1b45dc2d0e4381b3498b118499c7a48987d60a0612 SHA512 06dcdd809dc6a367ae4b7ab7a033da8f9931470ba9f2bad1247cb28729d68f82fb1b382f5d2b1241630f26b989e47de28bfc911dbe4f9b898b11063001e86036 WHIRLPOOL 26c2402058a66b40d62ef050d449de242741703efd5ec6989f6f90822630b78aa1711bcbb77ea634c0fc8c284fe63d9f816f6c63fec2f9e2e547c9902437eb06
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160918.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160918.ebuild
new file mode 100644
index 0000000..2c5e544
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160918.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-09-18_00-02-33/zip/netbeans-trunk-nightly-201609180002-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 8e8df35..0e0a473 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -50,6 +50,7 @@ DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318b
 DIST netbeans-trunk-nightly-201609150002-src.zip 218016283 SHA256 90b7a4a97f9328512ad9388caab30b88290338dcd87e90d7b20c1568b679a11e SHA512 bc398e865c55547752f8ac05ed2de3c22eff9d5b7c204f28ecd30d1a1d11bda9276454d505d12f5a951d88c40a160a1dad15fc62ab39a6d350d0ba45af4df299 WHIRLPOOL 283749fe3c678341d9489fea580e7af7bec404507be57bd264d4a3673b8b5660a729c5a3f96da2adbeee1fa10fe3205e486c6186f01dcb5fa05f93627bc646de
 DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72fbb6102c07095a61e6cc10066c5fff94a3abfebe2852484e31e SHA512 e41d80df015b84f2faf8811a8fd242f85c72e39867161d236ef0242062568c6fd163bf46a623f4a14779e9d89a49b6a2d88691487a5ec785eece6c7f70459ffa WHIRLPOOL e42fac6f885c4fd1c2bc030cf47aa82ec4e35f66d305e8dd06d6a439ca958074ce57ae761b7ee16e4612dc5f94bedd7fe4655463ab4a7c095e03f41d4fc686f1
 DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b2578585227423c94ebeb38b7bdfacac7a284cd29808d0d63373c845f55b SHA512 73d44db142dadeb4df6cba0b4c0308de49620f4f08d07297eb31b171a8923c0515bbcd45eea8c4b30ca8919b6b169a61e1c696d3381e303dd3249ad4c864d2f6 WHIRLPOOL 88be2575993c7773534f1c20d52ce9cc56d57ab7abcb31276e4d64f9d89c0df1bc2545294a7b7d7ac1bf043cb9c890f61a05f7d9648c7a83fa0f2171cad91a74
+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
@@ -80,4 +81,5 @@ EBUILD netbeans-webcommon-9999_p20160914.ebuild 6242 SHA256 df8cddb3912ba6bf004b
 EBUILD netbeans-webcommon-9999_p20160915.ebuild 6242 SHA256 01eebd9963d6c7ac3c165ac5eb7183b49e04add149809504fbf585d844802aac SHA512 7d29c4baeb96f3ad615aae2f9496ed8f346c8740c1a63c0d3f4eb70e67ef84d284ba461f60b3f28179263672aee8f7b51d15c6ebefbfc341a0f695dfbb8bda33 WHIRLPOOL 362fc6b4c4901096a65abed0e3cf11cd49efa4d46e5644640437e3a9ae3a770311c6c66caef999a68b1a043e889d42981ed8f27cb2937864137e9d8ed4262294
 EBUILD netbeans-webcommon-9999_p20160916.ebuild 6242 SHA256 d173be339ab585e07fa62d608ac15be18b203f0a25851d22b080271ba869ca19 SHA512 eb3675bf3489ffab2bcb198db6ced46b8a854d04c76b4d83d073d48206b9ba460b66e56518a1ef266ce836849eda5baf2bf493900e36b0bb4e96d9635a5c9176 WHIRLPOOL 83341d648612efc872de8b311e443c54cc447ca0eaa4d94910ab8c9e2814a48942c697d0fa303c9c5d1907b0a9d3a098b5c33858b25190f877549931599a7c8a
 EBUILD netbeans-webcommon-9999_p20160917.ebuild 6242 SHA256 96e701fe87e6f5863aef55f5fe64a9275b9d4c9434a0d465b9c5e9964212d840 SHA512 6052f14020235b58521d371eeec4f61930a323111df922b96e30757123dbde01196ce2d051097398f6e9928bf394d0f783238c90a6243ac1ce1868b6b14894c9 WHIRLPOOL aa3baeb25647e3a73813542e32593f1b23b35cb87a743ce37796898b7a2e6cad525a56679f8b2015d4a7ab68e42ad73ba4500da6ea99c28dc956b9c3bf14e406
+EBUILD netbeans-webcommon-9999_p20160918.ebuild 6242 SHA256 113951e94945428b6491100924dbe70e73e840c7a982953bf8fd15fa0328037b SHA512 1392542582a1bc2b1e4ac1c243140a46d5d18acac47941281b5c4cc9950d205acd6e05e2df752be35762e784fbb3708297ad0ef54c8c6415a5715945df53c55b WHIRLPOOL 31ee7f49eb81032ef150d49de7a7d34aae6579767914a9f85460f4369589b238ef94b587efebe10dff59b418cf6f4a3e93b2fbb15bd9e474c4a0bddadc9ef499
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160918.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160918.ebuild
new file mode 100644
index 0000000..a6f5be9
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160918.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-09-18_00-02-33/zip/netbeans-trunk-nightly-201609180002-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 afa9f47..8d99e35 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318b
 DIST netbeans-trunk-nightly-201609150002-src.zip 218016283 SHA256 90b7a4a97f9328512ad9388caab30b88290338dcd87e90d7b20c1568b679a11e SHA512 bc398e865c55547752f8ac05ed2de3c22eff9d5b7c204f28ecd30d1a1d11bda9276454d505d12f5a951d88c40a160a1dad15fc62ab39a6d350d0ba45af4df299 WHIRLPOOL 283749fe3c678341d9489fea580e7af7bec404507be57bd264d4a3673b8b5660a729c5a3f96da2adbeee1fa10fe3205e486c6186f01dcb5fa05f93627bc646de
 DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72fbb6102c07095a61e6cc10066c5fff94a3abfebe2852484e31e SHA512 e41d80df015b84f2faf8811a8fd242f85c72e39867161d236ef0242062568c6fd163bf46a623f4a14779e9d89a49b6a2d88691487a5ec785eece6c7f70459ffa WHIRLPOOL e42fac6f885c4fd1c2bc030cf47aa82ec4e35f66d305e8dd06d6a439ca958074ce57ae761b7ee16e4612dc5f94bedd7fe4655463ab4a7c095e03f41d4fc686f1
 DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b2578585227423c94ebeb38b7bdfacac7a284cd29808d0d63373c845f55b SHA512 73d44db142dadeb4df6cba0b4c0308de49620f4f08d07297eb31b171a8923c0515bbcd45eea8c4b30ca8919b6b169a61e1c696d3381e303dd3249ad4c864d2f6 WHIRLPOOL 88be2575993c7773534f1c20d52ce9cc56d57ab7abcb31276e4d64f9d89c0df1bc2545294a7b7d7ac1bf043cb9c890f61a05f7d9648c7a83fa0f2171cad91a74
+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
@@ -61,4 +62,5 @@ EBUILD netbeans-websvccommon-9999_p20160914.ebuild 2721 SHA256 820f0bd55b8116711
 EBUILD netbeans-websvccommon-9999_p20160915.ebuild 2721 SHA256 c4ca2158f326add4df2eebf8df33980c710e5b0f1a6c85c14a4d43a3bb6fe5b2 SHA512 0a76c936326075ecc90ef87321450632a155e7974ca3fa47312720e219cf2fbf26754b305f75cf7a573566bcae6a0a5c22f4532a33043e62ef39241f681bb61a WHIRLPOOL b8acc5587c88580150d8623f9b5b08cdb6c8067ccd15cd22e480a9353a340a663d636a081c80827f100870cef3cab52862212e84719b3cf2e5c50df122da845e
 EBUILD netbeans-websvccommon-9999_p20160916.ebuild 2721 SHA256 6f9e3fc28118bc6faeddeda2eb076399ec1c3b57ae564517c667bb510fc487f1 SHA512 ef6b57534ebe4a9428369b8b9f2f1defc6e1698028ab013b671ddb9a44fc429cec6dff645f2f109b68e82bae222ac735904ab7be358a648b839f3c416a8b01d1 WHIRLPOOL 254a4401de9bacf6f821f25625769b5f95e948f6f412fb662b4299eebc0456f55c71352e5cce12be2da24dac2f82f6b5753d542e143a182d03c3cc71947af853
 EBUILD netbeans-websvccommon-9999_p20160917.ebuild 2721 SHA256 4e3c6e2714663b6a35199b029d8990fc9f19624694bbc152211cb236c4691df2 SHA512 c4a4d5fb46ee97ec9dc0ddf24f5ee0bbfc522bae09c6be07305919eb87f4c28de1ae3db8585c89e1b137841a667629d7bfb62acfc39cfaf05ffd54cf5ef422d0 WHIRLPOOL 31426f41383eb8e649ecbef92047eac6f2109f3c6bedbfec3b51f0432de97e2ff3090329cc974dcd65c6a5a4c295035f3c1ca07795239a09471e1b6588e343ac
+EBUILD netbeans-websvccommon-9999_p20160918.ebuild 2721 SHA256 6760299fe150285a185d58c43d93b366d3a6c0ef522ba94c1fc10c655a663ceb SHA512 93c7938c9a7890078367127c604d66ecd1a1b9213dd3d3843744ca1301c3adc047067d1d60d84f9be0e5fd45b12ae58d84611254293fd76e8d54b9c4cf701d02 WHIRLPOOL fed94e0004cff079e4ad7a14cfba701c8223d77c9f35927c46ed9d68f7eb1b28f7edcaf0f9fa9b17b736c7df3eb9c3df5bd6a9c78a8eded215650b79dd055100
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160918.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160918.ebuild
new file mode 100644
index 0000000..969c3b7
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160918.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-09-18_00-02-33/zip/netbeans-trunk-nightly-201609180002-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 91fabde..582aff4 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318b
 DIST netbeans-trunk-nightly-201609150002-src.zip 218016283 SHA256 90b7a4a97f9328512ad9388caab30b88290338dcd87e90d7b20c1568b679a11e SHA512 bc398e865c55547752f8ac05ed2de3c22eff9d5b7c204f28ecd30d1a1d11bda9276454d505d12f5a951d88c40a160a1dad15fc62ab39a6d350d0ba45af4df299 WHIRLPOOL 283749fe3c678341d9489fea580e7af7bec404507be57bd264d4a3673b8b5660a729c5a3f96da2adbeee1fa10fe3205e486c6186f01dcb5fa05f93627bc646de
 DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72fbb6102c07095a61e6cc10066c5fff94a3abfebe2852484e31e SHA512 e41d80df015b84f2faf8811a8fd242f85c72e39867161d236ef0242062568c6fd163bf46a623f4a14779e9d89a49b6a2d88691487a5ec785eece6c7f70459ffa WHIRLPOOL e42fac6f885c4fd1c2bc030cf47aa82ec4e35f66d305e8dd06d6a439ca958074ce57ae761b7ee16e4612dc5f94bedd7fe4655463ab4a7c095e03f41d4fc686f1
 DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b2578585227423c94ebeb38b7bdfacac7a284cd29808d0d63373c845f55b SHA512 73d44db142dadeb4df6cba0b4c0308de49620f4f08d07297eb31b171a8923c0515bbcd45eea8c4b30ca8919b6b169a61e1c696d3381e303dd3249ad4c864d2f6 WHIRLPOOL 88be2575993c7773534f1c20d52ce9cc56d57ab7abcb31276e4d64f9d89c0df1bc2545294a7b7d7ac1bf043cb9c890f61a05f7d9648c7a83fa0f2171cad91a74
+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
@@ -64,4 +65,5 @@ EBUILD netbeans-9999_p20160914.ebuild 6939 SHA256 d4d81599df1c37a73c58788d302714
 EBUILD netbeans-9999_p20160915.ebuild 6939 SHA256 dd35f8be80fbc793c34d666be6604059577c25835bbe070b7da64f156d251250 SHA512 ebae8c4b55ea65ad9086561cf883c8202c2f978502e243c6da7c64f5aa895944fc5a33414ac8462d1aea73b43ec37c669fda9c38506ce99ad216a8c855144f1d WHIRLPOOL bd80c0fd2a720fc17b5a66305833351d581b352526d32755e5f39cee03fadbf50df77e03326537ea17e1d7b3b99cd579f8084f0f1eecf0ad58fbce4c97f40c80
 EBUILD netbeans-9999_p20160916.ebuild 6939 SHA256 7c49048223ccbb191d0f5417e2e46d85040040f8b055ca54fb1f88549f1e145e SHA512 d9e60419a9e13c746bde4c55ef9b2f7ffed3d302b47872bf7191a17c28a406ae20cc191ddcedf5211f50f2ce4de8e767968e50e245ca0db79ba2346155b0e574 WHIRLPOOL 76d194f1af6a2cd47233742d35dea2257ec25832cf9a35d52d7eb333fc6857fc3547fd79603e53326167776933c8b94e5e33a1eedf16b444a6ba93a586dc60e6
 EBUILD netbeans-9999_p20160917.ebuild 6939 SHA256 21bc698a33e861f3f370e20e4405cb69181b46950dff9b5f1beba3aa1eef08e5 SHA512 e4834c3e1fa41713f8bb80838a6777e0ad6c6f7b08553d60e420090ceb5df5096eeb5cd988840b4513405ff2852aed62cc2268b60a24a31188f499f753e9d11f WHIRLPOOL 137417be034e683df756d16052deacadc8dec485d0b01d3fb4763ce4e5e1a56a9c0fc4ec7b8d821a285e113d4f6958e377e58e456df641861ee18686649a2a71
+EBUILD netbeans-9999_p20160918.ebuild 6939 SHA256 db27e19d668a82d48cca4db5cb7767ef6bdc9a5f2fa58079906c4105ce076f74 SHA512 6899aebaaa7b1feaa065a7f9b3d9bb4a78a8375789ff0781efc1f540fc30bfa8ef9f60d6e47fc25af11ef03701088db09037668c8809ca975adb18628d7bb6a1 WHIRLPOOL e1374e1692b44c01f8cd1938fca96724dfec3be5c198e2423d074abf9e52860842025761815a3322b7901d9edfcc5c42d21e24bc83289debf899c800852d66b2
 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834

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


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

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

commit:     9f59a17ea1aa088a800b2982a01f2f5d07730b93
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 18 06:10:20 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Sep 18 06:10:20 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=9f59a17e

netbeans: removed obsolete ebuilds

Package-Manager: portage-2.3.0

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index dbecef9..84afe8a 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-201608160002-src.zip 217153721 SHA256 f7f0624027293b4eb18b02c6e83678b76f9161ae7790431e5cdf0a67c81067bf SHA512 004bbbafc97c8c155429d12c37e05d1737d5e5d7a5c1d77df1e120481c1f59f2535fd93efda3588aab85e8eef404cbae74ee01469b771226912ab876a23420dd WHIRLPOOL bd19581fb56c256dbf59dcc1fb7db4a11f0e8dc632763d55966f63f4bdc107645862c8ec51a8db231b462dafeb586f680f3de9ffe5af4a6c398dd4c30e880352
 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
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72f
 DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b2578585227423c94ebeb38b7bdfacac7a284cd29808d0d63373c845f55b SHA512 73d44db142dadeb4df6cba0b4c0308de49620f4f08d07297eb31b171a8923c0515bbcd45eea8c4b30ca8919b6b169a61e1c696d3381e303dd3249ad4c864d2f6 WHIRLPOOL 88be2575993c7773534f1c20d52ce9cc56d57ab7abcb31276e4d64f9d89c0df1bc2545294a7b7d7ac1bf043cb9c890f61a05f7d9648c7a83fa0f2171cad91a74
 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_p20160816.ebuild 3384 SHA256 af947e60e6142b5af78a851fec48312745a6565b9bad6bc7bb4777a3df28503d SHA512 86fc68d0870780b209967b2eb16bab1e0fd94c65076949213886054563f6ab30faf121068721bcd73728ddd506a2a7ec2347b6be9ca3a51ecd8a9315cab9b96d WHIRLPOOL fde89f6f10bb1088f2d3c2bd799dc1ab4af28cf662a93a7f956314b5840a34a5c00a0eaedf1e8aa08497642abd3e4a106e37b4d737b1f77f41a7341f8f87a778
 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

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160816.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160816.ebuild
deleted file mode 100644
index a7b42ea..0000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160816.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-16_00-02-33/zip/netbeans-trunk-nightly-201608160002-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 304c919..d60e114 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-201608160002-src.zip 217153721 SHA256 f7f0624027293b4eb18b02c6e83678b76f9161ae7790431e5cdf0a67c81067bf SHA512 004bbbafc97c8c155429d12c37e05d1737d5e5d7a5c1d77df1e120481c1f59f2535fd93efda3588aab85e8eef404cbae74ee01469b771226912ab876a23420dd WHIRLPOOL bd19581fb56c256dbf59dcc1fb7db4a11f0e8dc632763d55966f63f4bdc107645862c8ec51a8db231b462dafeb586f680f3de9ffe5af4a6c398dd4c30e880352
 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
@@ -49,7 +48,6 @@ DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72f
 DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b2578585227423c94ebeb38b7bdfacac7a284cd29808d0d63373c845f55b SHA512 73d44db142dadeb4df6cba0b4c0308de49620f4f08d07297eb31b171a8923c0515bbcd45eea8c4b30ca8919b6b169a61e1c696d3381e303dd3249ad4c864d2f6 WHIRLPOOL 88be2575993c7773534f1c20d52ce9cc56d57ab7abcb31276e4d64f9d89c0df1bc2545294a7b7d7ac1bf043cb9c890f61a05f7d9648c7a83fa0f2171cad91a74
 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_p20160816.ebuild 4790 SHA256 0508775024101190991ff8279d4c6d5cd3a13c467bf1c57fefb9955c9e00f6c0 SHA512 95a5162b52f2e15047effd730e9b8d6ea5bc3bb5f023c16b2b601089c70c276069f9f0fc1c937bc7308b6f3118d6775e951a8f35f46f260dffae98e0ededecd8 WHIRLPOOL dfdad6ffe565aa3eaa7aa83ed3b7135f25f157602b6c8c8e8a4862a18c25e3af36987a31c1983fa9faa67d168a8b04be945b4b9e941668e228394bebfbc8dd05
 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

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160816.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160816.ebuild
deleted file mode 100644
index 8211a67..0000000
--- a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160816.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-16_00-02-33/zip/netbeans-trunk-nightly-201608160002-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 1acef44..3af4282 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-201608160002-src.zip 217153721 SHA256 f7f0624027293b4eb18b02c6e83678b76f9161ae7790431e5cdf0a67c81067bf SHA512 004bbbafc97c8c155429d12c37e05d1737d5e5d7a5c1d77df1e120481c1f59f2535fd93efda3588aab85e8eef404cbae74ee01469b771226912ab876a23420dd WHIRLPOOL bd19581fb56c256dbf59dcc1fb7db4a11f0e8dc632763d55966f63f4bdc107645862c8ec51a8db231b462dafeb586f680f3de9ffe5af4a6c398dd4c30e880352
 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
@@ -39,7 +38,6 @@ DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72f
 DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b2578585227423c94ebeb38b7bdfacac7a284cd29808d0d63373c845f55b SHA512 73d44db142dadeb4df6cba0b4c0308de49620f4f08d07297eb31b171a8923c0515bbcd45eea8c4b30ca8919b6b169a61e1c696d3381e303dd3249ad4c864d2f6 WHIRLPOOL 88be2575993c7773534f1c20d52ce9cc56d57ab7abcb31276e4d64f9d89c0df1bc2545294a7b7d7ac1bf043cb9c890f61a05f7d9648c7a83fa0f2171cad91a74
 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_p20160816.ebuild 2968 SHA256 9738df5d7f5a814965a9e59535364362375aee11d3b5be15ab826cd3cc74ec77 SHA512 88be684af2040260f05991b1b3e9eece437e6eb8fc6bb7125f42947cb940123e006e11951fcaecc385d014faaef4520d76b4423f7ba35b2dd708525534586e13 WHIRLPOOL a3bcadfee10a0b6294d62db93951cea9afc2daef9b0f96beedbc60f695fba8548cabda9d8286ce1823b6f2be1a40e837cd006507403f6943a791ab69da62b56a
 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

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160816.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160816.ebuild
deleted file mode 100644
index 61eeb1f..0000000
--- a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160816.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-16_00-02-33/zip/netbeans-trunk-nightly-201608160002-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 b0bd0fe..b613956 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-201608160002-src.zip 217153721 SHA256 f7f0624027293b4eb18b02c6e83678b76f9161ae7790431e5cdf0a67c81067bf SHA512 004bbbafc97c8c155429d12c37e05d1737d5e5d7a5c1d77df1e120481c1f59f2535fd93efda3588aab85e8eef404cbae74ee01469b771226912ab876a23420dd WHIRLPOOL bd19581fb56c256dbf59dcc1fb7db4a11f0e8dc632763d55966f63f4bdc107645862c8ec51a8db231b462dafeb586f680f3de9ffe5af4a6c398dd4c30e880352
 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
@@ -66,7 +65,6 @@ DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72f
 DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b2578585227423c94ebeb38b7bdfacac7a284cd29808d0d63373c845f55b SHA512 73d44db142dadeb4df6cba0b4c0308de49620f4f08d07297eb31b171a8923c0515bbcd45eea8c4b30ca8919b6b169a61e1c696d3381e303dd3249ad4c864d2f6 WHIRLPOOL 88be2575993c7773534f1c20d52ce9cc56d57ab7abcb31276e4d64f9d89c0df1bc2545294a7b7d7ac1bf043cb9c890f61a05f7d9648c7a83fa0f2171cad91a74
 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_p20160816.ebuild 15825 SHA256 0113703432395733a4580f1e28462c572d966d1578b286821c3e80b5f1c465a1 SHA512 37fe453c3234f37569a3296777682ee632a8e29622c5cf8d40fe4b2e380be1a71ea4fb9e5e62d74be729de8eabef7cecba4c70600c2c1ed293c9bd4380c688da WHIRLPOOL 45fc21808fa84d84cfd1f620777837a34849a35161d27a3b896a558526707b27cbabb62e3aaf3a40bc5adbda004732835db7f083ec8c80a638aa21ff5a91cb43
 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

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160816.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160816.ebuild
deleted file mode 100644
index 12c0a09..0000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160816.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-16_00-02-33/zip/netbeans-trunk-nightly-201608160002-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 fe9f073..4842fc9 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-201608160002-src.zip 217153721 SHA256 f7f0624027293b4eb18b02c6e83678b76f9161ae7790431e5cdf0a67c81067bf SHA512 004bbbafc97c8c155429d12c37e05d1737d5e5d7a5c1d77df1e120481c1f59f2535fd93efda3588aab85e8eef404cbae74ee01469b771226912ab876a23420dd WHIRLPOOL bd19581fb56c256dbf59dcc1fb7db4a11f0e8dc632763d55966f63f4bdc107645862c8ec51a8db231b462dafeb586f680f3de9ffe5af4a6c398dd4c30e880352
 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
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72f
 DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b2578585227423c94ebeb38b7bdfacac7a284cd29808d0d63373c845f55b SHA512 73d44db142dadeb4df6cba0b4c0308de49620f4f08d07297eb31b171a8923c0515bbcd45eea8c4b30ca8919b6b169a61e1c696d3381e303dd3249ad4c864d2f6 WHIRLPOOL 88be2575993c7773534f1c20d52ce9cc56d57ab7abcb31276e4d64f9d89c0df1bc2545294a7b7d7ac1bf043cb9c890f61a05f7d9648c7a83fa0f2171cad91a74
 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_p20160816.ebuild 2913 SHA256 329ef2bf71b230285b383b26faf048077bff26c692d557e8ff51aa6f553588eb SHA512 657363cef99ce7a1d079dd94aa41ef4cb3c50ab193a0b192c199e159f511fb3cd9b3c11b62f8a03e54605f5752406007fdcef4579e2d6bd059066ff57335cb72 WHIRLPOOL ed10e6e50a48beca5b0f341c2d9498f9181ed94d66511cb1dc7566aec8e8bb224aab6c052ee462b3fe2986ae428da3c74625996bd328cc4fab6c29302acb5986
 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

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160816.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160816.ebuild
deleted file mode 100644
index 8a3124d..0000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160816.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-16_00-02-33/zip/netbeans-trunk-nightly-201608160002-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 f029c2f..1ac444b 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-201608160002-src.zip 217153721 SHA256 f7f0624027293b4eb18b02c6e83678b76f9161ae7790431e5cdf0a67c81067bf SHA512 004bbbafc97c8c155429d12c37e05d1737d5e5d7a5c1d77df1e120481c1f59f2535fd93efda3588aab85e8eef404cbae74ee01469b771226912ab876a23420dd WHIRLPOOL bd19581fb56c256dbf59dcc1fb7db4a11f0e8dc632763d55966f63f4bdc107645862c8ec51a8db231b462dafeb586f680f3de9ffe5af4a6c398dd4c30e880352
 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
@@ -38,7 +37,6 @@ DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72f
 DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b2578585227423c94ebeb38b7bdfacac7a284cd29808d0d63373c845f55b SHA512 73d44db142dadeb4df6cba0b4c0308de49620f4f08d07297eb31b171a8923c0515bbcd45eea8c4b30ca8919b6b169a61e1c696d3381e303dd3249ad4c864d2f6 WHIRLPOOL 88be2575993c7773534f1c20d52ce9cc56d57ab7abcb31276e4d64f9d89c0df1bc2545294a7b7d7ac1bf043cb9c890f61a05f7d9648c7a83fa0f2171cad91a74
 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_p20160816.ebuild 3377 SHA256 a54ce52cd9bc33ac5e70b3cfec553d02688ae6db8b173aa01f25d2888a7f6dae SHA512 7b36e4e6020a60d14d23786828533929db4c7588167c144477acc1a569947d2e973af9711abb683f8a20781c4ddc6cdea9cb6365c8b78f312130fbfd69228290 WHIRLPOOL e0c70a2b69b2cfb041a9d9610b2d52bdf440c9740ab095308440f53a92e84b84970cc3f6c38df59348bb7b2364eeb07b74ba486189c9d655781fd8b23121cc6a
 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

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160816.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160816.ebuild
deleted file mode 100644
index 92aafa6..0000000
--- a/dev-java/netbeans-extide/netbeans-extide-9999_p20160816.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-16_00-02-33/zip/netbeans-trunk-nightly-201608160002-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 c693ba6..7783c4a 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-201608160002-src.zip 217153721 SHA256 f7f0624027293b4eb18b02c6e83678b76f9161ae7790431e5cdf0a67c81067bf SHA512 004bbbafc97c8c155429d12c37e05d1737d5e5d7a5c1d77df1e120481c1f59f2535fd93efda3588aab85e8eef404cbae74ee01469b771226912ab876a23420dd WHIRLPOOL bd19581fb56c256dbf59dcc1fb7db4a11f0e8dc632763d55966f63f4bdc107645862c8ec51a8db231b462dafeb586f680f3de9ffe5af4a6c398dd4c30e880352
 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
@@ -36,7 +35,6 @@ DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72f
 DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b2578585227423c94ebeb38b7bdfacac7a284cd29808d0d63373c845f55b SHA512 73d44db142dadeb4df6cba0b4c0308de49620f4f08d07297eb31b171a8923c0515bbcd45eea8c4b30ca8919b6b169a61e1c696d3381e303dd3249ad4c864d2f6 WHIRLPOOL 88be2575993c7773534f1c20d52ce9cc56d57ab7abcb31276e4d64f9d89c0df1bc2545294a7b7d7ac1bf043cb9c890f61a05f7d9648c7a83fa0f2171cad91a74
 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_p20160816.ebuild 3416 SHA256 dfa8087233f7ce6f9db1da48b5656b50032e041754e4374dce521c492bf2d6ee SHA512 274746c115a2a5ca52bbeecda87de4b413ecd0589c77628ea103c1edb1adb02da8219615c375a5da470f7cc1ad9c878d04a20b7bc5b77080e5fc94c0944ffb2d WHIRLPOOL 4cdac6ca115af00fc3ceadaeb82784ff154cd4bc4dfd907af31ce607da830bc6591aeeb42e115e96803bc3463e123d9a249c16a700e5a66a16ae1a9cfa8b9d45
 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

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160816.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160816.ebuild
deleted file mode 100644
index 9d23ada..0000000
--- a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160816.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-16_00-02-33/zip/netbeans-trunk-nightly-201608160002-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 47c227b..6fc67b5 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-201608160002-src.zip 217153721 SHA256 f7f0624027293b4eb18b02c6e83678b76f9161ae7790431e5cdf0a67c81067bf SHA512 004bbbafc97c8c155429d12c37e05d1737d5e5d7a5c1d77df1e120481c1f59f2535fd93efda3588aab85e8eef404cbae74ee01469b771226912ab876a23420dd WHIRLPOOL bd19581fb56c256dbf59dcc1fb7db4a11f0e8dc632763d55966f63f4bdc107645862c8ec51a8db231b462dafeb586f680f3de9ffe5af4a6c398dd4c30e880352
 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
@@ -39,7 +38,6 @@ DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72f
 DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b2578585227423c94ebeb38b7bdfacac7a284cd29808d0d63373c845f55b SHA512 73d44db142dadeb4df6cba0b4c0308de49620f4f08d07297eb31b171a8923c0515bbcd45eea8c4b30ca8919b6b169a61e1c696d3381e303dd3249ad4c864d2f6 WHIRLPOOL 88be2575993c7773534f1c20d52ce9cc56d57ab7abcb31276e4d64f9d89c0df1bc2545294a7b7d7ac1bf043cb9c890f61a05f7d9648c7a83fa0f2171cad91a74
 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_p20160816.ebuild 4126 SHA256 d9dac36974e1c6e43ded744dfa8cc377a16c2070e7cd5a137f8f5d9cecb72f21 SHA512 be51ebb12b7e4ec734670b9d6a63c3ca39a79505f1fc3227b9777857d8d209a671646e522e210813a6c4fa26a28817837ba48a046df8c300833e4b968dfcad45 WHIRLPOOL 38b8ebc4939b2054fbb2a3f8bfa25780c95e272d55925925f50ace8545a1974a1ce5a727cbe9ccd686901c54727075d14ce644732586c06866836bc462642420
 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

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160816.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160816.ebuild
deleted file mode 100644
index 056668b..0000000
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20160816.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-16_00-02-33/zip/netbeans-trunk-nightly-201608160002-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 3bca273..f35e224 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-201608160002-src.zip 217153721 SHA256 f7f0624027293b4eb18b02c6e83678b76f9161ae7790431e5cdf0a67c81067bf SHA512 004bbbafc97c8c155429d12c37e05d1737d5e5d7a5c1d77df1e120481c1f59f2535fd93efda3588aab85e8eef404cbae74ee01469b771226912ab876a23420dd WHIRLPOOL bd19581fb56c256dbf59dcc1fb7db4a11f0e8dc632763d55966f63f4bdc107645862c8ec51a8db231b462dafeb586f680f3de9ffe5af4a6c398dd4c30e880352
 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
@@ -173,7 +172,6 @@ DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72f
 DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b2578585227423c94ebeb38b7bdfacac7a284cd29808d0d63373c845f55b SHA512 73d44db142dadeb4df6cba0b4c0308de49620f4f08d07297eb31b171a8923c0515bbcd45eea8c4b30ca8919b6b169a61e1c696d3381e303dd3249ad4c864d2f6 WHIRLPOOL 88be2575993c7773534f1c20d52ce9cc56d57ab7abcb31276e4d64f9d89c0df1bc2545294a7b7d7ac1bf043cb9c890f61a05f7d9648c7a83fa0f2171cad91a74
 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_p20160816.ebuild 29867 SHA256 18da6e7f5cf326e1851e5151e62d0077ebe464921ac4904a07e1b6855134bf06 SHA512 8aeb6ef5726ef24d7d535409e8db2d696ae561a4dbea669edcf2c7c5df62835e051f02387eb01849364359112c2e57d36cf12972f834e8b7724364f2e13bb49a WHIRLPOOL 9c20dd0390548045f340887425792603ace1b5338df2f59f54be0c342b7dad7ef4644a12f02bf95017f4c53ce77a3f9b1096d961e39fae0672d5edd7cde64078
 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

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160816.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160816.ebuild
deleted file mode 100644
index 9c3bdda..0000000
--- a/dev-java/netbeans-ide/netbeans-ide-9999_p20160816.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-16_00-02-33/zip/netbeans-trunk-nightly-201608160002-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 71760b4..33d9a26 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-201608160002-src.zip 217153721 SHA256 f7f0624027293b4eb18b02c6e83678b76f9161ae7790431e5cdf0a67c81067bf SHA512 004bbbafc97c8c155429d12c37e05d1737d5e5d7a5c1d77df1e120481c1f59f2535fd93efda3588aab85e8eef404cbae74ee01469b771226912ab876a23420dd WHIRLPOOL bd19581fb56c256dbf59dcc1fb7db4a11f0e8dc632763d55966f63f4bdc107645862c8ec51a8db231b462dafeb586f680f3de9ffe5af4a6c398dd4c30e880352
 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
@@ -71,7 +70,6 @@ DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72f
 DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b2578585227423c94ebeb38b7bdfacac7a284cd29808d0d63373c845f55b SHA512 73d44db142dadeb4df6cba0b4c0308de49620f4f08d07297eb31b171a8923c0515bbcd45eea8c4b30ca8919b6b169a61e1c696d3381e303dd3249ad4c864d2f6 WHIRLPOOL 88be2575993c7773534f1c20d52ce9cc56d57ab7abcb31276e4d64f9d89c0df1bc2545294a7b7d7ac1bf043cb9c890f61a05f7d9648c7a83fa0f2171cad91a74
 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_p20160816.ebuild 15656 SHA256 ae26c0d1839a78b4eafedb4ece35fa0e14644f6027925e77f64b47d4ae0b5c97 SHA512 31e2cc1d8f4b42463ad6df1bf7fa47275f7d78c64afd99bbe56e20c79eee51dbe71a1bdb040d85ceff0c45fb10e52ca83561f7467d3a02fcf0b3001114d003c0 WHIRLPOOL 7497e8a7d1d972fced43eb537cddad9d31e5b69bbb8e86c0cb5016300b25c369b71b9068f80bdd1f9b30f2437ba4e5b86e2e97bf97a12a219c30e113e2e0ad8e
 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

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160816.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160816.ebuild
deleted file mode 100644
index 879cb56..0000000
--- a/dev-java/netbeans-java/netbeans-java-9999_p20160816.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-16_00-02-33/zip/netbeans-trunk-nightly-201608160002-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 f23ccb8..a1c1edc 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-201608160002-src.zip 217153721 SHA256 f7f0624027293b4eb18b02c6e83678b76f9161ae7790431e5cdf0a67c81067bf SHA512 004bbbafc97c8c155429d12c37e05d1737d5e5d7a5c1d77df1e120481c1f59f2535fd93efda3588aab85e8eef404cbae74ee01469b771226912ab876a23420dd WHIRLPOOL bd19581fb56c256dbf59dcc1fb7db4a11f0e8dc632763d55966f63f4bdc107645862c8ec51a8db231b462dafeb586f680f3de9ffe5af4a6c398dd4c30e880352
 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
@@ -37,7 +36,6 @@ DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72f
 DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b2578585227423c94ebeb38b7bdfacac7a284cd29808d0d63373c845f55b SHA512 73d44db142dadeb4df6cba0b4c0308de49620f4f08d07297eb31b171a8923c0515bbcd45eea8c4b30ca8919b6b169a61e1c696d3381e303dd3249ad4c864d2f6 WHIRLPOOL 88be2575993c7773534f1c20d52ce9cc56d57ab7abcb31276e4d64f9d89c0df1bc2545294a7b7d7ac1bf043cb9c890f61a05f7d9648c7a83fa0f2171cad91a74
 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_p20160816.ebuild 4971 SHA256 516ef1945b529fdba09cb25577b04ee3982633cf995027bd6bd4450c7df29192 SHA512 befb8c3515ee3df100a46a34ac8d27803d3b812ac0ef03c5900680d652f85302e05608f95e69fa251781cb365489c4cadcc8d648583bd3244f8219c1121269a7 WHIRLPOOL 1d9d1f7b03a61afdf54907e65d9f2aaf362c7f90e5f80b177aa503f5bf4cd4fec2ed42a4a19865f0cfd84404038b1bcc35cd08c3ea3efd9ce9163a142f2a9ec9
 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

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160816.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160816.ebuild
deleted file mode 100644
index 8514bd0..0000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160816.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-16_00-02-33/zip/netbeans-trunk-nightly-201608160002-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 defaa2a..a1cb583 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-201608160002-src.zip 217153721 SHA256 f7f0624027293b4eb18b02c6e83678b76f9161ae7790431e5cdf0a67c81067bf SHA512 004bbbafc97c8c155429d12c37e05d1737d5e5d7a5c1d77df1e120481c1f59f2535fd93efda3588aab85e8eef404cbae74ee01469b771226912ab876a23420dd WHIRLPOOL bd19581fb56c256dbf59dcc1fb7db4a11f0e8dc632763d55966f63f4bdc107645862c8ec51a8db231b462dafeb586f680f3de9ffe5af4a6c398dd4c30e880352
 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
@@ -36,7 +35,6 @@ DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72f
 DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b2578585227423c94ebeb38b7bdfacac7a284cd29808d0d63373c845f55b SHA512 73d44db142dadeb4df6cba0b4c0308de49620f4f08d07297eb31b171a8923c0515bbcd45eea8c4b30ca8919b6b169a61e1c696d3381e303dd3249ad4c864d2f6 WHIRLPOOL 88be2575993c7773534f1c20d52ce9cc56d57ab7abcb31276e4d64f9d89c0df1bc2545294a7b7d7ac1bf043cb9c890f61a05f7d9648c7a83fa0f2171cad91a74
 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_p20160816.ebuild 6293 SHA256 0fe8bb8b9ac0343a284114749c8be72692d70af4d6e91546a825e96509dad20b SHA512 656f7ffe55ec344bb36606a120f3d21daa2489899149c412d6183390a34e34678a6498398d5ceadb2df22977d2301a51ca580c25f0781080aeddbfa50021cc8f WHIRLPOOL a89348ac3f2230bde9bd686bcee417a8d3a5cf548f5f5cc025820c79ee0991b032d454563f796cf3e945e21429e7d42b33c0f6d100b3cf32b26e3e37092d6d4e
 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

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160816.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160816.ebuild
deleted file mode 100644
index 3e22349..0000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160816.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-16_00-02-33/zip/netbeans-trunk-nightly-201608160002-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 0c34295..8b99c5c 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-201608160002-src.zip 217153721 SHA256 f7f0624027293b4eb18b02c6e83678b76f9161ae7790431e5cdf0a67c81067bf SHA512 004bbbafc97c8c155429d12c37e05d1737d5e5d7a5c1d77df1e120481c1f59f2535fd93efda3588aab85e8eef404cbae74ee01469b771226912ab876a23420dd WHIRLPOOL bd19581fb56c256dbf59dcc1fb7db4a11f0e8dc632763d55966f63f4bdc107645862c8ec51a8db231b462dafeb586f680f3de9ffe5af4a6c398dd4c30e880352
 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
@@ -42,7 +41,6 @@ DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72f
 DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b2578585227423c94ebeb38b7bdfacac7a284cd29808d0d63373c845f55b SHA512 73d44db142dadeb4df6cba0b4c0308de49620f4f08d07297eb31b171a8923c0515bbcd45eea8c4b30ca8919b6b169a61e1c696d3381e303dd3249ad4c864d2f6 WHIRLPOOL 88be2575993c7773534f1c20d52ce9cc56d57ab7abcb31276e4d64f9d89c0df1bc2545294a7b7d7ac1bf043cb9c890f61a05f7d9648c7a83fa0f2171cad91a74
 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_p20160816.ebuild 4717 SHA256 45c887cb461e0bdab54eeae32acfa5f317145c19e2410cf7ed117fbddf09e86d SHA512 b26dd5e5abffda3d0dc566c0206be428cbf5047519a2f9c3114a15d70f2d8731a95592b3d1c58bf6a3a5993eb8ec7ebfb262d5326e29a006d7e5016f87120dcb WHIRLPOOL 04b9cec1dd6e389bdb522a54e54457373fcee6ff224c735a25ba54f1d4ad5d59b9d61d37f21c221398f285cfeaefde8dabdfdad21f4311bd39be92227afae375
 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

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160816.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160816.ebuild
deleted file mode 100644
index 4f2404d..0000000
--- a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160816.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-16_00-02-33/zip/netbeans-trunk-nightly-201608160002-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 1bd62b9..bab7685 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-201608160002-src.zip 217153721 SHA256 f7f0624027293b4eb18b02c6e83678b76f9161ae7790431e5cdf0a67c81067bf SHA512 004bbbafc97c8c155429d12c37e05d1737d5e5d7a5c1d77df1e120481c1f59f2535fd93efda3588aab85e8eef404cbae74ee01469b771226912ab876a23420dd WHIRLPOOL bd19581fb56c256dbf59dcc1fb7db4a11f0e8dc632763d55966f63f4bdc107645862c8ec51a8db231b462dafeb586f680f3de9ffe5af4a6c398dd4c30e880352
 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
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72f
 DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b2578585227423c94ebeb38b7bdfacac7a284cd29808d0d63373c845f55b SHA512 73d44db142dadeb4df6cba0b4c0308de49620f4f08d07297eb31b171a8923c0515bbcd45eea8c4b30ca8919b6b169a61e1c696d3381e303dd3249ad4c864d2f6 WHIRLPOOL 88be2575993c7773534f1c20d52ce9cc56d57ab7abcb31276e4d64f9d89c0df1bc2545294a7b7d7ac1bf043cb9c890f61a05f7d9648c7a83fa0f2171cad91a74
 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_p20160816.ebuild 4412 SHA256 e42f228a870270be25a8656008d1df106e79940253e1493b50cbd41ad8bde3d9 SHA512 0a3ad62df9c15b1872d10e4fbbbf9f721185751c6a6ea3b45d1facd689d4cdb9c6b74005a733da1fd11a17b8432204a6463b2b6be458da1ff42d9e64f97ba391 WHIRLPOOL 7d90d71cb0f12f4898112ae81919b00e56fa54c70c5a0fd74ba7d28822a3aafdce36333cdf62ff8285e5ab1b91751f34c13fff581d3c72006799ec90e99b83ef
 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

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160816.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160816.ebuild
deleted file mode 100644
index 698bf9e..0000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160816.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-16_00-02-33/zip/netbeans-trunk-nightly-201608160002-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 0e112ac..e86bd4b 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-201608160002-src.zip 217153721 SHA256 f7f0624027293b4eb18b02c6e83678b76f9161ae7790431e5cdf0a67c81067bf SHA512 004bbbafc97c8c155429d12c37e05d1737d5e5d7a5c1d77df1e120481c1f59f2535fd93efda3588aab85e8eef404cbae74ee01469b771226912ab876a23420dd WHIRLPOOL bd19581fb56c256dbf59dcc1fb7db4a11f0e8dc632763d55966f63f4bdc107645862c8ec51a8db231b462dafeb586f680f3de9ffe5af4a6c398dd4c30e880352
 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
@@ -37,7 +36,6 @@ DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72f
 DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b2578585227423c94ebeb38b7bdfacac7a284cd29808d0d63373c845f55b SHA512 73d44db142dadeb4df6cba0b4c0308de49620f4f08d07297eb31b171a8923c0515bbcd45eea8c4b30ca8919b6b169a61e1c696d3381e303dd3249ad4c864d2f6 WHIRLPOOL 88be2575993c7773534f1c20d52ce9cc56d57ab7abcb31276e4d64f9d89c0df1bc2545294a7b7d7ac1bf043cb9c890f61a05f7d9648c7a83fa0f2171cad91a74
 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_p20160816.ebuild 4111 SHA256 cbd6252d751bbf47d389c4d1a4b9f96dd5035dfa442a7543b7b0f916969de7f0 SHA512 d28f48a5dd75d6f03138612e470abe72a665fc68b25e68f68ed88cacf8b54a574d30773dad0c3ee4809534459de2b36b08fc5e9766535514428fe5262a60daf9 WHIRLPOOL cc32ccff3b283e7c5b8fffb28d6871d881a9d99c7a4bb30387017fe49515328564354991b06d8a862a363e1156386bb0bf0a28dbeb4d69099f2a84785aa82521
 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

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160816.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160816.ebuild
deleted file mode 100644
index 357e6c4..0000000
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20160816.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-16_00-02-33/zip/netbeans-trunk-nightly-201608160002-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 4990430..8b3adf9 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-201608160002-src.zip 217153721 SHA256 f7f0624027293b4eb18b02c6e83678b76f9161ae7790431e5cdf0a67c81067bf SHA512 004bbbafc97c8c155429d12c37e05d1737d5e5d7a5c1d77df1e120481c1f59f2535fd93efda3588aab85e8eef404cbae74ee01469b771226912ab876a23420dd WHIRLPOOL bd19581fb56c256dbf59dcc1fb7db4a11f0e8dc632763d55966f63f4bdc107645862c8ec51a8db231b462dafeb586f680f3de9ffe5af4a6c398dd4c30e880352
 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
@@ -39,7 +38,6 @@ DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72f
 DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b2578585227423c94ebeb38b7bdfacac7a284cd29808d0d63373c845f55b SHA512 73d44db142dadeb4df6cba0b4c0308de49620f4f08d07297eb31b171a8923c0515bbcd45eea8c4b30ca8919b6b169a61e1c696d3381e303dd3249ad4c864d2f6 WHIRLPOOL 88be2575993c7773534f1c20d52ce9cc56d57ab7abcb31276e4d64f9d89c0df1bc2545294a7b7d7ac1bf043cb9c890f61a05f7d9648c7a83fa0f2171cad91a74
 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_p20160816.ebuild 4418 SHA256 fdc8c013c1993ba95fe3e7ea12f18ee1fb818a4b70268a879d0b8cc8d4e3a3d4 SHA512 e30ca0f7c5bb9e81bdb972faec5be4c92618ceae91a722ebd5e13546d0721c80ae7a3b17e2e95142ed87b4fdccce752d0c94c26e15c59e1314365719fad23f89 WHIRLPOOL cc65b7e33ac80cc11d925e3ea97833d20e593b2c528088804c80773cfcd0be10639ef494ffd3ce09918899a9a6accd8ef60fb0a9abd0b4a3797c579e22e8b6ab
 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

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160816.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160816.ebuild
deleted file mode 100644
index 9e0f51d..0000000
--- a/dev-java/netbeans-php/netbeans-php-9999_p20160816.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-16_00-02-33/zip/netbeans-trunk-nightly-201608160002-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 9b76cfd..270761f 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-201608160002-src.zip 217153721 SHA256 f7f0624027293b4eb18b02c6e83678b76f9161ae7790431e5cdf0a67c81067bf SHA512 004bbbafc97c8c155429d12c37e05d1737d5e5d7a5c1d77df1e120481c1f59f2535fd93efda3588aab85e8eef404cbae74ee01469b771226912ab876a23420dd WHIRLPOOL bd19581fb56c256dbf59dcc1fb7db4a11f0e8dc632763d55966f63f4bdc107645862c8ec51a8db231b462dafeb586f680f3de9ffe5af4a6c398dd4c30e880352
 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
@@ -60,7 +59,6 @@ DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72f
 DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b2578585227423c94ebeb38b7bdfacac7a284cd29808d0d63373c845f55b SHA512 73d44db142dadeb4df6cba0b4c0308de49620f4f08d07297eb31b171a8923c0515bbcd45eea8c4b30ca8919b6b169a61e1c696d3381e303dd3249ad4c864d2f6 WHIRLPOOL 88be2575993c7773534f1c20d52ce9cc56d57ab7abcb31276e4d64f9d89c0df1bc2545294a7b7d7ac1bf043cb9c890f61a05f7d9648c7a83fa0f2171cad91a74
 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_p20160816.ebuild 9520 SHA256 9d696b911348b79511b23f6b213af67685629740741a70e233ad4a6c7a7f3e45 SHA512 e6dd7ddf9f68449ea8a9ebe5977c5a62f8677e2dd5e5200dd008ffca8fcf08b2301b5b53cabfe132467ab1c8a33d64926b33f382ad11476679b3c9e3cb3bf219 WHIRLPOOL ba10f87328b76e08a8954b6cfd07de893d53dcf73e4cdb0e2c1a26391ef6af5f8091ad2b03cc07a9674a00f7c0438afcabe707e7ee9b414cc0b9f9ed57f968f8
 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

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160816.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160816.ebuild
deleted file mode 100644
index 1febfd3..0000000
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20160816.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-16_00-02-33/zip/netbeans-trunk-nightly-201608160002-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 19944f1..4235277 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-201608160002-src.zip 217153721 SHA256 f7f0624027293b4eb18b02c6e83678b76f9161ae7790431e5cdf0a67c81067bf SHA512 004bbbafc97c8c155429d12c37e05d1737d5e5d7a5c1d77df1e120481c1f59f2535fd93efda3588aab85e8eef404cbae74ee01469b771226912ab876a23420dd WHIRLPOOL bd19581fb56c256dbf59dcc1fb7db4a11f0e8dc632763d55966f63f4bdc107645862c8ec51a8db231b462dafeb586f680f3de9ffe5af4a6c398dd4c30e880352
 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
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72f
 DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b2578585227423c94ebeb38b7bdfacac7a284cd29808d0d63373c845f55b SHA512 73d44db142dadeb4df6cba0b4c0308de49620f4f08d07297eb31b171a8923c0515bbcd45eea8c4b30ca8919b6b169a61e1c696d3381e303dd3249ad4c864d2f6 WHIRLPOOL 88be2575993c7773534f1c20d52ce9cc56d57ab7abcb31276e4d64f9d89c0df1bc2545294a7b7d7ac1bf043cb9c890f61a05f7d9648c7a83fa0f2171cad91a74
 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_p20160816.ebuild 3472 SHA256 88518622aea4d688593e76d8ea508822a82a3f78430389a4e83002c345079be9 SHA512 1eb036c2a52dea1bba695c2096b3c00a7d2df04df683b929f072a2e24c44b82bb30d0381fe197bcc106900ad732be73ec71a5ffaa9aade14a8829389d09e4b70 WHIRLPOOL 8210b9cdc3df1f990a171fa88727a6406342d5f21a9e07f58cf805ec09a29b647fc03d71df7329759c90ea197b93a147d7c8d22205f041fe8cc3fc41e288dd57
 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

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160816.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160816.ebuild
deleted file mode 100644
index 0c46253..0000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160816.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-16_00-02-33/zip/netbeans-trunk-nightly-201608160002-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 72802cf..8e8df35 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-201608160002-src.zip 217153721 SHA256 f7f0624027293b4eb18b02c6e83678b76f9161ae7790431e5cdf0a67c81067bf SHA512 004bbbafc97c8c155429d12c37e05d1737d5e5d7a5c1d77df1e120481c1f59f2535fd93efda3588aab85e8eef404cbae74ee01469b771226912ab876a23420dd WHIRLPOOL bd19581fb56c256dbf59dcc1fb7db4a11f0e8dc632763d55966f63f4bdc107645862c8ec51a8db231b462dafeb586f680f3de9ffe5af4a6c398dd4c30e880352
 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
@@ -53,7 +52,6 @@ DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72f
 DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b2578585227423c94ebeb38b7bdfacac7a284cd29808d0d63373c845f55b SHA512 73d44db142dadeb4df6cba0b4c0308de49620f4f08d07297eb31b171a8923c0515bbcd45eea8c4b30ca8919b6b169a61e1c696d3381e303dd3249ad4c864d2f6 WHIRLPOOL 88be2575993c7773534f1c20d52ce9cc56d57ab7abcb31276e4d64f9d89c0df1bc2545294a7b7d7ac1bf043cb9c890f61a05f7d9648c7a83fa0f2171cad91a74
 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_p20160816.ebuild 6242 SHA256 799a7b09e60d6a5ae006a67dd5a6d30755c8fc3839bb41888563488eecc65447 SHA512 270177407780752e3e01d5b7074c5f89c9870e90561527160fc9d308122b82fe866567f09487bd4535a6e51dca394539757f477093e53a3a06743ff05dc36e06 WHIRLPOOL 6649396e3d5e3490e0f80d089c144a0d9cd817601cc5a12e4a4fee66c8d98e6f74e9fd4dd37f0a39b99f31f0fcf56499ccdf7bfc15261778901bdd36e81ff89b
 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

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160816.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160816.ebuild
deleted file mode 100644
index 897469d..0000000
--- a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160816.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-16_00-02-33/zip/netbeans-trunk-nightly-201608160002-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 cc16858..afa9f47 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-201608160002-src.zip 217153721 SHA256 f7f0624027293b4eb18b02c6e83678b76f9161ae7790431e5cdf0a67c81067bf SHA512 004bbbafc97c8c155429d12c37e05d1737d5e5d7a5c1d77df1e120481c1f59f2535fd93efda3588aab85e8eef404cbae74ee01469b771226912ab876a23420dd WHIRLPOOL bd19581fb56c256dbf59dcc1fb7db4a11f0e8dc632763d55966f63f4bdc107645862c8ec51a8db231b462dafeb586f680f3de9ffe5af4a6c398dd4c30e880352
 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
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72f
 DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b2578585227423c94ebeb38b7bdfacac7a284cd29808d0d63373c845f55b SHA512 73d44db142dadeb4df6cba0b4c0308de49620f4f08d07297eb31b171a8923c0515bbcd45eea8c4b30ca8919b6b169a61e1c696d3381e303dd3249ad4c864d2f6 WHIRLPOOL 88be2575993c7773534f1c20d52ce9cc56d57ab7abcb31276e4d64f9d89c0df1bc2545294a7b7d7ac1bf043cb9c890f61a05f7d9648c7a83fa0f2171cad91a74
 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_p20160816.ebuild 2721 SHA256 c823084e70e6fd4f406af378ba45a89352649b5db523cff737baf2c4340e0720 SHA512 6ad7bfeaedad8b3df5d27a38bf9b94e8e47ae801346e62e58aff1affac2617054173e44abc7c3b18289cd4613d23fc1a2b33c524e4c96d992b53e33f2915c4e5 WHIRLPOOL d9974fe1eb9aa57b3a4b031aff3e597f069687dddd5787c9070ab384da242d5052044048dcdc7721037aed97dff704ad15398a3efa1874e6065cfaff77190dc4
 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

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160816.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160816.ebuild
deleted file mode 100644
index 802e3f5..0000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160816.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-16_00-02-33/zip/netbeans-trunk-nightly-201608160002-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 e1271c6..91fabde 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-201608160002-src.zip 217153721 SHA256 f7f0624027293b4eb18b02c6e83678b76f9161ae7790431e5cdf0a67c81067bf SHA512 004bbbafc97c8c155429d12c37e05d1737d5e5d7a5c1d77df1e120481c1f59f2535fd93efda3588aab85e8eef404cbae74ee01469b771226912ab876a23420dd WHIRLPOOL bd19581fb56c256dbf59dcc1fb7db4a11f0e8dc632763d55966f63f4bdc107645862c8ec51a8db231b462dafeb586f680f3de9ffe5af4a6c398dd4c30e880352
 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
@@ -37,7 +36,6 @@ DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72f
 DIST netbeans-trunk-nightly-201609170002-src.zip 218003184 SHA256 abd5b2578585227423c94ebeb38b7bdfacac7a284cd29808d0d63373c845f55b SHA512 73d44db142dadeb4df6cba0b4c0308de49620f4f08d07297eb31b171a8923c0515bbcd45eea8c4b30ca8919b6b169a61e1c696d3381e303dd3249ad4c864d2f6 WHIRLPOOL 88be2575993c7773534f1c20d52ce9cc56d57ab7abcb31276e4d64f9d89c0df1bc2545294a7b7d7ac1bf043cb9c890f61a05f7d9648c7a83fa0f2171cad91a74
 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_p20160816.ebuild 6939 SHA256 5a55d50ad50aa424194248f8d253031058365ac9625f9f84d5a9f9aa79f236a9 SHA512 bfeb71cb42693ed1346677d5634cc86041ac9b183a1ac766b3758ea0841a97d8695c0ebaf94c2f556848f3901a2db5a01dfcaae91885e9e672ce671eada5fcb9 WHIRLPOOL f871c5984fb5499297e8684120dcfe987c373932903a7be69fd05c15ed3973c84d05716c6a824fd9205d3a0629024077816b713f9d86fe106a38e12213270f66
 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

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


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

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

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

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