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-javadoc/, ...
@ 2015-09-29  9:56 Miroslav Šulc
  0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2015-09-29  9:56 UTC (permalink / raw
  To: gentoo-commits

commit:     89341adf4a1259e7ad8363ea621e6d2742739c96
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 29 09:56:25 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Sep 29 09:56:25 2015 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=89341adf

netbeans: version bump

Package-Manager: portage-2.2.22

 dev-java/netbeans-apisupport/Manifest              |   2 +
 .../netbeans-apisupport-9999_p20150929.ebuild      | 111 ++++++
 dev-java/netbeans-cnd/Manifest                     |   3 +
 .../netbeans-cnd-9999_p20150929.ebuild             | 127 +++++++
 dev-java/netbeans-dlight/Manifest                  |   2 +
 .../netbeans-dlight-9999_p20150929.ebuild          | 101 ++++++
 dev-java/netbeans-enterprise/Manifest              |   2 +
 .../netbeans-enterprise-9999_p20150929.ebuild      | 266 +++++++++++++++
 dev-java/netbeans-ergonomics/Manifest              |   2 +
 .../netbeans-ergonomics-9999_p20150929.ebuild      | 101 ++++++
 dev-java/netbeans-extide/Manifest                  |   2 +
 .../netbeans-extide-9999_p20150929.ebuild          | 108 ++++++
 dev-java/netbeans-groovy/Manifest                  |   2 +
 .../netbeans-groovy-9999_p20150929.ebuild          | 111 ++++++
 dev-java/netbeans-harness/Manifest                 |   2 +
 .../netbeans-harness-9999_p20150929.ebuild         | 114 +++++++
 dev-java/netbeans-ide/Manifest                     |   2 +
 .../netbeans-ide-9999_p20150929.ebuild             | 377 +++++++++++++++++++++
 dev-java/netbeans-java/Manifest                    |   2 +
 .../netbeans-java-9999_p20150929.ebuild            | 273 +++++++++++++++
 dev-java/netbeans-javacard/Manifest                |   2 +
 .../netbeans-javacard-9999_p20150929.ebuild        | 134 ++++++++
 dev-java/netbeans-javadoc/Manifest                 |   2 +
 .../netbeans-javadoc-9999_p20150929.ebuild         | 168 +++++++++
 dev-java/netbeans-javafx/Manifest                  |   2 +
 .../netbeans-javafx-9999_p20150929.ebuild          | 124 +++++++
 dev-java/netbeans-mobility/Manifest                |   2 +
 .../netbeans-mobility-9999_p20150929.ebuild        | 126 +++++++
 dev-java/netbeans-nb/Manifest                      |   2 +
 .../netbeans-nb/netbeans-nb-9999_p20150929.ebuild  | 148 ++++++++
 dev-java/netbeans-php/Manifest                     |   2 +
 .../netbeans-php-9999_p20150929.ebuild             | 127 +++++++
 dev-java/netbeans-platform/Manifest                |   2 +
 .../netbeans-platform-9999_p20150929.ebuild        | 166 +++++++++
 dev-java/netbeans-profiler/Manifest                |   2 +
 .../netbeans-profiler-9999_p20150929.ebuild        | 121 +++++++
 dev-java/netbeans-webcommon/Manifest               |   2 +
 .../netbeans-webcommon-9999_p20150929.ebuild       | 123 +++++++
 dev-java/netbeans-websvccommon/Manifest            |   2 +
 .../netbeans-websvccommon-9999_p20150929.ebuild    |  94 +++++
 dev-util/netbeans/Manifest                         |   2 +
 dev-util/netbeans/netbeans-9999_p20150929.ebuild   | 264 +++++++++++++++
 42 files changed, 3327 insertions(+)

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index ed79888..413eb1e 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -16,6 +16,7 @@ DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f35
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
 DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
 DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
+DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 EBUILD netbeans-apisupport-8.0.2.ebuild 3314 SHA256 b68fe791f275fe4fcc8b00888688949b8927cb39db2cf9ad7860017c6d20adee SHA512 35c4bbcd34ec0eaef8a2de86c13333d2bf092db61af48558c3e173bb17dbf8fcd15001307bd7c498f4ccdbaa4277e1ee42ff0909af6170039165b547f646c383 WHIRLPOOL 206fe8d5f64e76827d3eb958a629ba087e8a16c2797752f5d9e62dff4166653677587a81be19e0a2c6adcf49292255d532e1f542c02550b1cf6ffd51467bde3c
 EBUILD netbeans-apisupport-9999_p20150901.ebuild 3384 SHA256 187e107dda837afe5fdc0b321a4bba2e5fc6f18dff1eb359c64c122ad04b9e86 SHA512 ea07d62ef5f4ee8d68f17f69fb3b10924e37ff38a6c15147f432232f354d3475f4fc768a535503cd12da6a3d6b2ad303abec714e362506bd723ff23cbef4b36c WHIRLPOOL 9fc6fb1c7f4bbbf79d15eef81c9c440c3a98a2ed8ff4f04e73ba4a0e36b9c54cad45e50ea89e04e5a8b175a3d9d56c9f3e3af47fbe9dd21b9d8c367bb3623ea2
 EBUILD netbeans-apisupport-9999_p20150903.ebuild 3384 SHA256 13a7a16b6a12ed08e9ad7234bec1ad5e5fe209e4f13e4587bfcf4d28a8869b22 SHA512 cbd2dbb4d8c01b1f6c70ca8a7835a58c2ecf94a0ec084ef2b2c73b675734ec61497925791bc2045fe7b36d372676309057a520a669828d604d93dd279306e9db WHIRLPOOL 08fc78eac704d29500bec5772b64ed2b159130e3414c9f7beeddb786ad3233afa0b74086d7de80d66ca335af56b22eafe254513a847839cc1ecf7584cbad832d
@@ -32,4 +33,5 @@ EBUILD netbeans-apisupport-9999_p20150922.ebuild 3384 SHA256 8ce99a19d486f4bc619
 EBUILD netbeans-apisupport-9999_p20150923.ebuild 3384 SHA256 0df65ef5bd88ee939ff058090b1b4fc44f512fb8e5e6e7d9b76b1bc39ad385d2 SHA512 b109d9d7fbc34f665369becb58d9c5ba2d283f8a57517a9b948c06c64d03ec6d87ced0802b4db3e9783ec43f13652f60ce85ac0c7a99bdfc2d264dc72df590e6 WHIRLPOOL e1398ceb66bd8ca96cf096fe4d6b79a9baae4b5c99b082eca6a1434fcc39429fed75e0ba6ba0ffe0af91dabef619bdd360a0b3af809ab33b2ecc3bd9ddb409a3
 EBUILD netbeans-apisupport-9999_p20150924.ebuild 3384 SHA256 309feaf4f8cc24c494a4c79d9faf8c26faf34591cb9939b84d2983ea8873007d SHA512 734448ecee1173232a33044acef5d7b1aa2625c3a30b8155151ecf67f47b3c4e92934430c4a14a3e49cbbce84fd50aeb8e34fd92431d68769f845fa85b950ef9 WHIRLPOOL e46cbbe3efa2d49e29b9391d31e7ceb5fc5f10cc33f699ba5fb7a4721283ee3c4caddcfa4bbbaf508f3d94d65b347c974ea8f75c25255bb0d8f33ca5f2328ab0
 EBUILD netbeans-apisupport-9999_p20150925.ebuild 3384 SHA256 aa5fa670a547df953726f37bcdc18deaf4843277912312a62edadc6024e2d215 SHA512 54ca38f1f15f0fb970190d10988eb720482bc9796410430fd8df9526579e2f80904fbf8995e33d0cf9dc04cb56c30e224cb1bfa51974217db23f67429c0ad1fd WHIRLPOOL 8a4f0a7f5afa62ca0f734c20b59b6ba5b3300bef190a8b0feb42504d26b2c35792cd81c1317164f66786479488ec661de86279e652beda4a8098a9808e3b5903
+EBUILD netbeans-apisupport-9999_p20150929.ebuild 3384 SHA256 cff9f5c21fc857af535175ae3d3bfd7f5d444a11d8ca84cafcd5808433f4426c SHA512 4aa8b0f28b022e9a03afd15a6eed0f28c8ad3e716e76de0dfabb8cfde3bd7f215fd026406dbf0821145abda79615327ff4c959bf01c6e85018b1968f0a8c1daf WHIRLPOOL 4614d7bd4d8ddcc358794b6761e7882c677136e5d4f4910c8ab8dc32f0bb4ec240e0ab16bc556c48ad85d9187bac92c37980ca1983d3f7b43046c59b019c3905
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index 5eb111a..d3a1025 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -1,5 +1,6 @@
 DIST 069B350908C75C4C2D357902CC4A5967EDCCD420-clank_0.3.6.zip 7499918 SHA256 a1d7e2cc7830d6338c175846357e9c7f1afeb64fe3f9840b6fa97ed2133d47d0 SHA512 81735aac1cf26a568333d893c1e2c558ca0c77b92dce90a0524d56125b565ba69ff30f7d01e2d21bedf57d0ed91275d27156dbe6b8df48d969f16f049152ca04 WHIRLPOOL fda157151796ba7cc9344d5124719670e6cd0b44655127515874cb026b8c752f4fcc25e555fc1ff5bfb1c503b66efc631645f920d3514e08b5e4e8dcbba1b6dd
 DIST 09A3160AABFD64441C5B0427D0C9B61D2A64146B-clank_0.3.6.zip 8259390 SHA256 e86a560561b1484cf866305db6e1cd67a9ab3a776513c2e59755a31227993dc8 SHA512 c3359cec8bf96567738186b03d713f889526e154cb3c5a96eda16ea2423bcca8cd0f0357d18bdd83a83d567a42edb88fcc782a81a393d66e1eaff91a30b06e57 WHIRLPOOL 6a36a67856945018225974a71a189a9c68f3cb63893bd5b28ab8abb8820857a1e1f9c0a9a7834196352100e12fea1fd1c0f62265b39b38f292695f678a981ee2
+DIST 0F2BB0A9D0C3B271431391AB394E95D25C871A68-clank_0.3.6.zip 7734360 SHA256 14ba371997b6c435950f4d6b1df6ad99d60fcc473abca4aeeb870f3e31ea9f4a SHA512 398410b3dceabe190b526178d2e75e114e4e50a1c83203b9a398ffd8166b533db6067179b5f8cc2548aec11bfa32b97990e2eec9a89101bdb2be0688a8d65f17 WHIRLPOOL b5c1f67e2789a2165580461c4b7a97745d628435a771e6ea8013a786f38cd148f9eaebd76e426b0c2e80d914e8d7764db43ddeec6e00bf8de9987f2375bfa2d7
 DIST 23CB1F69F8E645CCD8C436D59F5FDB676A96A9D7-clank_0.3.6.zip 7712458 SHA256 36c8f75d0563c8d8c7dea3bd5948d2dc9b1f5a57950d5fe22b3e0c4ba56e8d44 SHA512 a5cab2fd02f79eade56550c3433ca89fa9eb5be4b5a18a9f30e52501c0d084d4e7ab6d9dc8c02c7585997f1ebd4bb5b3f71da5ce0aafa52a5bb7c05d0e2d193e WHIRLPOOL ebfc9fa2e5745dabfc8aa27f8c699c2d431807e7f6627c9ed97804816a0a2cb30f6ea8af2232e19c5fc61380acbc768939e91f46c4393ef5ea4aafa0314d1191
 DIST 24C58A1D3C410AD3E23CD828871630C17068B238-cnd-build-trace-1.0.zip 28980 SHA256 205a14a41fb7232c2a20779278ee1e303e6d3dedb3c84496b370ae397a7767b5 SHA512 0e570745cfb163cb54ac8b6b0f6feb6c76e3c414f03eab213f93637dc84471c0bb5b786af096acdd6265383474bf26db763ebda066add398efe601e5749a51b9 WHIRLPOOL 2d0042e180eba66269d4ccdf6279dcd166b4a34947406b5f7279b0017ebed27b2ea95f1565e57908e3567b303fb69d2cb5ca6504653126611ced84f103650a0c
 DIST 266E6F59C67F78B1044BD8E026D2940DE322904E-clank_0.3.6.zip 7522214 SHA256 c70dccfe70362a94e4e0ef76d4fecfb7fa9b7c933f50052511c108503dc0e94e SHA512 f4cc763cf585b406f5370f6d85dad3077c23978f33ddcc3a417a8f1b215a68db4fed546992588c85220347dffb22153f081ccd44c4e1929106ecdce1d7211c8f WHIRLPOOL ee7f59f7d30e0f1c35ad223ab82256be7752d81693038e1eb362345ed23ff01bb6c0dcadd261320052c8019be6c0fb98536db4c10b359d25b80a1e92b0c02bb6
@@ -36,6 +37,7 @@ DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f35
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
 DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
 DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
+DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 EBUILD netbeans-cnd-8.0.2.ebuild 4510 SHA256 0a9a4e58e28f395b5bcb017016b6ddb1b77afe393d0e5bd81cc05e3a32076c71 SHA512 2b1fedfe292fa140920fd11829e77127f9535e08b8307886accfa37e6d11195a1204e6b71b2640937da0711c3ce0bbf80c0eaa3c248a64fd61b6a3d99d5de14e WHIRLPOOL 10b1518360ade5d6f1f27c79a10f630b94a2ec5062e18df11f9828d4b374e6cbdea0b9f770e01c117ca90fa194dff9bd3be6a468075c2d35167fb78a7bb32794
 EBUILD netbeans-cnd-9999_p20150901.ebuild 4790 SHA256 0be3c11a9af46d2d8aba83d0e15c09b935bd598464f43d5030887464d3f96f9b SHA512 f3b2e7de31f3434d6390bec0382fd6d77d2075470543cb9052572c91483ccfd026822a5db6f10932cb86b5974a0d2c5f390551873dac6cbd1f463b62560ab196 WHIRLPOOL f158e99c020c4e0f67c3ceec7a59d5f2cc455c52db4a9301bce821a123b7c8f3e570467aabe9281ac440d067dac36525b864dabd0c06b88ad86a2464d4e5140a
 EBUILD netbeans-cnd-9999_p20150903.ebuild 4790 SHA256 57a5694dab810fdf15990d575c3270fb7338837550ba4598e21703e4d904e85c SHA512 b5073782475520ba9126954d5341c0977a73f4b838ea4484835558b821baab49cbb52e3e07705f611e879b3eefedccb1e9a0817bbf9b98d80d17018e5888ad1d WHIRLPOOL 408c5a25c4877204b5e3a9ae8c4b7b23464a68527a8bd37e37df89a5fddf71fd23cc4e80610981dd72325d9289cfe2c5b3172986e3aff240be9911354b7d8946
@@ -52,4 +54,5 @@ EBUILD netbeans-cnd-9999_p20150922.ebuild 4790 SHA256 b982f6466f4e54e21f00581697
 EBUILD netbeans-cnd-9999_p20150923.ebuild 4790 SHA256 f944283bb71857fb4e66583e70eff2b674a59ed34f23ca671f7e7bd09eb17f3a SHA512 4ed5bccb7bf8a3609e7393d5eb389e517bf9b1e9bc8adcd8f69cf82c52045ecf33b940279e1d48354a83a76f6897f2e8146565405c8caae779ef8d6f78486c35 WHIRLPOOL 87a6d3e5c5ef43a79c4721b86d565476577a00cf7b9af0135340e0d55cf33f2c1697a64336d140970febc194a82ee5739173c0e1e29e998e88f696d8910ffa63
 EBUILD netbeans-cnd-9999_p20150924.ebuild 4790 SHA256 1e6242df1437ee478cd4bb792599cab312e7e62ac903bfd68c15e22c2b48482b SHA512 2b7e57699ca2ae3a68965ce1c7574946d5dd3af97342414bcba0acc3fd70d35010b305da1bc287d791123f0e98a2669c2aeee82121ded6107718be309fc28f66 WHIRLPOOL e40ec033df821077b8852fac390f9b538b270acf054aec4f6a77e966ce2904bdf2c50a9e29c5823ab683e6ba99c3fe0d1436f84363b393f683907b7e6ad6bb8a
 EBUILD netbeans-cnd-9999_p20150925.ebuild 4790 SHA256 0442eb9d63835aa3ace4ec5fac2ee030e4821dce54376011399dc817276f372c SHA512 939d64a173e4a1ee037891cdfbdc11fa593894ef146cdd00845012d49f015df76cb72fbf05502d290cf1b4028716cceae8ed81d81afeb286349ef53d4bf0e81e WHIRLPOOL 03311a53adb48ad4c559d7d539d00829d65d0631b3a992bf0a1e6da947fd33fdde566122b62ff98fc74df1acfbf3f8a0f30b6b6cde0bcfa6443e6751e0b7d196
+EBUILD netbeans-cnd-9999_p20150929.ebuild 4790 SHA256 87d109d9568049b9a036f1b6c90f6bfb18cd7d2753719f1eabe78f841f66b26e SHA512 1974287975c2949e59fac98769fba4e605516e29dab8dfe12a9b34501100a0703901adf158ce1898e266d084228158e614e1c9550f089f5ae1e64e75f4e4f526 WHIRLPOOL 25b27509f3246e85c43a3f92e500d04e4b8cdb393759c379ba2cf78c9752d4f3acb60fde27f02eeb1b0a0196c38ef0946310b3744d0ae59ffcd3f7260fa117c5
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index c02b923..e7ce5c5 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -18,6 +18,7 @@ DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f35
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
 DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
 DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
+DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 EBUILD netbeans-dlight-8.0.2.ebuild 2898 SHA256 08402481b573b90396431be03bda45904b2dd29f0086e09a111fe362e310c3f7 SHA512 3f6d6c9ea0043382562fbe47ad16e3273032407a74cb44ec7ff26736f96483835af4be8674361e910912a550b9fe592cc5a28c2b93b6b993076553195c35eac5 WHIRLPOOL 9d8706ccbc0d97b0f5d64ebf22c36316b08d8fbccd57408119ca5f5faef08c7f82677bf67488ff611eabeaa730e4c9a730c50966d94d738cfe79330ac147863d
 EBUILD netbeans-dlight-9999_p20150901.ebuild 2968 SHA256 f24ed1a628b18c080f9e06c1b488b101ebc2cf6cf0aa44c5b86f168fe52f912a SHA512 0fa494a731edd4f27e36d537e0a57ab868b8a04db394777b191d8352c452f75d06900ec23b0e25e4d08b18cfe9a8d9245890b01e24e510e52b2b218ebb91d2e8 WHIRLPOOL 439d07e76a1cb3967a1ef46540bfde542e11ffd7e4fbeb6fde5f198fa5f203703b6df26c4ba764d11d6299849fc8d4c5b7eb9f2133de02ccc586deee4cc34c34
 EBUILD netbeans-dlight-9999_p20150903.ebuild 2968 SHA256 e798582769fa118385293ad20cfcdeb51a4e10be437941396b37a71faf72bf3a SHA512 3080e3c87c9668b8c1646a61f2106ae937e1b8c9049e9d08aa933458b8e4dc4721c1caf84e12c37c397c4982cecfd53e39f2516c05617a59905182aa4e4190c1 WHIRLPOOL 5ea9f447ee4cd7a398db727ce0e3dd2944c58979d8af5f5a9c686732fd6dabf2403c2357c2e5d4d088ee36655b403dc6d574e2676d032e639b9cab3faf00bf70
@@ -34,4 +35,5 @@ EBUILD netbeans-dlight-9999_p20150922.ebuild 2968 SHA256 403af1813e041afd958689d
 EBUILD netbeans-dlight-9999_p20150923.ebuild 2968 SHA256 2b221372d118fb453301879cfd96b3ab509b7353fc2fa5567ec20330acce9b80 SHA512 695d5d7ad3e703e1d6b234990723f79a5a4129b65e879b549b6c1e50f5a9f1f31588f63372c809fb8e91dbd63fbaad74a192495c9c9b7a4147fe4239996c914c WHIRLPOOL 3680eb3608402212df13506975713da9e9c45365ac41b92e1ead3b5bd50a2c555e3fa623e37e371bb0692917eb5d938f19059fdc5d2e95d0189f7f52bdcb25b2
 EBUILD netbeans-dlight-9999_p20150924.ebuild 2968 SHA256 e74b2e1e4f2473d588949d9d6fdaf8f67b0f86c1d2c830a8fc100bbb0d5baa2d SHA512 782d0c4254476989012242dcd967835e1b20b5078e56a9065b202a0fec71c1a6876459a633bc20c1815ce82c78ed88e5b79097a16f21274940a4012ce9a91ea1 WHIRLPOOL b6065bed8b3ee63bf831fc8f2a311db04b029333cb7a0b1d2370a8ce06cbd746cd827245b27ee4c4f57baa8c210d7cc6284cf4cf0c9d467ef926aaa3959a7133
 EBUILD netbeans-dlight-9999_p20150925.ebuild 2968 SHA256 aad2e8a17a258ef0a163cb5c6d1926c6086273d9b9f339f5943d09fb55c74e5c SHA512 751b9692a9fc416b6f2597278ffeccc6c157f5167bebc5ead143ada9efe1c1f1b728c437db4d493cb5ffa2539483df1bd1971e6368e683179150d73f98304e96 WHIRLPOOL 0bc902ce4756029153908effdeda559ef96005c23a094665402008358b269a3c2ebb35376c52c0c6647d230f8717ea8ce2933c285640c20d4bf918ff2f0485f2
+EBUILD netbeans-dlight-9999_p20150929.ebuild 2968 SHA256 2faba25efcb7eaf80d0fda7d0b40dde2eba9cb606660a7349c07ac02a82f98bd SHA512 d795e0e6cc884530f4f7b4e93d945535e0dc6c5635793a48f0d9999b2a189fda056e9348876e41d39321b8e6d86d15a1eb0e138b5c8f6d00b8a6eed27468aaf0 WHIRLPOOL ba3292c9c38a767525608e6022d3372d1a087fc40b60b1e1724ea39c125ebac09b3489d06b3860c5d81707c2b015637975ed6064fb635881ace0f032e9046672
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 99d360b..927f0ef 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -48,6 +48,7 @@ DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f35
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
 DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
 DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
+DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 EBUILD netbeans-enterprise-8.0.2.ebuild 15071 SHA256 84621e3bb946cfa254bb70ca3c3f61202882a7e6d631769ad2f0f4639b0de875 SHA512 6ad38e840764661e6bc5b89b5925e9665871009ba0b640c0a78c555ec104214dbee1200a93cb48e655bc620e07bb6e4d8932b23a00fe458f8a5e9e5c3200d79d WHIRLPOOL b2c2bbf2ff72f8cd9b4cdbe039fdbf7cd074b0fdc20f634aa0b6f79f5c639be358c61fab30854a6e3ab9714a285d9461ac4e39e94e10c14c5068422d6c873c56
 EBUILD netbeans-enterprise-9999_p20150901.ebuild 15931 SHA256 44c06fa71678bc9434d41c8f580375f0e56c4756da1ad14de658574360a4ca8a SHA512 0e0800cd6259f4e4524d328a593ad4d1a40cb0b129ef53088403c0fe90b732f15eb897686485f629501cdaf4efbbaa69c60ce648e655a016abf4d24588a9191a WHIRLPOOL ee6d2a407a2d6e124f21912a7a0b1c6dfc8155cf228f9f451554c1c40ab63d497070d0264360aded0de23e7c03a52825593fde03dc4ed092b65789cbe083d47a
 EBUILD netbeans-enterprise-9999_p20150903.ebuild 15931 SHA256 2d15c63f7b1c6b590dfbda9cc26aa44ee36c043a695ad4ae06bac98b17f9f73a SHA512 6ca976ec3cb4b96d4d9794abaaadaa7e42dc0d4537e02a6cd0a65b0df7c2789a5eeeaabdb33b42df134271d4f8f0b5d54ddbeffb18a704e36c6e8a25f6d5245b WHIRLPOOL b0927d3c4aedd46698cba83fb07e35d5d0796ec9a50b65cc828534da1c45ab9b75701c58003583af3f999a2d4fa69a6b4a62abc3225d7591444dfca0353e3bf8
@@ -64,4 +65,5 @@ EBUILD netbeans-enterprise-9999_p20150922.ebuild 15931 SHA256 549133f581930d318c
 EBUILD netbeans-enterprise-9999_p20150923.ebuild 15931 SHA256 65047c6434da308e3675534b5867361f4a6a2a2a5a73126938f7c53f072c1afa SHA512 9ae8307b6dd95a4e4344a325056dde34ca8b953ae49eef0bf61670817a73098192470ebbedda5c4a70d378e2f9223908cf921cbdbc8404ad033f438eb0110e6a WHIRLPOOL b30c9bb1cf001711c9ae353241d513f74d64fc74c5d70b8b0e4aa9b6e32e943976f5cf0859213eab4fd3520cb6a928bf12481078ded099d28d094beb0b05cf3a
 EBUILD netbeans-enterprise-9999_p20150924.ebuild 15931 SHA256 68b6cb8a497d46a59c4df1d0ed8b3d4469f8f77bbe5f4586b9521e6e5adbc570 SHA512 1041148a771e73854eb55fbaa93b69c327de91f0b5059abddb4d6760077487ac2b25dd01bb0d0b8212a9a713772b82bd0a955bf8eb94bb72b30bab3ea38ab901 WHIRLPOOL 488106f3cfac8c48af21b30d39dbfc6e256dc4c57005cd28364f28c55d4d648982c04c1c0b8417bcf768b81335356ebaf15ac63c359ca8b3a5aba02eb96b5929
 EBUILD netbeans-enterprise-9999_p20150925.ebuild 15931 SHA256 49b14b170a1eacc6eced325d759248f967fba69c4f48b3dbad2c43cde1733165 SHA512 884ef667b2fc27fb09e1405bb79ca7dc1d7dde99192b0a24847d7a72451eaaef4aaf32946c1ff182c1f61ee6d1cdbaea341af85d2df0dc6814210dbd27b8fd0c WHIRLPOOL 3031bb949cc147fb1e853bb77860342d38a7c398357af60125fc838519595560064ccca44db0658334c7206876f550b38669889460832f9c3b5a998fbbf05fff
+EBUILD netbeans-enterprise-9999_p20150929.ebuild 15931 SHA256 c4832834e7177dd02b4c6ea73155b86c4183b0be3b6bf31f85b75fbcb85333a9 SHA512 3aa244ed6c0df566530ad591aa84776bb011231b94e7c52279e10e717ebee18245bb798b57971ca555054b4bcd7308ba34af06b59d756951bcb711b65472ac29 WHIRLPOOL 4708419729c5f94ef86a10300c1c5eae37959e890fb1f7e3443c67bb41663b07343ad07fde358314aad0e3ce0be06ae1586d09386481f5cd574918fb7f8323dc
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150929.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150929.ebuild
new file mode 100644
index 0000000..6fefa3a
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150929.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2015 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/2015-09-29_00-02-28/zip/netbeans-trunk-nightly-201509290002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar
+	http://hg.netbeans.org/binaries/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar
+	http://hg.netbeans.org/binaries/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar
+	http://hg.netbeans.org/binaries/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar
+	http://hg.netbeans.org/binaries/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar
+	http://hg.netbeans.org/binaries/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar
+	http://hg.netbeans.org/binaries/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar
+	http://hg.netbeans.org/binaries/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar
+	http://hg.netbeans.org/binaries/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar
+	http://hg.netbeans.org/binaries/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar
+	http://hg.netbeans.org/binaries/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar
+	http://hg.netbeans.org/binaries/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar
+	http://hg.netbeans.org/binaries/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar
+	http://hg.netbeans.org/binaries/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar
+	http://hg.netbeans.org/binaries/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar
+	http://hg.netbeans.org/binaries/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar
+	http://hg.netbeans.org/binaries/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip
+	http://hg.netbeans.org/binaries/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar
+	http://hg.netbeans.org/binaries/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip
+	http://hg.netbeans.org/binaries/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip
+	http://hg.netbeans.org/binaries/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip
+	http://hg.netbeans.org/binaries/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar
+	http://hg.netbeans.org/binaries/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar
+	http://hg.netbeans.org/binaries/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip
+	http://hg.netbeans.org/binaries/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip
+	http://hg.netbeans.org/binaries/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar
+	http://hg.netbeans.org/binaries/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar
+	http://hg.netbeans.org/binaries/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip
+	http://hg.netbeans.org/binaries/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip
+	http://hg.netbeans.org/binaries/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip
+	http://hg.netbeans.org/binaries/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-profiler-${PV}
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-webcommon-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/commons-codec:0
+	dev-java/commons-fileupload:0
+	dev-java/commons-logging:0
+	dev-java/glassfish-deployment-api:1.2"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/jsr181:0
+	>=dev-java/junit-4.4:4
+	dev-java/tomcat-servlet-api:2.3"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}
+	dev-java/antlr:0[java]
+	dev-java/bsf:2.3
+	dev-java/cglib:3
+	dev-java/commons-beanutils:1.7
+	dev-java/commons-collections:0
+	dev-java/commons-digester:0
+	dev-java/commons-io:1
+	dev-java/commons-validator:0
+	dev-java/glassfish-persistence:0
+	dev-java/guava:14
+	dev-java/jakarta-oro:2.0
+	dev-java/osgi-core-api:0
+	dev-java/validation-api:1.0"
+#	dev-java/commons-chain:1.1 in overlay
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.enterprise -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar libs.amazon/external/aws-java-sdk-1.2.1.jar || die
+	ln -s "${DISTDIR}"/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar libs.elimpl/external/el-impl.jar || die
+	ln -s "${DISTDIR}"/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar web.jspparser/external/glassfish-jspparser-4.0.jar || die
+	ln -s "${DISTDIR}"/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar libs.glassfish_logging/external/glassfish-logging-2.0.jar || die
+	ln -s "${DISTDIR}"/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar libs.amazon/external/httpclient-4.1.1.jar || die
+	ln -s "${DISTDIR}"/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar libs.amazon/external/httpcore-4.1.jar || die
+	ln -s "${DISTDIR}"/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar javaee.api/external/javaee-api-6.0.jar || die
+	ln -s "${DISTDIR}"/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar javaee7.api/external/javaee-api-7.0.jar || die
+	ln -s "${DISTDIR}"/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar javaee.api/external/javaee-web-api-6.0.jar || die
+	ln -s "${DISTDIR}"/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar javaee7.api/external/javaee-web-api-7.0.jar || die
+	ln -s "${DISTDIR}"/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar j2ee.platform/external/javaee-doc-api.jar || die
+	ln -s "${DISTDIR}"/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar javaee.api/external/javax.annotation.jar || die
+	ln -s "${DISTDIR}"/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar javaee7.api/external/javax.annotation-api.jar || die
+	ln -s "${DISTDIR}"/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar javaee7.api/external/javax.xml.soap-api.jar || die
+	ln -s "${DISTDIR}"/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar javaee.api/external/jaxb-api-osgi.jar || die
+	ln -s "${DISTDIR}"/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar javaee7.api/external/jaxb-api-osgi.jar || die
+	ln -s "${DISTDIR}"/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip websvc.restlib/external/jaxrs-ri-2.5.1.zip || die
+	ln -s "${DISTDIR}"/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar javaee7.api/external/jaxws-api.jar || die
+	ln -s "${DISTDIR}"/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip web.jsf12/external/jsf-1.2.zip || die
+	ln -s "${DISTDIR}"/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip web.jsf20/external/jsf-2.2.zip || die
+	ln -s "${DISTDIR}"/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip web.jsf.editor/external/jsf-api-docs.zip || die
+	ln -s "${DISTDIR}"/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar libs.jstl/external/jstl-api.jar || die
+	ln -s "${DISTDIR}"/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar libs.jstl/external/jstl-impl.jar || die
+	ln -s "${DISTDIR}"/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip websvc.metro.lib/external/metro-1.4-doc.zip || die
+	ln -s "${DISTDIR}"/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip websvc.metro.lib/external/metro-2.0.zip || die
+	ln -s "${DISTDIR}"/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar web.primefaces/external/primefaces-5.0.jar || die
+	ln -s "${DISTDIR}"/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar servletjspapi/external/servlet3.1-jsp2.3-api.jar || die
+	ln -s "${DISTDIR}"/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip web.struts/external/struts-1.3.10-javadoc.zip || die
+	ln -s "${DISTDIR}"/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip web.struts/external/struts-1.3.10-lib.zip || die
+	ln -s "${DISTDIR}"/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip web.core.syntax/external/syntaxref20.zip || die
+	ln -s "${DISTDIR}"/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar javaee.api/external/webservices-api-osgi.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into j2eeapis/external glassfish-deployment-api-1.2 glassfish-deployment-api.jar jsr88javax.jar
+	java-pkg_jar-from --into libs.amazon/external commons-codec commons-codec.jar commons-codec-1.3.jar
+	java-pkg_jar-from --into libs.amazon/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
+	java-pkg_jar-from --into libs.commons_fileupload/external commons-fileupload commons-fileupload.jar commons-fileupload-1.3.jar
+	java-pkg_jar-from --build-only --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=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-fileupload-1.3.jar && dosym /usr/share/commons-fileupload/lib/commons-fileupload.jar ${instdir}/commons-fileupload-1.3.jar || die
+	rm jsr88javax.jar && dosym /usr/share/glassfish-deployment-api-1.2/lib/glassfish-deployment-api.jar ${instdir}/jsr88javax.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/aws-sdk
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-codec-1.3.jar && dosym /usr/share/commons-codec/lib/commons-codec.jar ${instdir}/commons-codec-1.3.jar || die
+	rm commons-logging-1.1.1.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.1.1.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/javaee7-endorsed
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jersey2/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm cglib-2.2.0-b21.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.0-b21.jar || die
+	rm guava-14.0.1.jar && dosym /usr/share/guava-14/lib/guava.jar ${instdir}/guava-14.0.1.jar || die
+	rm org.osgi.core-4.2.0.jar && dosym /usr/share/osgi-core-api/lib/osgi-core-api.jar ${instdir}/org.osgi.core-4.2.0.jar || die
+	rm persistence-api-1.0.jar && dosym /usr/share/glassfish-persistence/lib/glassfish-persistence.jar ${instdir}/persistence-api-1.0.jar || die
+	rm validation-api-1.1.0.Final.jar && dosym /usr/share/validation-api-1.0/lib/validation-api.jar ${instdir}/validation-api-1.1.0.Final.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jsf-1_2
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-beanutils.jar && dosym /usr/share/commons-beanutils-1.7/lib/commons-beanutils.jar ${instdir}/commons-beanutils.jar || die
+	rm commons-collections.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections.jar || die
+	rm commons-digester.jar && dosym /usr/share/commons-digester/lib/commons-digester.jar ${instdir}/commons-digester.jar || die
+	rm commons-logging.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/struts
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm antlr-2.7.2.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.2.jar || die
+	rm bsf-2.3.0.jar && dosym /usr/share/bsf-2.3/lib/bsf.jar ${instdir}/bsf-2.3.0.jar || die
+	rm commons-beanutils-1.8.0.jar && dosym /usr/share/commons-beanutils-1.7/lib/commons-beanutils.jar ${instdir}/commons-beanutils-1.8.0.jar || die
+	rm commons-digester-1.8.jar && dosym /usr/share/commons-digester/lib/commons-digester.jar ${instdir}/commons-digester-1.8.jar || die
+	rm commons-fileupload-1.1.1.jar && dosym /usr/share/commons-fileupload/lib/commons-fileupload.jar ${instdir}/commons-fileupload-1.1.1.jar || die
+	rm commons-io-1.1.jar && dosym /usr/share/commons-io-1/lib/commons-io.jar ${instdir}/commons-io-1.1.jar || die
+	rm commons-logging-1.0.4.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.0.4.jar || die
+	rm commons-validator-1.3.1.jar && dosym /usr/share/commons-validator/lib/commons-validator.jar ${instdir}/commons-validator-1.3.1.jar || die
+	rm oro-2.0.8.jar && dosym /usr/share/jakarta-oro-2.0/lib/jakarta-oro.jar ${instdir}/oro-2.0.8.jar || die
+	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 215a6fc..312fe81 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -16,6 +16,7 @@ DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f35
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
 DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
 DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
+DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 EBUILD netbeans-ergonomics-8.0.2.ebuild 2843 SHA256 f9262f6ee7f2aed1fab9bf4cf756f565272e9894afa50b349735e39961e7acc3 SHA512 f158c27640541f7aef31da050e0811c07a251ae4797cc663b95a074a47eaf9d6bb7a9aa11ba38ea55e75c185f7dba74629ba6716a819e8ad68eb3db9ada71451 WHIRLPOOL 4fe9634fb673fb05dbba25996efc3a212ef3bb23ab6e7c732cb75de076feb930735e3901806fd9c801abc7ee8aa8eb800718065325d415371255a886474061d4
 EBUILD netbeans-ergonomics-9999_p20150901.ebuild 2913 SHA256 5c3c619373ecaa4361d21b0686e634abd8e4f94f1d73aedbdc57307d50c64ba3 SHA512 d83f039014436f6e26b1f6fab2391ad2ecc33c184847574ea9c646a1b028f22ce3b566e4976a28d5b6bb00fd671043ff81bc718be76304077caa016613ef1edc WHIRLPOOL d0dbd357622f050e0b18a5c1262057050b740ce60069bdf6450cbdab0cdc4a78c81fc28e3837bd1fa1ab571666d3c2885fb975f5e26d50550b7c30ddbe17f547
 EBUILD netbeans-ergonomics-9999_p20150903.ebuild 2913 SHA256 08d2510fcb31a4ff36c702493e7a028659225e1678b6ad519c625b11220286c9 SHA512 5c5917f2498717d6d404145d13f2e1e75e1e93b08baaa451fbfa4c8e9b518f6207ec1eb86d7f6d57cc96ebaf55c0926f14b8601d7c2ea036c6566e95b2c5deb0 WHIRLPOOL 0e82e1fc32f080535e2b621f69111f0b5f453e08613b916c6fa1eb741cd9dfdb72651b31ac8f5c7bcf31b0b968aed41c3c6d9de6fa272b6d06851853beb1d57b
@@ -32,4 +33,5 @@ EBUILD netbeans-ergonomics-9999_p20150922.ebuild 2913 SHA256 99d61bf90b07930aa0a
 EBUILD netbeans-ergonomics-9999_p20150923.ebuild 2913 SHA256 b100ef3ff227f2c4ddc8f1a07c97f904fb181d754563322330511cb256913c61 SHA512 a19d34362ea59bd717dda16bec8b94048c6deea467b5bda04ef6ba5b3530637ceb95ece8ab918d2561ae444024de0516563400ed94d79b04b48b94240747aebf WHIRLPOOL d7232c6723b636d8e8d8725a6147b71c805fee1a66095f7c1fef5bc19f57fa4de99e950104db10fecfd40305787bd0699bccd34a6bd80a92dec1f0d5bc9af698
 EBUILD netbeans-ergonomics-9999_p20150924.ebuild 2913 SHA256 bfdcef4d4fa4557bc70f33486e379e005ba8b6ae7fdfdb8f717db52b6019ac93 SHA512 24e2d40c13545e895722839b1eeb109dcfa9cd2febf5f9db07a8328fad30d55bd068ff2a039b5c9e9e311b3889705d94f9cf64da7b89e1de809d743f682af38f WHIRLPOOL 52d46edcbd581a9ef9e372850270a3553e137d564e7f59933439e2f57e87a4336e4aeb3655cbbf4519ab3666b5ed6d4c061223b9ca81f6b33b6dccb0ee7eff74
 EBUILD netbeans-ergonomics-9999_p20150925.ebuild 2913 SHA256 d8a77a9dae947a38f83d532c97d51e4217553cbbd4651b79a6bea4090a696c52 SHA512 94b0136ef3c99095abae7cbf88dbe8572f97a0656e0870738baa26d2f90b8cb894062bcb913cb2ee7a5cb0666364c566ee67c6029c1c45440fcb29781e147e1d WHIRLPOOL c2e861874d370a8e3149d7f833c16c544f866b2c8bdd33f8dcc23cede14c27d29eb4d5e98ae71761f762e674be48d541cd4cccaaacbda7c9c705b03b8593b6b9
+EBUILD netbeans-ergonomics-9999_p20150929.ebuild 2913 SHA256 0260fc62f5450f7cbb7b91be981c41fb8d2e5054270ec9d89f649cb35f42c915 SHA512 02ab4b0b92bdf9cd6f15e67f88ceb3a70940e61f9c550893836b6a4ec51b7ac3aa96b5d40aec6566ecda2960a1f76df7b74b332ae480bd409f6c711b612c9db2 WHIRLPOOL e25e35a5b1627d4a217bfafd89b9339604ce781685eaab301aa1bc39e7d078d072ea5b01c78923aef6f9b2c00252c36be6612f8db8564b9cdd6e1123689bc357
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index 7d23a13..581ec56 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -18,6 +18,7 @@ DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f35
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
 DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
 DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
+DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 EBUILD netbeans-extide-8.0.2.ebuild 3307 SHA256 084e952eae1708b0fab785fd34313985e864dbc74a8531a0d5cdcf906e88f85a SHA512 ade8dc37aa932d7ec20966199e521311716061c23df08d02635f78efd2776f1d7bf040b0f9c9488b947bbbdfb3e33fa764723e3dfffa2214892bc6d685428f6f WHIRLPOOL ad2c26b005675ebca7d902ff1e6caa28552f3fda6795e327cc3584cf109f0ad6efad6516e15af5e70d689be236298b0948003e09a3da4991b3e29a1c85607b2f
 EBUILD netbeans-extide-9999_p20150901.ebuild 3377 SHA256 a459e45e713807b3565add526bbbca698d49b86ec31dfdb90dde5de79a98bf4f SHA512 7221a46804530530304a4cb1a36d58a82c19717e9d6a61c4e5c35a28ad3cb58d108fb11341a5ef9005557b1c7e891478e64f38aa12efffc652ddb684ba94c0d3 WHIRLPOOL 8b4d65a5d5c72f544ea83b43681136ba08678b20a71a15d336e9f8cf235331e01d6ba21bb7bf8147deb638d9e857006eb1ead0a0016e47c3c21262012c03e8ff
 EBUILD netbeans-extide-9999_p20150903.ebuild 3377 SHA256 e0a7a1f3704f2521ff54dbaa7eb9672a10bb8b866026d359c6fd4ae287937afa SHA512 c0f77e05c7a78608804126a10738d46e337f38b0124e30f50d14fedb24e984bca9a94bf31ee8ff6cc3931ca8b74527d521a27384dba09f555f7d59bafc366642 WHIRLPOOL 73fe4c7dc37d7b1ab2794cc55864dad1a5c1408a14c028df00c9f26c5049f08ccb5b8d2a88d3b0f2ad72d5fc927513692157e38b943db69fce602f6256638ab8
@@ -34,4 +35,5 @@ EBUILD netbeans-extide-9999_p20150922.ebuild 3377 SHA256 f4bdce5273270bf10b49f2b
 EBUILD netbeans-extide-9999_p20150923.ebuild 3377 SHA256 2cd816b16087a53f17f73a38fcdc5f98401c447548e5b828d32a94e5563dae67 SHA512 969db7beab82ad2339e2247a60f0e5b16ed9321d96f16ed47c5a57b00d88a31bd82d75ffb15ecc43822cf31fcd8df1ad9591b8fcf8c9541a78949919d3aaefbb WHIRLPOOL 9486b4eeb498d1b20e254702438e35f2eecce40578babb048ad43d5da6ed3faed789d1d02ebcb34a684115d422550164f78f6e55b23ff19082f03fb1d612e80c
 EBUILD netbeans-extide-9999_p20150924.ebuild 3377 SHA256 1188da08cbc5da731416edb34dbe840c0db15bb503491e85729aa4115223c0a1 SHA512 802ec93bb631ac19b5c5812709939e8017d73f32bfd85d681abf365e90a5400e95007e07b01588e130a26b4277338b23403d40786ef268bfc00c8ad20c5ac845 WHIRLPOOL ac4b2a2e2aeb1534ab6398f79f72ce5af9511623d06c592bba06753ce9ac435492c4d08508382140f39fb084c49c5cee4aedffb59c3f30b50c248f57f66d63dc
 EBUILD netbeans-extide-9999_p20150925.ebuild 3377 SHA256 8df930f5181319c8ab5191b750e96c82397258d61c61ee3822184aac6827770d SHA512 9f65400999b48ae34931d9b5cb9b0e4cd24d76860038603eae415098a5d87ebd86283a2c907d32a7c7fbdfb089d31abfb405811ae7673fc08e0e726a0ed29c81 WHIRLPOOL a9362bd03e7f2e2a2883c46e1d63b660fb0a252c4545acb57036e5083d4c5ce8c3ee072e3bf01d0ff80d168e9b150b44551104a816ede1890353a608b06135c4
+EBUILD netbeans-extide-9999_p20150929.ebuild 3377 SHA256 2d7dd2b719df3c5796435269dd65c1a4bac427cdd023efb15e873c92ec444c15 SHA512 399652fa635bb8b5a5a779ae766e9b8d2c0337e3c416db4e9e18b86b2156b60c0151e5ad228b145811554d8e0321f1234629de46bd4b48eb385220ef99a890b4 WHIRLPOOL 596a0202c30b0a8ab8a9aa8a85ce737f2d99b7899986b4cf000f64467a817c75ef263e59384d91117b9618e84e868694d10e4b43dca2ca71df1e311e39de554e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 8c15d32..5c96b3d 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -17,6 +17,7 @@ DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f35
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
 DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
 DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
+DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 EBUILD netbeans-groovy-8.0.2.ebuild 3346 SHA256 907e6cd11c222f15c826494b44929483803f0e4249de0d54db51e6855b574148 SHA512 8bb37121e7e32621959318d109b1d982e2c705a9deb7171f5fef1dcaed55fc5718b0bc9e6bbb2592cdaa5e96d874bb6e6bfa96d06fe09f14d5250c1485eb1da5 WHIRLPOOL d5e09fa1e975835f05c6132c091fee4ae9fc9dd671af9f5f88a9195d5cd4a93804f96687ed3f2bd741117fa65773f2c464b3cfd6697425039cc51a940efa2a31
 EBUILD netbeans-groovy-9999_p20150901.ebuild 3416 SHA256 bd899df99a2dfaf3081354ae331ad0494b5f2cdda81dc9039cef398ff8fcb10d SHA512 5753e9033ecb74072aae302ac814e5e8f3c264b159f4d82f7d41467f552b8089ad4a02141a277f154d8f48145a925b4214898e188d69f38d50dbb28af5b45b60 WHIRLPOOL ff875fab2e82d6fe6dcbabcccf334ff8056939ea7502773191ba622ecf597acbb49ac0a685ddca883bee01a890c220d9d531b6daa01189dc9b4a58cf41144c80
 EBUILD netbeans-groovy-9999_p20150903.ebuild 3416 SHA256 52900724587824fe2970ef01a4f6e2478d2b43f8068473edce228ae26f295f11 SHA512 15387a879c00dc1262cfe45c5d4d4bed353a15606531a1942a4921eaa7e947d89624bf81ed25a75bc9d76c1f8d7d729478e31f5dff416f08ba5c81280d1b88ab WHIRLPOOL fe65f7e8120c3586e0e35c49008c85296237f69eeac8f6f383a0bf47c86407e66c6f17c3ff01dbdb921ecd9bb4c71e57e106a1f779b276239b9fa3ccefa8d2ab
@@ -33,4 +34,5 @@ EBUILD netbeans-groovy-9999_p20150922.ebuild 3416 SHA256 af55ad2b5a13535b46b1fa3
 EBUILD netbeans-groovy-9999_p20150923.ebuild 3416 SHA256 78238d84d239a2d978d848f36b5f083e2929b37c7ce269827dc6fd63a37753b2 SHA512 af7bdba5bdbf0929367349c5e90cc2662254d8e0b72d43f3696ebe734786807f7819933a0cbb8a8a67d49a469ab8d94cb041d1d681cc7555886c1a5aeb07dd1e WHIRLPOOL 6139fbb2749be1692c685a8ce9fbe55aab402be1fd0f1b8c4d95f375dcc8cf3187af6a58ba153adc428701eae0266890c85d1c462e5771c2340bbea83d2b255b
 EBUILD netbeans-groovy-9999_p20150924.ebuild 3416 SHA256 508d788fe407dde8973b878f196f2bdfcee583a58974ca1370503a2852e68e61 SHA512 b4ba688dcfcb8ce4823af0495766e3e9443484980f326506e61569d316e04d1460ad399ed0393a6746a2f61be1dacee715b256b5d08d66b5e100154f399c04c8 WHIRLPOOL 5569f4c616b16dfd841fc7ec2aea798b67d18d4b511ce0031ecdb571760c5d631c4c65c7d26313eebd798e200219918eeea27c76b22f74ea6c2284064e57cf91
 EBUILD netbeans-groovy-9999_p20150925.ebuild 3416 SHA256 2bb58f38747a3a37402f5586c5a6f04cc95df0eaeb57701767a91c1fb51a2b69 SHA512 3c6bf667321908beeda115f69790b4e869e90ea7a34748df82f261de8184f897890ee3042242efbadc3606d75272c59684d95de5f2e0149a04ac4aadd1d914a1 WHIRLPOOL 807d0f95e4dda163d4fb6ba984fb40192c70be8130f208274c23f56fa6dc8c290f45836a0a7ffd2fb1878929db717343f24df00e083827eacb0913386cfc9a16
+EBUILD netbeans-groovy-9999_p20150929.ebuild 3416 SHA256 2c20201dbbb456a22ca66f74703bbf35b31be0e748ef4501c356de13ce557223 SHA512 22cc755a4e43f9bda36a702f9bc65eb7e6c831ab938dc55a9378b3a4116dc87cfd0728f3017c806b9a6b7ca11227b1f1398e3de5d402160253783bca11b5244e WHIRLPOOL ea336706ddf6f13367d1fbc5e5d936857c67960e5238f84d6ab54b8d0f42d188c4910aec790fdb3caa81e76de0615ef208ba140c94b2090f901d76835bb0f7b7
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 36ffd23..fe515ae 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -21,6 +21,7 @@ DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f35
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
 DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
 DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
+DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 EBUILD netbeans-harness-8.0.2.ebuild 4055 SHA256 2674d562adc57648c82cac9f714f74f9d29dd7b7ff7fa7f0ef37c43ef0975489 SHA512 7d72bed5b955b2365a4c11fcd97a2d6f2372ab939fb9a03b3ff7915053f24d695373c1aa154f6e6916d37ef3ace7b38864d575419460382760500576dae52e49 WHIRLPOOL 72f54a6cb83f282a75f0abb073109414a7b8bcd4e9263466281e68ff34148a7343ed3bd78ebdc8afd109b6b9f5b9f15bfd0e250f418fcaa4986a7c886b57b9f6
 EBUILD netbeans-harness-9999_p20150901.ebuild 4125 SHA256 c9189bd6d9b770dcc22627aedb7041e6dd80a0464b4b3649a6cebf1352fd7dea SHA512 154f820f3b07192e4d8b35fd473cdedd3dcee70d81f8484e95a33846fd6c3e8474acbad1ee99ca2ee29574da125521ca695bed8a471e5fd10ab7724ef9d8f7d4 WHIRLPOOL 8b4a9ff80f36f06108df4508abd091b99e5ed96c6b297c1efe5b18b3f798890f6f23313c02d543d89fcde5169631bf3cdca15cc54a086747f8f52eda303d8f09
 EBUILD netbeans-harness-9999_p20150903.ebuild 4125 SHA256 68de6c9e0f914b0db958bcb0a48f9e74170cef31e65dcea5e8996f8796df32d1 SHA512 93a557e04df4f9fc4bc068b087e3b91d5fb409c30e8c16b625f2973b28e3f5f36474fa7d36ca9fc72c154bb2a2bd84b696a95241cd02ec14cf7ae4800291d545 WHIRLPOOL 4bbdb9c03f2b21ce25eba8f4ac8abe8144c4f315dc2a608d2ec4cb3a6adcd7020f4bae313924024eaba580e245d1e8e3e3cd19f3d1e6f90db4c6ca6f7c90ad3c
@@ -37,4 +38,5 @@ EBUILD netbeans-harness-9999_p20150922.ebuild 4125 SHA256 fb7a88d8116d3df5c70fe0
 EBUILD netbeans-harness-9999_p20150923.ebuild 4125 SHA256 8938d3a67b01fe0d178a210c3e3b402a75d68aba430764933912d1849dbd3994 SHA512 a182972c9a1ce9c7a0b130000bc6b63934a3e5c34529c98730f9211dd0adb1280bb92eaa81f5b003a7e2efb72f6c624fa763907c15f7ef6d915db7b9dbd6944f WHIRLPOOL 7c60493eda014812b4636239f56e3e22496ba9b8ac56ba8c0104bfaccffb0ac0287913835a2cb881fbe633898ca2063689690cdf3c5362f749cac26a54d88d98
 EBUILD netbeans-harness-9999_p20150924.ebuild 4125 SHA256 ea1aa6d115ace52b0e6b2259453bcbbd1350540d210998d9d85a7ced00df77f9 SHA512 90757ba75b0def880e7cc247b625a5bc7c44eee6197f36d0536f39f5d623870a5a721ba78a4002a4103db96b27aac4c95951f63d73b2aa81062132d17883acdf WHIRLPOOL e998bf731f839b0e4f19c2f3da575babab8b75de2a9cfff42faf7b610391ae535c6e171ed52d7c2da6e13eb1295f7382aae82f4f938a1b79da1605e4b7265446
 EBUILD netbeans-harness-9999_p20150925.ebuild 4125 SHA256 ec043c193907209f28dea43a159c3da3e2d01bd511058d78f7e9111b04bf84cc SHA512 8f645244bfa6ce883e55fb8110150924ac98059a8015eee55557f96a3f7324a89cf443fd34e1e8e8d204dc691d2a33906e45116316e269f14871289bfc4400ac WHIRLPOOL ca02f532d539da47fe19b5752530c48dec2c4d90bffd3bcf31e1bebb84a9a9183353df6f01246f0867209273d72429417f1d32918289d75d0f064ac7a9bad56c
+EBUILD netbeans-harness-9999_p20150929.ebuild 4125 SHA256 fef9bca6ffd87b35570d593e14c78b27a10f3a1499cd5c1e9afd2f7d61bdf6f9 SHA512 436f495476bcb81b80563e89f14e82960d92c84aeae05b088517638997cb4253aaf3edb57be73781734206ff4806285f6590c51e02cc95f7e4d2644f9ec9d3d5 WHIRLPOOL dd9cbd92b68529df70ac2963f0aeda23b1301d02f290828e8490a725050b330d5a10216a769f6bf71a2260dfded13ea988a8928e4e649ccc7a7e4a375fcae917
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20150929.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20150929.ebuild
new file mode 100644
index 0000000..6b2e98c
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20150929.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2015 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/2015-09-29_00-02-28/zip/netbeans-trunk-nightly-201509290002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
+	http://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar
+	http://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip
+	http://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip
+	http://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	dev-java/javahelp:0"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	>=dev-java/junit-4.4:4"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.harness -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar apisupport.harness/external/bindex-2.2.jar || die
+	ln -s "${DISTDIR}"/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar apisupport.harness/external/jnlp-servlet.jar || die
+	ln -s "${DISTDIR}"/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar jemmy/external/jemmy-2.3.1.1.jar || die
+	ln -s "${DISTDIR}"/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip jemmy/external/jemmy-2.3.1.1-doc.zip || die
+	ln -s "${DISTDIR}"/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip jemmy/external/jemmy-2.3.1.1-src.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into apisupport.harness/external javahelp jsearch.jar jsearch-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/harness >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/harness$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	fperms 755 launchers/app.sh
+	find "${D}" -name "*.exe" -type f -delete
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/antlib
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsearch-2.0_05.jar && dosym /usr/share/javahelp/lib/jsearch.jar ${instdir}/jsearch-2.0_05.jar || die
+	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 13dcdb6..5918ff8 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -122,6 +122,7 @@ DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f35
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
 DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
 DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
+DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 EBUILD netbeans-ide-8.0.2.ebuild 29317 SHA256 42218788ab0fc7c7cd1bb42a8b0c72a66543a3260b752aa55365833c355bcc63 SHA512 c712b66b6bee654390a45e5c616479df2be624bb770f3838d4fcce875f71a8d165703dffd55c4fd7d30e19c392784203e5fe01e2404907d88c935d439efaf578 WHIRLPOOL 67763e4a36215ac002fd321556ce2269affc15ba48ad5069d7ccc746d918179994f174e09305a9d9ddadddbea690778c2769e0ea1993eafc09e01580485e2292
 EBUILD netbeans-ide-9999_p20150901.ebuild 30334 SHA256 a2430eba1da126a548c390a52701aa5a9ff7f3c5afcf591492704f6270f49ee2 SHA512 ee3b7c4d773f16ae78341f8393397d6090055d11b2b45a579afc23e020cda5bf0f86b1348d47b99fe94280885db4869b3f54a15e5f70aafb62c2ead0e63bc9f6 WHIRLPOOL dae179c3bed6fdbfa5527a31d3b15a9e8f1eb7a805ce872b9fa512be27b1ee4e3393a0713bec6e461fdaf7d09c04857c68cca5b497f772559491a4f32f2ef4cc
 EBUILD netbeans-ide-9999_p20150903.ebuild 30334 SHA256 ae41f1ecbbaf9cfc10fa655a7ac439d418a40d7cd2ae2cf8e40009035c839f22 SHA512 c8d03b4c44ed1855b06f861347078aadbbaed51e42eced7f35f02c438440a269b055042aa44666ebd2c0d1fb16c626f07a70c751025bce97735393e4faf9c387 WHIRLPOOL 45c00d9dcc84161a15412652088d25e5f220b7d499da453ef2f482960c7e51cef8d6ac3e6b343e9a9b5b78f6cc8f68ba7aaab15c557c2734c0335bf27e48a531
@@ -138,4 +139,5 @@ EBUILD netbeans-ide-9999_p20150922.ebuild 30334 SHA256 3612fb5cb93cccd7abfc41d62
 EBUILD netbeans-ide-9999_p20150923.ebuild 30334 SHA256 fc39a83681e844b1389dc24303683d541051f26d932b973da5014eecf465a977 SHA512 ebe494e3cc3767b5da64268f85d951f73474ff64718bd91b4a7b0bb13c602d33d46443ff0daffec604825b23462a4125730255708865a7fad133a38e01ef193c WHIRLPOOL 02b8819c413af8ec6ffa91bb4687426ece58a38ffe030c1c0a89fd1fa1e12e9121fc7634a6a819c37ce16e14ee48f5bf90cad86e239862fe94dc6814628a752e
 EBUILD netbeans-ide-9999_p20150924.ebuild 30334 SHA256 2b2f51c1c488b85fdf07e9b5a87b1aad9e381a3108f13bb2edeebf3771cabd8c SHA512 a01171ec42cec19a908285e5667637e3d58aa39178ea4791187d1d428522ee4120bf87903413100d0e29354bce4d65d57a255bcf4f48d856471aa252f5203f8e WHIRLPOOL 912421afa52a7aa9baf82fce3f068855fbfd642ba5ed8c95346842060dba6d9e5e2a613b3db119bd61f2c36b5a56c28376dac117596b9e960f9e2c02c19b7d52
 EBUILD netbeans-ide-9999_p20150925.ebuild 30334 SHA256 f00c2a190c4e0d8891a5201e4ec4de8ef89640db272c6c69856ba031ae5ecf95 SHA512 af182e1926a28f11fc6478f6238bbf7c908800984086121ea830e0558efbd063e331a80a1a6936da2bb352944850691fe48c9b5977883f95b7b1335cbaae6547 WHIRLPOOL baa696f2a5643110fdfac99245cb5ac62f2e31e130dda561abf82df7f05d253df131ba4663b1c4c9c20c99cf2da31405141b5f77d281c5195eafcccee2e3bbc6
+EBUILD netbeans-ide-9999_p20150929.ebuild 30334 SHA256 e48c57411bd1c03f0598aafa6820617ffaec85336229250ec6e45cf61dbc3e2d SHA512 de86c553caa4bb24eb7d87634793812f2af58b64f58bfaa35cda638f816cd543a332f51e15b4784de656d9b7210c1a0443b72e6bd30663fd3c328f4f08cec5bc WHIRLPOOL 16a5a122390eb893b5bddab3f18ef1b302a93d9239c07f955272741653748cfb2f258bc8eb13a880cb59426f7d658a0d082dd4e50bc9bc5c70c62e47f55f9db7
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20150929.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20150929.ebuild
new file mode 100644
index 0000000..e1a349d
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20150929.ebuild
@@ -0,0 +1,377 @@
+# Copyright 1999-2015 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/2015-09-29_00-02-28/zip/netbeans-trunk-nightly-201509290002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
+	http://hg.netbeans.org/binaries/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar
+	http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
+	http://hg.netbeans.org/binaries/ACAB7C860DF78C4A528FD8A64F2C62A0A96639E5-com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar
+	http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar
+	http://hg.netbeans.org/binaries/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/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
+	http://hg.netbeans.org/binaries/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar
+	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/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar
+	http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar
+	http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip
+	http://hg.netbeans.org/binaries/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar
+	http://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar
+	http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
+	http://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar
+	http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar
+	http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar
+	http://hg.netbeans.org/binaries/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar
+	http://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar
+	http://hg.netbeans.org/binaries/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip
+	http://hg.netbeans.org/binaries/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip
+	http://hg.netbeans.org/binaries/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip
+	http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar
+	http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar
+	http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar
+	http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar
+	http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
+	http://hg.netbeans.org/binaries/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar
+	http://hg.netbeans.org/binaries/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar
+	http://hg.netbeans.org/binaries/F27BF427BE72709F3094BF76ECA8C5A2B9AC6DA9-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar
+	http://hg.netbeans.org/binaries/9BC512C5BB9A9F5276B9E8672F6B30AD0BD97D88-org.eclipse.core.jobs-3.5.101_nosignature.jar
+	http://hg.netbeans.org/binaries/105DC9A1A93E6EA9A6CD368AD12897B1F247D6AE-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar
+	http://hg.netbeans.org/binaries/E99C3C29A90F8AB29078A38CF8EBC3860249640C-org.eclipse.core.runtime-3.7.0_nosignature.jar
+	http://hg.netbeans.org/binaries/84FC6D443CD0816FA87093B6B7AD6876ADFC4207-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar
+	http://hg.netbeans.org/binaries/74069BFD03B2C66A9EBB4370C0B8064E3F5B6594-org.eclipse.equinox.app-1.3.100_nosignature.jar
+	http://hg.netbeans.org/binaries/A7953EEE9D4D7CD896C7D0AD6D21902E6259979B-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar
+	http://hg.netbeans.org/binaries/3FB169C95F095B70F05B96BE9496DA63FAE7F707-org.eclipse.equinox.preferences-3.4.2_nosignature.jar
+	http://hg.netbeans.org/binaries/CD5919A707EB6B5C1FC29964C8EF5E2CF3F5A3D4-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar
+	http://hg.netbeans.org/binaries/A4634373DC60650C49CC98AEA2090889F7ADC68F-org.eclipse.equinox.security-1.1.1_nosignature.jar
+	http://hg.netbeans.org/binaries/278049664FFA5447191BD5FE96B0B62B0CFD15D1-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/9039A0C1FA0E56CB56A1A192908814478FA747C5-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/DAA45A7EE529A7532F5DC08625A5A3E81DB2D4CB-org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar
+	http://hg.netbeans.org/binaries/F5AC8FBA216A8C52F319EC2CB455B44FFD734B38-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar
+	http://hg.netbeans.org/binaries/B43E7CE55F0DECA3BE1A6E695A3E3ABC6D62567F-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar
+	http://hg.netbeans.org/binaries/1B9CBEC0FCB47C279519E52D360199C24EC99B01-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar
+	http://hg.netbeans.org/binaries/6B0A6E9F9179E314944E4ADB831A9D6FCADED3DC-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar
+	http://hg.netbeans.org/binaries/B28B8EE777232102471EA5334FD70E20851845DD-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar
+	http://hg.netbeans.org/binaries/24A15BD37950663933CC4975EE6E518BEB2C28A3-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar
+	http://hg.netbeans.org/binaries/01CD242F06F6F7E4E61C9E05ABBE07318E501D51-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar
+	http://hg.netbeans.org/binaries/75928E4368CA748131A6767BA1A97D9DA643C306-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar
+	http://hg.netbeans.org/binaries/8307A44D3F150F1BB317532097A0C7D125C00F2D-org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar
+	http://hg.netbeans.org/binaries/E90EF50215FFD23928B3308DC76A17B7DADE5F33-processtreekiller-1.0.5.jar
+	http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar
+	http://hg.netbeans.org/binaries/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar
+	http://hg.netbeans.org/binaries/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar
+	http://hg.netbeans.org/binaries/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar
+	http://hg.netbeans.org/binaries/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.jar
+	http://hg.netbeans.org/binaries/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar
+	http://hg.netbeans.org/binaries/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar
+	http://hg.netbeans.org/binaries/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar
+	http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar
+	http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar
+	http://hg.netbeans.org/binaries/6FC6098C230D7CBA5730106D379CBBB42F6EC48A-validator.jar
+	http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar
+	http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar
+	http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar
+	http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-platform-${PV}
+	dev-java/commons-httpclient:3
+	dev-java/commons-lang:2.1
+	dev-java/commons-logging:0
+	dev-java/icu4j:4.4
+	dev-java/iso-relax:0
+	dev-java/jdbc-mysql:0
+	dev-java/jdbc-postgresql:0
+	>=dev-java/jsch-0.1.46:0
+	>=dev-java/json-simple-1.1:0
+	dev-java/jsr173:0
+	dev-java/jzlib: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/freemarker:2.3
+#	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/trilead-ssh2:0 in overlay
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	dev-java/commons-codec:0
+	${CDEPEND}
+	dev-java/javacc:0
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ide -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
+	ln -s "${DISTDIR}"/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar libs.nashorn/external/asm-all-4.0.jar || die
+	ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
+	ln -s "${DISTDIR}"/ACAB7C860DF78C4A528FD8A64F2C62A0A96639E5-com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar || die
+	ln -s "${DISTDIR}"/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar o.apache.commons.io/external/commons-io-1.4.jar || die
+	ln -s "${DISTDIR}"/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}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
+	ln -s "${DISTDIR}"/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar html.validation/external/html5-datatypes.jar || 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}"/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar html.validation/external/io-xml-util.jar || die
+	ln -s "${DISTDIR}"/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar html.validation/external/iri.jar || die
+	ln -s "${DISTDIR}"/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip spellchecker.dictionary_en/external/ispell-enwl-3.1.20.zip || die
+	ln -s "${DISTDIR}"/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar c.googlecode.javaewah.JavaEWAH/external/JavaEWAH-0.7.9.jar || die
+	ln -s "${DISTDIR}"/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar xml.jaxb.api/external/jaxb-api.jar || die
+	ln -s "${DISTDIR}"/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip libs.jaxb/external/jaxb-api-doc.zip || die
+	ln -s "${DISTDIR}"/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar libs.jaxb/external/jaxb-impl.jar || die
+	ln -s "${DISTDIR}"/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar libs.jaxb/external/jaxb-xjc.jar || die
+	ln -s "${DISTDIR}"/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar libs.jaxb/external/jaxb1-impl.jar || die
+	ln -s "${DISTDIR}"/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar libs.javafx/external/jfxrt.jar || die
+	ln -s "${DISTDIR}"/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar html.validation/external/jing.jar || die
+	ln -s "${DISTDIR}"/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip javascript2.editor/external/js-corestubs.zip || die
+	ln -s "${DISTDIR}"/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip javascript2.editor/external/js-domstubs.zip || die
+	ln -s "${DISTDIR}"/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip javascript2.editor/external/js-reststubs.zip || die
+	ln -s "${DISTDIR}"/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.core-0.0.7.jar || die
+	ln -s "${DISTDIR}"/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.sshagent-0.0.7.jar || die
+	ln -s "${DISTDIR}"/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.pageant-0.0.7.jar || die
+	ln -s "${DISTDIR}"/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.usocket-jna-0.0.7.jar || die
+	ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.process/external/libpam4j-1.1.jar || die
+	ln -s "${DISTDIR}"/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar libs.nashorn/external/nashorn-02f810c26ff9-patched.jar || die
+	ln -s "${DISTDIR}"/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar html.validation/external/non-schema.jar || die
+	ln -s "${DISTDIR}"/F27BF427BE72709F3094BF76ECA8C5A2B9AC6DA9-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}"/9BC512C5BB9A9F5276B9E8672F6B30AD0BD97D88-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}"/105DC9A1A93E6EA9A6CD368AD12897B1F247D6AE-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}"/E99C3C29A90F8AB29078A38CF8EBC3860249640C-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}"/84FC6D443CD0816FA87093B6B7AD6876ADFC4207-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}"/74069BFD03B2C66A9EBB4370C0B8064E3F5B6594-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}"/A7953EEE9D4D7CD896C7D0AD6D21902E6259979B-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}"/3FB169C95F095B70F05B96BE9496DA63FAE7F707-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}"/CD5919A707EB6B5C1FC29964C8EF5E2CF3F5A3D4-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}"/A4634373DC60650C49CC98AEA2090889F7ADC68F-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}"/278049664FFA5447191BD5FE96B0B62B0CFD15D1-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}"/9039A0C1FA0E56CB56A1A192908814478FA747C5-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}"/DAA45A7EE529A7532F5DC08625A5A3E81DB2D4CB-org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar || die
+	ln -s "${DISTDIR}"/F5AC8FBA216A8C52F319EC2CB455B44FFD734B38-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar || die
+	ln -s "${DISTDIR}"/B43E7CE55F0DECA3BE1A6E695A3E3ABC6D62567F-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar || die
+	ln -s "${DISTDIR}"/1B9CBEC0FCB47C279519E52D360199C24EC99B01-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar || die
+	ln -s "${DISTDIR}"/6B0A6E9F9179E314944E4ADB831A9D6FCADED3DC-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar || die
+	ln -s "${DISTDIR}"/B28B8EE777232102471EA5334FD70E20851845DD-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar || die
+	ln -s "${DISTDIR}"/24A15BD37950663933CC4975EE6E518BEB2C28A3-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar || die
+	ln -s "${DISTDIR}"/01CD242F06F6F7E4E61C9E05ABBE07318E501D51-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar || die
+	ln -s "${DISTDIR}"/75928E4368CA748131A6767BA1A97D9DA643C306-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar  || die
+	ln -s "${DISTDIR}"/8307A44D3F150F1BB317532097A0C7D125C00F2D-org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar || die
+	ln -s "${DISTDIR}"/E90EF50215FFD23928B3308DC76A17B7DADE5F33-processtreekiller-1.0.5.jar extexecution.process/external/processtreekiller-1.0.5.jar || die
+	ln -s "${DISTDIR}"/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar libs.svnClientAdapter.svnkit/external/svnkit_1.7.8.r9538_v20130107_2001.jar || die
+	ln -s "${DISTDIR}"/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar o.apache.xml.resolver/external/resolver-1.2.jar || die
+	ln -s "${DISTDIR}"/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar libs.svnClientAdapter.svnkit/external/sqljet-1.1.10.jar || die
+	ln -s "${DISTDIR}"/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.10.3.jar || die
+	ln -s "${DISTDIR}"/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.10.3.jar || die
+	ln -s "${DISTDIR}"/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.10.3.jar || die
+	ln -s "${DISTDIR}"/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.jar libs.svnClientAdapter.javahl/external/svnjavahl-1.8.4.jar || die
+	ln -s "${DISTDIR}"/3B91269E9055504778F57744D24F505856698602-svnkit-1.7.0-beta4-20120316.233307-1.jar libs.svnClientAdapter.svnkit/external/svnkit-1.7.0-beta4-20120316.233307-1.jar || die
+	ln -s "${DISTDIR}"/015525209A02BD74254930FF844C7C13498B7FB9-svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar libs.svnClientAdapter.svnkit/external/svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar || die
+	ln -s "${DISTDIR}"/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar libs.swingx/external/swingx-all-1.6.4.jar || die
+	ln -s "${DISTDIR}"/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar httpserver/external/tomcat-webserver-3.2.jar || die
+	ln -s "${DISTDIR}"/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar swing.validation/external/ValidationAPI.jar || die
+	ln -s "${DISTDIR}"/6FC6098C230D7CBA5730106D379CBBB42F6EC48A-validator.jar html.validation/external/validator.jar || die
+	ln -s "${DISTDIR}"/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar extexecution.process/external/winp-1.14-patched.jar || die
+	ln -s "${DISTDIR}"/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar o.apache.xmlrpc/external/xmlrpc-client-3.0.jar || die
+	ln -s "${DISTDIR}"/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar o.apache.xmlrpc/external/xmlrpc-common-3.0.jar || die
+	ln -s "${DISTDIR}"/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar o.apache.xmlrpc/external/xmlrpc-server-3.0.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	popd >/dev/null || die
+
+	java-pkg_jar-from --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.53.jar
+	java-pkg_jar-from --into c.jcraft.jzlib/external jzlib jzlib.jar jzlib-1.0.7.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
+	java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar
+	java-pkg_jar-from --into html.parser/external icu4j-4.4 icu4j.jar icu4j-4_4_2.jar
+	java-pkg_jar-from --into html.validation/external iso-relax isorelax.jar isorelax.jar
+	java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
+	java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
+	# java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.19.jar
+	java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
+	java-pkg_jar-from --into libs.lucene/external lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smack.jar smack.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smackx.jar smackx.jar
+	# java-pkg_jar-from --into libs.svnClientAdapter.javahl/external subversion svn-javahl.jar svnjavahl-1.8.4.jar
+	java-pkg_jar-from --into libs.xerces/external xerces-2 xercesImpl.jar xerces-2.8.0.jar
+	java-pkg_jar-from --build-only --into o.apache.commons.codec/external commons-codec commons-codec.jar apache-commons-codec-1.3.jar
+	java-pkg_jar-from --into o.apache.commons.httpclient/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.1.jar
+	java-pkg_jar-from --into o.apache.commons.lang/external commons-lang-2.1 commons-lang.jar commons-lang-2.4.jar
+	java-pkg_jar-from --into o.apache.commons.logging/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
+	java-pkg_jar-from --into o.apache.ws.commons.util/external ws-commons-util ws-commons-util.jar ws-commons-util-1.0.1.jar
+	java-pkg_jar-from --into servletapi/external tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
+	java-pkg_jar-from --into xml.jaxb.api/external sun-jaf activation.jar activation.jar
+	java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_1.0_api.jar
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	unset DISPLAY
+	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+	pushd nbbuild/netbeans/ide >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/ide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	rm -fr "${D}"/${INSTALL_DIR}/bin/nativeexecution || die
+	rm -fr "${D}"/${INSTALL_DIR}/modules/lib || die
+
+	insinto ${INSTALL_DIR}/bin/nativeexecution
+	doins bin/nativeexecution/*
+
+	pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution >/dev/null || die
+	for file in *.sh ; do
+		fperms 755 ${file}
+	done
+	popd >/dev/null || die
+
+	if use x86 ; then
+		doins -r bin/nativeexecution/Linux-x86
+		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86 >/dev/null || die
+		for file in * ; do
+			fperms 755 ${file}
+		done
+		popd >/dev/null || die
+	elif use amd64 ; then
+		doins -r bin/nativeexecution/Linux-x86_64
+		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86_64 >/dev/null || die
+		for file in * ; do
+			fperms 755 ${file}
+		done
+		popd >/dev/null || die
+	fi
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm com-jcraft-jsch.jar && dosym /usr/share/jsch/lib/jsch.jar ${instdir}/com-jcraft-jsch.jar || die
+	rm com-jcraft-jzlib.jar && dosym /usr/share/jzlib/lib/jzlib.jar ${instdir}/com-jcraft-jzlib.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	# 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 && dosym /usr/share/icu4j-4.4/lib/icu4j.jar ${instdir}/icu4j-4_4_2.jar || die
+	rm isorelax.jar && dosym /usr/share/iso-relax/lib/isorelax.jar ${instdir}/isorelax.jar || die
+	rm json-simple-1.1.1.jar && dosym /usr/share/json-simple/lib/json-simple.jar ${instdir}/json-simple-1.1.1.jar || die
+	rm jvyamlb-0.2.7.jar && dosym /usr/share/jvyamlb/lib/jvyamlb.jar ${instdir}/jvyamlb-0.2.7.jar || die
+	rm log4j-1.2.15.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.15.jar || die
+	rm lucene-core-3.5.0.jar && dosym /usr/share/lucene-3.5/lib/lucene-core.jar ${instdir}/lucene-core-3.5.0.jar || die
+	rm mysql-connector-java-5.1.23-bin.jar && dosym /usr/share/jdbc-mysql/lib/jdbc-mysql.jar ${instdir}/mysql-connector-java-5.1.23-bin.jar || die
+	rm postgresql-9.2-1002.jdbc4.jar && dosym /usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar ${instdir}/postgresql-9.2-1002.jdbc4.jar || die
+	rm saxon9B.jar && dosym /usr/share/saxon-9/lib/saxon.jar ${instdir}/saxon9B.jar || die
+	rm servlet-2.2.jar && dosym /usr/share/tomcat-servlet-api-2.2/lib/servlet.jar ${instdir}/servlet-2.2.jar || die
+	rm smack.jar && dosym /usr/share/smack-2.2/lib/smack.jar ${instdir}/smack.jar || die
+	rm smackx.jar && dosym /usr/share/smack-2.2/lib/smackx.jar ${instdir}/smackx.jar || die
+	# rm svnjavahl.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl.jar || die
+	rm xerces-2.8.0.jar && dosym /usr/share/xerces-2/lib/xercesImpl.jar ${instdir}/xerces-2.8.0.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxb
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm activation.jar && dosym /usr/share/sun-jaf/lib/activation.jar ${instdir}/activation.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxb/api
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsr173_1.0_api.jar && dosym /usr/share/jsr173/lib/jsr173.jar ${instdir}/jsr173_1.0_api.jar || die
+	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 4c6bd47..68e6d14 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -45,6 +45,7 @@ DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f35
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
 DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
 DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
+DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 EBUILD netbeans-java-8.0.2-r3.ebuild 13294 SHA256 4abac657cff75400e92b1f2b19bca696113cdc37611c8c0f49dfa8c82fec4296 SHA512 32e41d7acc3aca026993e5edc791f1314f2bfda47413538af655b0335973c4fe50d998c67f129307b164075c3e0503280b4c1729d700431644ca6610d7f0f635 WHIRLPOOL d7f99c13421d08529b54085138fcffd2959a3c3f97d94a1dbe6e726a6dbc2cded69ec0bf97e1458b56847ac121954e8f173c1adde0703fd2969defa53ac37c51
 EBUILD netbeans-java-9999_p20150901.ebuild 14818 SHA256 2e650037a388a620e743e8212f0099878e8908fe4dc1680b36f6ae8e9a72fa54 SHA512 b7d8475055812c78ee45ceec123fc103641b4070972f0f7e3572a0b07efee2ca2cbcd16600fcfc7f30dff461fc235ccbbc1fde941f528e27f4a2f742f3ee5cdd WHIRLPOOL bb23d595159c481696ba4fefba3e398797db9cea44e4c2f00eef7929fbe1f442362c470163bc460d349da5cb18f627a3892c6d63b17439112becf538352785e2
 EBUILD netbeans-java-9999_p20150903.ebuild 14818 SHA256 f34ba8d98927651ec621ec445d4760fc596073f6857194bfceb5688b2910089b SHA512 ce7c86a52990ec26660a9eee1bc7588a2e069e80e42eb5b521699a9784e1da41411d5e9965c4f77bd4771b7046e9bd99e6563511336744404dd716e54c11faae WHIRLPOOL 5477f4bda878bfa48ba3851b740e5d9f06f594fa953f5ea0fab0a37917c7462b7356f96aaeca5847e85623c37e4bb46df81217451aace87cbcde7c50c38146a6
@@ -61,4 +62,5 @@ EBUILD netbeans-java-9999_p20150922.ebuild 14818 SHA256 348a24121519445a2d1bb1f0
 EBUILD netbeans-java-9999_p20150923.ebuild 14818 SHA256 9f4b5b668c10447c1578a2394fbac79395df5a28339b257587969ca318a24c74 SHA512 2d46647f4fcc44392f78d0890004e73c51ba6551a13f48cfd14a3dc7d83ded7e680503e412d710c25d43cd4ed714cb5f2c6c15b34f621e3b77f14f90574d6422 WHIRLPOOL 5752022bbef17168a91d47aa73e3a7ff637e09b85b416ff5cf0f81fa5116b09bb3562ceca505be888ace6e845114f6b8790a7dec19f6582b5c8a87cd461c7d71
 EBUILD netbeans-java-9999_p20150924.ebuild 14818 SHA256 cfcdfc64c907fe1a594e997f01b75e3c1c61b8c0b872597c3072169d7f21c5d4 SHA512 def4870e3e70555552f2fe6a65892c7a4a6da37c6bda3197a7af7e89aee39521b064b1aedd1e0060cf7bfd68eabec3f8df52d0fbd0082c6109e9066f2cec2e7f WHIRLPOOL 3202638e60fc8944af0fa213e10347c45022a0115a8a3927946c31ee9425cb8a5a47def8c1a5fb369c4683bb6bd7121829a1e452dd1c1bc96f15072763732318
 EBUILD netbeans-java-9999_p20150925.ebuild 14818 SHA256 8009633b2894840b5c4405358400690e05d1bfa8ebdb5729dfc8d9b1bdddbc21 SHA512 99ff05cd7d9a28dad280bd45243754ebea442fcfe60a1091aeb31be6e4cbcee34d8c6218995032e631bd12858b04098e4c8671329b8b35ee9ef54521e84836ce WHIRLPOOL 1e817112d9a171419afa1569149c8406a90c75ad261c7f3364469e2cdab72f969d4530c52102ab10d43116566453cce59afcec2da3c0246ba3cbf170967ddd8a
+EBUILD netbeans-java-9999_p20150929.ebuild 14818 SHA256 e746cd4a38e63f882c42e022c8635b0daa17205de2bc484df92ffad88fc91b6f SHA512 1250330f5b76235fa42455fe5dc022d42090a989251c03a2e85755321aba68a76153cc46975af20b409de3cdc441031bb6db7bd668324117389bc10b8ecd20e0 WHIRLPOOL a65e0257e2d06b7099ff605f1fc5d177aee6055a635176cb7003c28efc67cb9a1086763aa63e9175f0def4f7a350490059446e7176209849176a4ef36d786a02
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20150929.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20150929.ebuild
new file mode 100644
index 0000000..81c561b
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20150929.ebuild
@@ -0,0 +1,273 @@
+# Copyright 1999-2015 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/2015-09-29_00-02-28/zip/netbeans-trunk-nightly-201509290002-src.zip"
+# jarjar-1.4 contains also asm libraries
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/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/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar
+	http://hg.netbeans.org/binaries/7B98BEC9E6D1A447C9C3DDC61EF6658BA000008C-nb-javac-impl.jar
+	http://hg.netbeans.org/binaries/CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.jar
+	http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
+	http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar
+	http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip
+	http://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip
+	http://hg.netbeans.org/binaries/B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/beansbinding:0
+	dev-java/cglib:3
+	dev-java/jdom:0"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/json-simple:0
+	dev-java/junit:4"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}
+	dev-java/absolutelayout:0
+	dev-java/antlr:0[java]
+	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:0
+	dev-java/log4j:0
+	dev-java/mimepull:0
+	dev-java/oracle-javamail:0
+	dev-java/saaj:0
+	dev-java/slf4j-api:0
+	dev-java/slf4j-log4j12:0
+	dev-java/slf4j-simple:0
+	dev-java/stax-ex:0
+	dev-java/stax2-api:0
+	dev-java/xmlstreambuffer:0"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.java -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+pkg_pretend() {
+	local die_now=""
+
+	if [ -d /usr/share/netbeans-java-${SLOT}/ant ]; then
+		if [ -n "$(find /usr/share/netbeans-java-${SLOT}/ant -type l)" ]; then
+			eerror "Please remove following symlinks and run emerge again:"
+			find /usr/share/netbeans-java-${SLOT}/ant -type l
+			die_now="1"
+		fi
+	fi
+
+	if [ -L /usr/share/netbeans-java-${SLOT}/maven ]; then
+		if [ -z "${die_now}" ]; then
+			eerror "Please remove following symlinks and run emerge again:"
+		fi
+
+		echo "/usr/share/netbeans-java-${SLOT}/maven"
+		die_now="1"
+	fi
+
+	if [ -n "${die_now}" ]; then
+		die "Symlinks exist"
+	fi
+}
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/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}"/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
+	ln -s "${DISTDIR}"/7B98BEC9E6D1A447C9C3DDC61EF6658BA000008C-nb-javac-impl.jar libs.javacimpl/external/nb-javac-impl.jar || die
+	ln -s "${DISTDIR}"/CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.jar maven/external/netbeans-cos.jar || die
+	ln -s "${DISTDIR}"/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar || die
+	ln -s "${DISTDIR}"/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselinkmodelgen/external/org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar || die
+	ln -s "${DISTDIR}"/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip libs.springframework/external/spring-framework-3.2.7.RELEASE.zip || die
+	ln -s "${DISTDIR}"/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip libs.springframework/external/spring-framework-4.0.1.RELEASE.zip || die
+	ln -s "${DISTDIR}"/B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.jar maven.embedder/external/wagon-http-2.8-shaded.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.cglib/external cglib-3 cglib.jar cglib-2.2.jar
+	java-pkg_jar-from --build-only --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+	java-pkg_jar-from --into maven.embedder/external jdom jdom.jar jdom-1.0.jar
+	java-pkg_jar-from --into o.jdesktop.beansbinding/external beansbinding beansbinding.jar beansbinding-1.2.1.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/java >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+	grep -E "/java$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	chmod 755 "${D}"/${INSTALL_DIR}/maven/bin/mvn* || die
+	rm -fr "${D}"/${INSTALL_DIR}/maven/bin/*.bat || die
+
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/maven/lib
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-cli-1.2.jar && dosym /usr/share/commons-cli-1/lib/commons-cli.jar ${instdir}/commons-cli-1.2.jar || die
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm AbsoluteLayout.jar  && dosym /usr/share/absolutelayout/lib/absolutelayout.jar ${instdir}/AbsoluteLayout.jar || die
+	rm beansbinding-1.2.1.jar && dosym /usr/share/beansbinding/lib/beansbinding.jar ${instdir}/beansbinding-1.2.1.jar || die
+	rm cglib-2.2.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/hibernate4
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm antlr-2.7.7.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.7.jar || die
+	rm c3p0-0.9.2.1.jar && dosym /usr/share/c3p0/lib/c3p0.jar ${instdir}/c3p0-0.9.2.1.jar || die
+	rm cglib-2.2.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
+	rm commons-collections-3.2.1.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections-3.2.1.jar || die
+	rm dom4j-1.6.1.jar && dosym /usr/share/dom4j-1/lib/dom4j.jar ${instdir}/dom4j-1.6.1.jar || die
+	rm javassist-3.18.1-GA.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist-3.18.1-GA.jar || die
+	rm jboss-logging-3.1.3.GA.jar && dosym /usr/share/jboss-logging/lib/jboss-logging.jar ${instdir}/jboss-logging-3.1.3.GA.jar || die
+	rm jboss-transaction-api_1.2_spec-1.0.0.Final.jar && dosym /usr/share/glassfish-transaction-api/lib/jta.jar ${instdir}/jboss-transaction-api_1.2_spec-1.0.0.Final.jar || die
+	rm jtidy-r8-20060801.jar && dosym /usr/share/jtidy/lib/Tidy.jar ${instdir}/jtidy-r8-20060801.jar || die
+	rm log4j-1.2.12.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.12.jar || die
+	rm slf4j-api-1.6.1.jar && dosym /usr/share/slf4j-api/lib/slf4j-api.jar ${instdir}/slf4j-api-1.6.1.jar || die
+	rm slf4j-log4j12-1.6.1.jar && dosym /usr/share/slf4j-log4j12/lib/slf4j-log4j12.jar ${instdir}/slf4j-log4j12-1.6.1.jar || die
+	rm slf4j-simple-1.6.1.jar && dosym /usr/share/slf4j-simple/lib/slf4j-simple.jar ${instdir}/slf4j-simple-1.6.1.jar || die
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext/jaxws22
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm FastInfoset.jar && dosym /usr/share/fastinfoset/lib/fastinfoset.jar ${instdir}/FastInfoset.jar || die
+	rm javax.mail_1.4.jar && dosym /usr/share/oracle-javamail/lib/mail.jar ${instdir}/javax.mail_1.4.jar || die
+	rm mimepull.jar && dosym /usr/share/mimepull/lib/mimepull.jar ${instdir}/mimepull.jar || die
+	rm saaj-impl.jar && dosym /usr/share/saaj/lib/saaj.jar ${instdir}/saaj-impl.jar || die
+	rm stax-ex.jar && dosym /usr/share/stax-ex/lib/stax-ex.jar ${instdir}/stax-ex.jar || die
+	rm stax2-api.jar && dosym /usr/share/stax2-api/lib/stax2-api.jar ${instdir}/stax2-api.jar || die
+	rm streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/xmlstreambuffer.jar ${instdir}/streambuffer.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxws22/api
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
+	rm saaj-api.jar && dosym /usr/share/jsr67/lib/jsr67.jar ${instdir}/saaj-api.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/maven
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jdom-1.0.jar && dosym /usr/share/jdom/lib/jdom.jar ${instdir}/jdom-1.0.jar || die
+	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 7dfe863..7e8781a 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -19,6 +19,7 @@ DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f35
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
 DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
 DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
+DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 EBUILD netbeans-javacard-8.0.2.ebuild 4906 SHA256 944fee40d693c2c287e748f70ba565f3cd84bb7c19110f8be716134ec20694a7 SHA512 1f66cd2756effbfde7d43f9da7d8d93cb6252c58a02ee3d821f6faeaf63bf3c63e28f80c6eb44689e3aa954452a2f3893c65e75de84158dff1da0d94cafea14a WHIRLPOOL 88197e03008b8acb1ce62f72783bb096d9a3fc2a289b83367841a8adbee2bf822031f9bd6051831515ee44b1d5d2a109c5646f98ca723506f27c874301fb4189
 EBUILD netbeans-javacard-9999_p20150901.ebuild 4976 SHA256 f8bbd7f2419ccc07c17b05c295359dc07c55f3cfca78d7760105b82903fa2b79 SHA512 53bb2b9edbe87daecc4feb6b063579517ccea53b52168fc4a6ed03d8351d3f254a819125937aec58f551aa926b4b5a567b5bde3850fc390fad437f45194add80 WHIRLPOOL 9403f1dc9c3042fb5981d340b02d3615db9aefde73f1b2ade96b9010bdd6a37f610387aa303625ae0c979f20ccffd57ca87115321bd42ff9b6dcb39bcff03580
 EBUILD netbeans-javacard-9999_p20150903.ebuild 4976 SHA256 20835b1551b3382cd7a6b3f97fcf7725597e77317e8a5ede489954f99f0eb4e4 SHA512 93dc8f950ec2d8d8ad83eba39699436121729915ceca17ab3a4593ea2ec0a9cbeb81263f52cde443fb2ebe43658620c438664cd112b30774290a8cc03f2dfdb6 WHIRLPOOL 69670cab1e9e12e074a2874ade1cec66b08313763f7380b1839395becdab4bbd617172987d0ddb021dfa29241654119fa2d6d61cb34d507584c3c8e7670f6b83
@@ -35,4 +36,5 @@ EBUILD netbeans-javacard-9999_p20150922.ebuild 4976 SHA256 919d62a90ad04af5c1873
 EBUILD netbeans-javacard-9999_p20150923.ebuild 4976 SHA256 58e94384eeb962687d8297668b691f465d65a5cdc1258b71f973004a83c35166 SHA512 a2938fe2d436ba51863145f67e7616b1e94525bc6e7e7db26e2134ba96903ba00d1201906c01993951e1906e99e83343ee5478b5f61ded7d6fe33fede694c8b7 WHIRLPOOL 319ee683fd8100a1b1df94241c6738ec27b63c708359b930b6930c35584fad04c1e75ec6e58704a50fdabd83f967b28f73177c20a57902e0aabe4b626bed803b
 EBUILD netbeans-javacard-9999_p20150924.ebuild 4976 SHA256 db09ee755db06f77e212e5b21e50205922eed49e8ac5f594b3996ab73282c343 SHA512 ba6bb3c2be5c3a9f866a58487dbd73e31e7b4f56a8440c812b5f66161ca79d6caaa31859e8b034e94271494581c8ec7c0a2a071a4f5ccec2e459befbee8d3b99 WHIRLPOOL 589440d8c08895334fbdd3c06239b14ccfa640e6660b7c147376cdb16a8a5d2f59d9dcb0b7afeffcb88f7c96d2a492cfd6c4fdfb4b82e367d7d01556517b876a
 EBUILD netbeans-javacard-9999_p20150925.ebuild 4976 SHA256 e8bdd18777ea9dbaf9127a86f5b1446959e4843e8811d8bce83915e2772e3fd6 SHA512 273de50e8d0a3b78c8a20785373c39e51b0edb7f584a3b793e221cd3f7e4330d9a9f528d5929c0dccf2eae177d7c166f76e8e49a448799adab05fc2659584555 WHIRLPOOL 1a8582d3d574290ed2d85024d8ace16593e4fc18b1ffd76e63b5352accd77e312bcb3d982cafada9339e9b1d91b9fabb1b51c707c5c263263b439bf0da8286ab
+EBUILD netbeans-javacard-9999_p20150929.ebuild 4976 SHA256 01561b45f5a730b0d5cca539d2c2193ad8f42b62b3fdf8b14eaa4805217f1fa3 SHA512 899000c51813f9dbf4545b511f177f0900b0dadacdeba9d01051d82c569df4a65a2c92c4fdb710f35491c938bea0104d665426efcb1fcea01725cd06c1b1f950 WHIRLPOOL 427097b8ae5fb4487fdb375c3658b239c0466653b7619ff547f9e28579ef49e05a561b3bc79b0e7b387c0c66433b3b056cb1742555b6e4827ef8cd342de364da
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150929.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150929.ebuild
new file mode 100644
index 0000000..a7e1586
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150929.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2015 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/2015-09-29_00-02-28/zip/netbeans-trunk-nightly-201509290002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar
+	http://hg.netbeans.org/binaries/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar
+	http://hg.netbeans.org/binaries/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}
+	dev-java/ant-contrib:0
+	dev-java/asm:3
+	dev-java/bcel:0
+	dev-java/commons-cli:1
+	dev-java/commons-codec:0
+	dev-java/commons-httpclient:3
+	dev-java/commons-logging:0"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.javacard -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar javacard.ri.platform/external/anttasks.jar || die
+	ln -s "${DISTDIR}"/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar javacard.apdu.io/external/apduio.jar || die
+	ln -s "${DISTDIR}"/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip javacard.ri.bundle/external/javacard_ri.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/javacard >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/javacard$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	rm -fr "${D}"/${INSTALL_DIR}/bin || die
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/JCDK3.0.2_ConnectedEdition/lib
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm ant-contrib-1.0b3.jar && dosym /usr/share/ant-contrib/lib/ant-contrib.jar ${instdir}/ant-contrib-1.0b3.jar || die
+	rm asm-all-3.1.jar && dosym /usr/share/asm-3/lib/asm.jar ${instdir}/asm-all-3.1.jar || die
+	rm bcel-5.2.jar && dosym /usr/share/bcel/lib/bcel.jar ${instdir}/bcel-5.2.jar || die
+	rm commons-cli-1.0.jar && dosym /usr/share/commons-cli-1/lib/commons-cli.jar ${instdir}/commons-cli-1.0.jar || die
+	rm commons-codec-1.3.jar && dosym /usr/share/commons-codec/lib/commons-codec.jar ${instdir}/commons-codec-1.3.jar || die
+	rm commons-httpclient-3.0.jar && dosym /usr/share/commons-httpclient-3/lib/commons-httpclient.jar ${instdir}/commons-httpclient-3.0.jar || die
+	rm commons-logging-1.1.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.1.jar || die
+	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 2331a1e..e9566a1 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -17,6 +17,7 @@ DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f35
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
 DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
 DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
+DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 EBUILD netbeans-javadoc-8.0.2.ebuild 5993 SHA256 baf9da38d87b86eb8ed10ef46017361f36ca8583dd90885c9d1667a51851bc52 SHA512 892bc25b30dc26e3ee7c8be9aaf8542c00a7fa1d1d8f883d82bebb816edfa93e1ee9abeac1b0c47ecc8b4169bcaded56c5c71f18151fdc22fe241fcee0fd4521 WHIRLPOOL 2012f28f3ba5074b4d262b20e9a1c8ddf590ce444339ec1a404c890867c1271e38f9f9e09717d0648fae061553f5c8da3d97a70c35c8e853fe4894fb6fd4ec96
 EBUILD netbeans-javadoc-9999_p20150901.ebuild 6228 SHA256 70adb18643384a52dbe2b88467c14663a755609b1a5098cf816c5c0b88994e9e SHA512 529fa63d125fe04aa06c4f444924b0e1390680092ff4a474810b6ede97925cdf907b14283016f9000f54bc9cc1a1d0e89835ca681940152a029eee0f370c2fba WHIRLPOOL e117f345fd2dde9298afd3f8b2f7ac1a699936336a68dee80c50cc33193aba40b069ed8867a1af84efe3a4621fea35daf8b0835bf89f7ca7f35278b60ddaa56a
 EBUILD netbeans-javadoc-9999_p20150903.ebuild 6228 SHA256 9f0dd0e792cbe63c9dad51f0b445a2245ac2931123c3de1fc8079631e3dd4b77 SHA512 76e8762c17b07fdbe1ab65cef9b6b6c0e26355deb5f1827b7d864cf582d1aeecac57c579d439a49f19cbadd6db7f92e626e0c97ef5ddf0b1b883cfdd6282ee6b WHIRLPOOL 0efef7d57f10a275fda7f97c209ae41fc61f8f9961de19325e34c117378d97e7d1b362ffab93e1ac71ce38b13881823937fb8ef10fb014c84e1cd61ae42b3d2c
@@ -33,4 +34,5 @@ EBUILD netbeans-javadoc-9999_p20150922.ebuild 6228 SHA256 b2f814969114a6591a12ae
 EBUILD netbeans-javadoc-9999_p20150923.ebuild 6228 SHA256 e1b83b70a1a34c40ae982904c186d7803ad521e38d57199824a251c89bc52377 SHA512 fec664c8a59140def6d74fd00670750a56aa280fbf30a4d1cef5b58c4dd54b6ea186abf8f1502b67ea79aa4adb63863e7bae0ca6a22760f9ce2c77ba3a8fa994 WHIRLPOOL 3a7a7c46697ef7c90421643ffdac232be9c20ecb215b47cad1038c11a4133faeec9f53ac2c9a9229dc7d2c6584fbef527cbab18ebe61d24192578d2530310199
 EBUILD netbeans-javadoc-9999_p20150924.ebuild 6228 SHA256 7a074717de8d444c14278fdcc0f0399c9531697f9da931fb72f54258a5c68d45 SHA512 70003d8d5b50d2a1b856fd022b88b277bed7c92b6166f87819111d71005a54c2cafe4fb586928d93566210c45aeda79f2964280f6addea8e56ab9eafb34018d4 WHIRLPOOL cd87caffea1334f9fad5b072e92f6682f74a960a018793d80b3e2a3e5f83704bb46d866032aab058924a71f363f24ce28f9d8d08a77804fa63ea2fcbdd6c92a6
 EBUILD netbeans-javadoc-9999_p20150925.ebuild 6228 SHA256 9da2acae57f47e7029ef3a37d2d853990aeb74404da75e5e33822560112f55fd SHA512 3de58070e7cd7debee8e2d4587df6fa72884ce591d1c414bfb3b4e9106c28f8bd1f36a45f3be5c7afe862eb92bd034b941a192679c60acb70d20071514fb6b39 WHIRLPOOL 7fcadfc16e3e41f74cd539e89a2b2add49b721ef2cee7cffd64c6c4307dc82f862af425779f7c3e148c0a3c624237680ec269ec54c5191b4b80aafc85971a457
+EBUILD netbeans-javadoc-9999_p20150929.ebuild 6228 SHA256 3035638cf50308bd9b82ceeae22615d518d618476b78be9ab9f9fec366b18f0c SHA512 cf994c65cbea24f104261f38bf96f858cceaedb7acd5f2800405ca59921375fdb3a467ddbeef73d50f76dad684df1554d6e9acd818b8b1f23af6469764fc5b79 WHIRLPOOL 847b01a3bfb1503eb98446c8a25ca81786b3944e34beb02109332a1fa1bd1dde8f11efd63b5612e7f8a562125326c79226b9f79e0685dbf7416ad70e185165ed
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150929.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150929.ebuild
new file mode 100644
index 0000000..7a46378
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150929.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2015 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/2015-09-29_00-02-28/zip/netbeans-trunk-nightly-201509290002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+# oracle-jdk-bin is needed because other jdks do not contain jre/lib/ext/jfxrt.jar
+DEPEND="dev-java/oracle-jdk-bin:1.7
+	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.7"
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip o.apache.tools.ant.module/external/ant-libs-1.9.4.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-apisupport-${SLOT} apisupport || die
+	cat /usr/share/netbeans-apisupport-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.apisupport.built
+
+	ln -s /usr/share/netbeans-cnd-${SLOT} cnd || die
+	cat /usr/share/netbeans-cnd-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.cnd.built
+
+	ln -s /usr/share/netbeans-dlight-${SLOT} dlight || die
+	cat /usr/share/netbeans-dlight-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.dlight.built
+
+	ln -s /usr/share/netbeans-enterprise-${SLOT} enterprise || die
+	cat /usr/share/netbeans-enterprise-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.enterprise.built
+
+	ln -s /usr/share/netbeans-ergonomics-${SLOT} ergonomics || die
+	cat /usr/share/netbeans-ergonomics-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ergonomics.built
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-groovy-${SLOT} groovy || die
+	cat /usr/share/netbeans-groovy-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.groovy.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-javacard-${SLOT} javacard || die
+	cat /usr/share/netbeans-javacard-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.javacard.built
+
+	ln -s /usr/share/netbeans-mobility-${SLOT} mobility || die
+	cat /usr/share/netbeans-mobility-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.mobility.built
+
+	ln -s /usr/share/netbeans-nb-${SLOT}/nb nb || die
+	cat /usr/share/netbeans-nb-${SLOT}/nb/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.nb.built
+
+	ln -s /usr/share/netbeans-php-${SLOT} php || die
+	cat /usr/share/netbeans-php-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.php.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-profiler-${SLOT} profiler || die
+	cat /usr/share/netbeans-profiler-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.profiler.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	eant -f nbbuild/build.xml bootstrap || die
+	ANT_OPTS="-Xmx1536m" eant -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 3e7143d..ce22f73 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f35
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
 DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
 DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
+DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 EBUILD netbeans-javafx-8.0.2.ebuild 4647 SHA256 15e5e0b1c4729852dd55e5bfb2dcb520ba7c959bd9927d315c0abcb3f94e4ecc SHA512 520c60264fee67b0ccfd50ced0cc8586d5653d5186fa75c6b7cd8b400aae834de446b7e6145ad38df7e68207391fb360ef4834140e096d48add568fed387ac98 WHIRLPOOL 416a56ceb2ba85e3923ada0c8ef485cdd6fa16b3423b8fd0de523fa54dd082cbaedee5da4f1a92b50e440195f9256376f50e99a850d70ccdcb8c0ff370007f7c
 EBUILD netbeans-javafx-9999_p20150901.ebuild 4717 SHA256 e95804f3d997f20e45ff63e57182227513494d00f034115bfea0fb80f7b06f86 SHA512 20431b8026fbcca039f412ab076e9aeea22745f964858dee0cebb070c08113cdabe35edefdb998efd0d146b0a9d055de441b21620e1beadfeb9970009e479eab WHIRLPOOL 1352d5de66acd787070011681f7800e37f7bc9f9420b7e957a16c490b7b0419d88408c13ce930f2e2507ff8a84308a93ed50434ed80c9f26b21e28356b73a716
 EBUILD netbeans-javafx-9999_p20150903.ebuild 4717 SHA256 f8dcd19435adff0ba1a386857b8a0d2624ba16b64e36bfd40f58a2da8616be5f SHA512 776aa675ae3ee669bff503e9ac240e801dd080c34a18f46a53ee9308044152eb4dd067b0ce9b3d89708a56f533426c2010e06d63d2c7465bd3e461193a71c082 WHIRLPOOL 12f7d33492850172e803a4c2fac724d0b6e196bc7d64746fb51f1382cc1d82df5714511dadc1167e5921d6a492e47d5e879f8f5fdcd1bb2d2501e14e2425407c
@@ -39,4 +40,5 @@ EBUILD netbeans-javafx-9999_p20150922.ebuild 4717 SHA256 4332eef96845d8fb617c9b6
 EBUILD netbeans-javafx-9999_p20150923.ebuild 4717 SHA256 97c803a2ac5d392bde1cccdf82103735286b3520637bff52bc82e8488434c7de SHA512 95c03e22d532e87813ff30a19f897f872a8ef24986165a1d78d80a35d4954130a8b7df2f410f1a0b428b30b45ac7acf7d0d1e448a637bf28a13dfd0703f0d187 WHIRLPOOL 6b28f811a9bcf3ed289c69314c66c7e921ec03026c9be82b32adf7891ceb46e6372f05ba6efbfec8bc5ddcad2635de0860d6cd0299fb3ba9d1f184686a6a0b8d
 EBUILD netbeans-javafx-9999_p20150924.ebuild 4717 SHA256 766cd1df0358aded64dbd39780e54040bc8b553ac7a2b65ec4ff63665843f494 SHA512 501e6f2cba6298409412bf7e7fc1b630e2c8f7eb97b634c17cb2a552209a23af08f847b1c71983b91b049fd83bdf773db985875107cc5b90c41252af285a0e3a WHIRLPOOL d83f6394b04ce893ab02e639ad3ed834c642517fc4cd3a825ed04898a2de75c6d30bc9f3d4b515075f95aa30f3486976210062676cac7319cde36c84360942e8
 EBUILD netbeans-javafx-9999_p20150925.ebuild 4717 SHA256 8c1627c4c59d97318b19668429b125071cf92509b9530ecfa3b9ce04ea292ea4 SHA512 36ca1292c6cd05f932a0eb40af6321769772c67ff35ba97d6dc9cc187d7caaef30aefcc21bfddd93a0b413cc911517b183ec75099e74d58c5988232cba1cdcba WHIRLPOOL 5aeb6008a854e15f824f0f3e87612c80beda26550f537494be310e7b940131bb339441410afc7b6e7d8dc9bbf8ba27b5c668304e6ead91d4f37b6c506ee71ea8
+EBUILD netbeans-javafx-9999_p20150929.ebuild 4717 SHA256 682c527ca8852d8e2dc0bab8f04a915b63a479d5a29bee4d1129b24d91f9e6b4 SHA512 cb5593d381c0258350ff1e9bee77fa4062afe371882f88557e512463791a1236c34cc070c3f63c615beaad7ee0500790afb03ea8b778385fd3f139503165d05e WHIRLPOOL a80bacad9c52faf4b1ea851134b87677713f7f9bc668ef42484d867c46f420c7cda7c6f2c1883b5bebee60a8ff05f648637a14591e4d3480ff5f0ceed05f8814
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 6683e31..83f0dd9 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -16,6 +16,7 @@ DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f35
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
 DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
 DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
+DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 EBUILD netbeans-mobility-8.0.2.ebuild 4342 SHA256 e9b4ff8fe38904346bc21a82219696e97322bf9df4e9d4cad2259b6f08bbe7f9 SHA512 338711fe61c469cee80e499ddf8c3ad70a3a38e6658311afcd1d24edd1a99b87566fafcbd392bb958b589796e0913d2574b07570870c8d3382a91a324227082f WHIRLPOOL 855b2817c36bea67c8fb368a0740be18b71dbebb2b98a154552f002a56eaff34f54eee2698379d7200a6042c1de699df23e7717b5b6c532776852d8757b74cb0
 EBUILD netbeans-mobility-9999_p20150901.ebuild 4412 SHA256 24385dc623efa0f82a8ac6b377c867cc43863d1ef24a67cf0a55840d22d24fc8 SHA512 cef8f1359a5a8607376cf3db54b737a637a2efb7e08a3ec34ef911403c3cbe7c3f6201674522554875d96e8870a6a53b9fa54f9bb4d920575b7fd870d00f4448 WHIRLPOOL 7ab52bd93e70de0c6b3c184bce62b22086e81d736224ce66a157c40a052a57d9963030916f96fa54c5be7abfbec33536fe6be968696eff0461d1900366c0acb1
 EBUILD netbeans-mobility-9999_p20150903.ebuild 4412 SHA256 7ba27bee1e24a5cae28b92bd03db76751ef9815e6b9ca1f48e93302e33753edd SHA512 90aa1332c367f89d6fd7cd562376baac469928b71d878f6974bd0435eac1238c49a8215a53286092331fe2b87dff24357928e4811b093bcef8307bbe90d6eb87 WHIRLPOOL cf8378b155e8661bc366ea56ae4078e2e5c0209f9eb1363202b3daa3a9ab531ad21ecee420ac96e62a6ecd006f4e80ef9da8095cce60e9a293c644923e432656
@@ -32,4 +33,5 @@ EBUILD netbeans-mobility-9999_p20150922.ebuild 4412 SHA256 2551a6ed15599bcdf7c26
 EBUILD netbeans-mobility-9999_p20150923.ebuild 4412 SHA256 f2686ed1e225c66b150d43bc4d603807c755ce526753e0203e622535e0712366 SHA512 12da96cdef98cae1d4d415621da26b125546ee6f95c97da1155dc3b9a6fba5a52ebc173f72abc625cb728761039fb0d5096eb8637d0c25545a131c1fa6745c09 WHIRLPOOL 7108f3a151528046fc3f93d89232a6721547f743fd3e2f1c1a19fafb74e55fe5a2aae2ac0559389159e80c8ad60a9ebb3878d7e8240adbeda3a5b24de3c92562
 EBUILD netbeans-mobility-9999_p20150924.ebuild 4412 SHA256 527eefabc406e61cf74da15e51f972a9dcbe219ddd459e98f460a5d6da824263 SHA512 f194ac194e6e13a794902af269b49cc135e3770d61f12d00c32b44909c8c2fdce0945be87e7572a5b96ccee93b5ec582d3081902e57c7221e091a068954d7b45 WHIRLPOOL b64c7c60ce2c40528228a57c43afafa782424e3fc1f27eaa8b81dcec9718c9f22aa20f2090eb331e1bcc21709b5fcade37167986a71138a26cb6733d305e6331
 EBUILD netbeans-mobility-9999_p20150925.ebuild 4412 SHA256 e443173e1940e1f0fc4c4ae5ae6180c2bc861e454d3a2a3cda2c1f62a44069d3 SHA512 7ecd9c061b21c51254804c083b85a03bcb549a301e4eb7529f25f764248743f0a573e1ee4a0f8b6722e3139e7ef3fef15ddb179342d3007aa80feb7605a8e995 WHIRLPOOL 8979eeffdee61861b05abc470b4c4a4feb4ca09b1730ccecacd3e761ecf4ce27d165aedcca1ee7a7b5a7ed2ec883010032a7dda5a8cf1b97fa46d6c1231d7ba3
+EBUILD netbeans-mobility-9999_p20150929.ebuild 4412 SHA256 ccf44b1222add6a7a1d0d73122438b43e8cd467849f208d32c23121bc3f79656 SHA512 b08c4d586f6200925bd6fd2e43c9068778a5f355617690b6e6c07c1a05aa903637b8624dff647d171f5f585f2cbb66e10567564ba39225851dbb572e113d1884 WHIRLPOOL 76fe5de816c67035600d006e222846814605a98e21af29c1110695684f1095d10698cbda466fb0276a5fd1ed58ec196f13e2712ca9427a201b94fcae60dc33c2
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index fc218fe..392a423 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -19,6 +19,7 @@ DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f35
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
 DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
 DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
+DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 EBUILD netbeans-nb-8.0.2.ebuild 4927 SHA256 7531e50c4d76608bf925efdba4f54f522de3a8ceeef4d48807fb4ee48bfabdf6 SHA512 925734f331cf228066c5c9e614f48b756af31cac8b559cfe756347b6a2cb0ce362c7c41489a25084f2ed3f2e415baefd148a54f39fc00269fb14179efe056cb9 WHIRLPOOL e3224c5f22bb8e4792a5f98bbe819e071ff18c99533ce05a3fc1c5898ddcca1e3ce34487ba78159bb4d60155acdf15ae4fe81189ff2d5b1bc77ffd9ee4e20aca
 EBUILD netbeans-nb-9999_p20150901.ebuild 4997 SHA256 4bc20abbd79e622dae684777ea3942b19cdb96e94d76cae254b9bae919055997 SHA512 9eac2a9adbcb86bde4662b9edbb874ba820db2e622a0f4e436a570081cb49e664958e3e8fe6900dbfcfd44a0e1b33047fc25a536e93781b8e9b303ae9738bc83 WHIRLPOOL b83b659bbbd93f830039465b737c190e5031e88a634523f3e2647715e4a5b953d3469ac1c760db9613f3d6987157d89b14f0e740da228c0436950fd339d53ab9
 EBUILD netbeans-nb-9999_p20150903.ebuild 4997 SHA256 f2cbf0e344be20488551d7ad04e8c1f2452c03bc7f6f1e3db68527924c3a9b4f SHA512 f7eb44514e61a0e30d546d43caf3e2239da9faa0e59d6c224df6a102fd194589079833b980fcc719982faa9a35c2fb60dec1cf77f327926955e984e633fafba1 WHIRLPOOL 4995f7d9e24ca16d1d7d5a863692fa221b252f2185beac1c6ca908b3ea731a94f7f150affd8cfd03d16f2f7eb620be60833286d37a8d4b71a1e6b8eadbb32f50
@@ -35,4 +36,5 @@ EBUILD netbeans-nb-9999_p20150922.ebuild 4997 SHA256 1918053dc784853fff25277eb31
 EBUILD netbeans-nb-9999_p20150923.ebuild 4997 SHA256 89297e7ab1c0d435234914e970ded51bb657467fc2121dcdff30752f4d0929fb SHA512 1876453edbd79bb756265a63fd2db043e9ee6f031cd888e9bce7679e8440209b8c64433a635a1f59eb390b9c545678b662659657f81e8eb8b38532aa83ae800f WHIRLPOOL 799a8692f600f2918fa980e3bb6969641644c6177062a37c9ba9ce7222d2f7ef35ec07128480158f6ea9e224b2bb3741de7f7b3e98ca0941bcbad1d60afaef08
 EBUILD netbeans-nb-9999_p20150924.ebuild 4997 SHA256 7f9f40d6d726ec69db027e2c4fa47919974f4ad302f977025628ed45841a41ec SHA512 bbb4a9ad3b0d066a4f520739742ce4f078a37dcfe98141235c317d5bc983a6cf3c56e1c53ffc4b74f992f5bdd681f395b0df30069c6fba627a1931a55d2694ac WHIRLPOOL 5c7558ac4ef69047f51ac3a51d6433ab2b6f3412475391cdf0c6af9103758aa16b802b4d8d91e6a5ea47641850f3257662ec9971818eacdff093067a3f4afd8c
 EBUILD netbeans-nb-9999_p20150925.ebuild 4997 SHA256 dff8097023e878707cd6204eee0dec09cd963a04df2768e6d3c0cf9b889331fa SHA512 3be846befd1ca0775eccf9c919dea7b0154e9f7cc246a8d1579697b00b5039f9cac27e1617437acf971c001b6e3d6325521301a94471d41dfecbee4d0b838aec WHIRLPOOL 4a819d4e19da883392043817f7a3b95c2430bf1f10cac39183e70b10c6039c668541953602c1d54d52645081ae129f0847ff214bb8d5fe49af2f8e9bc0723798
+EBUILD netbeans-nb-9999_p20150929.ebuild 4997 SHA256 cab36248dc89114c1bb44ef8d7192ce16c893115c5a03a26dc24518e2ee795fa SHA512 5751c433804a46b8f3b7bf86f6299e50ea9d6c073101dbe73a1b28dc6ba822e5d9b77be21fe3b7c8d6d21f4aea09917a3e35438247782986665ae9f6b85e2e38 WHIRLPOOL 75afd81d5c8255c8415b125506624ab3ca80dc4fa387511460bbfb21559a59ed28bf5041dced0bba86f1d98c875a0982ec64d9b63654b620cceeb9ae72ef6456
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20150929.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20150929.ebuild
new file mode 100644
index 0000000..e24396f
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20150929.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2015 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/2015-09-29_00-02-28/zip/netbeans-trunk-nightly-201509290002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE="keychain"
+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}
+	keychain? (
+		net-misc/keychain:0
+		net-misc/x11-ssh-askpass:0
+	)"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster create-netbeans-import finish-build"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.nb -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+	use keychain && epatch "${FILESDIR}"/${SLOT}/keychain-support.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
+}
+
+pkg_postinst() {
+	if use keychain ; then
+		einfo "You enabled keychain support, that means NetBeans will use keychain for managing"
+		einfo "your keys while connecting to ssh protected repositories. If you want to load some"
+		einfo "keys on NetBeans startup, create file keychain-keys.txt in your userdir"
+		einfo "(~/.netbeans/${SLOT}/keychain-keys.txt) and put names of your keys in the file,"
+		einfo "each key on single line, for example:"
+		einfo "id_dsa"
+		einfo "id_dsa_gentoo"
+		einfo "If on NetBeans startup key will not be handled by keychain yet, you will be asked"
+		einfo "for key password (only this time and never again). You can find more information"
+		einfo "about keychain at https://wiki.gentoo.org/wiki/Keychain"
+	fi
+}

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index 8d9a5ef..cdb1102 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -21,6 +21,7 @@ DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f35
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
 DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
 DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
+DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 EBUILD netbeans-php-8.0.2.ebuild 4347 SHA256 585b2488d748f3d0f87c17c951870e167aac7bf10847428add786e4a8a446583 SHA512 1431305d4f340cb0a2c7c896c54d45f6f02ef82a4201f82053278b98511a5a4a68210317530e9cdf5cf1f495996d3a3f9c4b2c3c479aa407abd375072ab3182f WHIRLPOOL af8476f2ff2d119f2657e6be03cfea1160f86e41bd791f40609f1bc8a8aada46ba1081e4f2417b0fddde931fa4e43d20956c0fe1d4fdf3617b78d01afd23f9b4
 EBUILD netbeans-php-9999_p20150901.ebuild 4417 SHA256 b6f52a63053c7f6d74829800396e15d463a7316c2de194bb0e243385eb8cc95b SHA512 b783d245589b2f43d616f3e3af5ab8bb0d9c5097974c640f8d22996b8185eb921edb851c174bd02a17ef0d29c50f0db03c595b5f23bc717dd3b2c4944c7fbf73 WHIRLPOOL 00d18b2b7f6bff0fcf8852a6137df8eebaa99885091a6363628b7ae18dd9c4ec18e3dfb75f214092be4cde7fe7c1150889ee8c173751089af52e8710f67446b7
 EBUILD netbeans-php-9999_p20150903.ebuild 4417 SHA256 e7c715d04d186e6e62d408485f33ee6c94ec5a76969d95de552d10e590b94940 SHA512 44abb97abf1ae49840e20575bd05374f301870892bde53213df37d5a0b21bd6d9691bfc9f36120225d357572ba6df840cd4ef5f5f5492c24e5ef25f57f64624a WHIRLPOOL 35a1dcede6c295345409ac71f20c53c41b772a523d91d91bcd9b20369bc203e5f7f79e1ce7e2a72bb3cbb50ad693dfd8ad77a4ba22eea72000d70dfa593dfc00
@@ -37,4 +38,5 @@ EBUILD netbeans-php-9999_p20150922.ebuild 4417 SHA256 f3c255b26a888be90282ac903a
 EBUILD netbeans-php-9999_p20150923.ebuild 4417 SHA256 255aaf9fbc47695e4c905d2582620548030a316b5438bc6a0d012a296fa95369 SHA512 7cd21c4b9e0ea84c040bf4f1f26dab4338de57f4d87b502af8c50212024ebd7e5e4d9e6f43fb25de57a1259fb93c313293e58e68a174c3b818111fa1b1cec2c9 WHIRLPOOL 035d00c33df35db7d04da6ddf7e43fcea167f460252a19c7920b9e74c4cfea48a9cb77b448f443a281f3482b8031dbf74ebe10987cad70d530c15322f28520a1
 EBUILD netbeans-php-9999_p20150924.ebuild 4417 SHA256 bb6880b20a6741929d144699be5630249c49028e45e643c95d40c9b5c3a66931 SHA512 d9b7e10821c977c6f83a73093eefc21b5e83409a51d331a1d28e87205c09072101f45d1aef76d4442e0d6192fffeb2ea1c9d0360419ab974fc7646fb49b51409 WHIRLPOOL b179a2b14b4a1f7d2cb20f6f5ec0e6fa9364c3d45b2bd1ff6a1516a2963467a089126de0cd4f87a99b7b9927da9ae6b769e97abe4a9b7e1df8ae5fd69802c73a
 EBUILD netbeans-php-9999_p20150925.ebuild 4417 SHA256 ffb384a595a952da0310361c0cf9c28a240df0ace754f7700d408cb179f9d610 SHA512 d345ca7f88afa4cd1d8398648eaa9bcbbc352be0b08a4924ef2e87eb6bbbf4c03fdb514efcc98b96059a06cb1bd23eab15ad3ba420eabaeaf3606057ca86030d WHIRLPOOL 58888a34eb736bb35a89470ff75aea47a64f0d2a657bdf158f2f296df7d9733aff9dfa486c2090f8fd44e89f4065a1be10cb573871121594111046c89d28ce06
+EBUILD netbeans-php-9999_p20150929.ebuild 4417 SHA256 5fd717c5b28d9317a83f6a634ad143f592c7749caf9f51d63a9d85b5ca0e145a SHA512 699074f43790af084f366351616b2c864b65e928a26838445d018d01f6bfb031601afd2296e0ff2d483b6b2b5dfcec79c5abb75f3ac050e578e1405c6465bd8e WHIRLPOOL 2f2315a187732006df6b26f2b633fea1cab8d6290e164f8ddfb567d20a577b3aee4d1fe4d02c1b828fe8e8def28ed2959977aa3c0354a90c8092fa425771a40c
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20150929.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20150929.ebuild
new file mode 100644
index 0000000..6a249e8
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20150929.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 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/2015-09-29_00-02-28/zip/netbeans-trunk-nightly-201509290002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip
+	http://hg.netbeans.org/binaries/73E9BC8A7AF36E0C95210F61A85AFEF212AEE1A9-phpsigfiles.zip
+	http://hg.netbeans.org/binaries/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-webcommon-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/javacup:0"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.php -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip php.phpdoc.documentation/external/phpdocdesc.zip || die
+	ln -s "${DISTDIR}"/73E9BC8A7AF36E0C95210F61A85AFEF212AEE1A9-phpsigfiles.zip php.project/external/phpsigfiles.zip || die
+	ln -s "${DISTDIR}"/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip php.editor/external/predefined_vars.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.javacup/external javacup javacup.jar java-cup-11a.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-webcommon-${SLOT} webcommon || die
+	cat /usr/share/netbeans-webcommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.webcommon.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/php >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/php$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm java-cup-11a.jar && dosym /usr/share/javacup/lib/javacup.jar ${instdir}/java-cup-11a.jar || die
+	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 277fce1..47dcb78 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -56,6 +56,7 @@ DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f35
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
 DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
 DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
+DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 EBUILD netbeans-platform-8.0.2.ebuild 5406 SHA256 98e9861da45ead0d2d975a0527315df5282870b2d7e71a089724d91c18852e81 SHA512 cadbe66132d3ad81f6d149e20731b558c11c529e2ec15b1fe47ff97d99a3f4b4612fa5c98c435c4ff979eaefab6702721db009a03162202c96b4b411cf9f872a WHIRLPOOL 9552948e8bbad308f4379eaae69d8c214da9fbfab87d75226949b69ddca3e68c2d36c4d05738196073e5b959ab0b764064c9186d421198937122aa4bdc4988dc
 EBUILD netbeans-platform-9999_p20150901.ebuild 9238 SHA256 85c58de49e8cf1c2202b5f892c9d9283587f255c58c4835f2169dce8b767967a SHA512 5d90e804870b94de49cf76db7e99bd2564f2fcd9984e9dc0b1f0ba02c5a66a2b97e0e59ad0b986d8ef055fb1184ab35998248379b76a456f576df5f87b90f81e WHIRLPOOL 4a74b24b3e8a975f1eff66d95406c629bf860b1956937a44f33eb2d92291d2dd95fb91dd8c34f730a35d6daafa9d16a67f2ed2a300c691d5dcacfd8f435b5185
 EBUILD netbeans-platform-9999_p20150903.ebuild 9334 SHA256 2e3f4bc8579db348c5b81fb1460caec924efd1c59ee4e980f0606673944d0efe SHA512 21e7cd36c60d7ac8d6ac919203d9d0fe800bf02c5d44d7f450f2005a6da86c1ec3ce50cc8a3577af144618964e0d2b9a9183f2957fdfbe087e2e5eefc4ff4186 WHIRLPOOL 1989aeedda0e97d37a5e99ec99899862d057fae52eafa789ef100c80f5ef30339a01f9155c9fb3be7fd3d91a693136eaad259b8706723a7fda51ee2949378eb2
@@ -72,4 +73,5 @@ EBUILD netbeans-platform-9999_p20150922.ebuild 9382 SHA256 f4ddd0f1d57fd2ab26d92
 EBUILD netbeans-platform-9999_p20150923.ebuild 9382 SHA256 cd2aab694308e65759b20a44ef6f44ef36dc0960b6bedbabfe90a0e38c4f52b7 SHA512 0f4feb08c4c722ba9780bdec1a9fc691e11544c3319884e72a75fb46545e8d62bb3c7a71a7fbc383f87364fe4293c29f1a4170804da76bf0dadd3b0b5bc926dd WHIRLPOOL 6adb9b96ab938acd93809dc56f66aef0f06e897bf6a80c7fb279a040662b02dbec6645e8138db64da2c108f6dfc73641cdb4829364de5b7f312e6ca3116bacf6
 EBUILD netbeans-platform-9999_p20150924.ebuild 9382 SHA256 0e1f7b2689bcd2efeecd722d69be9bae5fbe38d1742774273009bea6220dcba4 SHA512 af40867251bde673a40fb40090920ce6022238b99a73dcd22184ec0e7409ad09de950ce07aa9b457a11a9dd4722231a071b561331028c73d7fecf9446e27d5b9 WHIRLPOOL fed2a31403ffb222b3efa39704a62f9be72867d57c9991619d585196dbbc03f99cef68814057f9d294bd4d557f3ddaaf35dcc35535ccf95ab7262ed8aed3cef0
 EBUILD netbeans-platform-9999_p20150925.ebuild 9382 SHA256 fd582358cbf972f4b8f45709cb9eb0023b265757a94eecc5b33b241cbf770335 SHA512 60b22bbae546c8fe32caf5bb32d553eaf1e520a472ae8b899e1774164733975f5564e7308c7bef2dc8419f7e67e5ce2d1a6c3ecc554fe77c8aa877bc246dc382 WHIRLPOOL 139a03a2fd6fe8bf3a0ccb38af42dc9ada0a44ccd4cfbf25ea0d15026a1e56342d21b8e795bd5c2ba6b1cbe56989d15f04293dcd7bc64b352c9ff39ef214b490
+EBUILD netbeans-platform-9999_p20150929.ebuild 9382 SHA256 b29cf8cb3b38d906e7d870b2e8a0f79de51b59a8ed082a55ec01129ed53a5ff2 SHA512 a0053fba65bc66c9b2f76686ec34f56b07b83e85421af3c2ff2a9b072e2194ecd0e4721f10dc3331ebfa41adeb3176216bd0b0f36a2af494d5277a2d24aba743 WHIRLPOOL b22bfb92f917d71a3b4d82710a8baefb0d1223152f0e3e49c854dc1bdd3210860d47294989719aca12027139d6b81f23628b9d979a8849db1238f6cf22787584
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20150929.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20150929.ebuild
new file mode 100644
index 0000000..eb31ce6
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20150929.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2015 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/2015-09-29_00-02-28/zip/netbeans-trunk-nightly-201509290002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar
+	http://hg.netbeans.org/binaries/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar
+	http://hg.netbeans.org/binaries/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar
+	http://hg.netbeans.org/binaries/A3432F57D9B3B4AD62CB0B294EEC43D12FCF3F62-ko4j-1.2.3.jar
+	http://hg.netbeans.org/binaries/78DD1C0B4EDC348FF4DCD0616597BB809AAE248D-net.java.html-1.2.3.jar
+	http://hg.netbeans.org/binaries/7BA1E1C450BCD0AD9D0D2F6797A2EB50A4822E0E-net.java.html.boot-1.2.3.jar
+	http://hg.netbeans.org/binaries/068B9902E65F2292C9EA30E5423E41FB6B30D8AA-net.java.html.boot.fx-1.2.3.jar
+	http://hg.netbeans.org/binaries/8621531E83EC4850DA61AA2266FE41105C304F40-net.java.html.boot.script-1.2.3.jar
+	http://hg.netbeans.org/binaries/24824B1E8C2A2D3A5C471F5875BF61F27E8916DB-net.java.html.geo-1.2.3.jar
+	http://hg.netbeans.org/binaries/F41518385DA4B5682C864F19B82C3BA4AF65AE83-net.java.html.json-1.2.3.jar
+	http://hg.netbeans.org/binaries/989A81454D4FA962EB1C158FE794D2EB060AB9F6-net.java.html.sound-1.2.3.jar
+	http://hg.netbeans.org/binaries/B27F1304F18FEDE876F940AEFA6C9EB5632619D7-org.eclipse.osgi_3.9.1.v20140110-1610.jar
+	http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip
+	http://hg.netbeans.org/binaries/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+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"
+# oracle-jdk-bin is needed because other jdks do not contain file jre/lib/ext/jfxrt.jar
+# the error:
+#  [parseprojectxml] Distilling /var/tmp/portage/dev-java/netbeans-platform-9999_p20140922/work/nbbuild/build/public-package-jars/org-netbeans-libs-javafx.jar from [/var/tmp/portage/dev-java/netbeans-platform-9999_p20140922/work/nbbuild/netbeans/platform/modules/org-netbeans-libs-javafx.jar, /opt/icedtea-bin-7.2.4.7/jre/lib/ext/jfxrt.jar]
+#  [parseprojectxml] Classpath entry /opt/icedtea-bin-7.2.4.7/jre/lib/ext/jfxrt.jar does not exist; skipping
+#  [nbmerge] Failed to build target: all-api.html4j
+
+DEPEND="dev-java/oracle-jdk-bin:1.7
+	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.7"
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar libs.asm/external/asm-all-5.0.1.jar || die
+	ln -s "${DISTDIR}"/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar libs.felix/external/felix-4.2.1.jar || die
+	ln -s "${DISTDIR}"/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar junitlib/external/junit-4.12-javadoc.jar || die
+	ln -s "${DISTDIR}"/A3432F57D9B3B4AD62CB0B294EEC43D12FCF3F62-ko4j-1.2.3.jar o.n.html.ko4j/external/ko4j-1.2.3.jar || die
+	ln -s "${DISTDIR}"/78DD1C0B4EDC348FF4DCD0616597BB809AAE248D-net.java.html-1.2.3.jar net.java.html/external/net.java.html-1.2.3.jar || die
+	ln -s "${DISTDIR}"/7BA1E1C450BCD0AD9D0D2F6797A2EB50A4822E0E-net.java.html.boot-1.2.3.jar net.java.html.boot/external/net.java.html.boot-1.2.3.jar || die
+	ln -s "${DISTDIR}"/068B9902E65F2292C9EA30E5423E41FB6B30D8AA-net.java.html.boot.fx-1.2.3.jar net.java.html.boot.fx/external/net.java.html.boot.fx-1.2.3.jar || die
+	ln -s "${DISTDIR}"/8621531E83EC4850DA61AA2266FE41105C304F40-net.java.html.boot.script-1.2.3.jar net.java.html.boot.script/external/net.java.html.boot.script-1.2.3.jar || die
+	ln -s "${DISTDIR}"/24824B1E8C2A2D3A5C471F5875BF61F27E8916DB-net.java.html.geo-1.2.3.jar net.java.html.geo/external/net.java.html.geo-1.2.3.jar || die
+	ln -s "${DISTDIR}"/F41518385DA4B5682C864F19B82C3BA4AF65AE83-net.java.html.json-1.2.3.jar net.java.html.json/external/net.java.html.json-1.2.3.jar || die
+	ln -s "${DISTDIR}"/989A81454D4FA962EB1C158FE794D2EB060AB9F6-net.java.html.sound-1.2.3.jar net.java.html.sound/external/net.java.html.sound-1.2.3.jar || die
+	ln -s "${DISTDIR}"/B27F1304F18FEDE876F940AEFA6C9EB5632619D7-org.eclipse.osgi_3.9.1.v20140110-1610.jar netbinox/external/org.eclipse.osgi_3.9.1.v20140110-1610.jar || die
+	ln -s "${DISTDIR}"/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip o.jdesktop.layout/external/swing-layout-1.0.4-doc.zip || die
+	ln -s "${DISTDIR}"/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip libs.testng/external/testng-6.8.1-javadoc.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	# upstream jna jar contains bundled binary libraries so we disable that feature
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --into libs.junit4/external hamcrest-core-1.3 hamcrest-core.jar hamcrest-core-1.3.jar
+	java-pkg_jar-from --into libs.jna.platform/external jna platform.jar jna-platform-4.1.0.jar
+	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.jna/external jna jna.jar jna-4.1.0.jar
+	java-pkg_jar-from --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+	ln -s /usr/share/junit-4/sources/junit-src.zip junitlib/external/junit-4.12-sources.jar || die
+	java-pkg_jar-from --into libs.osgi/external osgi-core-api osgi-core-api.jar osgi.core-5.0.0.jar
+	java-pkg_jar-from --into libs.osgi/external osgi-compendium osgi-compendium.jar osgi.cmpn-4.2.jar
+	java-pkg_jar-from --into o.jdesktop.layout/external swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
+	ln -s /usr/share/swing-layout-1/sources/swing-layout-src.zip o.jdesktop.layout/external/swing-layout-1.0.4-src.zip || die
+	java-pkg_jar-from --into libs.testng/external testng testng.jar testng-6.8.1-dist.jar
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	unset DISPLAY
+	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+	pushd nbbuild/netbeans/platform >/dev/null || die
+
+	java-pkg_dojar lib/*.jar
+	grep -E "/platform$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	insinto ${INSTALL_DIR}
+	doins -r *
+	rm "${D}"/${INSTALL_DIR}/docs/junit-4.12-sources.jar || die
+	dosym /usr/share/junit-4/sources/junit-src.zip ${INSTALL_DIR}/docs/junit-4.12-sources.jar
+	rm "${D}"/${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip || die
+	dosym /usr/share/swing-layout-1/sources/swing-layout-src.zip ${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip
+	find "${D}"/${INSTALL_DIR} -name "*.exe" -delete
+	find "${D}"/${INSTALL_DIR} -name "*.dll" -delete
+	rm -fr "${D}"/modules/lib || die
+
+	popd >/dev/null || die
+
+	fperms 775 ${INSTALL_DIR}/lib/nbexec
+	dosym ${INSTALL_DIR}/lib/nbexec /usr/bin/nbexec-${SLOT}
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm hamcrest-core-1.3.jar && dosym /usr/share/hamcrest-core-1.3/lib/hamcrest-core.jar ${instdir}/hamcrest-core-1.3.jar || die
+	rm jhall-2.0_05.jar && dosym /usr/share/javahelp/lib/jhall.jar ${instdir}/jhall-2.0_05.jar || die
+	rm jna-4.1.0.jar && dosym /usr/share/jna/lib/jna.jar ${instdir}/jna-4.1.0.jar || die
+	rm jna-platform-4.1.0.jar && dosym /usr/share/jna/lib/platform.jar ${instdir}/jna-platform-4.1.0.jar || die
+	rm junit-4.12.jar && dosym /usr/share/junit-4/lib/junit.jar ${instdir}/junit-4.12.jar || die
+	rm osgi.cmpn-4.2.jar && dosym /usr/share/osgi-compendium/lib/osgi-compendium.jar ${instdir}/osgi.cmpn-4.2.jar || die
+	rm osgi.core-5.0.0.jar && dosym /usr/share/osgi-core-api/lib/osgi-core-api.jar ${instdir}/osgi.core-5.0.0.jar || die
+	rm swing-layout-1.0.4.jar && dosym /usr/share/swing-layout-1/lib/swing-layout.jar ${instdir}/swing-layout-1.0.4.jar || die
+	rm testng-6.8.1-dist.jar && dosym /usr/share/testng/lib/testng.jar ${instdir}/testng-6.8.1-dist.jar || die
+	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 369e6e7..5d76824 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -16,6 +16,7 @@ DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f35
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
 DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
 DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
+DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 EBUILD netbeans-profiler-8.0.2.ebuild 3402 SHA256 8021dea620d1bc26214ff0ec285f8061c24693dd28a62a97a48ac3223707e920 SHA512 2660390337a973256b1aac3a02b14e16782c230fa2714ae695213b0cabc0eb60621c6a1ae234f9e57259a19de22a87447f9a89ab846bd59bcedd2be313c35072 WHIRLPOOL 5d1053ded03143b2de05b64cfbe59b515cb786d60bfa65566be795567bfaf5feb88a2f8e7161a05da512fafd523f871778d5ddeb3c6b89fc95885096e379f65d
 EBUILD netbeans-profiler-9999_p20150901.ebuild 3472 SHA256 2463f091c9f090fd538ea9a18cb2fc00819c7e8d8b3780e0bbdff4a426fb361d SHA512 40e7d264ee795e18ea90278e8e1d792abbe6ad4c4339d76ffbf63dd1126b0c5bedcd259741dff47c624a415aa7e8c57c3d8ef192d74b69373b6bf3ec574d6691 WHIRLPOOL 1d33cc1f24c6b8e3dca00668fa152b5956490d4eabc60bcae55adcee1c45950c02c0ab19daadb7b3691fc0bc908be618f56af9119243770298307a398b181442
 EBUILD netbeans-profiler-9999_p20150903.ebuild 3472 SHA256 9c439061ab5f353d42cd066cc5793626222b9e9e9b40b4217427498e7036ac4b SHA512 0c0cf3b94565f9dbad4cca20fb9abc672655e8a032c4d53794d9db03cde7b400d41126d3eeca82304952f488d232f041675fea7ad417b4f2faa9c5e24bead22a WHIRLPOOL 97d96c8613ed98c787251b8a0d4a556ffb47cd477449044c9dd8b535c9b632650870b70ee6816604701884a83c19f869db0256cb7c1ff83c6af986a22d21a5fa
@@ -32,4 +33,5 @@ EBUILD netbeans-profiler-9999_p20150922.ebuild 3472 SHA256 54668d243147bd6336a0f
 EBUILD netbeans-profiler-9999_p20150923.ebuild 3472 SHA256 8abeb38b9a8940ef502b8cbffae3bc2d59a5ec36659a120a987dca62e2a29936 SHA512 15dd5d679b6e50f571e1ab69751603a2e8810a084625c64a4324e44b1d03fc60d3fc4d7fd7c036a1de54fff7bc078e509285ee20c87645b7ae4e496ac74678cb WHIRLPOOL d98d88e28a19f5b7e0271e9d477fbbd8f3d7d5c3ea83c8bae4827db00f5b896f1fabcb14b4793e40f8707845bbe12d26e3146e316c307d3d5f82b5b0e9fbb895
 EBUILD netbeans-profiler-9999_p20150924.ebuild 3472 SHA256 8cd244916c5b32f8f8ae7ae4e3e5669b2993726139810ad5ade728455d0ad2f7 SHA512 c80454f86e45c6b7829dedd0bde7999696ac35461829a3dbc88efcc8078d54ae0f481d2e94f8adc006116d47f99bd15ab13b3c1b38086241b633b4ee603fdc9b WHIRLPOOL 5f920428cb0665204ad5acfe46349ea740b9e7e52eb0c314432eb901d54cb73c40f47b8d88f47a0dc5df249c1570c533711ce5fea95e05597b885c0cb143e56a
 EBUILD netbeans-profiler-9999_p20150925.ebuild 3472 SHA256 fa9dccd6939559f3155e97a6db4acffa4542bfab9e05aab2b339c4ab2e2e743e SHA512 8b986d1e9cfda6b04495ee94665c0bac82bb2efd61ea2446db7904df779e7070535b8276cbfe183007e11e7333d8ee1ece841052b0eb6d4c77bf2691934f924f WHIRLPOOL de707c41f5e0450f9442fb5b64a09ed4a0fc360d89e2dcfc685923715ba06e80eeb0b8b5667143030ffbe920821e0101d704724ddfd6f5026f33664add50dda8
+EBUILD netbeans-profiler-9999_p20150929.ebuild 3472 SHA256 b82e95aa6e5265eac887b1552e68e10c3884174df66c447248444eeb2d90b48c SHA512 f4d5664b8161020fe6f360dddea06da25b089d690eacce71024d3e4e8a4ad7b3bac0b07ef15729755869e260937b2af80aabe71b06e386bfd85bac0acb548171 WHIRLPOOL d8e774ebefc407e6ce206c282abdf00b6517ba236445d334b1d9028d7d50eba0b011fb19d1c46894e3c94d4f5551fd374ddd5c5c7030abf3d62c890032431fbd
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index fdc41b0..d592db5 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f35
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
 DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
 DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
+DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 EBUILD netbeans-webcommon-8.0.2.ebuild 4723 SHA256 e2ba39cb6f22c990acf9a492eac5707f130382d56f9bc1e3636e82cbe4d61938 SHA512 61955d38f829b3ed54bc5cb9a71da07f05676a2bf7219fa8073aeee0f0e2d0e73f7aa6ec1636be39fb071d3d2b9de7ceb813a247a61961874f4cc78697d4e568 WHIRLPOOL 1a272650fc2394716a790b79cb85a9322929c7cc96ea4776cc639fb869c5b536140dbdc632b1a8aa9cb1fc8e740050125c2ebe9390de7a8f4207e88e24924206
 EBUILD netbeans-webcommon-9999_p20150901.ebuild 4991 SHA256 6a58d046976202f9630b42e133fac192593354c8620dfca0bc5f6d5eefb41b63 SHA512 c7d0da7bf9bacf40c8afc1ee6543749b0f30969abd398bddc9109f18e29f93416496d0e31c837358412f1de192953972b3a4ed7f709789dd6abcff9f63b871c6 WHIRLPOOL eb9eefc3b2fa66241f1035309856f3b68c3373cd355d3d275b5dae7bef26d53a93628863b081e4cbde480371dd72a037ce275af31947069fce424c563866e267
 EBUILD netbeans-webcommon-9999_p20150903.ebuild 4991 SHA256 b12f68d20eb276d5787e83ba650885835308517e4de0553dc4bf16487ef5d974 SHA512 5f4fb009a589c9bc36a2908d16009b6d72f476e5fcbea52fd21385448a58335a033ad3e58a410173c0ac029e892db0d2ca2081ae8bd16bed98b62d121690d237 WHIRLPOOL 1deef8a500b05468cf6f3c2623cc38eec880bcaab1dae9ab51ff4424018465db71ed37c7146b289451558d54d858f4246ec3cfb80feecea0e1f42306c105b4a4
@@ -41,4 +42,5 @@ EBUILD netbeans-webcommon-9999_p20150922.ebuild 4991 SHA256 4a070041fa92d6b27996
 EBUILD netbeans-webcommon-9999_p20150923.ebuild 4991 SHA256 14ee598db88d74bf19ef1ea8f289fb22013c7cfb2c1e6821acd7bb3d27c820b0 SHA512 abb3c419ab471779d55fcb5903ba9140e1d140ea95324c8f16b27cac76d58e85050f743d072ab50d626039f18b626e965788af76ca6f1f13e17d7660738f1248 WHIRLPOOL f2c55428d77b2e88b3555625a8cf2f98b31f0818fc73a41b5b05d252bd88640cf2215f35012204b472104927ddcf56ab2886c43c89436f3d87cba328cca4a840
 EBUILD netbeans-webcommon-9999_p20150924.ebuild 4991 SHA256 38c67c9551280d6d8790566e51f76d134225d8599ac9759ed0858d655af738d1 SHA512 cff4c7e612c2056b3904492773ad6d0bebd565608fa62f4ae5befbc1612de7bb1f58176122055a00f771d9473a4c6fc78a8d87ad16891369fdd1855d34fb1f84 WHIRLPOOL f9c71301285e959a92905069412fc452cfe4f6c1cd8f599f34fe8bf99c6972b842d74eb98779ff2c35f6b9f612900d09c3f61b856e621062e30ae05d2b74addf
 EBUILD netbeans-webcommon-9999_p20150925.ebuild 4991 SHA256 898ffb39893f2b26f35726e6d112086431ff2c331cc737924e2c0aa93269652b SHA512 e48a70e0de0f4a62d8b03245fbab7be3516f949f38fec4124093689c9ce419415274daacbd0bd14b43ad8b5fbb9ce04b0896f8a3d44a293aa9279ba82814f771 WHIRLPOOL 925262c0ca50c99c370aa1f91270c545e4b6c318d28c315c07f634d19d93c466238061238da49f6669ca4f5a600ab177189ed77f2d5c1cc53d824422176f2529
+EBUILD netbeans-webcommon-9999_p20150929.ebuild 4991 SHA256 b9fdbe32b8e5dc4b1e1a4f16a2d80bb2f425e507c6b1689106aab8b351da11d7 SHA512 f1e52cfe14c29bf4e1fb46ef7b3301ff8b652eaab11042eb028ea5cd8c7c88c5b04cde2b4be80ce875a43d20add697b92e816b6651114f22957800ac59f45b18 WHIRLPOOL 6fae77bb36b63aac4978569e0280c60f9cf518accfe13242b62429550b4f2706bed53ca25b9242099bf30826a193ebf313462747622681f1ae5f48e2cc9ddd20
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150929.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150929.ebuild
new file mode 100644
index 0000000..c1fef21
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150929.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2015 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/2015-09-29_00-02-28/zip/netbeans-trunk-nightly-201509290002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar
+	http://hg.netbeans.org/binaries/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim
+	http://hg.netbeans.org/binaries/9D29F2A9722C91A403F32971E97DD0E49E97B02E-libiDeviceNativeBinding.dylib
+	http://hg.netbeans.org/binaries/9F0D0D95F57E73C0110FA023813A4F9756D543B1-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/D05B7274396C8EED185207399B6D0400DE347DB7-libusbmuxd.2.dylib"
+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}
+	dev-java/commons-compress: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.webcommon -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar libs.plist/external/dd-plist.jar || die
+	ln -s "${DISTDIR}"/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim cordova.platforms.ios/external/ios-sim || die
+	ln -s "${DISTDIR}"/9D29F2A9722C91A403F32971E97DD0E49E97B02E-libiDeviceNativeBinding.dylib cordova.platforms.ios/external/libiDeviceNativeBinding.dylib || die
+	ln -s "${DISTDIR}"/9F0D0D95F57E73C0110FA023813A4F9756D543B1-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}"/D05B7274396C8EED185207399B6D0400DE347DB7-libusbmuxd.2.dylib cordova.platforms.ios/external/libusbmuxd.2.dylib || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --into libs.commons_compress/external commons-compress commons-compress.jar commons-compress-1.8.1.jar
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/webcommon >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+	grep -E "/webcommon$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+	doins -r *
+
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-compress-1.8.1.jar  && dosym /usr/share/commons-compress/lib/commons-compress.jar ${instdir}/commons-compress-1.8.1.jar || die
+	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 bc3fbde..070c5c5 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -16,6 +16,7 @@ DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f35
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
 DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
 DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
+DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 EBUILD netbeans-websvccommon-8.0.2.ebuild 2651 SHA256 a195b307847c466dbb5f46eb04240358ce3c92cadeecb8fda1562304de46820f SHA512 933626bd2073f58e3508180c042e237b9e61ba6f3c992cf37ea43978ac2fc972d2dcc3ef0b5c390b3867296e197ed2605c43452c98e36acf0982e7338b6d1eb7 WHIRLPOOL c3db8f0b50116d0129f50778e1961166e76601d8c165e20e73d75c91b02c8a095067e0f13e18178d849dd29adcedaeee7d3e0e62f99be592d7ce159fd6af632e
 EBUILD netbeans-websvccommon-9999_p20150901.ebuild 2721 SHA256 1b1853b108ea504ea98052027c51e2ab8e55853bc016e1b288f7d5fdfa937ba9 SHA512 f914e9d3d8060c6740ab305233379a6c5cda835a09d1ad9c2d5e4a37fe7154f560899b4dc4e375b4a1d8b724102b522eb02529d65ce562afb914cdabbeebceff WHIRLPOOL 2eb7a4627b93b6bb8bbc033a6e941a64452a5c6377e28b86abcaca6b6be76ddec7df0950e7ef5234f5e3d6addb3dd191cfa00f6fc18b4442a2d7c1e6b27fa19b
 EBUILD netbeans-websvccommon-9999_p20150903.ebuild 2721 SHA256 5b548eaf95bd714f2b32bdbf189f8a5967ebb9ff9f4472b7dec07165540a4bf2 SHA512 d4e19899b1df32711eb649b10bb66ee7daeb463ce87bf330f3405e02788e7acea6a8573aacd2f17c5e09c93762e627dfc88b1f331c40280761cd0bd1d2b0339c WHIRLPOOL e6914d11ecf33f57de66f4bba5f8689f0ffc0ff40df29ec98cc6a0b731cf7c73096124e67433205a3fafaf744cc8b9c0a0361c905be1823b0dbde7e85bd52a66
@@ -32,4 +33,5 @@ EBUILD netbeans-websvccommon-9999_p20150922.ebuild 2721 SHA256 fafd322e6c62164d0
 EBUILD netbeans-websvccommon-9999_p20150923.ebuild 2721 SHA256 c981186dff431a882db2c04281d3e3d4214af096bd17806d72312dc702715d53 SHA512 33762418c6d77658a0f9d05bcd42b4dc881aebad00bdd82bd3c1e18bb716453a2a7495b3f32a249d4ec81291a60ffbb0d9b9b8fcc482d99f29a68facfdae131a WHIRLPOOL ea4156cf4a268c00f80802b7e594e365dd529193b580c040fa3370a8f5c4aa95a1621c5b19313f25d1ec55277d3907dd11200824e854a81331a0d44d4d41a9d6
 EBUILD netbeans-websvccommon-9999_p20150924.ebuild 2721 SHA256 a4643b09c82200531133182469c7f8e181990abfe0f2763a377c67d879ce3cf5 SHA512 eb233c702a2dcda36d17c53413c4e1ba35035f8d012843371e02cd3bbd3ade6c08323034b4cf903fc67693b1d42e78f3b658efa9ccc346f49b6fec767aa922b1 WHIRLPOOL 08da3b2be3fbb7bed75adbed5f349aa4a420d0d0ab4bb7d420e2c8c6f67dd6212e66acfe189ea5540eabbed195a91236c06d5c1cd66bf85361ff88e15aa37028
 EBUILD netbeans-websvccommon-9999_p20150925.ebuild 2721 SHA256 fe270a017f4b6b3dd3d72a555285f3d29ace622e7ddc9bcb3d76fd1ca916da5e SHA512 8b5bbebc7927709576b96bc2e16bcdaa67eb8ecb7e701ce79f3a7acc6ee2f212b3214b7e428e65fbae8e145081a0f33640b1911546789ceb278aadd631167c16 WHIRLPOOL 20cc9c986c891fe69eb0a4462a95f8221256587166fb4a486b1eb9b1ebaffabf519063e1d712bfc2cdf92d5ea2e7c98252eec2f1177f391d4a72d053866d01e2
+EBUILD netbeans-websvccommon-9999_p20150929.ebuild 2721 SHA256 d15de36d53545f1c122f54f381b40daa574e5cfada795c9158b87634e9bc9928 SHA512 5a55315891a9f0364ba24c461b55e2d5eaa63c1fa4d01f4d722fc4eafecdb5888497f7b1a8f9fae87f523883c1bef7c6f40ca35d5f991efaa4c54f5f463459fa WHIRLPOOL e749767e1816d6dbae0cb14b0e8a64d7ebe664cf2d79b1cbc2741aff0e20cfb8304fc68b20feb8c7532345711d1de8ce58fbbbcfbb2be50760f1912ad1596e22
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index edf8800..a1f23ee 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -18,6 +18,7 @@ DIST netbeans-trunk-nightly-201509220002-src.zip 209215343 SHA256 1b927f671d6f35
 DIST netbeans-trunk-nightly-201509230002-src.zip 209218589 SHA256 73d239f4af29c18b696a70659b359d8eac25bd9e1e68255cdcfb70f07ee17bcf SHA512 9eee1f0beef7f4f0f89570222fd8278bca21cd25f1ef57b7fa6bee009b1b572a8db8726939236f39908e0a6cb859841ea116ee547a4122e438f0f3e487461c85 WHIRLPOOL 8b2b25fe3793120e96b03caa026b00bf58480c9d8b314e5b476becce4cdea57fbc9f4e7ab328eec94f64f3d623518857ccc284a19601622eac50ffa925de2e8e
 DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2ea9d4ae127e330251057b37d2a1062ca54ffece562c1851dca SHA512 b62a99828b1474c1ce79172ecfac9cb235f2b47c7cb7d57892c0b52b2a353dc8df8a0dc180bee56ca8c0103923f93f79999c9ee9cb188f31498b6a14c1c2322a WHIRLPOOL c9117690cb9c0ff1061f10939837235d6584288a81172d3532551ca5dd8ec0d6d51e79236f94fec4337f7109c86357eae5e821a121a4617e14603ab0fadc2c03
 DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
+DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 EBUILD netbeans-8.0.2.ebuild 7167 SHA256 80e31382a0ceb680c2a055dc5c78c1dce8edf32c50bbae6a1c14a2c568492519 SHA512 0ab466ca247ec953896ef0ab3b01b43ffea3a9f37e9bcdacecfc0476226d45cef35e4ddf27f2b85628d9512ed304e6cc6cfe963a5e547217d08cad400eefc4b9 WHIRLPOOL d09668e669f4f8d7987ab02cf26104fc6e54ba29b8b497fe0013cc8816a2d7560c99e6e1b02db77ead872d5240b84c09e3fabbc3465587d1d1ca7d6fcae114c1
 EBUILD netbeans-9999_p20150901.ebuild 7210 SHA256 aa601ee01f6fb1485234688933becffe18ee2d30af5045951a2bffc2f24f849a SHA512 98f00da7d90c3425cd718c34d65aa46980a9c10f50dd34a01a1776d1a1488e92b9e657210f61e45724b6c9358a36a44a2fbf8ac5b7012012d163c6c91f7ec421 WHIRLPOOL 008820f5bbb9077bc739629262c1e24bbece9c55b50c270c76c3900424ea77e0dca4a33bdf32535b506d61dacd951f65d669485321837dd83234404ad9143594
 EBUILD netbeans-9999_p20150903.ebuild 7210 SHA256 73a22280e3cd8d717bb224ba8c243faa59493011739522863e3e93b83def156d SHA512 87214a421b60dbe51dd45b0124ba463585096fe7f7820fa48e0cbf7d55b3d3080645ecd9dbd4679d7968a9b90d1ed60b88bbc3e50109a00e3c2a7ea8192ef0b2 WHIRLPOOL b820124da7676168df3529566db7b2ca095972189a1ba848da238caae7a93947c0c664af310edc722146d2daaa9fdab9bbcc5b3477207664a5193c003f289c09
@@ -34,4 +35,5 @@ EBUILD netbeans-9999_p20150922.ebuild 7210 SHA256 63dbe335824f0935897662c98b3b65
 EBUILD netbeans-9999_p20150923.ebuild 7210 SHA256 bfce43c31ee2c757dd2e60427f24562f43f8ffc4aca2a26cf3d208a712f436fb SHA512 b492ad6dde414079f76c4780ed2b26e5fda004f6527c69ed85da42cc72d92754bfc6734c831f06ad9a2a512d2e355745e1f035eaee5067599d3db6af619b8849 WHIRLPOOL 1cc85824b97d53d7e69e4f11e67e8c6393003ab349739e9c4125163a77cd259e4b267d8d46f7da6d2aeba530e23c5de9776584959ae4606a12d1f9b45a207f3e
 EBUILD netbeans-9999_p20150924.ebuild 7210 SHA256 6cd02bda976b99813c50c9cab0a6924a4645693887232c5a36fd30fc84fa0671 SHA512 fbb72dc71eaf222879c7a85e82452acba22faf4a1c44bf741f8d9a2a705c5459389d30eef51d660d61826368df7cdd335bbb1df7661fbc99491091a5bbecc168 WHIRLPOOL 9c83e6d1a896410d30b7425de17649910c4a3ffa3855113503351fdf48eae79ef6359a77247bc14b08f30d7306395572817e10b3c4f7d22ef605a7d3f4a7878f
 EBUILD netbeans-9999_p20150925.ebuild 7210 SHA256 024e11a350dda40eab393cc84e6a9b0bc793f74dde30f8a718c932121c916be8 SHA512 60809e6b64e957542b30c73c5ceb7d30c805a5667ba9dd06c880fa97f105d1218ecdc3c7132c9d98d9fb9a88b689fff54d815e513d0a28e7086ed216db1b44c5 WHIRLPOOL 1cfa6f83cd7bc654d9c3cab64db148dbe88c330dd152331b9285d99236dafcef3938543905c6700f11e2c3dff00a36bb8bcc6a5aa47df782c513e5ce3c0e7d67
+EBUILD netbeans-9999_p20150929.ebuild 7210 SHA256 102d914cac1aef4bb6da019493079610246f7b4414012277a68123bfe8147bde SHA512 b1603770130c0de5689f44e9539571142a8bc36546626996d59263f6ea5baad37a15ff2da3b5db1a11bad48ad3780bd92593b4e4fcf82b790762441ee70c39e2 WHIRLPOOL 3bf996c82f96a0b1ab99790de6e6fe57bd9967c6f497bbb214f82f271c73af60eea2cb5a664a263fd6e3ca7e6c27100e4948eadc484822dbce2c3f491983734b
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

diff --git a/dev-util/netbeans/netbeans-9999_p20150929.ebuild b/dev-util/netbeans/netbeans-9999_p20150929.ebuild
new file mode 100644
index 0000000..1629955
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20150929.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2015 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/2015-09-29_00-02-28/zip/netbeans-trunk-nightly-201509290002-src.zip"
+PATCHES_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2"
+L10N_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-9999-20131010.tar.bz2"
+ALL_URLS="${SOURCE_URL} ${PATCHES_URL} ${L10N_URL}"
+SRC_URI="linguas_af? ( ${ALL_URLS} )
+	linguas_ar? ( ${ALL_URLS} )
+	linguas_bg? ( ${ALL_URLS} )
+	linguas_ca? ( ${ALL_URLS} )
+	linguas_cs? ( ${ALL_URLS} )
+	linguas_de? ( ${ALL_URLS} )
+	linguas_el? ( ${ALL_URLS} )
+	linguas_es? ( ${ALL_URLS} )
+	linguas_fr? ( ${ALL_URLS} )
+	linguas_gl? ( ${ALL_URLS} )
+	linguas_hi_IN? ( ${ALL_URLS} )
+	linguas_id? ( ${ALL_URLS} )
+	linguas_it? ( ${ALL_URLS} )
+	linguas_ja? ( ${ALL_URLS} )
+	linguas_ko? ( ${ALL_URLS} )
+	linguas_lt? ( ${ALL_URLS} )
+	linguas_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_tl? ( ${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_bg
+	linguas_ca
+	linguas_cs
+	linguas_de
+	linguas_el
+	linguas_es
+	linguas_fr
+	linguas_gl
+	linguas_hi_IN
+	linguas_id
+	linguas_it
+	linguas_ja
+	linguas_ko
+	linguas_lt
+	linguas_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_tl
+	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}" = "gl" ]] ; then
+			lang="gl_ES"
+		elif [[ "${lang}" = "id" ]] ; then
+			lang="in_ID"
+		elif [[ "${lang}" = "nl" ]] ; then
+			lang="nl_BE,nl_NL"
+		elif [[ "${lang}" = "tl" ]] ; then
+			lang="fil_PH"
+		fi
+
+		if use ${lingua} ; then
+			if [ -z "${NBLOCALES}" ] ; then
+				NBLOCALES="${lang}"
+			else
+				NBLOCALES="${NBLOCALES},${lang}"
+			fi
+		fi
+	done
+
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	if [ -n "${NBLOCALES}" ] ; then
+		unpack $(basename ${SOURCE_URL})
+		unpack $(basename ${L10N_URL})
+
+		einfo "Deleting bundled jars..."
+		find -name "*.jar" -type f -delete
+
+		unpack netbeans-9999-r14-build.xml.patch.bz2
+	fi
+}
+
+src_prepare() {
+	if [ -n "${NBLOCALES}" ] ; then
+		einfo "Deleting bundled class files..."
+		find -name "*.class" -type f | xargs rm -vf
+
+		epatch netbeans-9999-r14-build.xml.patch
+
+		# Support for custom patches
+		if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+			local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+			if [ -n "${files}" ] ; then
+				einfo "Applying custom patches:"
+
+				for file in ${files} ; do
+					epatch "${file}"
+				done
+			fi
+		fi
+
+		einfo "Symlinking external libraries..."
+		java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	fi
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	if [ -n "${NBLOCALES}" ] ; then
+		einfo "Compiling support for locales: ${NBLOCALES}"
+		eant -f nbbuild/build.xml bootstrap || die
+		eant -Dlocales=${NBLOCALES} -Ddist.dir=../nbbuild/netbeans -Dnbms.dir="" -Dnbms.dist.dir="" \
+			-Dpermit.jdk7.builds=true -f l10n/build.xml build || die
+	fi
+}
+
+src_install() {
+	if [ -n "${NBLOCALES}" ] ; then
+		pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+		for cluster in apisupport cnd dlight enterprise ergonomics groovy harness ide java javacard javafx mobility php platform profiler webcommon websvccommon ; do
+			if [ -d "${cluster}" ] ; then
+				insinto /usr/share/netbeans-${cluster}-${SLOT}
+				doins -r ${cluster}/*
+			fi
+		done
+
+		if [ -d nb ] ; then
+			insinto /usr/share/netbeans-nb-${SLOT}/nb
+			doins -r nb/*
+		fi
+
+		popd >/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	if [ -n "${NBLOCALES}" ] ; then
+		einfo "Netbeans automatically starts with the locale you have set in your user profile, if"
+		einfo "the locale is built for Netbeans."
+		einfo "If you want to force specific locale, use --locale argument, for example:"
+		einfo "${PN}-${SLOT} --locale de"
+		einfo "${PN}-${SLOT} --locale pt:BR"
+	fi
+
+	if use linguas_ar ; then
+		einfo
+		einfo "You selected Arabic locale so you can choose either ar:EG or ar:SA variant."
+	fi
+
+	if use linguas_es ; then
+		einfo
+		einfo "You selected Spanish locale so you can choose either es or es:CO variant."
+	fi
+
+	if use linguas_gl ; then
+		einfo
+		einfo "You selected Galician locale which has locale code gl:ES in Netbeans."
+	fi
+
+	if use linguas_id ; then
+		einfo
+		einfo "You selected Indonesian locale which has locale code in:ID in Netbeans."
+	fi
+
+	if use linguas_nl ; then
+		einfo
+		einfo "You selected Dutch locale so you can choose either nl:BE or nl:NL variant."
+	fi
+
+	if use linguas_tl ; then
+		einfo
+		einfo "You selected Tagalog locale which has for Filipino locale code fil:PH 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-javadoc/, ...
@ 2016-10-18  7:35 Miroslav Šulc
  0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2016-10-18  7:35 UTC (permalink / raw
  To: gentoo-commits

commit:     5ea1026b40bab0533a9de0b848bf1a07c1d2e939
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 18 06:33:51 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Oct 18 06:33:51 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=5ea1026b

netbeans: removed obsolete ebuilds

Package-Manager: portage-2.3.2

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index cf92d9b..8f1594c 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
-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-201609190002-src.zip 218003305 SHA256 b9524ea17aae5220e46bc2d7f603ed8c741c3f07dc18bb36bff6b8feb1b105e5 SHA512 711ed0e38e0ee172f6ab1b3411075c477f9d4d86b2efd317ba72a0c2b716ca736ac1458e43ca2a35bb564eac3592e829bc72d0fa28abfe6f77ad1e22d2bb9b0c WHIRLPOOL f4624966ccc61c3d5cd6a339fe6b1ee52a87e7a585b360582b0549c49ba703c64329fa38a0edb6a546e941114b8adcfd2ad8d76b23127b15e5b7c361e440826a
 DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
@@ -31,7 +30,6 @@ DIST netbeans-trunk-nightly-201610170002-src.zip 218266835 SHA256 57ea6623695297
 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-8.2.ebuild 3059 SHA256 605b99cf2fe6fd30b28053ef3a3e6dfbed6189f97c20728c41e00ae08b766edd SHA512 876916d7591bc518c9ba63d8335391a41bbb89809828dfb44c3eb4edefddf7393c143825e8731de2b8cf6e6a1aafdbe274ac1d7456a982d3846b43a2d16adc8f WHIRLPOOL 329046fd8eb19229567f85d19e6fef0f0636bc6efb5ad1b84c102c3dc7119ea8672a8f4ad7937f837b4a43537725cea7e137d88ea01ea9fafb34cbebb9b0ec56
-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_p20160919.ebuild 3384 SHA256 789c6bde2584a8c5294727c0b49fd689cbe559f9f29b4940005c2cf9ecdd95d9 SHA512 cf2590f492fafe089d08daa257235b5169f52f1d1bc81107877d87ed401bbaf2ea3526cee54e587edc1f20fc58167c91b4ca00f7d0ed846f97549c40f93d2f69 WHIRLPOOL 62232db730aa3333783d4447b11646ab13bb2847b4385265d6172baef13cd57cde2a0951c8a1b13f1ed99f29d08d1f5c9a659ca6b2695693c08e36175c454eda
 EBUILD netbeans-apisupport-9999_p20160920.ebuild 3384 SHA256 de7d5a01a0af33c46c1b997b056a614afc01b609534976f391665a9ead4be8d7 SHA512 52ea6b6418eb9ed056064fae73bafe93b800697bc77438004ee1e6cff81a6d5cf295bd7643c91c15dc542cd5fd60c41c61a11e18a1be2013318477e177933a14 WHIRLPOOL 11f423becd2ae0d89d3b2262689e0ae5e14b76a52f6db55899835629c0612d9f6d55300386e69d54142bc50d7d7ff196e1a29bfbdb7d08ed066354f2cd891e9b

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160916.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160916.ebuild
deleted file mode 100644
index ca9abd7..0000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160916.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-09-16_00-02-33/zip/netbeans-trunk-nightly-201609160002-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 588e668..253d8a7 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -18,7 +18,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
-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-201609190002-src.zip 218003305 SHA256 b9524ea17aae5220e46bc2d7f603ed8c741c3f07dc18bb36bff6b8feb1b105e5 SHA512 711ed0e38e0ee172f6ab1b3411075c477f9d4d86b2efd317ba72a0c2b716ca736ac1458e43ca2a35bb564eac3592e829bc72d0fa28abfe6f77ad1e22d2bb9b0c WHIRLPOOL f4624966ccc61c3d5cd6a339fe6b1ee52a87e7a585b360582b0549c49ba703c64329fa38a0edb6a546e941114b8adcfd2ad8d76b23127b15e5b7c361e440826a
 DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
@@ -43,7 +42,6 @@ DIST netbeans-trunk-nightly-201610170002-src.zip 218266835 SHA256 57ea6623695297
 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-8.2.ebuild 4465 SHA256 e5268b1872a0ba3f39dfbd8d49fddd9938900bbbc96e432fa1807ee0b6c36fbb SHA512 6c30daf1aea9d0d598d16903facbbc4a02660821dd6ab5b98c940305adc3dbe41d5410bfad7c1afe4adb33b45056730c95eb9fe2462b5fff26449a7814202bce WHIRLPOOL f60d88d6cd35594ff406fbef4e181abb02a3699d442450f19da173e802576fbad7c891efeff236e3d02d7a217f4685650bd2d57aa6ea17e29f550ede9ac13d06
-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_p20160919.ebuild 4790 SHA256 1bf0d8971ef4655986702ab5c01f034b4d919b2d6f93a7e53ee3ee05262425d8 SHA512 1553186a841215cb937f28886ca25463ab689e46049c33456def87b32c711ae12ced4a7940a7c9eb558a5282f3539d29c73984d29e00fc84eedefe1aab9e2561 WHIRLPOOL 211958ad88ed8e442da1355708dd2ec4b55718fc0b2b11e963f4ff450b94a69080134c3c9f43ce801194329e31fbfb60314c1ea928c57578f067668d8d4aa0a8
 EBUILD netbeans-cnd-9999_p20160920.ebuild 4790 SHA256 16b13cee59598f079cad6409309a3b2d4388f51b16a834231531b465bebc0b68 SHA512 3ad16c8530ad8c55e716c2c72a10358e8b883bb8b1150be98cc5276cbae2906f0aec33d98c4215e7fe83918bad25265a70e53ca688e290c9675b0a0d26f795ed WHIRLPOOL 4a4336654e7c3a9d260fe29258645a20fdf35b431f82aaddb4f505ada2b17024990c099ad9789a77fb233856d9f2270cf1e0a8ed8418e65ff5f982f039e192dd

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160916.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160916.ebuild
deleted file mode 100644
index 3f2b10e..0000000
--- a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160916.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-09-16_00-02-33/zip/netbeans-trunk-nightly-201609160002-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 ab877f7..b3c4916 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -9,7 +9,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
-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-201609190002-src.zip 218003305 SHA256 b9524ea17aae5220e46bc2d7f603ed8c741c3f07dc18bb36bff6b8feb1b105e5 SHA512 711ed0e38e0ee172f6ab1b3411075c477f9d4d86b2efd317ba72a0c2b716ca736ac1458e43ca2a35bb564eac3592e829bc72d0fa28abfe6f77ad1e22d2bb9b0c WHIRLPOOL f4624966ccc61c3d5cd6a339fe6b1ee52a87e7a585b360582b0549c49ba703c64329fa38a0edb6a546e941114b8adcfd2ad8d76b23127b15e5b7c361e440826a
 DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201610170002-src.zip 218266835 SHA256 57ea6623695297
 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-8.2.ebuild 2643 SHA256 0608962b0d5b55245c0197d9d3611dce2abbda380cce67c72c5df8922367658c SHA512 fc46e711046fd751f358771c5fa08050bbd9fe51d81fc7f696c3ff7d597b5401a06fc1395c77baf33f8b8d5271e3f8dacf91a94f3a223af383a5596b227d9736 WHIRLPOOL 7a9d758015d16fb389b9a0e3e2a666508fa7079ddcf3fe36d967aeac73f5078f90ae72a90ddf28587337a1906b458034cd648cf75b71ef1a0fef52d168fa5192
-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_p20160919.ebuild 2968 SHA256 19f4fe180da1aeff8ad17344cdc672dacdf6d671f9203073057a2067213bd6b1 SHA512 1b04569368486d99bb246da9110432c47366e16bc36ccea627f1eaa58cd14a8fd06b3c4b6652bea5c13193e03c606163a80bdff6100c6870d720f05f8376f04d WHIRLPOOL 1b1fced51c157478bb92e95abde381ea69d6f34ea233a984e7083a84bd922f5fb52869bc296734e2ce74e7b9099a455cbc9eb318a2516a10dbb0aedc10f0dba9
 EBUILD netbeans-dlight-9999_p20160920.ebuild 2968 SHA256 55d14cd8522cde2857e3cdb34e8e567e3dbdbf51af57dbaa2f15b96793ba73c6 SHA512 dd4a3191b5397d03b6c5f9a63119b281326f1b96640e4196916fa5407315341e17e071161de9c4b0211861f95dc995934666f942e03f073c9107e32195a77170 WHIRLPOOL 09b11a1edf82e3d3ffe6f68d8b5caeae887f0538989e3dbe70b5b6417c5053606d6daa9631b49fb3fab10b3b72188a74f086abff016d89f4f7b2491d2f23384f

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160916.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160916.ebuild
deleted file mode 100644
index 040aa8a..0000000
--- a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160916.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-09-16_00-02-33/zip/netbeans-trunk-nightly-201609160002-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 cd00c1c..381a1c0 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -38,7 +38,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
-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-201609190002-src.zip 218003305 SHA256 b9524ea17aae5220e46bc2d7f603ed8c741c3f07dc18bb36bff6b8feb1b105e5 SHA512 711ed0e38e0ee172f6ab1b3411075c477f9d4d86b2efd317ba72a0c2b716ca736ac1458e43ca2a35bb564eac3592e829bc72d0fa28abfe6f77ad1e22d2bb9b0c WHIRLPOOL f4624966ccc61c3d5cd6a339fe6b1ee52a87e7a585b360582b0549c49ba703c64329fa38a0edb6a546e941114b8adcfd2ad8d76b23127b15e5b7c361e440826a
 DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
@@ -63,7 +62,6 @@ DIST netbeans-trunk-nightly-201610170002-src.zip 218266835 SHA256 57ea6623695297
 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-8.2.ebuild 15500 SHA256 c873137315dbae5c4e106ebb8e45c4f0f393b827c1f780c7b0bb8b1fb9acaf1b SHA512 b5c42aef845bc6095652f0fdc0cc09decd06603d7564de0b579018719127df108632f7c123b17477985adc5e06f53711221f62a50845f1e1163df5a8b5489cff WHIRLPOOL 802f4dbbfb9f49bcd3f82203612e5fee8ed41974f8d879388239fa019ad9336ac58c98620f2482d0de8e9fb19989ff77ff93130ae2b0b4c027fc3e4073704cf8
-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_p20160919.ebuild 15825 SHA256 a2ee1ba683fa966fdd3634beb36b1400ca544485b5dc53a2197ad98d001b2e96 SHA512 4ff2baf2e858d1820ec223275a041b64dfff5a3dd8a1c1b1b185fecd7c126ec4db000501e5204480e3a571022b85c9ea31cc01aa35132ff3ce6fb1bd32dedaae WHIRLPOOL eda97973a1e11c043ca9b9466efaa9d7d02e28e8ed14c8b62db882b8bad71f06bf7037ee6b65b7e5d369287ef733ae4f217db2bdeef2efe80eb63b9e8f8f4a16
 EBUILD netbeans-enterprise-9999_p20160920.ebuild 15825 SHA256 71f2de62de7be7787224eabf2cf43aa127383b6547e074c194afce0020d82928 SHA512 63d6d4da000ed067856aea100e269fc8f1b32c7c33707022bc8571a7a38e8aeef65a53d131a0b4ae895b8126f2fca6c97fdb24486dfbf97057d66348fa3622bc WHIRLPOOL 0a1d11a8bc1731f22bdc92815505cd8f90221d611b0ac10272a7d551bac74632dc8c9bd645270108b74bc6be6f7e46a5778d34233cbdf7f9c12977a0c5c9778b

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160916.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160916.ebuild
deleted file mode 100644
index 85973d2..0000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160916.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-09-16_00-02-33/zip/netbeans-trunk-nightly-201609160002-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 4476a3e..cbfd335 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
-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-201609190002-src.zip 218003305 SHA256 b9524ea17aae5220e46bc2d7f603ed8c741c3f07dc18bb36bff6b8feb1b105e5 SHA512 711ed0e38e0ee172f6ab1b3411075c477f9d4d86b2efd317ba72a0c2b716ca736ac1458e43ca2a35bb564eac3592e829bc72d0fa28abfe6f77ad1e22d2bb9b0c WHIRLPOOL f4624966ccc61c3d5cd6a339fe6b1ee52a87e7a585b360582b0549c49ba703c64329fa38a0edb6a546e941114b8adcfd2ad8d76b23127b15e5b7c361e440826a
 DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
@@ -31,7 +30,6 @@ DIST netbeans-trunk-nightly-201610170002-src.zip 218266835 SHA256 57ea6623695297
 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-8.2.ebuild 2588 SHA256 68db901e9ef42508812495dd42af7afc5c85398b3b6a4585dea23c5423ea9c50 SHA512 f79370f1568ce6125e366d023f008799036a0b4c4b6e97ab4fd0e52270d0526710edfe0a979e703dd668796c56e4d9a8ea32fcccf9ca49993eca9a0f5fe5dd2f WHIRLPOOL 769da617620b71da2c5dac7901a352b76939fcdfc12e3d2d2014fe209e0e1c6666a01f185b9543ca800d4e201ad1467afc054e5dd1fd5a7187224b669547c834
-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_p20160919.ebuild 2913 SHA256 e352e03a76698723b4333f02558080d2607a327315634f254c6b6df30fd5c2aa SHA512 6adb94989931286020947680c8f659be6d302cff8fdb05e367fdf830ee8dcce8250ae7446018578346230fcc6d0011e2dd00b40d8f79d3aaf0ec4174511e3e5b WHIRLPOOL f3dfa6d34ae695a6561f6c39e90c49038e41d9e5ee8ef08832668d016bc8612920c5c5929c2a29e2c5333092c0449d5d7600aba7fbc6b61ee716fcd76fed03c6
 EBUILD netbeans-ergonomics-9999_p20160920.ebuild 2913 SHA256 3e3f526858d5221b6e4968dbc8445bf9cdaa55a13b514d0c59ade13b1b4f330d SHA512 d468c8b08ad55e18f6597fc5e56d853ff943174797691bf3c0be643c010c4994c9fe46c021b3357a577947af56c29dbdf05cdab486c842ec2614055f3052e425 WHIRLPOOL efc07b013856546d68ebda24da7575eee796479c579c8f9a46c216a434ddf1536d25fc3505d01c5f49d10d9b1730403e144f15a51e25ee714af575c5d681539b

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160916.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160916.ebuild
deleted file mode 100644
index 3f93f64..0000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160916.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-09-16_00-02-33/zip/netbeans-trunk-nightly-201609160002-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 95f5dba..98e6249 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -12,7 +12,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
-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-201609190002-src.zip 218003305 SHA256 b9524ea17aae5220e46bc2d7f603ed8c741c3f07dc18bb36bff6b8feb1b105e5 SHA512 711ed0e38e0ee172f6ab1b3411075c477f9d4d86b2efd317ba72a0c2b716ca736ac1458e43ca2a35bb564eac3592e829bc72d0fa28abfe6f77ad1e22d2bb9b0c WHIRLPOOL f4624966ccc61c3d5cd6a339fe6b1ee52a87e7a585b360582b0549c49ba703c64329fa38a0edb6a546e941114b8adcfd2ad8d76b23127b15e5b7c361e440826a
 DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
@@ -37,7 +36,6 @@ DIST netbeans-trunk-nightly-201610170002-src.zip 218266835 SHA256 57ea6623695297
 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-8.2.ebuild 3052 SHA256 f02128c23e03f164a7dae35617012088d766fb7300808f0283916a95df8599fd SHA512 02b2646836ada4d32ba11d6acca442a9b261f27d1d2cbc0996b046bc6a9b32399a3a826bffaab1c1e688d0c96fce4e02499337fb02beb6a9be67cce0b80039e4 WHIRLPOOL 75ba6170663f260e5e8b67b1a1a2df6aa56db67674c84c64348acd0389647bdc1b310bd5202af9e2e280a442caf82aa64b9424a8d0830ac48f7a23665365bcd2
-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_p20160919.ebuild 3377 SHA256 a3c0528cee6034f0aa1659ef0e33dfe33377dd8439e43c3a10bb3d7028a70ee0 SHA512 027b952479635e1e6d7617d4671b35a2a96a1071a8e3e24fe47963379bd4f3f787e6704fcda89d6af8d229bcbdc6f9230efbd41ec4e465e243faf3f997f675b1 WHIRLPOOL dc90763f96cb2e0147b6ead4933c7d22eccf0f64c9c43397371e08e52b55bc8795e34c37e7515e938ea2e63b4a46cf9231bed348b895fea2c0fe7207feee5e55
 EBUILD netbeans-extide-9999_p20160920.ebuild 3377 SHA256 7999e7ccc6b393d509e6025379fef3fa783c6af7ff1401e43831f6b3a236c6f7 SHA512 a6b90952d9ee1607294445f44de8b319c7988199824072ac8dc64c6523f9c6e0ede60a93249f3fc999cccdd6222373d1d35d792998bb35d4b5afef5f8ede7eac WHIRLPOOL f65010b1c27d5ac2ac33714bc7aa353013a2016e06e6d3fff11406d707ee8f77673bdf255392a2b23eab2f529a55be912dc83569528993ed412aac96dbce8ded

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160916.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160916.ebuild
deleted file mode 100644
index 417ea4d..0000000
--- a/dev-java/netbeans-extide/netbeans-extide-9999_p20160916.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-09-16_00-02-33/zip/netbeans-trunk-nightly-201609160002-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 f92d9b1..a1822f2 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -8,7 +8,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
-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-201609190002-src.zip 218003305 SHA256 b9524ea17aae5220e46bc2d7f603ed8c741c3f07dc18bb36bff6b8feb1b105e5 SHA512 711ed0e38e0ee172f6ab1b3411075c477f9d4d86b2efd317ba72a0c2b716ca736ac1458e43ca2a35bb564eac3592e829bc72d0fa28abfe6f77ad1e22d2bb9b0c WHIRLPOOL f4624966ccc61c3d5cd6a339fe6b1ee52a87e7a585b360582b0549c49ba703c64329fa38a0edb6a546e941114b8adcfd2ad8d76b23127b15e5b7c361e440826a
 DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
@@ -33,7 +32,6 @@ DIST netbeans-trunk-nightly-201610170002-src.zip 218266835 SHA256 57ea6623695297
 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-8.2.ebuild 3091 SHA256 874191c03509577bc4a4bf7e54730eaa185a29620f09d1e44633fcddcefb08e1 SHA512 72d80927284126809760da993a3008cb7a45bb91f83781435c3199a51c5e2fbf5e85f39883322134c44dd1070d1b7274fa357b9187fd9ebc7cbcac98a5be925e WHIRLPOOL d12be4d592e12846bcd5e87e541170d0f27f4cb8fa21656dcc9294e4893cd0fe6bc4098ace1aed25bffa1faa5aaf260995395e29c3a2fc950c88727899337255
-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_p20160919.ebuild 3416 SHA256 720aab00c1a4ce6c61af0ecd0c88b26148266d9d4ddd315c7cafa870b8c0cc99 SHA512 7bbee2afddcaafbddb360b8e736802a45f8b65efce7c2aeb39dd9db58a37f4cb6952fa12ff9394231cb7a9cc25cc4efa6a41ab00af1dd118dec8ab6153b624fe WHIRLPOOL 0bc17deb701b656480e27661b3d26f9f4a165108b525127d850ff01abe65d7431b106e8babe47ad1956d5f1586fa64cbec8778780212864e7b17c142b90fd15e
 EBUILD netbeans-groovy-9999_p20160920.ebuild 3416 SHA256 523fffd499a2acf8232a6243451b1397e3b3672b2e69cea8753c86c1b1972d95 SHA512 d787a617b0f7039ffe1a1402963f9f124f0b35680d776178b7248fbd20f95440f38ae3930e32c6e04e719278e50a1dc9ca376e28f813dc6de9bd0aaf126b69c2 WHIRLPOOL fd07967c5943bdc15e33e8ba8eaccf69c2bae89016313952df59201ed57420b79964571a7a50f7012fe9285af7f44d25cb42d592b68c877b34bd8121311a0671

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160916.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160916.ebuild
deleted file mode 100644
index 17b4a22..0000000
--- a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160916.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-09-16_00-02-33/zip/netbeans-trunk-nightly-201609160002-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 61ecc91..8bfadd8 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -11,7 +11,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
-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-201609190002-src.zip 218003305 SHA256 b9524ea17aae5220e46bc2d7f603ed8c741c3f07dc18bb36bff6b8feb1b105e5 SHA512 711ed0e38e0ee172f6ab1b3411075c477f9d4d86b2efd317ba72a0c2b716ca736ac1458e43ca2a35bb564eac3592e829bc72d0fa28abfe6f77ad1e22d2bb9b0c WHIRLPOOL f4624966ccc61c3d5cd6a339fe6b1ee52a87e7a585b360582b0549c49ba703c64329fa38a0edb6a546e941114b8adcfd2ad8d76b23127b15e5b7c361e440826a
 DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
@@ -36,7 +35,6 @@ DIST netbeans-trunk-nightly-201610170002-src.zip 218266835 SHA256 57ea6623695297
 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-8.2.ebuild 3801 SHA256 fb8e3c76ee96cbe6d36c5dbabb49f4baf444dc3f879ac319c0bec693484684e2 SHA512 5ac59770e25f2ce3ebcd0af36c895060a1b1f3e38dfc2b8efbd8aa8d7d0cd09d9c88794a7d1a40bc69dc6afd2fa820f7add7fabc55e3cf064702bb8bf5903f3b WHIRLPOOL 7ac28d024972c33545f8163d3375d80defe3d1e6890a118e497a7fc6177b4d35e065a7283dcc7a04dda8a56687f18d55711018df168c302624800c80d68949fb
-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_p20160919.ebuild 4126 SHA256 c96d2a7b1e6ff950d7aa7ec75bc686a022d053fca132e9c04e9c141df45be875 SHA512 51acc6ad4b59a51d6a497c68ff3058b24c71f07c56bcfaf41a4b2523a33be71f5d62e343196104fb5ac8c58067f32c8acc35b9e7be74a3b34cf0276833fd5756 WHIRLPOOL e6b3759486c8cd03e64290094f70e72b38c98ba158edab0e77ec17dcc0965da5f1914a7241d9f7376006cf8d70d823a53cb3ffc442ec1f2329959f3cbf19553a
 EBUILD netbeans-harness-9999_p20160920.ebuild 4126 SHA256 644bb12dea929e3c68a6b636840512d987087c2ddae067a833cd45b199ea4bf2 SHA512 99e40ff3f204448e0d49a86c63a76693267a6d5ea423df6dfa137fc48d7ce6130d52f97a96a86604c7c8a5e87e3663e9cc444ba70acbb7e2047009cfd88e590a WHIRLPOOL 1ced7ee5f25c861b45c232848eb42fd6d8cd0b28401aa49cd108efda0c73ddc7e4838a8f4c1f7c7a0c1dcba9de425ff76e0073099110e2878dd6b06efc27ee4b

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160916.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160916.ebuild
deleted file mode 100644
index 4b00c20..0000000
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20160916.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-09-16_00-02-33/zip/netbeans-trunk-nightly-201609160002-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 76a3d7c..511fb8e 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -145,7 +145,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
-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-201609190002-src.zip 218003305 SHA256 b9524ea17aae5220e46bc2d7f603ed8c741c3f07dc18bb36bff6b8feb1b105e5 SHA512 711ed0e38e0ee172f6ab1b3411075c477f9d4d86b2efd317ba72a0c2b716ca736ac1458e43ca2a35bb564eac3592e829bc72d0fa28abfe6f77ad1e22d2bb9b0c WHIRLPOOL f4624966ccc61c3d5cd6a339fe6b1ee52a87e7a585b360582b0549c49ba703c64329fa38a0edb6a546e941114b8adcfd2ad8d76b23127b15e5b7c361e440826a
 DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
@@ -170,7 +169,6 @@ DIST netbeans-trunk-nightly-201610170002-src.zip 218266835 SHA256 57ea6623695297
 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-8.2.ebuild 29530 SHA256 90a463cbcf7753c53f3928eb542ad745a81f3b2518e1d6da3f3e28a951e08cad SHA512 37ccead9a142e330c07e030b1957d17cde945ed4fbe9a13f62125f7762d83965919836fdce654c8c305a34d69d585184155799f55495f9247b8916ef780510ab WHIRLPOOL a7e1d1c148dd776698bffa0a1fcb8b7e4f31ff32a7059a1c0327a266eaa5ac8b768b7d7dbba16fd71844f6e8834d2edf884a9f8470df1e22b8ecb7b44e0a6540
-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_p20160919.ebuild 29849 SHA256 864d511828c868eed5501381b8dabf91ade990d40dface018906c9419300ed7a SHA512 e7efeabc2f424e425f7b353d3fddf4c70d3572ddbf8c0d1c6671e20c62e3a10ccc6b248c7b56bead1b68f0a7b6e8d67d57182c436bbdf132d0a46484e3bf4ccc WHIRLPOOL 3ee23b9953ddf06c7c84d8c21e204d02a9f98f5d40ab3a8ff3d58ffa565337bb9f6cd34649c70aafbc53e6188e3726dd01371142211157eac2f33726a00d91ca
 EBUILD netbeans-ide-9999_p20160920.ebuild 29849 SHA256 b77baa64e73048f604ebaa909079eeb5ec6984a3e89f708a1721953c705c7c14 SHA512 695c020d32b4f7b123c9dff580ecac1b5d6173d8a836330d09a4321d8b372b35e78bdb54410983114863a94711c5ed334c6dc16de5c78e653535bb9edf0e4938 WHIRLPOOL 5bdbb56ad3d9c86d8b719d46251c93846d0b96bec7899936bb3273077565bfe49d8187c9b8a61d8423276c730912514fd2dfbad0ecd9e663f079a6333c83bd27

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160916.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160916.ebuild
deleted file mode 100644
index 57a8d81..0000000
--- a/dev-java/netbeans-ide/netbeans-ide-9999_p20160916.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-09-16_00-02-33/zip/netbeans-trunk-nightly-201609160002-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 a61b0da..3a7b7eb 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -41,7 +41,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
-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-201609190002-src.zip 218003305 SHA256 b9524ea17aae5220e46bc2d7f603ed8c741c3f07dc18bb36bff6b8feb1b105e5 SHA512 711ed0e38e0ee172f6ab1b3411075c477f9d4d86b2efd317ba72a0c2b716ca736ac1458e43ca2a35bb564eac3592e829bc72d0fa28abfe6f77ad1e22d2bb9b0c WHIRLPOOL f4624966ccc61c3d5cd6a339fe6b1ee52a87e7a585b360582b0549c49ba703c64329fa38a0edb6a546e941114b8adcfd2ad8d76b23127b15e5b7c361e440826a
 DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
@@ -66,7 +65,6 @@ DIST netbeans-trunk-nightly-201610170002-src.zip 218266835 SHA256 57ea6623695297
 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-8.2.ebuild 15331 SHA256 c35725f6dee4e634e4de474617a307e2aaa6434a9569bffd9566304501adc9d5 SHA512 259c16a255409df4d0519bf7bddd4200ccaefdcbae4436fb321c33b215b757910c8cd807c8f142e8ae42ab4bd59478436ecee8c4d3d38615e8bbf110c265e950 WHIRLPOOL 07b86ee0c402eaed18f3a640ec5a447bbb781154e477db93ca51ee8034b991be39d8203c88ed0119bd785091cd82ae41367477e902dfb96ad41ca97410f5f41d
-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_p20160919.ebuild 15656 SHA256 638828772b4a1eee02bd29f203a2d5fd87b34e1bdcf33b017afc3bd8ca1968d4 SHA512 c05793c2adae49d7e429f91321a63b4c2c78d413ad7c1a369159d83d5a304fd2359da6f94a6e2b74e0dce5459f0d935198bbd2de31a2edcf023b5285b41402a7 WHIRLPOOL 65649d3c562af4547b3733e429165b10c0afdd5ea12b5461f352e111bfdee52b987cf8d14418a820380e4eb1ff7aa0f169afb065b3b03bd9ac173377c48d0d9b
 EBUILD netbeans-java-9999_p20160920.ebuild 15656 SHA256 eb5eeba801ce75f3e4c8b65a8930b64a8c8fedfb2bb4115dd5ee34cf8a9d055f SHA512 07f7890f532d744b55b10ddd06eb5df0fb1b373d8fe11ca31c805e5d3cd232523a7412e86fc960407c01292e554880af5576d56aefbec681bc8bd18516f3a398 WHIRLPOOL e216f0e2ec2b6aa1cbfb46a3c1e01f4f92e53182be1411efadc3a5e27d2857c232d0cc929bce1a086611e34e04fb209b20de394a3ea018d51f686e02a2723a54

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160916.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160916.ebuild
deleted file mode 100644
index 0f337b8..0000000
--- a/dev-java/netbeans-java/netbeans-java-9999_p20160916.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-09-16_00-02-33/zip/netbeans-trunk-nightly-201609160002-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 4f7b5df..26f1e6c 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -9,7 +9,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
-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-201609190002-src.zip 218003305 SHA256 b9524ea17aae5220e46bc2d7f603ed8c741c3f07dc18bb36bff6b8feb1b105e5 SHA512 711ed0e38e0ee172f6ab1b3411075c477f9d4d86b2efd317ba72a0c2b716ca736ac1458e43ca2a35bb564eac3592e829bc72d0fa28abfe6f77ad1e22d2bb9b0c WHIRLPOOL f4624966ccc61c3d5cd6a339fe6b1ee52a87e7a585b360582b0549c49ba703c64329fa38a0edb6a546e941114b8adcfd2ad8d76b23127b15e5b7c361e440826a
 DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201610170002-src.zip 218266835 SHA256 57ea6623695297
 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-8.2.ebuild 4646 SHA256 3eb779b4872b425a8f9ac0b2eb78984eba38c614d784be47af32a3fc90b8b2fc SHA512 361cb549efbb2835509d9a6aba409832173a4f3731e1ae31016a286faa9e8da94a206ec876109f1a1095fd1f7e9d73f3360c5c385802268314e93aed1f187218 WHIRLPOOL ff13272370d4782a140484c0d4967c3b2d16a2687c9fba444637577ac3560ac4cd23a67699debc539b884049a61feefe4cc91af842c3c0243ee9077a2b6b9c4f
-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_p20160919.ebuild 4971 SHA256 563d365faea9bfe643e866bb0275af353a7747d7c40f400ffbe9e088118746a9 SHA512 d19bfb9d047b3148b0696c765cb598c5edd1f9d4c896806221dab730bfd112e428e01769b913a18f10692d161c8e7deff41644b16415e136d29f06b88bc0fb24 WHIRLPOOL dde57e774f930f45dd5466b1bd2aaf71ef780bbe90f1d7bac3457784d1191593223bb519f118d37b1217e21c4ad2d78d1882aea64ac4aa059e305b6f38f1058a
 EBUILD netbeans-javacard-9999_p20160920.ebuild 4971 SHA256 f942b0a7bd02a0aea4e897b90fece8cbadaf0a96f9cd798aca9baa36dbe8a125 SHA512 1ed4a96dd17f5eeb5c7cd5c9a1cb65de911742a258f48a62d4ec4483a9f366e58484fdd6303a6fd97685fe0964bfbf0e565d4d24de263913a31466a9cbc65850 WHIRLPOOL b8dcca77e0eac26c38ff4b7b2fa742df2d91bdac2fa81e6d81adea7d944c15ece6967439e2ef4185b160a3892a7dfe8dc5a9f45f7dd3fa4e3bdc02c917b41249

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160916.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160916.ebuild
deleted file mode 100644
index 321f234..0000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160916.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-09-16_00-02-33/zip/netbeans-trunk-nightly-201609160002-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 d6f2761..ce40e88 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -9,7 +9,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
-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-201609190002-src.zip 218003305 SHA256 b9524ea17aae5220e46bc2d7f603ed8c741c3f07dc18bb36bff6b8feb1b105e5 SHA512 711ed0e38e0ee172f6ab1b3411075c477f9d4d86b2efd317ba72a0c2b716ca736ac1458e43ca2a35bb564eac3592e829bc72d0fa28abfe6f77ad1e22d2bb9b0c WHIRLPOOL f4624966ccc61c3d5cd6a339fe6b1ee52a87e7a585b360582b0549c49ba703c64329fa38a0edb6a546e941114b8adcfd2ad8d76b23127b15e5b7c361e440826a
 DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201610170002-src.zip 218266835 SHA256 57ea6623695297
 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-8.2.ebuild 5947 SHA256 1f1c2aab9b63d0e87c93339f5457515573248c09532f2596ad272001605d096a SHA512 d133bfe2588f9a766ef4d5f01f8f0aacd683813ee93815af11f4560b2a7a9d7c48e919d36f002e667aec6ac978f02e07bbaf67a26512b69cd965a8f238b2f60b WHIRLPOOL f5e83670d013e22d4448d70bfdf38ca28adf99b2418446aa3018a59b5fcb75d43ed932659e222e6383e75a56de2340b4f939066631efdfa98ab016e438bcfcd1
-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_p20160919.ebuild 6293 SHA256 da219b92ab3ae26abeae551d1dbd0926021cb15af68de0fa28d7bae8a6827b2d SHA512 d9aa5a63688034a3dde960b961092227c536f758f5d035f132fcf3a896b04ba75da938da44b37ee71f9ea97ea773b57a003fd6981150e8b3a97131985b16d349 WHIRLPOOL a22f3b5e07170e577d2f2d6439b4d372be37155e03581e88f61f1117748ccb0077cb768e3dfcdb523953fe69725d2adb46800149169ac4f8d390a664b8e6cbbf
 EBUILD netbeans-javadoc-9999_p20160920.ebuild 6293 SHA256 8e8a74e20716e35510182e53940b4097ded4257aa66f751175b0cce0bf4d2766 SHA512 e3dfb14914e0d4d5ccf5de51d04e5409dd997b5d5b9871eac23de200e8aa18520ffd40dc6b7d3c50062848aa756e97bf8fc9033a564390a031adf5100a19df2a WHIRLPOOL 23e795989fe821f5ec934f3ffafced8fe40ac19388d76e887ff7b83db2d05976ad64eb36cbcdbb507b9ffe6b49a0d4d7fa7e170a62ac81bcf8e8c5f50ddcddbf

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160916.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160916.ebuild
deleted file mode 100644
index 0e98b1c..0000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160916.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-09-16_00-02-33/zip/netbeans-trunk-nightly-201609160002-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 c354e82..465023a 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -15,7 +15,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
-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-201609190002-src.zip 218003305 SHA256 b9524ea17aae5220e46bc2d7f603ed8c741c3f07dc18bb36bff6b8feb1b105e5 SHA512 711ed0e38e0ee172f6ab1b3411075c477f9d4d86b2efd317ba72a0c2b716ca736ac1458e43ca2a35bb564eac3592e829bc72d0fa28abfe6f77ad1e22d2bb9b0c WHIRLPOOL f4624966ccc61c3d5cd6a339fe6b1ee52a87e7a585b360582b0549c49ba703c64329fa38a0edb6a546e941114b8adcfd2ad8d76b23127b15e5b7c361e440826a
 DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
@@ -40,7 +39,6 @@ DIST netbeans-trunk-nightly-201610170002-src.zip 218266835 SHA256 57ea6623695297
 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-8.2.ebuild 4392 SHA256 8f8d1cb51f4071d00fd550a3cbcf48df0e1f3ccc8906bb43d7c384adf3ac2764 SHA512 4b4f347d25f758fb8c3f9ece13f831ca2365e510b895f6cf71b8063213a8db6cbc83f4cc4c3173e3778a536e425e969e7810df79ceaa453ea57b502d5080b239 WHIRLPOOL 73f50442c2d03473d0e3075c6c90f6dde8900faea51ed19974445db7a6a2abba6f525511ddc58d9da03e011e851e5a58539b73fe6e1c5b408b3d000318ce5630
-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_p20160919.ebuild 4717 SHA256 c976e2244621bfd7cff2483a448665d6a7f807971704b9f966d58193c06167cf SHA512 2762e6b0d09128f977a1e67af39e50fdfc607fe660172b7ed38080830b5e18279efda98e1e2dbd59573db9d479b2dee65c2e347b3109cc466c3d7ba419930607 WHIRLPOOL 6aef12a5e53a93cedc787dc85c77e7d974f79897242f8b5ed573ac04a20d992280322cea208287d66fbd04ba7810c253ed8751d5e673706fafa1c7436dc723ce
 EBUILD netbeans-javafx-9999_p20160920.ebuild 4717 SHA256 dc9fa4554706242615ca9f44f012f17997545b2088dd276a309a22ae5f5f5e26 SHA512 f282a6ded78b8d1def6d5cc00de383dea78fac0dea4eb49d3f47afc987903495928845306299ad9dc7f11443f5c74e0305470804b7e045a00a194e5019cd0b64 WHIRLPOOL 77d6096e1f0561e7b2cc0a38be5eab3054e0d73cdad298629c80f99529d5572ebaf81559db526b1794c2d13ac29c6266253ee5ceea25bb2c9d7966a4bf2e88c3

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160916.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160916.ebuild
deleted file mode 100644
index f722722..0000000
--- a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160916.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-09-16_00-02-33/zip/netbeans-trunk-nightly-201609160002-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 0f69016..6387be6 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
-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-201609190002-src.zip 218003305 SHA256 b9524ea17aae5220e46bc2d7f603ed8c741c3f07dc18bb36bff6b8feb1b105e5 SHA512 711ed0e38e0ee172f6ab1b3411075c477f9d4d86b2efd317ba72a0c2b716ca736ac1458e43ca2a35bb564eac3592e829bc72d0fa28abfe6f77ad1e22d2bb9b0c WHIRLPOOL f4624966ccc61c3d5cd6a339fe6b1ee52a87e7a585b360582b0549c49ba703c64329fa38a0edb6a546e941114b8adcfd2ad8d76b23127b15e5b7c361e440826a
 DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
@@ -31,7 +30,6 @@ DIST netbeans-trunk-nightly-201610170002-src.zip 218266835 SHA256 57ea6623695297
 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-8.2.ebuild 4087 SHA256 38f5fef1c2f2ff5030842622999f12ca02d8978eea528a38a6bb3c0705e46344 SHA512 2b6c00f2f2003b336e25f6c4a524be1835c2565302ed43f3eade9cfb251d368eb94ad5fed01578561684e8a1ed37f3368c78b0b9d00ea6c794abf200f007525d WHIRLPOOL b990976000d451d23144bbf1378365ad019252601e261558750fe38821abbf293fb40ccd5a966890a688162aa05bb34fe69b78519fa2b09fef0a539a482bd5dd
-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_p20160919.ebuild 4412 SHA256 f50dcead7e961cf7dce38a249340b83ecc37e2eed5f0438930b410602a3824e2 SHA512 d13aa2bd7b51cfc20ae274affa0b246a116156bc4217c31a6d8461e29774d45740808e23a209ff756b04ff5211927dcefa876121e26ad8ea95960f84b903d210 WHIRLPOOL e7baa6941ccafba68f068d06aef3523b1b1a4433016f2a082848f182fda461909a78d0e6f4a8d9a6d62ec9f78af17b5d9f10f3857ad3ba6df0a9faea62e404fd
 EBUILD netbeans-mobility-9999_p20160920.ebuild 4412 SHA256 3020a5b9fe9ddfee9f58adc756b8c327fe580238c022342e8b5cc2829a03b068 SHA512 b87b67d64da0348cf36a89bca5d518c6af7ee2e1a5d45b7d5ad02bdf094d6c85f3294f8f36c1987a443bc4cdb44b79942ba009bd48b96234531929420bddbcad WHIRLPOOL 9a6f04e89311a9df34b07ebc78f3bf273ed6bd393e842cfbb726f791dfe528dc806d7a2f8e6a60ac51737cdf45e927da503649bff4c6d4dbee87cefde939cb45

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160916.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160916.ebuild
deleted file mode 100644
index 74ced7f..0000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160916.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-09-16_00-02-33/zip/netbeans-trunk-nightly-201609160002-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 7861482..8304f3a 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -9,7 +9,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
-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-201609190002-src.zip 218003305 SHA256 b9524ea17aae5220e46bc2d7f603ed8c741c3f07dc18bb36bff6b8feb1b105e5 SHA512 711ed0e38e0ee172f6ab1b3411075c477f9d4d86b2efd317ba72a0c2b716ca736ac1458e43ca2a35bb564eac3592e829bc72d0fa28abfe6f77ad1e22d2bb9b0c WHIRLPOOL f4624966ccc61c3d5cd6a339fe6b1ee52a87e7a585b360582b0549c49ba703c64329fa38a0edb6a546e941114b8adcfd2ad8d76b23127b15e5b7c361e440826a
 DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201610170002-src.zip 218266835 SHA256 57ea6623695297
 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-8.2.ebuild 3786 SHA256 52734d6772f8851119fd367429d69e4b2a1396cdaf0145cf5969a2532ecd2ec9 SHA512 52494c0b0b6988461d0ae2b730f2dce5a4ba7477851f3076637c4d4bba01525efa2ccd869db7f59827c201f47cdd933c25430fd441282bc6be41991f26af8370 WHIRLPOOL ca58b3abfe895c4c68b8b2bb60388924181fd9f44832281ec43d5561c36936ec13f189046bd9e6e12d17c80199a7692758ceabd903e839fd57c6776e3da21898
-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_p20160919.ebuild 4111 SHA256 8ae2a291a7603198dcff946e7806ad8f4beb788d5e3715a74556f6f6f6da5386 SHA512 899c46d9bdda7f35977caca7e6e564e1f10ff9f2d625326fc3e4a280820ff2c9df6283f9410ceecbc65dec624a07b265769dca3f2853d6289ef2c43b623989e9 WHIRLPOOL 669cf72063a9978917f584a60a465d2b9e7df186d0f7866a619e54b2382070286413104b7020676dbaf302cbd1673d8f3342548d18965c8719d203a9d74efdf5
 EBUILD netbeans-nb-9999_p20160920.ebuild 4111 SHA256 60dd1c81f381320e4ded3b4847bd1b27003ac60c6f94878b6cc64ad75df63608 SHA512 13da90d8791ee2d776edf5d1fe6025cca2cd13d0c6dec4107956bd05287d8c975a4ff51144c2c03ce4512fad17d140e4b0b2e77332d12e2a7623bb2f4a66b34d WHIRLPOOL 4d70778420193e47852797dddc67a3a3e21ff7ad0d8b6c87696a320528b08e6c90e5b39f070b3d7394b01448dd0fec28a59bdf7833025d69e72354aae1d62898

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160916.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160916.ebuild
deleted file mode 100644
index 1ab2344..0000000
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20160916.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-09-16_00-02-33/zip/netbeans-trunk-nightly-201609160002-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 6dce40b..4fa70c7 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -11,7 +11,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
-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-201609190002-src.zip 218003305 SHA256 b9524ea17aae5220e46bc2d7f603ed8c741c3f07dc18bb36bff6b8feb1b105e5 SHA512 711ed0e38e0ee172f6ab1b3411075c477f9d4d86b2efd317ba72a0c2b716ca736ac1458e43ca2a35bb564eac3592e829bc72d0fa28abfe6f77ad1e22d2bb9b0c WHIRLPOOL f4624966ccc61c3d5cd6a339fe6b1ee52a87e7a585b360582b0549c49ba703c64329fa38a0edb6a546e941114b8adcfd2ad8d76b23127b15e5b7c361e440826a
 DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
@@ -36,7 +35,6 @@ DIST netbeans-trunk-nightly-201610170002-src.zip 218266835 SHA256 57ea6623695297
 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-8.2.ebuild 4093 SHA256 849571671ca312e7c0f800927c355cc43497e2c1f0608ca59fc24a6e1c27700a SHA512 ce37abd91c8bed53c0ec17a71491c1ae734e973f1d537e8163e1ad49ef4ef7b7e26b9a5c8d58d9b43875f8d265e05664b9029841797e2207c9d8ff95467a573e WHIRLPOOL 3f1207f96c384836bd834ccc5287954b8767d8569cb1e0184d48da740de4c241d182d8016e53c6133f9c23788bdc168d4ce601141e88488329b299ce23e64e39
-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_p20160919.ebuild 4418 SHA256 eb8f9adae0721a6ef1888647160d5e3abc7453255a0840d38f253fc34c0f3c0c SHA512 52e42f125edeb13f965d7b229ff5cbdd62e8aa599911900b2a5b15eacfedcc54ae05160aaf3d094cfed7d898060c72be60c6ea85df6e083d8a8bcd48a0d54ec9 WHIRLPOOL 11957da397df21766049341e13c5b7abdfd4809518d772a72ae50b9568836386f289e7fd58110d26e200f57273961d68feff4afaeb380c4fe639b0e6aaed84bc
 EBUILD netbeans-php-9999_p20160920.ebuild 4418 SHA256 158832e6eb864b252f9b66723a49ec67146aa6a9cff6d87ac1ca319ebd2e9003 SHA512 ac9631c0c4ea2be2e8cc87fb9f09a1c87108cef9528e596c4a867d797814c32cfd0a11f0bed794aa5312a98d8be9d1fc84ecc08fe122441ace995b6a69bb2952 WHIRLPOOL 293473594db3debe4580d2fa3e54ea8791202ce72228bb545d7e29db68f867c9e259ae8ee16172709ed6daa160499eb37bd628a9543f3e3380abfb1d15a49ce4

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160916.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160916.ebuild
deleted file mode 100644
index 8b05367..0000000
--- a/dev-java/netbeans-php/netbeans-php-9999_p20160916.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-09-16_00-02-33/zip/netbeans-trunk-nightly-201609160002-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 a56e5f1..cb8a284 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -32,7 +32,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
-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-201609190002-src.zip 218003305 SHA256 b9524ea17aae5220e46bc2d7f603ed8c741c3f07dc18bb36bff6b8feb1b105e5 SHA512 711ed0e38e0ee172f6ab1b3411075c477f9d4d86b2efd317ba72a0c2b716ca736ac1458e43ca2a35bb564eac3592e829bc72d0fa28abfe6f77ad1e22d2bb9b0c WHIRLPOOL f4624966ccc61c3d5cd6a339fe6b1ee52a87e7a585b360582b0549c49ba703c64329fa38a0edb6a546e941114b8adcfd2ad8d76b23127b15e5b7c361e440826a
 DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
@@ -57,7 +56,6 @@ DIST netbeans-trunk-nightly-201610170002-src.zip 218266835 SHA256 57ea6623695297
 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-8.2.ebuild 9195 SHA256 6d0332d7983992e46c28840c56a9e2d2fd3fe7cde121f7b3b0fd861c2c2fe87b SHA512 3b62b7a2c35d6a4f124e17724a60145a673464d406d93925de616db07413d585b69a8dc6725c6c3e3ecb0f5ef89a9153c7d527b0d9e9c2922488f73f65123ae0 WHIRLPOOL dc00da4b290ae6148e7cd1636703207903688fc4f5a9d3593ed904aabf327358cac670b739e68ebf4514edf6d4d9ae5079082b84d3c11aafdbd586d5c15bc8d6
-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_p20160919.ebuild 9520 SHA256 ad6916a655bbb2548cff09be271b72c464e6ce06fd89199b38508b23afc6fc9f SHA512 233ba9c8e1bd5c098eec4635605c68142a83fdca4c099ccce8e5093dcf4596a221c7c4d4bf86cedb66b21b5e4443197d0007c4294bd916dd4f4ef8d9c15afa27 WHIRLPOOL e0c9aa76b542db6a654d2e3c4ea789d1b79c42d88be829e2156f2cd8dfc6ff7b0d908d8a77403aab62a04e0b8c33c509a7b0ac0fbc84fa501e91b5e9e404d7e2
 EBUILD netbeans-platform-9999_p20160920.ebuild 9520 SHA256 3920316f3bdba192111215e9fd7f95bd18f78d71a2fb90c0153328db8432bd9d SHA512 920861657aa16dae7e4247b1d61ad307b142d4c06c10f03f6362c103f25de5d10d842f1909479e33606560dba8558e7cabf20f0abbc1d6cc55fd9466bf7ec0c8 WHIRLPOOL b054ea3e99895981cbd2ee79535752f766ea112dec6d9daf5fdf7d97e705828a911698737f6292d8e1fe22c514e1bbf0ad675ac5506a399bdb320b8f1959585e

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160916.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160916.ebuild
deleted file mode 100644
index b51245f..0000000
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20160916.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-09-16_00-02-33/zip/netbeans-trunk-nightly-201609160002-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 97204df..cdb4816 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
-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-201609190002-src.zip 218003305 SHA256 b9524ea17aae5220e46bc2d7f603ed8c741c3f07dc18bb36bff6b8feb1b105e5 SHA512 711ed0e38e0ee172f6ab1b3411075c477f9d4d86b2efd317ba72a0c2b716ca736ac1458e43ca2a35bb564eac3592e829bc72d0fa28abfe6f77ad1e22d2bb9b0c WHIRLPOOL f4624966ccc61c3d5cd6a339fe6b1ee52a87e7a585b360582b0549c49ba703c64329fa38a0edb6a546e941114b8adcfd2ad8d76b23127b15e5b7c361e440826a
 DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
@@ -31,7 +30,6 @@ DIST netbeans-trunk-nightly-201610170002-src.zip 218266835 SHA256 57ea6623695297
 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-8.2.ebuild 3147 SHA256 74556e56694578c6645cae3aa5257abe399a984e11d9982e49051731f1f1cf95 SHA512 3f4e0998aca161292f813d50e0e6420225b24e2020812011d5cb28e9465514855766bd9d4508b8739c9a38c9fb3d8cc652a69f722470bfeda968fae453183b10 WHIRLPOOL 3dc0441cb0fadae8cfc315c11826ae020d4242e0fa0901fa147a90777a9b2dc33c6081f2f251b5b2ac9f9fd32f03ad87cf999956dcdabe4fe339ee1b48976849
-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_p20160919.ebuild 3472 SHA256 0025d9db2480a5dc66a77bd2689193a2133ba8e13d00816030276bbb6cde5c0c SHA512 4fb14b2f2b5c30089da8a1cc381554e0930653112c20ae533bf7d373e5922f43deb7774f680ebe28293216f55d2ea0301b0b569483e66285090da36f9810308b WHIRLPOOL cfadc0f361186f2ed9eacac00616b2965e1f5980d7c3e2dc679bb983077b34100caac79b6f01e26d6596e5201d926766f5c929069c1d771147263775f06a1e36
 EBUILD netbeans-profiler-9999_p20160920.ebuild 3472 SHA256 1d2c754743334e7c82cf76045c3544ec639e2f0db4fea9acb52b9d4d981990fe SHA512 5f44819d0eb17fc1c64bb1f92177bc8feae4a6c2eca80261d3b81641bbcaf805d742606e29d13c346e584862bdded19b09a32575deee6b9af54056f7673d5fc2 WHIRLPOOL 8b09a95ee22796c099a3349da1f493129b2d56df6b9f4725262a961c458c9ba63dc33ad849a63617f37d550a07dee0c3e7b77b373abcc8c964db5225154ac2a2

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160916.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160916.ebuild
deleted file mode 100644
index f90782c..0000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160916.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-09-16_00-02-33/zip/netbeans-trunk-nightly-201609160002-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 f3a22a0..0b397df 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -25,7 +25,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
-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-201609190002-src.zip 218003305 SHA256 b9524ea17aae5220e46bc2d7f603ed8c741c3f07dc18bb36bff6b8feb1b105e5 SHA512 711ed0e38e0ee172f6ab1b3411075c477f9d4d86b2efd317ba72a0c2b716ca736ac1458e43ca2a35bb564eac3592e829bc72d0fa28abfe6f77ad1e22d2bb9b0c WHIRLPOOL f4624966ccc61c3d5cd6a339fe6b1ee52a87e7a585b360582b0549c49ba703c64329fa38a0edb6a546e941114b8adcfd2ad8d76b23127b15e5b7c361e440826a
 DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
@@ -50,7 +49,6 @@ DIST netbeans-trunk-nightly-201610170002-src.zip 218266835 SHA256 57ea6623695297
 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-8.2.ebuild 5917 SHA256 c035b5efd55709fe58822548a97119768f99f33d025869d97da3d895c0e8e9a0 SHA512 5a5d6273239984590791ca40d4caaefee9f30c8ea44a4ec2d5abc07f087bcf4f4f35df444944badb7f7d80604d146f6768dcef5de911ac90b9b44891c6a02a9b WHIRLPOOL af8d1d6c692b206b90bbb81d54d839a486a9cbec1f38e6fb09b5745aef87a5c3de3961f0512f731e63abd8fc3fb54e03a70449034095173c2541ea7a12bdf389
-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_p20160919.ebuild 6242 SHA256 68b6b1f405e5d1fc5e4ac1166562411fd0e6b17d4546cf2f580f345ec503942a SHA512 da89cdf7f4a5ec551ea5dbfe16753c34a0e8524fc8e6a693267ac375e6c78787ae1787d6abfba914312da6d4cc239c6d28423e2cd16374d490230706afa6ea3d WHIRLPOOL cdc7b4e457ee3f6c2757629ad44321c56de415d00a354e09ccf7a1bef19a29cd9b6fde0daf5ac7e94731c784d723c1b9574da215670e9a9a3552c2e5d95d2141
 EBUILD netbeans-webcommon-9999_p20160920.ebuild 6242 SHA256 2d6623d7c15892c091adb90b7013b627794b6e509391168a1b2cd50183d30049 SHA512 50ee074d0bbe0cc161b730516252dd993b01c3fa781c2b12e6d04c4b6e1b5a56814b99026894807c779a48e0a1c2019e8aeceb86d9ad1d38f44fceadc08cbd0f WHIRLPOOL 0f14c23b86ddf85e74993c07409736e783bf9355bb4774adb7e7ae072b25adf4df46db69c8bc448a17749bb47794fc09b8f4807c998e7711b8dca5de9340cc30

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160916.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160916.ebuild
deleted file mode 100644
index 1b2dd28..0000000
--- a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160916.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-09-16_00-02-33/zip/netbeans-trunk-nightly-201609160002-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 3c56168..9e4bf5a 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
-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-201609190002-src.zip 218003305 SHA256 b9524ea17aae5220e46bc2d7f603ed8c741c3f07dc18bb36bff6b8feb1b105e5 SHA512 711ed0e38e0ee172f6ab1b3411075c477f9d4d86b2efd317ba72a0c2b716ca736ac1458e43ca2a35bb564eac3592e829bc72d0fa28abfe6f77ad1e22d2bb9b0c WHIRLPOOL f4624966ccc61c3d5cd6a339fe6b1ee52a87e7a585b360582b0549c49ba703c64329fa38a0edb6a546e941114b8adcfd2ad8d76b23127b15e5b7c361e440826a
 DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
@@ -31,7 +30,6 @@ DIST netbeans-trunk-nightly-201610170002-src.zip 218266835 SHA256 57ea6623695297
 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-8.2.ebuild 2396 SHA256 a015f50a9fcebf084d42a550d5a654e80129a5d92d2bec7cfd543d065a4c32e2 SHA512 cf4fd6fcb2ea088be645a79009205a84588c9c7f1b7e5ceeb9c95552ffba860d211e3d6b4fe95196e652f5c3c5665638ee95f1ca8f2f5b938d2b09100dc186aa WHIRLPOOL aa37154ee5fdb6ff7892e3bc1218c37b45fcbfc7a4da81c8cada6d9b50a1bbbc51c685b00389d1114f3d0ae84d5a06d9e10ba0e9101f385e6cb59358eef3e59c
-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_p20160919.ebuild 2721 SHA256 e35b28975a8097c992dc5e0784b380e762f8a0e276b02ef5c9514d9c1b14db2d SHA512 054bb48cc2bc462fc422571e78ef8847db0caa988c42cfdb67ba3bdf9ba4cb28fdbc28a565b095a595caea157c8ef2a87136769994cf76b35fac7e61ac3bcffe WHIRLPOOL 672e8bee38d048d78b9ea03469ae2f5064cb853225c98746adc9c3f8f929309f9bf2d1cf476c188a151871b07c690e2c5df12903a54d3307c8c2733012558448
 EBUILD netbeans-websvccommon-9999_p20160920.ebuild 2721 SHA256 e5ae98c4f2c8d36da6d8921971a44b508599ae60c8eed0b510f76fd4b57923c4 SHA512 a4f2ac41778fc3e8051908368999c489ef004d57194e37ead79a51a84e1fcd97567eac5215f40f8c092e75234d763af8b3820511e3fc88f775927ef3ce06e4fc WHIRLPOOL 34b923a7914c303c46fb787826ae10dcef1888db342d2c5c2591e28c85f665d295995bcddca09acd89ba3548da81e5dfb36c128d879471ea2df8365139386039

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160916.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160916.ebuild
deleted file mode 100644
index 1d6cf3f..0000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160916.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-09-16_00-02-33/zip/netbeans-trunk-nightly-201609160002-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 6369c3e..a8d41aa 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -11,7 +11,6 @@ DIST netbeans-l10n-8.1-20151105.tar.bz2 11945028 SHA256 33e86aa7315021d28fdb6479
 DIST netbeans-l10n-8.2-20160920.tar.bz2 12723797 SHA256 90d09843d2e0256f3196f4ea2fe9cdfd77d811f366a5d8cf13320cd813c7cc7a SHA512 4ac086e8189d89e7a0b91e7e03352f691f09edf208017062a8fc798e6f54906f1c85112dd2780feefa6a21c8fcb582b91bdd9758f5a90c05cbd2e3042d6c87c3 WHIRLPOOL 1002d7c6769eb9b4c0ae02e6c17ea91a064e7bbf99e151b720967f70a28bad3159fe5804f3c4ece62f7025da661bc717a098883995b0bebbdb7342b685cd475f
 DIST netbeans-l10n-9999-20131010.tar.bz2 12440242 SHA256 64c48605820ec1f35e38c34b48cc16cd40c053d085d50819d4b4e9a80453dfa9 SHA512 7d4d61fa61710186fefd90721598ec635db7c6249ce6fc484fd5813636220f163b60230349c984c398c87e083d2d629c531fe5b4cea3752ebbcaa9823b701a02 WHIRLPOOL 10506e3a3004d6c0ab17b05507f72db2c25d2713c3233a7f5478da27d3b1261b5fb6d5f71cbf369858668ca2d1219dad1900c6c42d3f250adcc935e846e56b09
 DIST netbeans-l10n-9999-20160920.tar.bz2 12724225 SHA256 f7bf8748874b30e7553c0f63492d556d24764bb4c8ea0083ade37707db0db0d1 SHA512 777160e22f648cd4c6343b51212c1a1ab5de31e84a36b8581dc3742aec7933122edc5215292ddb43df69960b6baaa8670b1b204c4728772627347b2bdcfa6254 WHIRLPOOL 9de45a38286d003e549da4eba2e1379c349d0aed4025e9c0697942a2596087994b428cf8843f3dbf2ac09524bc41aaa5ac1e7c810c78207a220af143cdc794ae
-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-201609190002-src.zip 218003305 SHA256 b9524ea17aae5220e46bc2d7f603ed8c741c3f07dc18bb36bff6b8feb1b105e5 SHA512 711ed0e38e0ee172f6ab1b3411075c477f9d4d86b2efd317ba72a0c2b716ca736ac1458e43ca2a35bb564eac3592e829bc72d0fa28abfe6f77ad1e22d2bb9b0c WHIRLPOOL f4624966ccc61c3d5cd6a339fe6b1ee52a87e7a585b360582b0549c49ba703c64329fa38a0edb6a546e941114b8adcfd2ad8d76b23127b15e5b7c361e440826a
 DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
@@ -36,7 +35,6 @@ DIST netbeans-trunk-nightly-201610170002-src.zip 218266835 SHA256 57ea6623695297
 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-8.2.ebuild 6152 SHA256 ddb5db62422e635ff3aee1137e93bb45cdee59adf1d6444d3291659846810d0c SHA512 f20b5fce0a14233796ebf4bc2a6669bb6d9f429fecc05564bc2170a8577c1c7dd64c027a4c8f3ab929e12d1e258fc5718f073050efc6ecccb01b1bbc33f8903e WHIRLPOOL 017adf9ee69bc95e291a73419d2c043acb3d1c67ecbd73c8e2f924e408562c46b5c9eb0ef58a6f02562a879dd5aa0080ed84ac16bd5502f361c925d1db3aaac5
-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_p20160919.ebuild 6939 SHA256 e54bdc55ce4a41e22b13568feaaf2628c9f2d0ecc354bd88bd5d6a56c37f146d SHA512 4029e527032aeb4a77a4452aab83a412be15f153c1bbe2b4dd41ebe2a27b5a5201a5d3abd6a1487115b692c7623a6253fd7572e7739aa375f2269a15f936af2b WHIRLPOOL 6a324b01be54775024419b1508bdd4645785b64c12ac2702d629733d0da1e93e7a575f52a06e7990c018daf7e106f81b9f4556fffc2a3b89bc99b0cbe0fd2dc3
 EBUILD netbeans-9999_p20160920.ebuild 6939 SHA256 56c017c40bedb1f60809d6c5e5357cf129aac1ab641232f353686ae0cbcfd365 SHA512 c5e783d4dd76b4440a8fcad2525ef9d27ac231a3a268752a2f6e618027cc32ddf0d11f332f643e161cfedd2c486b505274975d2fc18919af2eab710f699a0b74 WHIRLPOOL 9e3ac1d498f3f63fa9caab53eac68d58220d16f5a14810598599ce941e3bce1f69777c665ca9b34f0ec6af8171f9858d8032f932854456cf9f6ac2f4f80df477

diff --git a/dev-util/netbeans/netbeans-9999_p20160916.ebuild b/dev-util/netbeans/netbeans-9999_p20160916.ebuild
deleted file mode 100644
index 065bdba..0000000
--- a/dev-util/netbeans/netbeans-9999_p20160916.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-09-16_00-02-33/zip/netbeans-trunk-nightly-201609160002-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-10-18  7:35 UTC | newest]

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

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