public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-mobility/, dev-java/netbeans-websvccommon/, ...
@ 2015-01-23  9:11 Miroslav Šulc
  0 siblings, 0 replies; 4+ messages in thread
From: Miroslav Šulc @ 2015-01-23  9:11 UTC (permalink / raw
  To: gentoo-commits

commit:     dc49a09971d11224a083dc7b64244caf124914f4
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 23 09:11:24 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Jan 23 09:11:24 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/fordfrog.git;a=commit;h=dc49a099

netbeans: bumped to the latest sources

---
 dev-java/netbeans-apisupport/ChangeLog             |   6 +
 dev-java/netbeans-apisupport/Manifest              |   4 +-
 .../netbeans-apisupport-9999_p20150123.ebuild      | 111 ++++++
 dev-java/netbeans-cnd/ChangeLog                    |   6 +
 dev-java/netbeans-cnd/Manifest                     |   4 +-
 .../netbeans-cnd-9999_p20150123.ebuild             | 125 +++++++
 dev-java/netbeans-dlight/ChangeLog                 |   6 +
 dev-java/netbeans-dlight/Manifest                  |   4 +-
 .../netbeans-dlight-9999_p20150123.ebuild          | 101 ++++++
 dev-java/netbeans-enterprise/ChangeLog             |   6 +
 dev-java/netbeans-enterprise/Manifest              |   4 +-
 .../netbeans-enterprise-9999_p20150123.ebuild      | 249 ++++++++++++++
 dev-java/netbeans-ergonomics/ChangeLog             |   6 +
 dev-java/netbeans-ergonomics/Manifest              |   4 +-
 .../netbeans-ergonomics-9999_p20150123.ebuild      | 101 ++++++
 dev-java/netbeans-extide/ChangeLog                 |   6 +
 dev-java/netbeans-extide/Manifest                  |   4 +-
 .../netbeans-extide-9999_p20150123.ebuild          | 108 ++++++
 dev-java/netbeans-groovy/ChangeLog                 |   6 +
 dev-java/netbeans-groovy/Manifest                  |   4 +-
 .../netbeans-groovy-9999_p20150123.ebuild          | 111 ++++++
 dev-java/netbeans-harness/ChangeLog                |   6 +
 dev-java/netbeans-harness/Manifest                 |   4 +-
 .../netbeans-harness-9999_p20150123.ebuild         | 114 +++++++
 dev-java/netbeans-ide/ChangeLog                    |   6 +
 dev-java/netbeans-ide/Manifest                     |   4 +-
 .../netbeans-ide-9999_p20150123.ebuild             | 373 +++++++++++++++++++++
 dev-java/netbeans-java/ChangeLog                   |   6 +
 dev-java/netbeans-java/Manifest                    |   4 +-
 .../netbeans-java-9999_p20150123.ebuild            | 253 ++++++++++++++
 dev-java/netbeans-javacard/ChangeLog               |   6 +
 dev-java/netbeans-javacard/Manifest                |   4 +-
 .../netbeans-javacard-9999_p20150123.ebuild        | 134 ++++++++
 dev-java/netbeans-javadoc/ChangeLog                |   6 +
 dev-java/netbeans-javadoc/Manifest                 |   4 +-
 .../netbeans-javadoc-9999_p20150123.ebuild         | 168 ++++++++++
 dev-java/netbeans-javafx/ChangeLog                 |   6 +
 dev-java/netbeans-javafx/Manifest                  |   4 +-
 .../netbeans-javafx-9999_p20150123.ebuild          | 124 +++++++
 dev-java/netbeans-mobility/ChangeLog               |   6 +
 dev-java/netbeans-mobility/Manifest                |   4 +-
 .../netbeans-mobility-9999_p20150123.ebuild        | 126 +++++++
 dev-java/netbeans-nb/ChangeLog                     |   6 +
 dev-java/netbeans-nb/Manifest                      |   4 +-
 .../netbeans-nb/netbeans-nb-9999_p20150123.ebuild  | 148 ++++++++
 dev-java/netbeans-php/ChangeLog                    |   6 +
 dev-java/netbeans-php/Manifest                     |   4 +-
 .../netbeans-php-9999_p20150123.ebuild             | 127 +++++++
 dev-java/netbeans-platform/ChangeLog               |   6 +
 dev-java/netbeans-platform/Manifest                |   4 +-
 .../netbeans-platform-9999_p20150123.ebuild        | 153 +++++++++
 dev-java/netbeans-profiler/ChangeLog               |   6 +
 dev-java/netbeans-profiler/Manifest                |   4 +-
 .../netbeans-profiler-9999_p20150123.ebuild        | 121 +++++++
 dev-java/netbeans-webcommon/ChangeLog              |   6 +
 dev-java/netbeans-webcommon/Manifest               |   4 +-
 .../netbeans-webcommon-9999_p20150123.ebuild       | 123 +++++++
 dev-java/netbeans-websvccommon/ChangeLog           |   6 +
 dev-java/netbeans-websvccommon/Manifest            |   4 +-
 .../netbeans-websvccommon-9999_p20150123.ebuild    |  94 ++++++
 dev-util/netbeans/ChangeLog                        |   6 +
 dev-util/netbeans/Manifest                         |   4 +-
 dev-util/netbeans/netbeans-9999_p20150123.ebuild   | 264 +++++++++++++++
 63 files changed, 3417 insertions(+), 21 deletions(-)

diff --git a/dev-java/netbeans-apisupport/ChangeLog b/dev-java/netbeans-apisupport/ChangeLog
index a20032f..5da8314 100644
--- a/dev-java/netbeans-apisupport/ChangeLog
+++ b/dev-java/netbeans-apisupport/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-apisupport-9999_p20150123 (23 Jan 2015)
+
+  23 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-apisupport-9999_p20150123.ebuild:
+  bumped to the latest sources
+
 *netbeans-apisupport-9999_p20150122 (22 Jan 2015)
 
   22 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 413a915..169126f 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -41,6 +41,7 @@ DIST netbeans-trunk-nightly-201501190001-src.zip 201391445 SHA256 ce4ec7706f8073
 DIST netbeans-trunk-nightly-201501200001-src.zip 201396862 SHA256 1a9378d8f52c4f617653d096aff287cf62212af8a6f878fe54cc468e4dd4bed7 SHA512 92fd39cda2d11816b9a01e0e5c26b3f527354a69efdc940cb27d5b17ee6493a07225d2698260db2bdc220e01d166ac42b5fb62f809d1e2eb84419c6e6abb3e14 WHIRLPOOL c3ba7155b5d376041d750c42f1ff8f8dec5bdbfedb470dea483a665978ef3982f087cb7a521f7892c264bb38d0876e4e7a08346ae4579338ba698ae7ee4ba456
 DIST netbeans-trunk-nightly-201501210001-src.zip 201405381 SHA256 95369f4a232531feb195f2d41c14b7ec9791bbd86282fc8155bb1828affe6afa SHA512 4e710bc5905ea83167152e3252a4309d6a4f6fe8f0ccd8f50bd6389635cb2c4fa1cda60c9c9df8d70149ef84bba66527a8c94b1822710421aa704d374a0132b5 WHIRLPOOL c6780c694d1acabd53ca2b23ac660d587b02f63f3f8b5a98c7e293af4e099dfc46dcd5dcd939d7133edb5885388150fd28723b6325678519a80f2cd0ea673ac8
 DIST netbeans-trunk-nightly-201501220002-src.zip 201432275 SHA256 1969c39ce22136b5ff98f7959bf96088b7caaf9ea46df54ff0ed01ca857de8df SHA512 dae7c345289746e85ea6bf99a6352fcb53ec02c8828bf447a686aed0cea577de11e75e89451abf76a1dee3b1d91aaa204dbbe3057ca40c58759f16a4d768b7a9 WHIRLPOOL 39163c8ccac8111c9ab2a0787a2bd137a680bd16eccf4a7e526cfe34c74df0efa957b320df52b92fe9f1dbd134e7e2b2e1479c237b78e7a060c3893aac8838f9
+DIST netbeans-trunk-nightly-201501230002-src.zip 201448361 SHA256 9705937c7762d0df36dd885713111a80c01b67f17c2257423961ec7c25acf546 SHA512 c6a11a10357a44e899e621d4402daa6b435ec285c467d44d636e3c3c457f025225bb7594b84c7ee526fd7c416441960350645f098860e858cdf7106ccf694ee4 WHIRLPOOL 03b767b926ff881cea4b2227b11e0ef9b7b866d88d6b05f7f90419de7ff19216fbb785a9bf74c5db5b533b17186393e1d4280dc3c38dcdd9afa8440239fc6113
 EBUILD netbeans-apisupport-7.0.1.ebuild 3134 SHA256 41c32033c9945a39c0aebb6b0271767031d53a47e5c8365d9e3a7c86712e24cd SHA512 dd4bdde9574a87b46b02fd7204b1e90394bd87dc572dfa015b601203b026b35571f20323db834a310f90aefe6e4a822044b0d71d535a7351137219b50ecb2aa8 WHIRLPOOL f3721521a33b337d7dc24d6b49b0b2fe723f5ec446a5a4befb085051140a41bfd2d3081876e9f02f8b9932a3a0997b92211cd964fe372e40b42813df5db5170e
 EBUILD netbeans-apisupport-7.1.2.ebuild 3143 SHA256 cf24048c0ecca98a7d6371624bb0ddfb78663bead073d515a7c84229dbec00a8 SHA512 ec44c263e786210fd64c9ebb253bc9d4fc34d3be9493157dad06007c19734672bfd767765c003393d1e5cc6755fd5d1eda956b00c2092e98592a73ec1af4e729 WHIRLPOOL d619c304a994a2b818d892fb6315d092588f2ebf95e566f7a909f92daf21bb368a28c4e1af876ae585980dc82996e62aba30b12c41461103c23620a215480b76
 EBUILD netbeans-apisupport-7.2.ebuild 3126 SHA256 b0d64795b8403a932e3e20721a116c755c4de66fc36f7191476fcb4a226bad13 SHA512 cea062a72a8e75a9c2fe91c323f83d542a70149336360e1c41479f401fcae5ead6a301c8a7d5704d5beb27f7810b5d1e3cff0196cce7a26890a001c570179f6a WHIRLPOOL c286f4e4d3a02cbeb1a6e13b2005dc5435a6e9ec026a98fcc00bb83222014b800cd83f437c69352b48d16bdf442a6c7ebbed6aff86f10b3c5e6cdfb7edd9e184
@@ -76,5 +77,6 @@ EBUILD netbeans-apisupport-9999_p20150119.ebuild 3390 SHA256 c98effa1386e5ddcbe6
 EBUILD netbeans-apisupport-9999_p20150120.ebuild 3390 SHA256 bf1fab0ecdaa7f6aa37cf41366d44233da2ae492eb1016ed8aa17312a2d6fbe7 SHA512 0121916113a461c4acffe166c0555fb1620ae4f343e5ecb80524b4377e110a5344f528ce6db081fac0fc3938b516704b6c352b6abaf5b8d6608597fd737d0ebd WHIRLPOOL 15ffa2ae2b8bff82cfc99749343214e4af4a3855ee6499de1c7f6562fe473d2eab8a8dafa1335f3838a6f66125e2fe4df196de4749298bac81c2ed93ed738260
 EBUILD netbeans-apisupport-9999_p20150121.ebuild 3390 SHA256 502a7a03367cf511f4466fe74e421c3ff4d4ca6ef4e1e312b59faddf4d7f0a32 SHA512 74fae0356af0c98fc9f3724cdd6304501f1714d7f47c8df8236e24543a7813cf93a61a12751f8fb62c836d2e81b877d48b894fd9fb4409c5cbc292f9442acf0e WHIRLPOOL 3db8faf41126c6cea11b4b3e785d905c994006344c6076b75d26be491c840e8f96c798f88585fae4da50024d08d99536e0d5446958cd7907fa6a1a848b71e529
 EBUILD netbeans-apisupport-9999_p20150122.ebuild 3390 SHA256 f31fd3dd9bfe3fa9257a01defff3ea415519635b2954284aaf0b8e037dbb8f11 SHA512 4e618c6ef508fae324052923443965cbc47ec9ff239d60b0c893d984de81f9e3a8ca0f1621407247383f6a90928ba44ff2f416a8b4f106c79f6340362a48db22 WHIRLPOOL d086b3a91931c176b10dd23dacfed89961f0972b8c849717961fedf186b9727373f65008bd6aa49d31d38680db31aeca13b97b80f28ec44b8f6056771b644543
-MISC ChangeLog 154926 SHA256 9edab257a69305f60277ed8b51cd3f538d134f1cf7ef2fcd7b6d8c2b43659d53 SHA512 db73777eef107fef62eee3429982c33a4862a0a4c741ba0beb4ce7be8819c9fe18f3caebd2d4bbc9b450527b67b540438ff1d0d44737a1b11ce3480db880630a WHIRLPOOL 6eec250064c234f7e462a64103952f25433ceebe953ef50be350b32c368bcf27fcca5916a5f7ab1cf1c6f5e57729855d297b4770859a3373fb10e80de84fca7c
+EBUILD netbeans-apisupport-9999_p20150123.ebuild 3390 SHA256 4715f774fa726124b5e2404b4ba0311b9761aec64e9fafc5876467eb9113bd03 SHA512 77953186bf53b5e7eb54e555fce74272d8ecf50d8374000044f8c56bf1d0cac01897ae8c4435a6d9f1df1611d15606c40f40b83cf7a2675c8bf302861020472e WHIRLPOOL e7bd4c8ea808a8b04e7ae046e8b44760416876fc6620109b86f2ad1bf19a55753f247dcce3df034b03df6187880eff53f9fc059ceb1fa606c38ea6246758db92
+MISC ChangeLog 155107 SHA256 13a263cf7bd302cf8e61fcc4d5f9f918d6e7292a8ddfa4882f5d985e9d5983d1 SHA512 3b6c2725bcf5f078f247625e1c8af10fbf430983e647da05e62752260e013068f1cc029fa772c7b2103e860f6b1a213318fba204807b6b6e097db82765710a5c WHIRLPOOL a329a0d5bf79348479d34b488b9726413222a7dafd027f591633ae103721684709a92cf9e05844159ca40c924da897b132bf45f7fd4b9b2740ec62c2eb6f3445
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150123.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150123.ebuild
new file mode 100644
index 0000000..9ad2184
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150123.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-01-23_00-02-29/zip/netbeans-trunk-nightly-201501230002-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/ChangeLog b/dev-java/netbeans-cnd/ChangeLog
index e876579..d71df68 100644
--- a/dev-java/netbeans-cnd/ChangeLog
+++ b/dev-java/netbeans-cnd/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-cnd-9999_p20150123 (23 Jan 2015)
+
+  23 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-cnd-9999_p20150123.ebuild:
+  bumped to the latest sources
+
 *netbeans-cnd-9999_p20150122 (22 Jan 2015)
 
   22 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index 4dc93e9..a1a2541 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -54,6 +54,7 @@ DIST netbeans-trunk-nightly-201501190001-src.zip 201391445 SHA256 ce4ec7706f8073
 DIST netbeans-trunk-nightly-201501200001-src.zip 201396862 SHA256 1a9378d8f52c4f617653d096aff287cf62212af8a6f878fe54cc468e4dd4bed7 SHA512 92fd39cda2d11816b9a01e0e5c26b3f527354a69efdc940cb27d5b17ee6493a07225d2698260db2bdc220e01d166ac42b5fb62f809d1e2eb84419c6e6abb3e14 WHIRLPOOL c3ba7155b5d376041d750c42f1ff8f8dec5bdbfedb470dea483a665978ef3982f087cb7a521f7892c264bb38d0876e4e7a08346ae4579338ba698ae7ee4ba456
 DIST netbeans-trunk-nightly-201501210001-src.zip 201405381 SHA256 95369f4a232531feb195f2d41c14b7ec9791bbd86282fc8155bb1828affe6afa SHA512 4e710bc5905ea83167152e3252a4309d6a4f6fe8f0ccd8f50bd6389635cb2c4fa1cda60c9c9df8d70149ef84bba66527a8c94b1822710421aa704d374a0132b5 WHIRLPOOL c6780c694d1acabd53ca2b23ac660d587b02f63f3f8b5a98c7e293af4e099dfc46dcd5dcd939d7133edb5885388150fd28723b6325678519a80f2cd0ea673ac8
 DIST netbeans-trunk-nightly-201501220002-src.zip 201432275 SHA256 1969c39ce22136b5ff98f7959bf96088b7caaf9ea46df54ff0ed01ca857de8df SHA512 dae7c345289746e85ea6bf99a6352fcb53ec02c8828bf447a686aed0cea577de11e75e89451abf76a1dee3b1d91aaa204dbbe3057ca40c58759f16a4d768b7a9 WHIRLPOOL 39163c8ccac8111c9ab2a0787a2bd137a680bd16eccf4a7e526cfe34c74df0efa957b320df52b92fe9f1dbd134e7e2b2e1479c237b78e7a060c3893aac8838f9
+DIST netbeans-trunk-nightly-201501230002-src.zip 201448361 SHA256 9705937c7762d0df36dd885713111a80c01b67f17c2257423961ec7c25acf546 SHA512 c6a11a10357a44e899e621d4402daa6b435ec285c467d44d636e3c3c457f025225bb7594b84c7ee526fd7c416441960350645f098860e858cdf7106ccf694ee4 WHIRLPOOL 03b767b926ff881cea4b2227b11e0ef9b7b866d88d6b05f7f90419de7ff19216fbb785a9bf74c5db5b533b17186393e1d4280dc3c38dcdd9afa8440239fc6113
 EBUILD netbeans-cnd-7.0.1.ebuild 4602 SHA256 1336b76de715719ef59a3601dd5ad3b24992f58096f874f0e37935ec0d088d8e SHA512 38745c3ad6364198516ebb64002185fd05c34dee75acdb3933221d772177d5d6fcda853bb63991f0d071b21079fdab0c090db93e59cddd8daeb8f8d571a18a41 WHIRLPOOL cc196275289a01c1168b8c2710e0be0c2483cc86dc47b8fb3383ce1141f7bc11565e2b2feb95436cf448c09aaac7ee8c8804316ce6782d8853c0742367c0963a
 EBUILD netbeans-cnd-7.1.2.ebuild 4218 SHA256 6c80020e4204226274f4a24413dad8bf134f5beb7aee4ecc53d6b4d709093bb2 SHA512 299c07f5e5d930045e8c8ef3d04009beee7035daa2022a803e6dcb16b380096bbf5014c2d684094705d06b4608afcf6925266ef609a483a86452b03505dcb67c WHIRLPOOL 6d6c8bddf3490282b9134315f9bc94ff55675160056fa4c98c302a59d943a9cb38f23ffb9ca313c82061d84d0ae86898ce72d16756d41c468737e319e68f06ce
 EBUILD netbeans-cnd-7.2.ebuild 4201 SHA256 0f77a1a343d437e2eb1236722b27b2f2f03901ecc1afde29e1d38e54aef7c81d SHA512 b5fc985d1280ab900cb5125691a0ff99bab075ff5e93ded9af256310a7dcbea87a28a52ba383875caa24fd0ff28bc8dff4fc0fa0242987a673fdc729f7234b58 WHIRLPOOL 19e79dc426fb05ffb48ff9b13de3bab40f483b6dd9d79514e8f819029c278ee47a09c9531b5b4dba2014f805d502e66745f3355e2932e24e0dd9b5e3e273d2c2
@@ -89,5 +90,6 @@ EBUILD netbeans-cnd-9999_p20150119.ebuild 4586 SHA256 a6ee0cc4194be234a9c16e55cd
 EBUILD netbeans-cnd-9999_p20150120.ebuild 4586 SHA256 25666db555276180d7046d3912f39ba37e4e6696aef46d1a893494a9b72694bd SHA512 e6c36f9f01149dc04bf67c0cc0aaba96cd96d5951ffc697b81d3833044ade2f976f4caebd564e8222576fe866889a7ece3de7e1b3b43014a35a84bfdbcdc47d1 WHIRLPOOL 38ef873c22ce786396aeca127283bcec5ce57c1a8770bd13bbc96efd0a1bae027b774a754d0b42eca52f3da227a74e1391696dfb6c830f797ed57f40f5e103d3
 EBUILD netbeans-cnd-9999_p20150121.ebuild 4586 SHA256 e273b7a340725c8063af8ce80db35b812f1cc96733c34ce1552f377544b86b76 SHA512 cdf87ee042dc7b0972149f5c95f3c52f0a5e4744eb2f6b0248beea767b298aec714ccf5433c9fbd790c0b1d1f480bd7f94966bebe57229b3577113ad9ee32031 WHIRLPOOL 994412dccd3f3c9278ca5d3b3e64fe5cc388b7620b53783205afe0832e42fd7ebcfa97001cfccb7f4d485c11dab650c286dfc2d0ea36e6bd3ca807801201f930
 EBUILD netbeans-cnd-9999_p20150122.ebuild 4586 SHA256 77ba145c8154c73582574fe16bdcda66a0566b5f2fbdd587553db2b1d9a4b9e6 SHA512 d67545b9e84a49a7713e1661fa611c7bfce91841b6e649019b663891256946feb02a5b098953f68328f9f7ff7ee6c184cba52e5bb0d7373a546c63153ead9e3d WHIRLPOOL cb5869b1e3a089cbe96a933b6552576091e4ec5bf79a2f641cff7780f15df5e07c6ac7072a352ef2c90697c9346a924172c5b0961d89e4469dfb4c87ac6e5468
-MISC ChangeLog 141520 SHA256 a6ff7913ed32edc06d768b3cb997611fe6050fcd1c804d82f665056650f7629c SHA512 0e7b00e2b4a308c74e248e35e3c6acb9118f7e96b8eb8b21e19aa2e75bb5dad85be9d177c6f691ba7e72cb8440d1367e543071afb8ed537baafe7132af37a8ff WHIRLPOOL bb4233f072d3a40b57a2cd9897dd76ac1e7a6a8ede12f620d474bfcd6af70199866cd285eddd965d3aa2bed652eb3f540b857e1893771b486b04c35669ce168a
+EBUILD netbeans-cnd-9999_p20150123.ebuild 4586 SHA256 ea67ec3cb812f2b5d8206c413dd75cab741925621d657566485bebf27f8e51e5 SHA512 806ae693a80804057f4635d46d0cbf7c1c1ed63d736a2295ddd173849835102dfd8941327d4bee9ecb9615e4bcc8d200a31b14a34a55a1407d3667fb9140c2b8 WHIRLPOOL 6920335abab03ae46c7e4b08d5a4fd19287c6b3c5928a64a60ecbc2e57bd0592ddb1539bac920782eaaac10364800504e6af5e24c20cb99c07c734db5fb40c97
+MISC ChangeLog 141687 SHA256 32cd50b2861888e93fdacf7a1faf3a9012b0283926465cc9fde23122ef25b99c SHA512 9260c56e84bd6f6580d913c786062fd7761a8b73e58f12926a5674de0211da2d9f4b27773556bb36b75aa406bde38cb7c7837ecde8d889b64e8cc2aa682eace4 WHIRLPOOL 45c36ff00e3b97b9b7662335a9eb2f6333d6ceddce143cb8c234b54cb68900a90a8713c4697bf7f4d31306e616f1927070f0252b50fea98ae36d04895733a958
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150123.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150123.ebuild
new file mode 100644
index 0000000..3dec91c
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150123.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-01-23_00-02-29/zip/netbeans-trunk-nightly-201501230002-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/24C58A1D3C410AD3E23CD828871630C17068B238-cnd-build-trace-1.0.zip
+	http://hg.netbeans.org/binaries/2BCF2047382FB68A2F275677745C80E79B4046AB-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}"/24C58A1D3C410AD3E23CD828871630C17068B238-cnd-build-trace-1.0.zip cnd.discovery/external/cnd-build-trace-1.0.zip || die
+	ln -s "${DISTDIR}"/2BCF2047382FB68A2F275677745C80E79B4046AB-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/ChangeLog b/dev-java/netbeans-dlight/ChangeLog
index 2734cf7..0af9d31 100644
--- a/dev-java/netbeans-dlight/ChangeLog
+++ b/dev-java/netbeans-dlight/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-dlight-9999_p20150123 (23 Jan 2015)
+
+  23 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-dlight-9999_p20150123.ebuild:
+  bumped to the latest sources
+
 *netbeans-dlight-9999_p20150122 (22 Jan 2015)
 
   22 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index beefaa9..a91f2e4 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -48,6 +48,7 @@ DIST netbeans-trunk-nightly-201501190001-src.zip 201391445 SHA256 ce4ec7706f8073
 DIST netbeans-trunk-nightly-201501200001-src.zip 201396862 SHA256 1a9378d8f52c4f617653d096aff287cf62212af8a6f878fe54cc468e4dd4bed7 SHA512 92fd39cda2d11816b9a01e0e5c26b3f527354a69efdc940cb27d5b17ee6493a07225d2698260db2bdc220e01d166ac42b5fb62f809d1e2eb84419c6e6abb3e14 WHIRLPOOL c3ba7155b5d376041d750c42f1ff8f8dec5bdbfedb470dea483a665978ef3982f087cb7a521f7892c264bb38d0876e4e7a08346ae4579338ba698ae7ee4ba456
 DIST netbeans-trunk-nightly-201501210001-src.zip 201405381 SHA256 95369f4a232531feb195f2d41c14b7ec9791bbd86282fc8155bb1828affe6afa SHA512 4e710bc5905ea83167152e3252a4309d6a4f6fe8f0ccd8f50bd6389635cb2c4fa1cda60c9c9df8d70149ef84bba66527a8c94b1822710421aa704d374a0132b5 WHIRLPOOL c6780c694d1acabd53ca2b23ac660d587b02f63f3f8b5a98c7e293af4e099dfc46dcd5dcd939d7133edb5885388150fd28723b6325678519a80f2cd0ea673ac8
 DIST netbeans-trunk-nightly-201501220002-src.zip 201432275 SHA256 1969c39ce22136b5ff98f7959bf96088b7caaf9ea46df54ff0ed01ca857de8df SHA512 dae7c345289746e85ea6bf99a6352fcb53ec02c8828bf447a686aed0cea577de11e75e89451abf76a1dee3b1d91aaa204dbbe3057ca40c58759f16a4d768b7a9 WHIRLPOOL 39163c8ccac8111c9ab2a0787a2bd137a680bd16eccf4a7e526cfe34c74df0efa957b320df52b92fe9f1dbd134e7e2b2e1479c237b78e7a060c3893aac8838f9
+DIST netbeans-trunk-nightly-201501230002-src.zip 201448361 SHA256 9705937c7762d0df36dd885713111a80c01b67f17c2257423961ec7c25acf546 SHA512 c6a11a10357a44e899e621d4402daa6b435ec285c467d44d636e3c3c457f025225bb7594b84c7ee526fd7c416441960350645f098860e858cdf7106ccf694ee4 WHIRLPOOL 03b767b926ff881cea4b2227b11e0ef9b7b866d88d6b05f7f90419de7ff19216fbb785a9bf74c5db5b533b17186393e1d4280dc3c38dcdd9afa8440239fc6113
 EBUILD netbeans-dlight-7.0.1.ebuild 3624 SHA256 499a9303a1972ee89dfa2685e1dc1e4511c7531ff3b29caadd1136ba25dee82e SHA512 ad60adc5d64f93d03e27170311ce7bd0a6952c8b41cdc51385f8efc9140593201064d162b3130bff7a003570de11963d375d3676476115b1129ac74632d4a227 WHIRLPOOL d68dcdba50b2565d40e1adc484b51c1ed0171c2fcf99fbee08a221e6d9767f96d161d45eda612eb4c4d62e0db6826e2cd124b83e11ee2f7c9bfb6a440ec6821d
 EBUILD netbeans-dlight-7.1.2.ebuild 2935 SHA256 dc7d110b80174b1baeaca9c005e2cc9167540f186c7794067cfb45d335251b9a SHA512 7dc2db63ee40a3e64375eb49e669c54f88cc532d7ac8c7320329f8378a3be15ebc4536208ea2975c7fe4a9b3f2ac60d0ec5b8c9a9da392587fb04838f101e0ec WHIRLPOOL 1801653d9e146eba02642dbdb0a39c235a40e5d3d5ac8d4d5b8d2a570aa62330638355ee8df76693db177c58bbf31271342215c70d7e198e4b6bd905984ed9c7
 EBUILD netbeans-dlight-7.2.ebuild 2650 SHA256 9b0c0049b7cf6894cd44327c3697d4ddfb0dba2aebd6aabc1821b550932cd69d SHA512 0584c2a1cc65193673bded284c454b430fa3f5774c33d704922977d25ed26bf88d090670e330299c85ada2e897e5f124ae9f635a6f8be7d7fd10740482df7eae WHIRLPOOL 1c27b0c84a34865cb8a84062127f49aefcd245fa16fb825d7ee57d24c3f5841935242c16b3250319078762ce4e8aa5bc8dbd8dbe497b39af8e027b9e39ee585f
@@ -83,5 +84,6 @@ EBUILD netbeans-dlight-9999_p20150119.ebuild 2995 SHA256 158fc2e1046bfc65addf7cb
 EBUILD netbeans-dlight-9999_p20150120.ebuild 2995 SHA256 f322c5f23012f61f49f20faf2a6a42a9751fae61e912e8ca104083c999da14f7 SHA512 5b6f69d45f7c368fc7bfb603e4f07e1fd9842064ce7f212d8cf0f122e1c4f30b998a724e32a7360ab3ac32448d691db5b6140a4a3d60d9e20be0508855a0bea4 WHIRLPOOL 3ef4b9498c71716e443eea2329bebd3b4704dd7c51b28cde6206bf1470003348a2a7757b7fe94d44646d24b7587781c882ea4191112ba1263695e43a9d911011
 EBUILD netbeans-dlight-9999_p20150121.ebuild 2995 SHA256 28c1140f6c49e5e00e201340f4b930ee794dbaf2f05b2eb58da751a172b96b85 SHA512 e7af91237b87f7e4e59acc06962237861f19ebb51e17fc3be014f3d32c47bb65a7c6a60a94abd0ece91eb0ae8405e3cf8bbcff3763834234cabbc742adcae716 WHIRLPOOL ec9a1ca04f7a109520b66c070ea8819d595375e8795f1aaf45981137f6e0f89fc0463edb0e1d9541cc7acade8e52ddef933e7e658cd38b1875f943ed3e613009
 EBUILD netbeans-dlight-9999_p20150122.ebuild 2995 SHA256 c1238e1d1b8a046aa36785225a049371dc751cbca1a729b4f59d7b231002ea7a SHA512 c5223ab43cc8dd1ae465192a37d92956038026d1b1992e352a743c3e78cc989b8960a418a356739e2c5e6ef8abb23187ac869b2f28dab26f00f41483c8481794 WHIRLPOOL 7bf0eba5b2185c42529bae061a6220b6a2f7f42b873af9e8edb8648dc7ce24f10a9a5192e8494b42f731d46184c3e63b9dbad0f5694bb77121bbfae457a3afc3
-MISC ChangeLog 147549 SHA256 16a716d866d961a202fd3917cefd3ab6fbbe44277c937bde794be09a8d2b336a SHA512 f3fbba009a54359b178601c769f038928ea4050bf27808bedb6d1ed1352d4c6fcbc9c1103ed465f9b0eccfbe4c81beb67f18a44d3c888d84a393361ef472b35e WHIRLPOOL 80b6d597dcca6d291573a38ffe8c3563641efac8dd40cbb25fff6a965172df92e3aa5edd0ea8306ec1a59a3bff94233d08f1f9715883f447a602037e0d08761b
+EBUILD netbeans-dlight-9999_p20150123.ebuild 2995 SHA256 cacb26d5b39c6c5c59c65d1e595b62e25a0b9a6e3ae725654820abf43f2412ab SHA512 189ec35a171373d0d438ea8974e5a3c1c8cbb45cede965df562adffae1da983a76e0604459986dd93bb3bdb7148d2d5e69766a423fb3d9a6b285a3d2433d817d WHIRLPOOL b416f9e32b753950a303e9dcfb16e97975601fb4c4a895f5fdf89ea51f3fa0128e340fa9cbed758830e59e0a86040271e6f77c75a9650eb7ebf1b4154dc42ac3
+MISC ChangeLog 147722 SHA256 95515a6f3506b1bb919efc005fc91bd00aef000f012f1b72638b10fa97bdd67e SHA512 8ec3d3214f146d4daf4eab5d4e8ae6c6239556813f96bd645e60a75ce9769cb6c90c0f58f4d5cdd5c0393270b28aa9effc12dfc0d69c66dc4c298a8b81d9478f WHIRLPOOL 4227f5600bcf5744518a908e74af7a3e2b7c1e8b366b9cdfa06cf38f14189090dac3e3ec42b3d94f1600845adbb44bd799e212a4cfb687fc9e18196439d280d8
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150123.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150123.ebuild
new file mode 100644
index 0000000..e8e1c8f
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150123.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-01-23_00-02-29/zip/netbeans-trunk-nightly-201501230002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/DFC4928B8E531CC3E53B191500BFB066468B70AD-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}"/DFC4928B8E531CC3E53B191500BFB066468B70AD-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/ChangeLog b/dev-java/netbeans-enterprise/ChangeLog
index 8655ddb..6ae698b 100644
--- a/dev-java/netbeans-enterprise/ChangeLog
+++ b/dev-java/netbeans-enterprise/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-enterprise-9999_p20150123 (23 Jan 2015)
+
+  23 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-enterprise-9999_p20150123.ebuild:
+  bumped to the latest sources
+
 *netbeans-enterprise-9999_p20150122 (22 Jan 2015)
 
   22 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 11b0d5f..dc6be31 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -130,6 +130,7 @@ DIST netbeans-trunk-nightly-201501190001-src.zip 201391445 SHA256 ce4ec7706f8073
 DIST netbeans-trunk-nightly-201501200001-src.zip 201396862 SHA256 1a9378d8f52c4f617653d096aff287cf62212af8a6f878fe54cc468e4dd4bed7 SHA512 92fd39cda2d11816b9a01e0e5c26b3f527354a69efdc940cb27d5b17ee6493a07225d2698260db2bdc220e01d166ac42b5fb62f809d1e2eb84419c6e6abb3e14 WHIRLPOOL c3ba7155b5d376041d750c42f1ff8f8dec5bdbfedb470dea483a665978ef3982f087cb7a521f7892c264bb38d0876e4e7a08346ae4579338ba698ae7ee4ba456
 DIST netbeans-trunk-nightly-201501210001-src.zip 201405381 SHA256 95369f4a232531feb195f2d41c14b7ec9791bbd86282fc8155bb1828affe6afa SHA512 4e710bc5905ea83167152e3252a4309d6a4f6fe8f0ccd8f50bd6389635cb2c4fa1cda60c9c9df8d70149ef84bba66527a8c94b1822710421aa704d374a0132b5 WHIRLPOOL c6780c694d1acabd53ca2b23ac660d587b02f63f3f8b5a98c7e293af4e099dfc46dcd5dcd939d7133edb5885388150fd28723b6325678519a80f2cd0ea673ac8
 DIST netbeans-trunk-nightly-201501220002-src.zip 201432275 SHA256 1969c39ce22136b5ff98f7959bf96088b7caaf9ea46df54ff0ed01ca857de8df SHA512 dae7c345289746e85ea6bf99a6352fcb53ec02c8828bf447a686aed0cea577de11e75e89451abf76a1dee3b1d91aaa204dbbe3057ca40c58759f16a4d768b7a9 WHIRLPOOL 39163c8ccac8111c9ab2a0787a2bd137a680bd16eccf4a7e526cfe34c74df0efa957b320df52b92fe9f1dbd134e7e2b2e1479c237b78e7a060c3893aac8838f9
+DIST netbeans-trunk-nightly-201501230002-src.zip 201448361 SHA256 9705937c7762d0df36dd885713111a80c01b67f17c2257423961ec7c25acf546 SHA512 c6a11a10357a44e899e621d4402daa6b435ec285c467d44d636e3c3c457f025225bb7594b84c7ee526fd7c416441960350645f098860e858cdf7106ccf694ee4 WHIRLPOOL 03b767b926ff881cea4b2227b11e0ef9b7b866d88d6b05f7f90419de7ff19216fbb785a9bf74c5db5b533b17186393e1d4280dc3c38dcdd9afa8440239fc6113
 EBUILD netbeans-enterprise-7.0.1.ebuild 16338 SHA256 03ea08daaf5d4c5592937929bac33b4af3bac00a23f2167a7ef7b3c172a72abe SHA512 4d24162c7920b9a1c65e6c6753900ead387a4941c2db98b522631bb09889c281bce048a74e2e584f8b5732cfaad1d7125e0cfd37aa2dc81fe85160b0e123ccd8 WHIRLPOOL 35eb648c37cb6e59aca7969c1074c2c280814529aa7ec3c3191b0d3f2a92fa24e1a8d981f343e4217fff52f6100b4884b970df734c45145759889aa6e6661ff2
 EBUILD netbeans-enterprise-7.1.2.ebuild 18060 SHA256 f63721b8ce5e1afbc58f783348f66f1e3501be519a1c9c1287ef860acc64ceda SHA512 2ca89ec8f89f106a284136d4d0ed52fe3bcf49c650d56ded6e62306c531e5e41f62b8aa923cb544842cf6e34e5f433fecb278bc1515abac987e2d00fb68ffa26 WHIRLPOOL 879067d72285aa6c7273e84ddc3dfef7d09c7cb9f9a6c279fddfbd3eea6439dea053d3c648fcd56d47ef2292db14d101307eb1aa8b3081dfcdbc3dac4d0c3ed9
 EBUILD netbeans-enterprise-7.2.ebuild 17752 SHA256 2f46916df731fe33c5d4626ae580a77686c392932a3388f755324bc3184bd636 SHA512 3543d033b971108fa2b8e6633ed640e812a83b34807e1cb5a69d425823d1fec1c13ecba3cc36fa4504fbfd6297e7eff1ecabe07d01725d9f13c99ffd70d220ba WHIRLPOOL 512753153bbf714ae3fbf9c580f350234d88bd5ce5690e7bc0fadd1c355bd38c2a5c1e9adb7993c3678d759661bbfb1654b0630e3535a2fb9198742fa7fd2c1e
@@ -165,5 +166,6 @@ EBUILD netbeans-enterprise-9999_p20150119.ebuild 15147 SHA256 186fe6352ee1dee2c3
 EBUILD netbeans-enterprise-9999_p20150120.ebuild 15147 SHA256 be456f664c423b99fd2c07a6bbac5c66cb0a0a4e0b15425a8464181d19825ed7 SHA512 a89b690c69ac102e1131c5548fa887821731e0236f8d3a56b1c2b1f024b53d4a2199e9bdc5fcfc384179fc6fb7598e977f4d977dd338827148f34c90a211829c WHIRLPOOL 2228cc1729ebe1abec4dd4a38e82b9a66ab272ee4672fc66d7d71abce66da1964bd258dd134ef9b012ed93f1a02cebdf712e387d0065bc37406b12d46ac638f0
 EBUILD netbeans-enterprise-9999_p20150121.ebuild 15147 SHA256 e7f9cb3e31a105c4fac0b0126e9b84ac77b327ea97e4056fdde50c30c85cdad3 SHA512 b67925ed706db84e76374965bfe08ab15e16836a8dc4c1defc93907712da529ea95fbd437ed4145191a8979a661cc8335f9aff752733821e7823b18919fc3ac1 WHIRLPOOL 1b3e0d169ca116972f4514843f2bf6d01a4493b52534caedc410757a38f3002f2ac7499b727fddf4cf0be6ddf64dd7b0a1cb49da2f6617069857ac207a8c8679
 EBUILD netbeans-enterprise-9999_p20150122.ebuild 15147 SHA256 c8cfd4db15a76e2b4202c50fb259b02893702fce1a901dc38f8f1fa648d66ba2 SHA512 402a5225e890d9ddaff369dc9438efe3fda0129e4f25d62da44596c0231c080426d923a624347ae4d428932ef5046e9aa9855c02b287d808cdf926c0d17addc0 WHIRLPOOL a107c02527374a307189e365be8c8f2da8798ca859dad26219fd3d3263170522705566c665aa3b830990502aed6e34fe4dd3bbbfd3dd71c2430d19ae7b606aff
-MISC ChangeLog 155451 SHA256 52df86d679471ae0b7aa9a65208cf25c1b3a009419e7d7ee104b46cbd6522d1c SHA512 54159337c05cbebbf7ddef17f6e78192a7df52be697ea58505a71b0de39434f99138d6858ea7405c981db3a2788952d4767671b72ddc983c65f6a4e76f12012e WHIRLPOOL ac9e590e413bd524b0f0af8e7b492eba46659c79b15c69a46945816cf6f65a1b45a11b2244cf3877779280106b441617b30984c350ad71f97e4fd3121daa9a8a
+EBUILD netbeans-enterprise-9999_p20150123.ebuild 15147 SHA256 d3a59968caecfbe3661e69a26b0ddd5a6e7e15b0697ed6fab38c969040e13bcb SHA512 ee5d3ed600c460ed5c5baabbe153c27f24056491250b2499f1c6dc6c430213cca7741b273a0126316ca903243b3cfcfb456881f0856cdad111fffdd2c0099c32 WHIRLPOOL 062d6420dbbfdaa2d507311a08385c8aaad42b15ac21e91adf9d0e90252a6255d94f9bf6750726e537bc3a51b236c49b8197729e1bd289cfff1134e1963bd8db
+MISC ChangeLog 155632 SHA256 3c7f5bcd32f90acc93eff27d42c459b4985a04b1d0613b92ed83ef08f033f801 SHA512 a5a01eedfa79575f7abba3b42a8772c2ad85286e0d3f269cb92da6c2fe2edc9f9e01294b8d424bb91095ed338b0da457ad40e4d7fbd8f2eb764e47d682b50fbc WHIRLPOOL be22ea5dd7f665dd1dc70639b11f850b2a4f96c02295971aa943b2c6f4382c61adfddf877e425ff6735f215622373ce901575093b3da8642e1ec8df439e67d04
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150123.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150123.ebuild
new file mode 100644
index 0000000..df1f29e
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150123.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-01-23_00-02-29/zip/netbeans-trunk-nightly-201501230002-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/75C30C488AD2A18A82C7FE3829F4A33FC7841643-glassfish-tooling-sdk-0.3-b054-246345.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/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/jakarta-oro:2.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}"/75C30C488AD2A18A82C7FE3829F4A33FC7841643-glassfish-tooling-sdk-0.3-b054-246345.jar libs.glassfish.sdk/external/glassfish-tooling-sdk-0.3-b054-246345.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.10.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/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/ChangeLog b/dev-java/netbeans-ergonomics/ChangeLog
index e5d576d..7ddc690 100644
--- a/dev-java/netbeans-ergonomics/ChangeLog
+++ b/dev-java/netbeans-ergonomics/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-ergonomics-9999_p20150123 (23 Jan 2015)
+
+  23 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ergonomics-9999_p20150123.ebuild:
+  bumped to the latest sources
+
 *netbeans-ergonomics-9999_p20150122 (22 Jan 2015)
 
   22 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index db578d5..b4abfae 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -41,6 +41,7 @@ DIST netbeans-trunk-nightly-201501190001-src.zip 201391445 SHA256 ce4ec7706f8073
 DIST netbeans-trunk-nightly-201501200001-src.zip 201396862 SHA256 1a9378d8f52c4f617653d096aff287cf62212af8a6f878fe54cc468e4dd4bed7 SHA512 92fd39cda2d11816b9a01e0e5c26b3f527354a69efdc940cb27d5b17ee6493a07225d2698260db2bdc220e01d166ac42b5fb62f809d1e2eb84419c6e6abb3e14 WHIRLPOOL c3ba7155b5d376041d750c42f1ff8f8dec5bdbfedb470dea483a665978ef3982f087cb7a521f7892c264bb38d0876e4e7a08346ae4579338ba698ae7ee4ba456
 DIST netbeans-trunk-nightly-201501210001-src.zip 201405381 SHA256 95369f4a232531feb195f2d41c14b7ec9791bbd86282fc8155bb1828affe6afa SHA512 4e710bc5905ea83167152e3252a4309d6a4f6fe8f0ccd8f50bd6389635cb2c4fa1cda60c9c9df8d70149ef84bba66527a8c94b1822710421aa704d374a0132b5 WHIRLPOOL c6780c694d1acabd53ca2b23ac660d587b02f63f3f8b5a98c7e293af4e099dfc46dcd5dcd939d7133edb5885388150fd28723b6325678519a80f2cd0ea673ac8
 DIST netbeans-trunk-nightly-201501220002-src.zip 201432275 SHA256 1969c39ce22136b5ff98f7959bf96088b7caaf9ea46df54ff0ed01ca857de8df SHA512 dae7c345289746e85ea6bf99a6352fcb53ec02c8828bf447a686aed0cea577de11e75e89451abf76a1dee3b1d91aaa204dbbe3057ca40c58759f16a4d768b7a9 WHIRLPOOL 39163c8ccac8111c9ab2a0787a2bd137a680bd16eccf4a7e526cfe34c74df0efa957b320df52b92fe9f1dbd134e7e2b2e1479c237b78e7a060c3893aac8838f9
+DIST netbeans-trunk-nightly-201501230002-src.zip 201448361 SHA256 9705937c7762d0df36dd885713111a80c01b67f17c2257423961ec7c25acf546 SHA512 c6a11a10357a44e899e621d4402daa6b435ec285c467d44d636e3c3c457f025225bb7594b84c7ee526fd7c416441960350645f098860e858cdf7106ccf694ee4 WHIRLPOOL 03b767b926ff881cea4b2227b11e0ef9b7b866d88d6b05f7f90419de7ff19216fbb785a9bf74c5db5b533b17186393e1d4280dc3c38dcdd9afa8440239fc6113
 EBUILD netbeans-ergonomics-7.0.1.ebuild 2884 SHA256 e8e4a785fc11b6d0d3c722826761581b8c9c779c5460dc7d1487b3154f4402ab SHA512 3ba2810e650726f48fbdb1bc0c58b6ee1e7d9d29d4be3b27c00bc981b773f26d979fd90154184276e044eafd1d4d8940b47d6f0f58589f9cff7fbadef5fbb05f WHIRLPOOL 5fab7fe6492f91bd0e97a8a95c0652266d771e9b60957e16ce6ff683c1e38081372151cd8c7bea44ee1f1dd7bf435f8b00b9a1a23e4c6106c990794c6093ba10
 EBUILD netbeans-ergonomics-7.1.2.ebuild 2893 SHA256 cd56250980429160b8fa9deb17f15050d016394d5fdef19bf772cf29988c86d8 SHA512 32d4556218791a32efb8cf8ec8303f7e8f27bfb03b97af0c66cee717563c7e02fcd9e350b0425ec0cec28ab09865d4815aba1471ee958e05e7c42e421a7f71c2 WHIRLPOOL 318c8528c2338c1e2f6e342c263be52753fa74c9ac934b0ee60fe0fff2146e86d1761fef8eaeca8eab844709bea2196fbe181fad1f689a9d5b9994da3271b4db
 EBUILD netbeans-ergonomics-7.2.ebuild 2876 SHA256 ca7184ac24c255941c4ec3e686c4237ef0af4be7242c44417fa799813083515e SHA512 c6537bedf2fed4ea914c74a208124fe692af837ab2c81c98b8aa0347cb9d5af496378a8c042437facced26d3b42b101225dfa8b81dfc3d6ec4e3e5613e359f72 WHIRLPOOL c7e4c08ace118690f454dbf6a9040bff3e7013c646947fd02b05bca2b4d802393b6eca3234c6228f8e4df4da1ed193ecfd93c848038e4dd9ae3f50959692aa15
@@ -76,5 +77,6 @@ EBUILD netbeans-ergonomics-9999_p20150119.ebuild 2919 SHA256 55b170eae70be1daf7d
 EBUILD netbeans-ergonomics-9999_p20150120.ebuild 2919 SHA256 d0f4968b4bc7e0b94a00e8b9a3734fc2b71f5009f63ee046dec0298d4a1741a7 SHA512 ee80ae5e3318e86b083682618bdb75ba9b105ca8cab70e99f7e590da94c5ca2080d75202089eae29b863fb8ff7104b9f8a14bea44c49d7283caa5cbb119796b4 WHIRLPOOL 0ad0fac6f0f8e3b8259b562afa7c173ed7886a7bd8945bdd0a02a62d4ed11d8771c23ea11853296e3d3c607f2be2426a40a8c83badecb476688f458d1ffbb980
 EBUILD netbeans-ergonomics-9999_p20150121.ebuild 2919 SHA256 db78e69a68b9bd7a5924c6b78c3294bf2434c4b0e435961b436435d79eeff34c SHA512 9100f6c425b416b895f8a7b90625bcf40d535862fe1ab0c6ebd3ceb4e11999ea6bc9dde225164855cf2d1c3f467be8b9e5f931a70965aeace97deb3f466fb195 WHIRLPOOL 8fd942dbd87eff45fb2b2facfbc96b0606e134b0f071ef2ca2a9c313d2f2e4266cdec45476e7092ca85f50e8bcc144834ddc2b11e019bf4a0e396e28c392fc96
 EBUILD netbeans-ergonomics-9999_p20150122.ebuild 2919 SHA256 cf227b12cc5003cc84c3f171e413be0ce60104eb2f5c93d7a3068785a5104dbe SHA512 96cc2db4c783ea200f8badcec5dee4522382f7cd45a76c678e95c6ffc282fb48d9efd456ef989850c1f283e857b62c8063dc168c788a329e993a0912615d16b0 WHIRLPOOL 9e415c3700a7f6aa6e24dd01b10ee64863cdcea59094185fc141b571c07ebb2c2d0dad98c26e4ff3e38581c20fb11bc50f88d78bff98cdad73b3db43c0c06aaf
-MISC ChangeLog 154926 SHA256 4ecf68069611be1985058d729c7c8a6766f3ad24a42defd8fe369cf076a8cf14 SHA512 69bc5daea00f5f160dbdcc62f7bdd2f0ab0d6291b15635ae4df9c12fd1f4c4a6a68fbcdefe4d768962457dca349a66d35a11c4cc44c893bb974faa0db78a84f7 WHIRLPOOL b2ae89d5180be120cd8e460a130851672fda515343ed432162da8571847ca14820b78ad12c4b8bea5525a948be28d794fa93df9ef081377eca4b8aa6927cb6ac
+EBUILD netbeans-ergonomics-9999_p20150123.ebuild 2919 SHA256 cd03f98b44b012f301d9f7322a66f08c1f443e845d6b1edcf27f060ae32fcb28 SHA512 3627227f32eef16f250400742aa46779e9f623a6d199d7d6daee9e7952da379453e4c29062ed3733070244add1fb0cc3cd132f2df8850067090a2d720492bd24 WHIRLPOOL d660a5180f50e859dd1d20c9ba7e918130dda8e2fa427517a45263e1cd1a022956e61af44385bc8e88075f5dae248bd6c812bdfe613fc27c6d10d22de5e4c3fb
+MISC ChangeLog 155107 SHA256 2feb4da603edc2f5682cef28901d4456db1ae66a54c3b3bf9dc821836ad17516 SHA512 b330c0d320e3c219725a6fb6f3a9111286734648879e591654d813e1f52793c1ba88740eb27aac0f0e393255e2e9eceaf96a6e70477efea6d718826d87f46827 WHIRLPOOL c8b886045fb43945d1b8ae2520eca97fe8831d086bd291bde24da6f9b6edd8b541ddbb97906d14f7c13edfd3c77b07a52a9a4c801eb9ffad8174e6f738e8ed0b
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150123.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150123.ebuild
new file mode 100644
index 0000000..4bc7015
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150123.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-01-23_00-02-29/zip/netbeans-trunk-nightly-201501230002-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/ChangeLog b/dev-java/netbeans-extide/ChangeLog
index 73664f4..a9f7042 100644
--- a/dev-java/netbeans-extide/ChangeLog
+++ b/dev-java/netbeans-extide/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-extide-9999_p20150123 (23 Jan 2015)
+
+  23 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-extide-9999_p20150123.ebuild:
+  bumped to the latest sources
+
 *netbeans-extide-9999_p20150122 (22 Jan 2015)
 
   22 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index ec99095..7f6d7d0 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201501190001-src.zip 201391445 SHA256 ce4ec7706f8073
 DIST netbeans-trunk-nightly-201501200001-src.zip 201396862 SHA256 1a9378d8f52c4f617653d096aff287cf62212af8a6f878fe54cc468e4dd4bed7 SHA512 92fd39cda2d11816b9a01e0e5c26b3f527354a69efdc940cb27d5b17ee6493a07225d2698260db2bdc220e01d166ac42b5fb62f809d1e2eb84419c6e6abb3e14 WHIRLPOOL c3ba7155b5d376041d750c42f1ff8f8dec5bdbfedb470dea483a665978ef3982f087cb7a521f7892c264bb38d0876e4e7a08346ae4579338ba698ae7ee4ba456
 DIST netbeans-trunk-nightly-201501210001-src.zip 201405381 SHA256 95369f4a232531feb195f2d41c14b7ec9791bbd86282fc8155bb1828affe6afa SHA512 4e710bc5905ea83167152e3252a4309d6a4f6fe8f0ccd8f50bd6389635cb2c4fa1cda60c9c9df8d70149ef84bba66527a8c94b1822710421aa704d374a0132b5 WHIRLPOOL c6780c694d1acabd53ca2b23ac660d587b02f63f3f8b5a98c7e293af4e099dfc46dcd5dcd939d7133edb5885388150fd28723b6325678519a80f2cd0ea673ac8
 DIST netbeans-trunk-nightly-201501220002-src.zip 201432275 SHA256 1969c39ce22136b5ff98f7959bf96088b7caaf9ea46df54ff0ed01ca857de8df SHA512 dae7c345289746e85ea6bf99a6352fcb53ec02c8828bf447a686aed0cea577de11e75e89451abf76a1dee3b1d91aaa204dbbe3057ca40c58759f16a4d768b7a9 WHIRLPOOL 39163c8ccac8111c9ab2a0787a2bd137a680bd16eccf4a7e526cfe34c74df0efa957b320df52b92fe9f1dbd134e7e2b2e1479c237b78e7a060c3893aac8838f9
+DIST netbeans-trunk-nightly-201501230002-src.zip 201448361 SHA256 9705937c7762d0df36dd885713111a80c01b67f17c2257423961ec7c25acf546 SHA512 c6a11a10357a44e899e621d4402daa6b435ec285c467d44d636e3c3c457f025225bb7594b84c7ee526fd7c416441960350645f098860e858cdf7106ccf694ee4 WHIRLPOOL 03b767b926ff881cea4b2227b11e0ef9b7b866d88d6b05f7f90419de7ff19216fbb785a9bf74c5db5b533b17186393e1d4280dc3c38dcdd9afa8440239fc6113
 EBUILD netbeans-extide-7.4.ebuild 3311 SHA256 8585e0b9eac3b9bb35d5b5e0152936f84708a824d76831930a3dfd3d196556b0 SHA512 19eceec7a634923b4712eb277a1ff9900a2eb4d9ac0a2c699175333c263f0c02baaf24eb30bd7919444f5c9df751186689b2d4359ca1c88dca02884d7c18c3cd WHIRLPOOL e64509f198c4d09851f98d5bd2ddd5b469b0a7c0f3122f391c17833e5d6d77b7a6c2fd9e942e34f2df42047504ad40593f97af9b2898450e769c7b012355c316
 EBUILD netbeans-extide-8.0.2.ebuild 3315 SHA256 91d5ece7097d8bff6d04ebbfd12b6fefb787b41ef33b4288e31e9babc49feca1 SHA512 42f4767cf06a9528d02db53f4d487a495135934302e33bcac9384cfd174260ff922638c9a0e659c537c50a81f91372aaf9d2585b4505b999e681dca9acaea4e0 WHIRLPOOL c55f05d55e8dc22478d29cf9e8ecd15de3e402f19e2d41cd302ec8f0b0d0f23dd434fded92761d5bbc55e1219a6d424afe8754b146f8312248e3a53dfede3b2d
 EBUILD netbeans-extide-8.0.ebuild 3305 SHA256 b2d57e2e2d92760ead3d383fe4dd5b4fb9fc2807a9b58c6f40b44fc24072b8bb SHA512 6e7f12758188a564ef6b5cf8b0ffdf79e30d1021172d10f215d04e727bc4001e4385fd0961a26a6bb42638089e0919b1d4628a13ba11a3deac94d4693c7210d5 WHIRLPOOL adac8461de43669b7bb98ea8920c0a2944837211a37503b957221149d4b91c4bd92b6db160191990b838c474495c65f62c8a4bb9fdbcaa371b4648a335b1afa9
@@ -70,5 +71,6 @@ EBUILD netbeans-extide-9999_p20150119.ebuild 3383 SHA256 827d7cfb394c45175c048f6
 EBUILD netbeans-extide-9999_p20150120.ebuild 3383 SHA256 247fa9496a39be6b8d18424c32cc1f8baf82aa86837a11c85da18061b22985b9 SHA512 9ce70d44cc33a68ebbcf157f92f2e4b8fd3d53663e4f3e44e8422780203d137f0894ab2fe9617da681937e3250769fad7722937f24b57cdba5952e4e21d1b43e WHIRLPOOL 566f3e6892a15998a1cd9e000e02161fcfbee009947227842f52f346ae57bf65efc8b6b845d4be4be3d3f08649cb4cc617638209fe98081e30eb792ff804797e
 EBUILD netbeans-extide-9999_p20150121.ebuild 3383 SHA256 bde9dc7c4548a86dbd9886ef6985784ae93a8c970dbe180e1bbc66f938ac0236 SHA512 59d1c05d8ae244f60bebeb63a0d19bc741b7dc4745a5cf2907ff7c36f71955877e4a66102557096b4f2dfb15480e22353a423aad5552e8082a91605bb28f24f1 WHIRLPOOL b650a36563e3661c8b8b7714cb9b9d9326aea06918b2a65cb30d47d3b1f6c507820cd573675538bec0bf73d4a7aaf5f5b10e16ec2f167890c1246faa0c6b50a5
 EBUILD netbeans-extide-9999_p20150122.ebuild 3383 SHA256 6cdeb7a89afd410dc5b8ea964c30da30878f98d300bf9ca35991e520fa8b3155 SHA512 00c9e9a8481f3e13e39b4057e41a352763685ff43385300f77dba3ad5e197a1844c63d9bc7a469397c2d00afff14ccac205d9cc9ca74d70668b23235dfc2ff7e WHIRLPOOL dce844403ea376fa7fbf22f1e296782bbb18bddbbd1f8f4df6fad69312b81c611ef8a866f9553c96eb1cf1682acebeae8fbe87786c3b0fd66c0fe0e9736d1f2d
-MISC ChangeLog 79561 SHA256 b95ac0b815f3a0d6a318e387aac39deddce67143e2ff2b04d595b13f101dc8a4 SHA512 12fe295963140fa01f208e48b3863124fa3367ed8c561ff40b3b2bb64f2198c59970465f6178aca63862ec76fd280671489552362ff61c563936d1b3f8c9b530 WHIRLPOOL 4083cfe9e0b2b7c88d56e18816afbb6c88f482e0fc4a611875c90314350d430463c1c565c17fbc49f0e43f0b5f1712de3a25ff0f3fd3b17eb3d3d77d72b0d833
+EBUILD netbeans-extide-9999_p20150123.ebuild 3383 SHA256 45c3dd7ba2012c06a9ef21b8ae6405e86cfbc738a854e25829e62b48673e90ba SHA512 60bac47dbd849af21184ef5ecc0913be0e1d04d99fee8308efa565f10e3e1871c826dbd53985a6d10bcf249366c902417a45a90fb13e89a178a2c4d44e97c551 WHIRLPOOL 18feb1e649e30a0a16362719481cee503f104a470a3d7a4b0423dcabbf2b8d5305611e8fecebccddef10c945e8aa157f325bb50b3dfbf37ffc0475ec79f93b18
+MISC ChangeLog 79734 SHA256 115b3b47907e7ad7dfe50cc1a1b4e14d28f924d55ebbe6a949fc6b6a4da0fbff SHA512 785b4c94b642c90ba0245674bdedb370432d034286e66f5dc36e47793f015f288f408221b3e64f565362f211d6ffe70ecccc608c695d27bf0280f9bf74df844a WHIRLPOOL 2423670326730170a3c3ddf569fcdebed9d55e46bd6a431f170ccf19a675d5a8eec43dc3602bde853ed7ca40b867e2a67d8fe8ebf709f56c3b28f94d5f2fcb50
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20150123.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20150123.ebuild
new file mode 100644
index 0000000..d242c32
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20150123.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-01-23_00-02-29/zip/netbeans-trunk-nightly-201501230002-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/ChangeLog b/dev-java/netbeans-groovy/ChangeLog
index 220aaa4..d469dca 100644
--- a/dev-java/netbeans-groovy/ChangeLog
+++ b/dev-java/netbeans-groovy/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-groovy-9999_p20150123 (23 Jan 2015)
+
+  23 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-groovy-9999_p20150123.ebuild:
+  bumped to the latest sources
+
 *netbeans-groovy-9999_p20150122 (22 Jan 2015)
 
   22 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index d4365c5..eadbc83 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -45,6 +45,7 @@ DIST netbeans-trunk-nightly-201501190001-src.zip 201391445 SHA256 ce4ec7706f8073
 DIST netbeans-trunk-nightly-201501200001-src.zip 201396862 SHA256 1a9378d8f52c4f617653d096aff287cf62212af8a6f878fe54cc468e4dd4bed7 SHA512 92fd39cda2d11816b9a01e0e5c26b3f527354a69efdc940cb27d5b17ee6493a07225d2698260db2bdc220e01d166ac42b5fb62f809d1e2eb84419c6e6abb3e14 WHIRLPOOL c3ba7155b5d376041d750c42f1ff8f8dec5bdbfedb470dea483a665978ef3982f087cb7a521f7892c264bb38d0876e4e7a08346ae4579338ba698ae7ee4ba456
 DIST netbeans-trunk-nightly-201501210001-src.zip 201405381 SHA256 95369f4a232531feb195f2d41c14b7ec9791bbd86282fc8155bb1828affe6afa SHA512 4e710bc5905ea83167152e3252a4309d6a4f6fe8f0ccd8f50bd6389635cb2c4fa1cda60c9c9df8d70149ef84bba66527a8c94b1822710421aa704d374a0132b5 WHIRLPOOL c6780c694d1acabd53ca2b23ac660d587b02f63f3f8b5a98c7e293af4e099dfc46dcd5dcd939d7133edb5885388150fd28723b6325678519a80f2cd0ea673ac8
 DIST netbeans-trunk-nightly-201501220002-src.zip 201432275 SHA256 1969c39ce22136b5ff98f7959bf96088b7caaf9ea46df54ff0ed01ca857de8df SHA512 dae7c345289746e85ea6bf99a6352fcb53ec02c8828bf447a686aed0cea577de11e75e89451abf76a1dee3b1d91aaa204dbbe3057ca40c58759f16a4d768b7a9 WHIRLPOOL 39163c8ccac8111c9ab2a0787a2bd137a680bd16eccf4a7e526cfe34c74df0efa957b320df52b92fe9f1dbd134e7e2b2e1479c237b78e7a060c3893aac8838f9
+DIST netbeans-trunk-nightly-201501230002-src.zip 201448361 SHA256 9705937c7762d0df36dd885713111a80c01b67f17c2257423961ec7c25acf546 SHA512 c6a11a10357a44e899e621d4402daa6b435ec285c467d44d636e3c3c457f025225bb7594b84c7ee526fd7c416441960350645f098860e858cdf7106ccf694ee4 WHIRLPOOL 03b767b926ff881cea4b2227b11e0ef9b7b866d88d6b05f7f90419de7ff19216fbb785a9bf74c5db5b533b17186393e1d4280dc3c38dcdd9afa8440239fc6113
 EBUILD netbeans-groovy-7.0.1.ebuild 3296 SHA256 29c3d304eca5999e78550fd715dbcbef9d15639d4e4f17fa0e45a46803080729 SHA512 43a0ddb43354bb3c0b8e29004ab547da508662d037b0006dfd24250c49470ddc0384bfffb6423f1e3eeaca98410c5de8b314a69970189306869a16380ab098a1 WHIRLPOOL bf626cecf6dec0c51e7e0b95ac4ff26a795e44a5dabd25719eeb2244742d96d33cb20ebbd9a68728dc27d28b8e558a7e2a3ee318c2e4fde234e0b5e8d32e6a58
 EBUILD netbeans-groovy-7.1.2.ebuild 3305 SHA256 1e00f335b8cc1e90deec3c3251629ba699286b25be5b6945d135d271004dc34b SHA512 3a1d67d02054478ed15e11789292fcce3fcfd343b8feebde5e07a9463c380c644310603a3f9f984e8071b0b097075809dce423b888e1f2aed316cb90a562d20e WHIRLPOOL a790c1e186c4d1949de6b4dd975b929c132e3e7b7c455c7867bd1445f59fb6ace72b5c9adf09d0c6079718fdc6c34a0c5f0c9c437517b55b7ae109ce3e20b064
 EBUILD netbeans-groovy-7.2.ebuild 3160 SHA256 6d709b7cc07d7ebb59c3ede0a19c9890ca3230144d7f455cf24d984ac2f633b0 SHA512 e30c8d58165b87a39a356f8b813c593910cd2c247de41420369fee21157c2f2881db34612711f77c9ecd9501aa6d7235ab7bc41d4092be1e68fab778c16d8288 WHIRLPOOL 4a6495ca077f3c374105b25698c8251aaa89daf56c2749bdc73867b0ea1ae404cfc7b2a8b435ef7b19f00aee8128be051c04d6a24fb631379fbe98d6854a507b
@@ -80,5 +81,6 @@ EBUILD netbeans-groovy-9999_p20150119.ebuild 3422 SHA256 450b88640cfe658ebda2b22
 EBUILD netbeans-groovy-9999_p20150120.ebuild 3422 SHA256 7033da090c70a8dede2b1a7a9a27a9562ac60f649b6e603ef2404740845f4e4d SHA512 681aec5635620f216d65520dc995786c4cd87add0dbe8689bc722317a455b80c8f30e2dff911f1c19e8a501ea2932b48e101706868d534ff2d7892c1228c5f57 WHIRLPOOL add523d48883e389be477583c4e6699222fd561b64e104a4d034a561740870935e92ac95414dbdce06512983e2864287dddbfd64dfa4e23868cdb433e2c18cca
 EBUILD netbeans-groovy-9999_p20150121.ebuild 3422 SHA256 64fff3b2ff9934b622fdc65538e4f86b14ad67ac09a1475f45718150fd768ced SHA512 c98cba29d78887bb0567f55eb20cbc24ce16ec635b2472abace57a1cbf9596522fb13ab9ff2178f39753602c6aa8388c29087ea222c17314473f073701fb6a00 WHIRLPOOL 7db4c9e278e7651ca9f8cf49e37e0498e041d2bbb516588c0f23a11ee78d49f3839c4d7a7a9429f5e4ab76d498f2de2e00447a1268d05cb340b65bd6aa5e8246
 EBUILD netbeans-groovy-9999_p20150122.ebuild 3422 SHA256 eb8ea8f5f95a69899e1106af46de12b7d360176672196ba4531ab269e58b8f4b SHA512 c8b0da450ff962ba24da93234261c458dfd09e3b44cbbbd8c62429ee44c9c655c5faf25050c987ac3593f8237b86a1828cc95cc39f1ce0dc02bb7fc35f38a0e7 WHIRLPOOL 8f1270324fd7f0c934cd3ca58ad0c1c49b8f405a6178e3be5aa20e82e0926bd1c06621f119090704a20a6ec7928b042c41cabf8f6aee7984f4e87ec5e81884a4
-MISC ChangeLog 147541 SHA256 f54cc9606ba030dee9aa09a80e32ba2c044f6496aeeacb82b6c0d4337c965167 SHA512 007496b956fcd6bd5d8efcacfa643b4b4d55fbb0d48c0dcb1025142d3af2d5db6ace314252ba367abb8fa117e1a525a73d478f81704b2a72355689a3c9d3d2f6 WHIRLPOOL a927f5e8c8e8cbe6cff6abc3ee53ea6c50aa5d64ae000e8cfae32eddb27db0a85a2c114835967419b96e05a610d3555e7158d4d8fea7a593182c8ff1e910c968
+EBUILD netbeans-groovy-9999_p20150123.ebuild 3422 SHA256 8f87d6ffefb16d53c31192827c9113a2e93073f5fc0128a2385c6f6dda10ff67 SHA512 e5252c41846c6d35790008fd6c038362de14859b7a121e0109823d383562aadbbfc75c69fc7d00cd148d87690a1f8c5b379acf52d56a1a6224616fac0b49e9fe WHIRLPOOL 121a4ff3afbeae09124fcc94c4fdaa7dfcd08589e2796edb4dcc87ab0be5181e8abdcf4b2d46b9622b53137defbc2b1a45d763d80c37b716bc58fdb99c69d470
+MISC ChangeLog 147714 SHA256 1f4fe4d86fbd4904d8ad61d7f729e7bd9f61de842bd70e7851e69d428d9ec1d6 SHA512 684f844a6afb909fd354dac55939e61faf73c1cee61a478b3bab5e3f3e4340d5f29d21767f985da2ab4c7ac66ab0012aa7a6400d747644381b9c6b403dfa80e3 WHIRLPOOL e27781eeba7e566f9190af858acbea36603ca4115ee5e1f3e74e95245eedf6914c9c820f1ab210c3c3ae94352e274579b457b9c842f50cb8cbc41bf7d3e62a87
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150123.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150123.ebuild
new file mode 100644
index 0000000..36f9770
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150123.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-01-23_00-02-29/zip/netbeans-trunk-nightly-201501230002-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/ChangeLog b/dev-java/netbeans-harness/ChangeLog
index 3bee5af..d1d2320 100644
--- a/dev-java/netbeans-harness/ChangeLog
+++ b/dev-java/netbeans-harness/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-harness-9999_p20150123 (23 Jan 2015)
+
+  23 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-harness-9999_p20150123.ebuild:
+  bumped to the latest sources
+
 *netbeans-harness-9999_p20150122 (22 Jan 2015)
 
   22 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 8b46852..5cf5e49 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -47,6 +47,7 @@ DIST netbeans-trunk-nightly-201501190001-src.zip 201391445 SHA256 ce4ec7706f8073
 DIST netbeans-trunk-nightly-201501200001-src.zip 201396862 SHA256 1a9378d8f52c4f617653d096aff287cf62212af8a6f878fe54cc468e4dd4bed7 SHA512 92fd39cda2d11816b9a01e0e5c26b3f527354a69efdc940cb27d5b17ee6493a07225d2698260db2bdc220e01d166ac42b5fb62f809d1e2eb84419c6e6abb3e14 WHIRLPOOL c3ba7155b5d376041d750c42f1ff8f8dec5bdbfedb470dea483a665978ef3982f087cb7a521f7892c264bb38d0876e4e7a08346ae4579338ba698ae7ee4ba456
 DIST netbeans-trunk-nightly-201501210001-src.zip 201405381 SHA256 95369f4a232531feb195f2d41c14b7ec9791bbd86282fc8155bb1828affe6afa SHA512 4e710bc5905ea83167152e3252a4309d6a4f6fe8f0ccd8f50bd6389635cb2c4fa1cda60c9c9df8d70149ef84bba66527a8c94b1822710421aa704d374a0132b5 WHIRLPOOL c6780c694d1acabd53ca2b23ac660d587b02f63f3f8b5a98c7e293af4e099dfc46dcd5dcd939d7133edb5885388150fd28723b6325678519a80f2cd0ea673ac8
 DIST netbeans-trunk-nightly-201501220002-src.zip 201432275 SHA256 1969c39ce22136b5ff98f7959bf96088b7caaf9ea46df54ff0ed01ca857de8df SHA512 dae7c345289746e85ea6bf99a6352fcb53ec02c8828bf447a686aed0cea577de11e75e89451abf76a1dee3b1d91aaa204dbbe3057ca40c58759f16a4d768b7a9 WHIRLPOOL 39163c8ccac8111c9ab2a0787a2bd137a680bd16eccf4a7e526cfe34c74df0efa957b320df52b92fe9f1dbd134e7e2b2e1479c237b78e7a060c3893aac8838f9
+DIST netbeans-trunk-nightly-201501230002-src.zip 201448361 SHA256 9705937c7762d0df36dd885713111a80c01b67f17c2257423961ec7c25acf546 SHA512 c6a11a10357a44e899e621d4402daa6b435ec285c467d44d636e3c3c457f025225bb7594b84c7ee526fd7c416441960350645f098860e858cdf7106ccf694ee4 WHIRLPOOL 03b767b926ff881cea4b2227b11e0ef9b7b866d88d6b05f7f90419de7ff19216fbb785a9bf74c5db5b533b17186393e1d4280dc3c38dcdd9afa8440239fc6113
 EBUILD netbeans-harness-7.0.1.ebuild 3579 SHA256 f4d09cb7bd5e8485caf75a3020ddb8102d3ea326878ac384ef4aecb011a1f6a5 SHA512 390c26b4a3dbc81ad1ef210b3ea668926398cb38ea13fa37dceb6782b4478b1ceb7a49e9db300f691fb8b31c21c56b25f4c3237c0890f0c637ca45f596c88294 WHIRLPOOL ae1e34af6dd61c30f645f39a825b6235e3eb1f9a42dd23431225513733209a2eb225a741b75342f827a4be0ffbf41b9786a6a6430051f543c321abe3c20da6bd
 EBUILD netbeans-harness-7.1.2.ebuild 3587 SHA256 e0adc470109009641bf48569623bf0fc51a400ac1ba686475c7dae1a5b561c96 SHA512 e4157a6b294c17fd7430802b33253d473120dc16173557e0d7840078f4043a383d5e3672af64f124509e54cc85d590abfa4375f181a32ab8b49e976cb6613cea WHIRLPOOL 423a5844a2c55ea99db4ac78e1c605a55a04f634601c0ac054e739c0ab4a3e9c765778dbd81ccf4a1e50e9d9e4cc29ecfad2ec64b483197927f434b67cd4d773
 EBUILD netbeans-harness-7.2.ebuild 3421 SHA256 47a5281d140b47e0235592c58657a9065d1827175ccca7d0c73fd81e90710090 SHA512 403fd1f49e11b27ef8002c4066fc911dbeadcccc7adddcdded86c6cd95e8bddaf0603c0ccafd0e91ef31a0909508deab1eb326e98e621bcbae7304413acca291 WHIRLPOOL fe3c5f95a606db39861a80201c185cb5a25e2d80698ac78ff724587b54e859f861b834b89aa79aac22f2c5da700532eaafae67fbcc33259ee07d578ba5c7f9ee
@@ -82,5 +83,6 @@ EBUILD netbeans-harness-9999_p20150119.ebuild 4131 SHA256 de6d8554c3a779967434e9
 EBUILD netbeans-harness-9999_p20150120.ebuild 4131 SHA256 bbab44c8b1712888d3c18427cc42a6020a589975ac957f2290565d274eade088 SHA512 748c8b81112fc46f5d6da4aff48fa35d8cf7b71e599556249848d5fb1cb9a52be49fd97d55972f21ac1eb5168d9bd6ca36b53feccf197e7e647d8fa4396e5a0f WHIRLPOOL ccfc1069c519a611ee657030e98bf313d2857d7a17aaddd1b1d12d1d9d6a69fd80be3ea025734d8e6bfa4f5b114dfd75eb2a722c37b757aa6b6dae262afcf0ce
 EBUILD netbeans-harness-9999_p20150121.ebuild 4131 SHA256 9d33cbae34a807b35e1fe102b4d7695b0aace27555c5cab5259909266f6c2147 SHA512 c192479641180598967f94c43fddcfcbbe74770a6c8188ee8b121fc819f950bbeb1dedc691691bfbac346579f1478fc4a3dd3f1ce8324e5f93e458834cd1a9c4 WHIRLPOOL 179cfb039ffe25f335ccbaa13d772c671390cb29dd1c67279d139e2828a2d922a99db473b2132586bc9c643378b7b1a9f97c9c6ec6eeb9c3663372aca81609d3
 EBUILD netbeans-harness-9999_p20150122.ebuild 4131 SHA256 fea7932342192ce4e6109f162854975fedf6c76137f27e09989df39c5d39228d SHA512 4317c9e3c678264cd293e0e6754dcdfec14d138584aa0273fc570cc6b76ff91d3f87907358718d3e3cba1a40cbb29b453fd89c1c3beb2ea619a2a743a78ea000 WHIRLPOOL bf4e2c243b74c3304f57eb3a1a5f96a3b89973a99295e8d44608f0c8d54e9d4a88ce546f1e0847d3b470c090b92f38ab5db7c854bf0df9e6f29543ca6a1bdf0b
-MISC ChangeLog 149416 SHA256 12af10f5c68d3b7b3f2147d0dc3dbd9137a43e58494c2afd740df59286db8160 SHA512 edf14f9a1e267452a7ec894577dfb23654c3692b506790e248f6ca670d592317d541c206fd1dde6493c1d606b4fd2761a7f215c75ad69d9cb473ca36571806f2 WHIRLPOOL af431c3ace52ead7e37661fe2422ee1c40aaf7c6a130ff6a4248d5445e18b33f7cb2b267c9ecc737c55916ca8b18cd4bd6cd949b46ac03962ae7e17254a25f5e
+EBUILD netbeans-harness-9999_p20150123.ebuild 4131 SHA256 d0a4a3a63614b071c98bbd13c89c23bb6cb87148e3dde3e49f218b5cb65b19f2 SHA512 c8492519e89467dc9f67068a3dcaa9cd866fa18fb5b4040fd419be576f760be8521d604e2d09f8358926c6f5863a7abb5e528856f87877b6d82dd616d6f34603 WHIRLPOOL 758a4c0b145d059dfd5a8a2a325dae4533029ff8cde78143791a0313f09c4dbcc132fdcba48654d264664d588047e81bf02fec61063a3d330d51d67132130284
+MISC ChangeLog 149591 SHA256 6ea32d9a55642b73cc28956081a10a1974ed74141c3ccd981b342a862a3511f7 SHA512 34098968e42d80b74caad505e02c60a75a599e64b3760525a3c9655b9732d7cf095bf5f8bae18e9f7984204834dfafcfcc12439e5c408457bcd875b13be617cf WHIRLPOOL eabfea095978aaf96a4fb6759365ceb5e20d300f7f367ddd724791b5931218c52d48c8d393d0b43f475e4ca38b7c3aada55e92b0bbe209ced519feb783310661
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20150123.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20150123.ebuild
new file mode 100644
index 0000000..95e156a
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20150123.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-01-23_00-02-29/zip/netbeans-trunk-nightly-201501230002-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.10.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/ChangeLog b/dev-java/netbeans-ide/ChangeLog
index 9168c84..95b1bb4 100644
--- a/dev-java/netbeans-ide/ChangeLog
+++ b/dev-java/netbeans-ide/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-ide-9999_p20150123 (23 Jan 2015)
+
+  23 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ide-9999_p20150123.ebuild:
+  bumped to the latest sources
+
 *netbeans-ide-9999_p20150122 (22 Jan 2015)
 
   22 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 5d6cfbd..5b5e0fe 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -227,6 +227,7 @@ DIST netbeans-trunk-nightly-201501190001-src.zip 201391445 SHA256 ce4ec7706f8073
 DIST netbeans-trunk-nightly-201501200001-src.zip 201396862 SHA256 1a9378d8f52c4f617653d096aff287cf62212af8a6f878fe54cc468e4dd4bed7 SHA512 92fd39cda2d11816b9a01e0e5c26b3f527354a69efdc940cb27d5b17ee6493a07225d2698260db2bdc220e01d166ac42b5fb62f809d1e2eb84419c6e6abb3e14 WHIRLPOOL c3ba7155b5d376041d750c42f1ff8f8dec5bdbfedb470dea483a665978ef3982f087cb7a521f7892c264bb38d0876e4e7a08346ae4579338ba698ae7ee4ba456
 DIST netbeans-trunk-nightly-201501210001-src.zip 201405381 SHA256 95369f4a232531feb195f2d41c14b7ec9791bbd86282fc8155bb1828affe6afa SHA512 4e710bc5905ea83167152e3252a4309d6a4f6fe8f0ccd8f50bd6389635cb2c4fa1cda60c9c9df8d70149ef84bba66527a8c94b1822710421aa704d374a0132b5 WHIRLPOOL c6780c694d1acabd53ca2b23ac660d587b02f63f3f8b5a98c7e293af4e099dfc46dcd5dcd939d7133edb5885388150fd28723b6325678519a80f2cd0ea673ac8
 DIST netbeans-trunk-nightly-201501220002-src.zip 201432275 SHA256 1969c39ce22136b5ff98f7959bf96088b7caaf9ea46df54ff0ed01ca857de8df SHA512 dae7c345289746e85ea6bf99a6352fcb53ec02c8828bf447a686aed0cea577de11e75e89451abf76a1dee3b1d91aaa204dbbe3057ca40c58759f16a4d768b7a9 WHIRLPOOL 39163c8ccac8111c9ab2a0787a2bd137a680bd16eccf4a7e526cfe34c74df0efa957b320df52b92fe9f1dbd134e7e2b2e1479c237b78e7a060c3893aac8838f9
+DIST netbeans-trunk-nightly-201501230002-src.zip 201448361 SHA256 9705937c7762d0df36dd885713111a80c01b67f17c2257423961ec7c25acf546 SHA512 c6a11a10357a44e899e621d4402daa6b435ec285c467d44d636e3c3c457f025225bb7594b84c7ee526fd7c416441960350645f098860e858cdf7106ccf694ee4 WHIRLPOOL 03b767b926ff881cea4b2227b11e0ef9b7b866d88d6b05f7f90419de7ff19216fbb785a9bf74c5db5b533b17186393e1d4280dc3c38dcdd9afa8440239fc6113
 EBUILD netbeans-ide-7.0.1.ebuild 22653 SHA256 4c1b3e46e2a6cb89d902c7f4fe6ad9306cbd0c9463a514e87d4c6ec019dc0356 SHA512 5dd526a85a70720686c612efb3aa5602c395111d507b91ae4db04c5814b27bafd1480ab7e44e1148b7412f768543110ff58abdf676de303cd3be9d87b87bd373 WHIRLPOOL abaedc56df115c6050ad7824929ee959ba1669fc1f3f9d4cd1eb9f9f948a608828621f46aeedd0b6062c85b1ad4481d12f952a504559e52c110ff37b88ae0d72
 EBUILD netbeans-ide-7.1.2-r1.ebuild 26831 SHA256 2643a4435aa093e292a2728583d8ffbf213dac6a13dad8e47029ed13a2478493 SHA512 5ba14c7b820f2daae788588ae2fdebdc8af6bb870d6ed56adcc2d43810e5dbd2ea21ae639e6b864d6d0b1e69c9aa4f86dfb15e99eb4a170434aadf0109ad876a WHIRLPOOL c9367735f073f9fcf6bb992b6d481aaea1ebe8526907cb6366d432a3f47a0c4d76bc9224206e0e512708dfe896b465878a2a1ad68836c7cd9b51a3a4efa2aecc
 EBUILD netbeans-ide-7.1.2.ebuild 26834 SHA256 1e57e60a1a00b4530f917319b5d8eef915b9669b9dd3ab82b5afabe171d8959a SHA512 4242265c0783a87c028f955425c86596038aa477e3256ff8ba244220a573486bb7f2e47b07b3c94fbef07940a3b32c313a1320b58656a67cb15a490e7307b1ca WHIRLPOOL 1e23b1e4370292500f154527ecd7a0e7ca315ee73588806413f630355677ee8fe9318a0e672b5f6ad60f829c0a5579b37eedbd737bc8ec154aba9f59c53bd337
@@ -264,5 +265,6 @@ EBUILD netbeans-ide-9999_p20150119.ebuild 29641 SHA256 0a9d14dce3396c0b95d2c68f6
 EBUILD netbeans-ide-9999_p20150120.ebuild 29641 SHA256 a9396d34246b81c8c8adb762f4c5996d76c9410112b0124dd0830b49a59a7d4c SHA512 3e31cdd4b6a9afd671d904880499184a18476f1ddad5f3afadc06385d0fa589428390c60f5549a8b81e3dca1574afdd9119f6cc621b2648528b56dd8aafcf7c0 WHIRLPOOL 14af3ab7526fc6732b1eac5f80ebdec039dc882bbadd717b849def6cddd281da733971d0697f26c32261277ca359dfea12a2baff89c270c4efcade7991b91eb9
 EBUILD netbeans-ide-9999_p20150121.ebuild 29641 SHA256 90c7a1286982cc0489c8c6d278300be95db50c61a64430d3737cfba04d767739 SHA512 fa04d9ad1e44fb91fca9c9fd772989ff093cbfa14549e50bc2a7fa7da91401e1971cce19f6487a905d5cfc8277352c83813dc7b8fb37ac5714a01cd16a34f0a7 WHIRLPOOL cae73d531ccb7ee9d42ff77f839c4be11a21b62b958d5ada8fdfd3863abc48e09d7d80c0cc3839a6a020c8dc5fd8d2d04c9ef17bd079d990f4724ec3655de5f9
 EBUILD netbeans-ide-9999_p20150122.ebuild 29641 SHA256 d5496c86653b9531cc2932ef81ae4921849f40c110440569e6336992cde9f27d SHA512 3881dac98c15f24da2b4988d06533ee6636d13a3ffde098547b4fa6d71e25060ad6c77b5e73cd0e7860731271fbaa1d483d14e72bc4e605be9d0ded4690ef518 WHIRLPOOL 78fa74da56b5085a45df6584fce7908482666d024d71ea7a8251ba68cc6cf993180f4dc042f40dd1c3175d466a02222990dd78372c1d3d048b1cbef928949ef0
-MISC ChangeLog 142434 SHA256 b9ede3f6f5eb2f1ca9261162a8899087d28b60b9cb48ce9df0827f03aa93dd80 SHA512 30d906fbc7de5cd191c0d35e85463701728f088215603c0263039b00f08653d34ffae2521cc45deda2f3133741e9efb06e70c4a65a16069176f12071172e6e7c WHIRLPOOL 27ef3e9bbf78119b1e3afe86b5bfb74e45cd2f4b6b9b83e2ca84c8cd69b08948a18871a374afe1c2f23c386e2de57452e56f5552ed1e9afa66d363163e8b1af9
+EBUILD netbeans-ide-9999_p20150123.ebuild 29641 SHA256 b4e20b32a4a9ea843164beeaa85512bf84496aadc9faf3d8330505e80302f950 SHA512 0bd1aefa00209cb8ca657c38fa728b2fe5dade6194ed78e0417c0d9d563c8de863fb1872dbcaffb699ea2f79d0a147f743c01101c7a95886ae68ce7d481f521a WHIRLPOOL d34a85dbf8d952c8fcaeb7ab6eea8199f011ba48e27fb867a431f5c1bd8e56ddae24dda9b4e56c819c0d63d88a6979c6a5d88c3bf6c2ae4ecc025d9a399b6585
+MISC ChangeLog 142601 SHA256 f798aa322e6c6123b5045cb193ec926a64baba36f18463f318ad3581940e5fa8 SHA512 a802e7b5845ca3940454af96b9bc5994bdb2c4f3d864f7457832f72587eefe0820abe681cbc48d6ba100e0e4e9c2083dd7dda79cb050d450198ca2dc0af064fc WHIRLPOOL 40b2b466d144377c543d9183b2106ae43afbeab3ec1a6797a2123430425ea9a1f7fab4829baaaf3d488c9513b94caf7a6c06bb7505bad3c480cef76c5f484399
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20150123.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20150123.ebuild
new file mode 100644
index 0000000..5628fd2
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20150123.ebuild
@@ -0,0 +1,373 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-01-23_00-02-29/zip/netbeans-trunk-nightly-201501230002-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/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/53AFD6CAA1B476204557B0626E7D673FBD5D245C-css3-spec.zip
+	http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
+	http://hg.netbeans.org/binaries/C40DFDACDF892D1BA14B540B32C11B6F34659931-exechlp-1.0.zip
+	http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar
+	http://hg.netbeans.org/binaries/75C30C488AD2A18A82C7FE3829F4A33FC7841643-glassfish-tooling-sdk-0.3-b054-246345.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/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-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/DA6CE3C2EB334DB61EFA99CD66134619867368FA-js-corestubs.zip
+	http://hg.netbeans.org/binaries/997BF4A93B8A99E37AB51C9016D1D18CF5FF4B60-js-domstubs.zip
+	http://hg.netbeans.org/binaries/291540295937BAC426A5A5BDDB6D86604075F4C0-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/7052E115041D04410A4519A61307502FB7C138E6-org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar
+	http://hg.netbeans.org/binaries/B19A4D998C76FE7A30830C96B9E3A47682F320FC-org.eclipse.core.jobs-3.5.101.jar
+	http://hg.netbeans.org/binaries/E64EF6A3FC5DB01AD95632B843706CCE56614C90-org.eclipse.core.net_1.2.100.I20110511-0800.jar
+	http://hg.netbeans.org/binaries/6658C235056134F7E86295E751129508802D71F2-org.eclipse.core.runtime-3.7.0.jar
+	http://hg.netbeans.org/binaries/0CA9B9DF8A8E4C6805C60A5761C470FCE8AE828F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110.jar
+	http://hg.netbeans.org/binaries/9C74D245214DB08E7EB9BC07A951B41CFE3E3648-org.eclipse.equinox.app-1.3.100.jar
+	http://hg.netbeans.org/binaries/78E5D0B8516B042495660DA36CE5114650F8F156-org.eclipse.equinox.common_3.6.0.v20110523.jar
+	http://hg.netbeans.org/binaries/FD94003A1BCE42008753522BFED68E5A84B92644-org.eclipse.equinox.preferences-3.4.2.jar
+	http://hg.netbeans.org/binaries/54AE046B40C9095C2637F8D21664C5CD76E34485-org.eclipse.equinox.registry_3.5.200.v20120522-1841.jar
+	http://hg.netbeans.org/binaries/0FFB9B1D7CD992CE6C8AAEEC2F6F98DFBB1D2F91-org.eclipse.equinox.security-1.1.1.jar
+	http://hg.netbeans.org/binaries/B005B69D9F5B4DBA636A95403D5CB62BAD5C486D-org.eclipse.jgit-3.6.0.201412230720-r.jar
+	http://hg.netbeans.org/binaries/0F81EBAFB75BE1C3A972B7563078897958724E1A-org.eclipse.jgit.java7-3.6.0.201412230720-r.jar
+	http://hg.netbeans.org/binaries/A94F8F805202B28236FFBC03C1CA149129DAEA1C-org.eclipse.mylyn.bugzilla.core_3.10.0.20131024-1218.jar
+	http://hg.netbeans.org/binaries/19D64C17A692D2023E22B16AD515118DF6427790-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710.jar
+	http://hg.netbeans.org/binaries/A1BF01D1DD09274446738C3F83360314B8881CD5-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210.jar
+	http://hg.netbeans.org/binaries/136A7EB3BB9B2559C5F9184B438F108C959B3C03-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116.jar
+	http://hg.netbeans.org/binaries/531746EBE57071AB7F8CCC7ACB0E806F25893916-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116.jar
+	http://hg.netbeans.org/binaries/D3ED088A49DE9E5163457E9279181DD4185BFBE6-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023.jar
+	http://hg.netbeans.org/binaries/8D4278A9F47D17A104182E59CF06D682B3DE0B3E-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055.jar
+	http://hg.netbeans.org/binaries/1FC011B8A350B70950B3F1D722D7F2890C6E76D8-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055.jar
+	http://hg.netbeans.org/binaries/6E914CA3075C8FDF7652F04A02868CF32F2EDCE3-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055.jar
+	http://hg.netbeans.org/binaries/8A2F6232978E0330A5D36F19BA0686F96FB980B5-org.tmatesoft.svnkit_1.8.4.r10218_v20140302_1242.jar
+	http://hg.netbeans.org/binaries/820FD32B3FB7F885996B15474F220BDCCACD6D27-processtreekiller-1.0.2.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/CE9A1C96875443F2FDD5127B750DA39CF4CE818B-com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.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/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/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
+	>=dev-java/jsch-0.1.46:0
+	dev-java/jzlib: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}"/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}"/53AFD6CAA1B476204557B0626E7D673FBD5D245C-css3-spec.zip css.editor/external/css3-spec.zip || die
+	ln -s "${DISTDIR}"/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip derby/external/derbysampledb.zip || die
+	ln -s "${DISTDIR}"/C40DFDACDF892D1BA14B540B32C11B6F34659931-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}"/75C30C488AD2A18A82C7FE3829F4A33FC7841643-glassfish-tooling-sdk-0.3-b054-246345.jar libs.glassfish.sdk/external/glassfish-tooling-sdk-0.3-b054-246345.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}"/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-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}"/DA6CE3C2EB334DB61EFA99CD66134619867368FA-js-corestubs.zip javascript2.editor/external/js-corestubs.zip || die
+	ln -s "${DISTDIR}"/997BF4A93B8A99E37AB51C9016D1D18CF5FF4B60-js-domstubs.zip javascript2.editor/external/js-domstubs.zip || die
+	ln -s "${DISTDIR}"/291540295937BAC426A5A5BDDB6D86604075F4C0-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}"/7052E115041D04410A4519A61307502FB7C138E6-org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar o.eclipse.core.contenttype/external/org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar || die
+	ln -s "${DISTDIR}"/B19A4D998C76FE7A30830C96B9E3A47682F320FC-org.eclipse.core.jobs-3.5.101.jar o.eclipse.core.jobs/external/org.eclipse.core.jobs-3.5.101.jar || die
+	ln -s "${DISTDIR}"/E64EF6A3FC5DB01AD95632B843706CCE56614C90-org.eclipse.core.net_1.2.100.I20110511-0800.jar o.eclipse.core.net/external/org.eclipse.core.net_1.2.100.I20110511-0800.jar || die
+	ln -s "${DISTDIR}"/6658C235056134F7E86295E751129508802D71F2-org.eclipse.core.runtime-3.7.0.jar o.eclipse.core.runtime/external/org.eclipse.core.runtime-3.7.0.jar || die
+	ln -s "${DISTDIR}"/0CA9B9DF8A8E4C6805C60A5761C470FCE8AE828F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110.jar o.eclipse.core.runtime.compatibility.auth/external/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110.jar || die
+	ln -s "${DISTDIR}"/9C74D245214DB08E7EB9BC07A951B41CFE3E3648-org.eclipse.equinox.app-1.3.100.jar o.eclipse.equinox.app/external/org.eclipse.equinox.app-1.3.100.jar || die
+	ln -s "${DISTDIR}"/78E5D0B8516B042495660DA36CE5114650F8F156-org.eclipse.equinox.common_3.6.0.v20110523.jar o.eclipse.equinox.common/external/org.eclipse.equinox.common_3.6.0.v20110523.jar || die
+	ln -s "${DISTDIR}"/FD94003A1BCE42008753522BFED68E5A84B92644-org.eclipse.equinox.preferences-3.4.2.jar o.eclipse.equinox.preferences/external/org.eclipse.equinox.preferences-3.4.2.jar || die
+	ln -s "${DISTDIR}"/54AE046B40C9095C2637F8D21664C5CD76E34485-org.eclipse.equinox.registry_3.5.200.v20120522-1841.jar o.eclipse.equinox.registry/external/org.eclipse.equinox.registry_3.5.200.v20120522-1841.jar || die
+	ln -s "${DISTDIR}"/0FFB9B1D7CD992CE6C8AAEEC2F6F98DFBB1D2F91-org.eclipse.equinox.security-1.1.1.jar o.eclipse.equinox.security/external/org.eclipse.equinox.security-1.1.1.jar || die
+	ln -s "${DISTDIR}"/B005B69D9F5B4DBA636A95403D5CB62BAD5C486D-org.eclipse.jgit-3.6.0.201412230720-r.jar o.eclipse.jgit/external/org.eclipse.jgit-3.6.0.201412230720-r.jar || die
+	ln -s "${DISTDIR}"/0F81EBAFB75BE1C3A972B7563078897958724E1A-org.eclipse.jgit.java7-3.6.0.201412230720-r.jar o.eclipse.jgit.java7/external/org.eclipse.jgit.java7-3.6.0.201412230720-r.jar || die
+	ln -s "${DISTDIR}"/A94F8F805202B28236FFBC03C1CA149129DAEA1C-org.eclipse.mylyn.bugzilla.core_3.10.0.20131024-1218.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.10.0.20131024-1218.jar || die
+	ln -s "${DISTDIR}"/19D64C17A692D2023E22B16AD515118DF6427790-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.10.0.20130926-1710.jar || die
+	ln -s "${DISTDIR}"/A1BF01D1DD09274446738C3F83360314B8881CD5-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.10.0.20131018-1210.jar || die
+	ln -s "${DISTDIR}"/136A7EB3BB9B2559C5F9184B438F108C959B3C03-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116.jar || die
+	ln -s "${DISTDIR}"/531746EBE57071AB7F8CCC7ACB0E806F25893916-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116.jar || die
+	ln -s "${DISTDIR}"/D3ED088A49DE9E5163457E9279181DD4185BFBE6-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023.jar || die
+	ln -s "${DISTDIR}"/8D4278A9F47D17A104182E59CF06D682B3DE0B3E-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055.jar || die
+	ln -s "${DISTDIR}"/1FC011B8A350B70950B3F1D722D7F2890C6E76D8-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055.jar || die
+	ln -s "${DISTDIR}"/6E914CA3075C8FDF7652F04A02868CF32F2EDCE3-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055.jar  || die
+	ln -s "${DISTDIR}"/8A2F6232978E0330A5D36F19BA0686F96FB980B5-org.tmatesoft.svnkit_1.8.4.r10218_v20140302_1242.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.4.r10218_v20140302_1242.jar || die
+	ln -s "${DISTDIR}"/820FD32B3FB7F885996B15474F220BDCCACD6D27-processtreekiller-1.0.2.jar extexecution.process/external/processtreekiller-1.0.2.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}"/CE9A1C96875443F2FDD5127B750DA39CF4CE818B-com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.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 --build-only --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.49.jar
+	java-pkg_jar-from --build-only --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.3.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/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.3.jar && dosym /usr/share/jvyamlb/lib/jvyamlb.jar ${instdir}/jvyamlb-0.2.3.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/ChangeLog b/dev-java/netbeans-java/ChangeLog
index d1801e6..8e3e604 100644
--- a/dev-java/netbeans-java/ChangeLog
+++ b/dev-java/netbeans-java/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-java-9999_p20150123 (23 Jan 2015)
+
+  23 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-java-9999_p20150123.ebuild:
+  bumped to the latest sources
+
 *netbeans-java-9999_p20150122 (22 Jan 2015)
 
   22 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 3ed672c..3958d12 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -119,6 +119,7 @@ DIST netbeans-trunk-nightly-201501190001-src.zip 201391445 SHA256 ce4ec7706f8073
 DIST netbeans-trunk-nightly-201501200001-src.zip 201396862 SHA256 1a9378d8f52c4f617653d096aff287cf62212af8a6f878fe54cc468e4dd4bed7 SHA512 92fd39cda2d11816b9a01e0e5c26b3f527354a69efdc940cb27d5b17ee6493a07225d2698260db2bdc220e01d166ac42b5fb62f809d1e2eb84419c6e6abb3e14 WHIRLPOOL c3ba7155b5d376041d750c42f1ff8f8dec5bdbfedb470dea483a665978ef3982f087cb7a521f7892c264bb38d0876e4e7a08346ae4579338ba698ae7ee4ba456
 DIST netbeans-trunk-nightly-201501210001-src.zip 201405381 SHA256 95369f4a232531feb195f2d41c14b7ec9791bbd86282fc8155bb1828affe6afa SHA512 4e710bc5905ea83167152e3252a4309d6a4f6fe8f0ccd8f50bd6389635cb2c4fa1cda60c9c9df8d70149ef84bba66527a8c94b1822710421aa704d374a0132b5 WHIRLPOOL c6780c694d1acabd53ca2b23ac660d587b02f63f3f8b5a98c7e293af4e099dfc46dcd5dcd939d7133edb5885388150fd28723b6325678519a80f2cd0ea673ac8
 DIST netbeans-trunk-nightly-201501220002-src.zip 201432275 SHA256 1969c39ce22136b5ff98f7959bf96088b7caaf9ea46df54ff0ed01ca857de8df SHA512 dae7c345289746e85ea6bf99a6352fcb53ec02c8828bf447a686aed0cea577de11e75e89451abf76a1dee3b1d91aaa204dbbe3057ca40c58759f16a4d768b7a9 WHIRLPOOL 39163c8ccac8111c9ab2a0787a2bd137a680bd16eccf4a7e526cfe34c74df0efa957b320df52b92fe9f1dbd134e7e2b2e1479c237b78e7a060c3893aac8838f9
+DIST netbeans-trunk-nightly-201501230002-src.zip 201448361 SHA256 9705937c7762d0df36dd885713111a80c01b67f17c2257423961ec7c25acf546 SHA512 c6a11a10357a44e899e621d4402daa6b435ec285c467d44d636e3c3c457f025225bb7594b84c7ee526fd7c416441960350645f098860e858cdf7106ccf694ee4 WHIRLPOOL 03b767b926ff881cea4b2227b11e0ef9b7b866d88d6b05f7f90419de7ff19216fbb785a9bf74c5db5b533b17186393e1d4280dc3c38dcdd9afa8440239fc6113
 EBUILD netbeans-java-7.0.1-r2.ebuild 14932 SHA256 3d8eeb5c3aea368c5064e83e9519b2982a3d0f999db11344ba33605f46f865b0 SHA512 0c99037f44aa968f357724650189fe0f6fc89496fbf73f6c5a9bcd589afa5af4974f058a8eea2b6a97e1884f4cabba8b5ecf0214b7e840870358f0e55abbc595 WHIRLPOOL 4c1ccada62d0c8883033500ead9586e5bfcd360e6030b3d8368b0b16b9ed01cc03d3c3d5888de437a16d5382b5fe9ec7c02f3e200c3c19bc9a43f011f32d3a68
 EBUILD netbeans-java-7.1.2-r1.ebuild 14936 SHA256 6082d8d5022e011e7aa9d4ff92bf9a144a4f733b879127552c0ca55566b0f18c SHA512 c03a674b6d93a4261bff40ad9aaad6fa9bc0451d6017aeb51f14c42113cc2ff12f84ff5a6cc01c01b43c7ce1b4d885da5c9cb4c0e13601c8ff780eb140060ac6 WHIRLPOOL d32f06a7bd7d4924f14fcb2ed67fd2f5a1766087e4f46ed77d12d472c4c133eef5431d75a709da1abcf8b8cff5afef303dd57e82e4022651a7278076502300d6
 EBUILD netbeans-java-7.2.ebuild 12206 SHA256 da05f74f2c02e4aac745dcf1be75069cc7070f241d063c19c40465e139ac135f SHA512 62be228321e175ad03c2a7d9270065445ba9e1ca08a1a51927027ddbc78aa43a0c57c6b4193add993764235068c7128655f2f12e00fcd17fbac807334f2483c6 WHIRLPOOL 5f518535df8a5f1e1e4f0bc5c845ca063317221c619c3e8928c89a4f2bb30be5a03838f5a610bcda58959d535e4fb152f92f4edd780bcd423918b448d7ddf2e1
@@ -154,5 +155,6 @@ EBUILD netbeans-java-9999_p20150119.ebuild 13429 SHA256 788f98dfe95c056ce18b8cd3
 EBUILD netbeans-java-9999_p20150120.ebuild 13429 SHA256 00caf2f373335e27e1ee6500b0867470513b12371fe3cfeb4fe54e7a496f8e11 SHA512 472d37d03a452d5ac7f425698a316c740a820ad350961fcbe858d23a2e78c41a2112924a0054fabc65e50d35607d526c992a470a6f3f134826d8b735fb61ad2b WHIRLPOOL 473278af7473167b3d2473c1d706f4fef09dae0f148a76e376d714d67426ada68f41f5265de11a505b3123ab8fd6ff97c1d7c21a011017bfcdec4190da3215f6
 EBUILD netbeans-java-9999_p20150121.ebuild 13429 SHA256 d943258194d15092c0046ef9ca400f31d75126cc941a3f3518e3ce0fabc3e2ba SHA512 8446db89765e6a4d4f961eafbcc7a507989bd5a2a171ca0501266464700049909a23527826e479488a266cdb3235b848b406800b1a1e53f730be52ee2266dbb9 WHIRLPOOL 49e7746d64aba0a6678238cfc9d4c08580ccd79129e7ac33b2c945e3f05e9ffd2afdd7c4512adc431490239fd09448194b560ab38c9880d904d1c460f356cca3
 EBUILD netbeans-java-9999_p20150122.ebuild 13429 SHA256 c11cbd34f4d82908aecbe6b3229d718fd6ab4d98465064c2ea5e029b5b4cd9ea SHA512 e79b59df90469ee68a592954b9078d7b486dc0fce5ac61634e8000f9cc704f7a4be8026941e8e5b159ea11ec8ba727a466e694e720acef5fa61350c2c0310c2b WHIRLPOOL 5788a948cae007f467bae3b9e5c6e7af1bb630287cd0363e4fab40601712de35194d741ee120c5c30a0177802127c0d69089722bf20e69b049931a2bef59ca6b
-MISC ChangeLog 145083 SHA256 16bbe896c26fff4ccb26eea70dbf1ee0470d84fea527a11f5f362886fdb30d06 SHA512 ca096bd965e30738d426aea04d881fb74c92657ceb19038a62a0fae9af2c00d3da4aff68868ef22330ddf001efc482901daa0a7f0d7e67c3cb438a16216c78a2 WHIRLPOOL 4eba86461c6018a57785955986bec1a85185d3bf73dd70c8c2bef7c5ea36c87b49bf1e3999c28e4897c85a7b48cd472d605df1f73e2772c60fca9b51de7ea739
+EBUILD netbeans-java-9999_p20150123.ebuild 13429 SHA256 1f049fbea1b66f1adcf770e3c90d180764abb8ba8da4a9d7ebcff2915c8b7274 SHA512 4dd64c758df2606b162254c9fb68b8379bf74102b28581aaeca9192ff04dd371da013094a9d29148048d63f081e78df68b60d5cde1a6b8477cac584086688782 WHIRLPOOL be9e467c35d8da110eaf9794d70f86f87322b626dcdaef4d8fab5d4ad61b65be099ed00228be510b2dce4047322e5afdbef3aa7a00ede20d0edc3fcbcba41784
+MISC ChangeLog 145252 SHA256 c8376d18b854908dfa106c7de1dbfd19a350a57a187c791029dd0768e73b4ee5 SHA512 613f0ee57faa05a367e61bf57a772c2330d13a170257c0ac165820ce6359881426242c162bb40bc0f5c7961a417b87d91b7eea304b367774517e35ee0b728ede WHIRLPOOL 872f30a0bd703274d063aa738a5e54897e05833908d54b3b4486f0be23c2d14405224c515b983a1b4a2952c8571e332ac1045a432f57556e27bc5882fbc8933d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20150123.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20150123.ebuild
new file mode 100644
index 0000000..221e578
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20150123.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-01-23_00-02-29/zip/netbeans-trunk-nightly-201501230002-src.zip"
+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/E5579EF3B0C1EF2F43562DD0C3B32F8E1F603B49-nb-javac-api.jar
+	http://hg.netbeans.org/binaries/38F9F426B1CE20EDC709424F51EDA1C87F13F420-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"
+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:2.2
+	dev-java/jdom:1.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/cglib:2.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/saaj:0
+	dev-java/stax-ex: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}"/E5579EF3B0C1EF2F43562DD0C3B32F8E1F603B49-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
+	ln -s "${DISTDIR}"/38F9F426B1CE20EDC709424F51EDA1C87F13F420-nb-javac-impl.jar libs.javacimpl/external/nb-javac-impl.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
+	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-2.2 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.10.jar
+	java-pkg_jar-from --into maven.embedder/external jdom-1.0 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}/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-2.2/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-2.1/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
+	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 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 streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/streambuffer.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-1.0/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/ChangeLog b/dev-java/netbeans-javacard/ChangeLog
index 5255d4f..908213e 100644
--- a/dev-java/netbeans-javacard/ChangeLog
+++ b/dev-java/netbeans-javacard/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javacard-9999_p20150123 (23 Jan 2015)
+
+  23 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javacard-9999_p20150123.ebuild:
+  bumped to the latest sources
+
 *netbeans-javacard-9999_p20150122 (22 Jan 2015)
 
   22 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 65877a3..a8e740f 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -44,6 +44,7 @@ DIST netbeans-trunk-nightly-201501190001-src.zip 201391445 SHA256 ce4ec7706f8073
 DIST netbeans-trunk-nightly-201501200001-src.zip 201396862 SHA256 1a9378d8f52c4f617653d096aff287cf62212af8a6f878fe54cc468e4dd4bed7 SHA512 92fd39cda2d11816b9a01e0e5c26b3f527354a69efdc940cb27d5b17ee6493a07225d2698260db2bdc220e01d166ac42b5fb62f809d1e2eb84419c6e6abb3e14 WHIRLPOOL c3ba7155b5d376041d750c42f1ff8f8dec5bdbfedb470dea483a665978ef3982f087cb7a521f7892c264bb38d0876e4e7a08346ae4579338ba698ae7ee4ba456
 DIST netbeans-trunk-nightly-201501210001-src.zip 201405381 SHA256 95369f4a232531feb195f2d41c14b7ec9791bbd86282fc8155bb1828affe6afa SHA512 4e710bc5905ea83167152e3252a4309d6a4f6fe8f0ccd8f50bd6389635cb2c4fa1cda60c9c9df8d70149ef84bba66527a8c94b1822710421aa704d374a0132b5 WHIRLPOOL c6780c694d1acabd53ca2b23ac660d587b02f63f3f8b5a98c7e293af4e099dfc46dcd5dcd939d7133edb5885388150fd28723b6325678519a80f2cd0ea673ac8
 DIST netbeans-trunk-nightly-201501220002-src.zip 201432275 SHA256 1969c39ce22136b5ff98f7959bf96088b7caaf9ea46df54ff0ed01ca857de8df SHA512 dae7c345289746e85ea6bf99a6352fcb53ec02c8828bf447a686aed0cea577de11e75e89451abf76a1dee3b1d91aaa204dbbe3057ca40c58759f16a4d768b7a9 WHIRLPOOL 39163c8ccac8111c9ab2a0787a2bd137a680bd16eccf4a7e526cfe34c74df0efa957b320df52b92fe9f1dbd134e7e2b2e1479c237b78e7a060c3893aac8838f9
+DIST netbeans-trunk-nightly-201501230002-src.zip 201448361 SHA256 9705937c7762d0df36dd885713111a80c01b67f17c2257423961ec7c25acf546 SHA512 c6a11a10357a44e899e621d4402daa6b435ec285c467d44d636e3c3c457f025225bb7594b84c7ee526fd7c416441960350645f098860e858cdf7106ccf694ee4 WHIRLPOOL 03b767b926ff881cea4b2227b11e0ef9b7b866d88d6b05f7f90419de7ff19216fbb785a9bf74c5db5b533b17186393e1d4280dc3c38dcdd9afa8440239fc6113
 EBUILD netbeans-javacard-7.0.1.ebuild 4961 SHA256 566bc7e3275c97d0fe3d68c843b53aee641548ec39a8143aebd56d248da3c32c SHA512 5973c8d4254943473209b0881c0fbe40ac6b61563d508e58adc248dd40c8c2d6b742bd6c1667ee11fb404f9d2e62f08a8e4d822a2a3db9fccab254f73828c3b0 WHIRLPOOL fd1e08943ce754a2abfe8c8b83954399287500ce574a46fe0d76f94b300fd2a5978957f94a3ac1d85781330248a46fefacfbae25db95669c3de910145ef96424
 EBUILD netbeans-javacard-7.1.2.ebuild 4970 SHA256 15ff13152b140edaa549ea6515949d99cdb2a4656918566179836ab2277f01b8 SHA512 b7e52b477f6ba645084034eb27e848fb48361351937fc45455bf4b7d74acbdd257427ec589286f0edc71cc98c8cdb114e55988b6d3dc92143e13f407e3b45a52 WHIRLPOOL 85ab6dc2c230ea89fd19d7602ac24e3d2b0f226590998e6a6e277c24ef60a7e86874f7e95e90921d255e84f05e04ad1998ee7361b4d26c6f14828076792a933c
 EBUILD netbeans-javacard-7.2.ebuild 4718 SHA256 d173c848e825b342a52073ba16b7784016f92124d4bc3b5ad8beebb7a7dda772 SHA512 019183c236c59ec2b961445c49643c6da0b376048f1be1d58677a753890bcb03db126f6441221c7572a74fe45c4c27aeee4acb38db620f9203ad04ae8ff2c426 WHIRLPOOL f2a10183045edd22ef4419b630cedafc093b326eb593178a0f50e8d82ebb25ab732fb8c561d49969073d9fce551c5b9150fb1900b49458ed53f0234baa29a78e
@@ -79,5 +80,6 @@ EBUILD netbeans-javacard-9999_p20150119.ebuild 4982 SHA256 ecc54fac44a7b853c48d2
 EBUILD netbeans-javacard-9999_p20150120.ebuild 4982 SHA256 067b3d60cc3fe809568b6bf77ffe1a8b86cf2eed9aa6121561dbaa78d2c5b96a SHA512 d4eedd7c3b68bf50a4fd02aa39bcb086b76f075f178851fadce4df85ede87e216e68ffbd55c08c481ae20bf19ec4a05501572671d7bb7dbb65bb96ade220f09e WHIRLPOOL 1120dbbf4d66ee8b9ce78a79cca2b89c69f7ac4a044297ce938a67df803db71b192b4677e3daa6c59ecff898f0a19c65dcfa309199999174818ed44d84423253
 EBUILD netbeans-javacard-9999_p20150121.ebuild 4982 SHA256 7378d9e476d00150cd9d59cf8a6707fe305fb1119796b594a4152f537f2819ae SHA512 7f87991f6029d6476f40d964f6f23a294bec98a81e374b406dee654b0872957079377ae1c5b7ed9a465c85fc41ca2ae9005f95460d0918100a7c6fddcfee85ed WHIRLPOOL d3df1c85f70e1df5ef6e3d7876b45e507ad3135185ddb3efb8b47821331507c761883ffeb3ebfb0c8e02bb4c984164a4d562b91cd534ef1052254a84af598ae4
 EBUILD netbeans-javacard-9999_p20150122.ebuild 4982 SHA256 79ee7a2d79b978de0c0b75f60907dd99bd91b19733116e7737ec3dafea6f588f SHA512 fc4cbeff946658fe44636bef3d9b2a755e0f0cb21796c398c5f7355a1e2941947cee5853cd76b2e80d51e0936242f9eece288aacbbdbb20edb617a8e60c6fb4c WHIRLPOOL 8a75bfe7e24bbbceb80047a6ba9767d4fa2dfdd768a1dce67e852fa7c9cf1e72281b06d259016d62fcd451e0449e03f688e6d7894b63e1778f1f97fafa5a9be6
-MISC ChangeLog 151291 SHA256 a8f31cc08c7083fc719024f495a571d46f1aa887ad7d84af721a5912f5082b9c SHA512 d8896188cbc28eff600cd905257a71746cae79089b34b203bbda61b177f62b5f5d4ea350c8ab88c176ec06e469736d9bebf36e95c6ad41c908c5e3e78a1b47c1 WHIRLPOOL fd775b9e2239d63e4feae9ea83a93974af022cf43ff18ed191bc185c8cdb8a6851e924b1b64524be62bedf72da7d86a42d10e88e82f81635ea7e67c245a7f627
+EBUILD netbeans-javacard-9999_p20150123.ebuild 4982 SHA256 f7eb5720da0829c06ca523ca9886ad1b2a576a8e465edb97207044c1cbda42b8 SHA512 90c1fbf37da1f6a28edc4c6f9a487925cddc64823c5243688a653e077ad4cef37a1422e62eed98a5082edd7818074a85ed7910bcf30b7a067d8ec95e70bec4df WHIRLPOOL 7589731cb9ed38c3323b0b3f2c5b25a09e4bc5a44346e8c3c261373231c54613282ec5d47d14bf8241acb7389230dc7686d84b7d332574486413e9ed7425a556
+MISC ChangeLog 151468 SHA256 0e1ba7dea43061ef2dd2f6f7a9a3207db73b2f3641ed751ef9649dd572807e6d SHA512 cd4c5e4e720b5273337240e25b73f9f73f33cdbd9a2815aee7c3853c37e7fc27b1859a91d6a17f720a31cfe5300e00e7c0b17390797d51c06a2e1bc23fe7f886 WHIRLPOOL 44462d0559f2f899d2e7a8ef965d88a23a0de8592480aefe891cb85586cf2380d095f1d53b547f510249b0b0f84c5d0356d6fa2499627dc9d003776e29cdc531
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150123.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150123.ebuild
new file mode 100644
index 0000000..97ff7dd
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150123.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-01-23_00-02-29/zip/netbeans-trunk-nightly-201501230002-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/ChangeLog b/dev-java/netbeans-javadoc/ChangeLog
index 86a80ce..baa0e9e 100644
--- a/dev-java/netbeans-javadoc/ChangeLog
+++ b/dev-java/netbeans-javadoc/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javadoc-9999_p20150123 (23 Jan 2015)
+
+  23 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javadoc-9999_p20150123.ebuild:
+  bumped to the latest sources
+
 *netbeans-javadoc-9999_p20150122 (22 Jan 2015)
 
   22 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index ef94ac4..7ddde83 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -47,6 +47,7 @@ DIST netbeans-trunk-nightly-201501190001-src.zip 201391445 SHA256 ce4ec7706f8073
 DIST netbeans-trunk-nightly-201501200001-src.zip 201396862 SHA256 1a9378d8f52c4f617653d096aff287cf62212af8a6f878fe54cc468e4dd4bed7 SHA512 92fd39cda2d11816b9a01e0e5c26b3f527354a69efdc940cb27d5b17ee6493a07225d2698260db2bdc220e01d166ac42b5fb62f809d1e2eb84419c6e6abb3e14 WHIRLPOOL c3ba7155b5d376041d750c42f1ff8f8dec5bdbfedb470dea483a665978ef3982f087cb7a521f7892c264bb38d0876e4e7a08346ae4579338ba698ae7ee4ba456
 DIST netbeans-trunk-nightly-201501210001-src.zip 201405381 SHA256 95369f4a232531feb195f2d41c14b7ec9791bbd86282fc8155bb1828affe6afa SHA512 4e710bc5905ea83167152e3252a4309d6a4f6fe8f0ccd8f50bd6389635cb2c4fa1cda60c9c9df8d70149ef84bba66527a8c94b1822710421aa704d374a0132b5 WHIRLPOOL c6780c694d1acabd53ca2b23ac660d587b02f63f3f8b5a98c7e293af4e099dfc46dcd5dcd939d7133edb5885388150fd28723b6325678519a80f2cd0ea673ac8
 DIST netbeans-trunk-nightly-201501220002-src.zip 201432275 SHA256 1969c39ce22136b5ff98f7959bf96088b7caaf9ea46df54ff0ed01ca857de8df SHA512 dae7c345289746e85ea6bf99a6352fcb53ec02c8828bf447a686aed0cea577de11e75e89451abf76a1dee3b1d91aaa204dbbe3057ca40c58759f16a4d768b7a9 WHIRLPOOL 39163c8ccac8111c9ab2a0787a2bd137a680bd16eccf4a7e526cfe34c74df0efa957b320df52b92fe9f1dbd134e7e2b2e1479c237b78e7a060c3893aac8838f9
+DIST netbeans-trunk-nightly-201501230002-src.zip 201448361 SHA256 9705937c7762d0df36dd885713111a80c01b67f17c2257423961ec7c25acf546 SHA512 c6a11a10357a44e899e621d4402daa6b435ec285c467d44d636e3c3c457f025225bb7594b84c7ee526fd7c416441960350645f098860e858cdf7106ccf694ee4 WHIRLPOOL 03b767b926ff881cea4b2227b11e0ef9b7b866d88d6b05f7f90419de7ff19216fbb785a9bf74c5db5b533b17186393e1d4280dc3c38dcdd9afa8440239fc6113
 EBUILD netbeans-javadoc-7.0.1.ebuild 5814 SHA256 68531c51838c95012830f5ae09e2386ea3179c2b31bfd5191f67993e3b3dbe2f SHA512 3bfe0ecc46f371d2553b031a5699229fb874dad1e94415635558b7d46b6764c31337d03444753e687b19a7c0976c68cb72007ccc82df7d1e5848a81f241f80c3 WHIRLPOOL 6571f7a73c262b3b67407840523b79eecc14bad9678cff05fb32a2811049158400870de51bbcef97ecb3f18f8ff59f965bdca8e788918d53822b92e2f20f75f5
 EBUILD netbeans-javadoc-7.1.2.ebuild 5855 SHA256 af28efb956ac3b7147e254ca3083dfaab11b84ea42e20677ebdd18aa29ff87e0 SHA512 ee06c552782170b51cfe70d603792b4240aef6064ba0a5074f394701a43285ed1e4030f539622c616be3175dab013e791c1a3a1193ad379193f5fa3e92eefa40 WHIRLPOOL dfcc63d6c9fcf094e2998ce1c08e29b4d4acbefbe9bea6498c2e28f84576f628da50164a1e0ab3ff5528720fe54cae71f2f5e6f84aedca5b639f13053464e6c1
 EBUILD netbeans-javadoc-7.2.ebuild 5805 SHA256 20d01deae745a7e8d84ffe55ca63ad74342bd8528c0dd15a20aac6570a1a83e3 SHA512 3947f1ab3efc236b8faa14736406ee3e537bbdbe377ea1bbd4f1eafa06a36d2863f8700dc7c84e6c8501abdf130a78e87ad6a0f52c5172bf0ab52f288617bc86 WHIRLPOOL 8301cce0679ed5f68a09e2e968ab2ba0955547f438758b042a04744539324fd79d83d853dfb8b48421f6dac616362cf1a9dd2a0e0ff8763dc2e12a470d16b95f
@@ -82,5 +83,6 @@ EBUILD netbeans-javadoc-9999_p20150119.ebuild 6234 SHA256 40617063c7a7f13db25570
 EBUILD netbeans-javadoc-9999_p20150120.ebuild 6234 SHA256 009a7ca34a96307c78d9c83dce750649810d56d10d093e21b1709064886ac8d5 SHA512 f1b2f4ceef3880c9f79936db788a8422306d0f00c5f2c7a809cb1ed0403798b1948197ad6fb19f97a75f7f67cc5840b3cd3c1e4d7fa414f5ad58bb6af1248d32 WHIRLPOOL 3c1bfbf9cbfd4273bd5f029d448027aa04b6696b3ce39c571407b6010367072dc4c2e58f3355ac363b272eb45629d4606cca6fdca6be83cfdb1053b41dd7555e
 EBUILD netbeans-javadoc-9999_p20150121.ebuild 6234 SHA256 2f89082bb4b83fb84bccdeca819cec5a23bdfe467b179edb6e26572b1a6ee2aa SHA512 64b0b5eead7f83d070670a3cf7713cbeb7ee1a3c13e73b0bc641d1e62cbc1ce7949c751147bbfab47bbcf3d07900390a55b71b1da54b16bd354f505282154ac6 WHIRLPOOL c5c40239923f4892adcf691f972a46d465b22e19d7b5d75724ad83a104f3eb198b6c2f2ea297a5a19fdfea824f88c286f8e9551d4787fde72cd0ea4ea8e54fe7
 EBUILD netbeans-javadoc-9999_p20150122.ebuild 6234 SHA256 87f2afa788403c632d8fc21073c2138057cb33d87c59d98a77b3ef36581056ec SHA512 75d563dec1c84e172cb95e4e51d9cf4629c5437dd8aca19a1284f03305790335607c987882d0878dff5c1df0beeebe1da5a27cd931b16fdd583ab977394fa1e0 WHIRLPOOL 8f28c849ca5f08630bc7740248eedbb95d19d80e7117ad82c7675e8c2861100eac64d03c7d474bc7058f6eeafd9e7b844624ff15057645d95a438734c37d0455
-MISC ChangeLog 149242 SHA256 c713cfdb2512432bebd0c4f935dc483af5237f5c2a5e490c5aff8487becc000f SHA512 b1f32b7174541436e5a76bdf088a6b672e6c3c2e577a0be3d29b474e0914f8425d851560a5c53dd162602f262096b3987f7c44685b00cc3bd98350f3fa2589fb WHIRLPOOL 7ff77d8f4ac0e1f7fc78359d6a05f54ce4d4484dbf072478901d5f5b1a01050fc09e93268012da017d6e79a88085cb51930b741e5d7f1cc773d5de1318080d34
+EBUILD netbeans-javadoc-9999_p20150123.ebuild 6234 SHA256 1db84bf2217d9bcda15ed0301f7db7200e5a79af5cd4a02b8f93404b92d4fe24 SHA512 82c6e11ce5570772f610714e3fc4fc65860378c4da9fe9404bc8b719b213ca0700ac4adcfede1fe2f3efc99242298b76ef505b92adcca764c8eda9245ec646b1 WHIRLPOOL 801d640557161391bd089a82c79813def57c8b11461c9ba6dd006b37b5c024872293407e99918c772b0362ba412c9cdffcd9695e070c59556667ea7295ba83d5
+MISC ChangeLog 149417 SHA256 e27c889649dcd883f85731a264ff38b141649cce67b482c73f61beec71528ab7 SHA512 b20df54e44eee7365415e5a7b468381a03379c1bd97c790b4514df36a6870d0f2987156eacdd19dede1d0b156acb324cbc3e90b11ebd1f9f242fd8d2c2fcee71 WHIRLPOOL 9adb2b1ba5a107fc168504d9d2a984e4f923fd806c17771a120894a4431ffc60b5a55a68eff4c0b2ca6a2cd34456795d8961671a800f8df0d2cec6f0ca104df8
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150123.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150123.ebuild
new file mode 100644
index 0000000..76197d2
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150123.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-01-23_00-02-29/zip/netbeans-trunk-nightly-201501230002-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.10.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/ChangeLog b/dev-java/netbeans-javafx/ChangeLog
index 7695d04..25c3d01 100644
--- a/dev-java/netbeans-javafx/ChangeLog
+++ b/dev-java/netbeans-javafx/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javafx-9999_p20150123 (23 Jan 2015)
+
+  23 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javafx-9999_p20150123.ebuild:
+  bumped to the latest sources
+
 *netbeans-javafx-9999_p20150122 (22 Jan 2015)
 
   22 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index db06875..c324e2f 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -46,6 +46,7 @@ DIST netbeans-trunk-nightly-201501190001-src.zip 201391445 SHA256 ce4ec7706f8073
 DIST netbeans-trunk-nightly-201501200001-src.zip 201396862 SHA256 1a9378d8f52c4f617653d096aff287cf62212af8a6f878fe54cc468e4dd4bed7 SHA512 92fd39cda2d11816b9a01e0e5c26b3f527354a69efdc940cb27d5b17ee6493a07225d2698260db2bdc220e01d166ac42b5fb62f809d1e2eb84419c6e6abb3e14 WHIRLPOOL c3ba7155b5d376041d750c42f1ff8f8dec5bdbfedb470dea483a665978ef3982f087cb7a521f7892c264bb38d0876e4e7a08346ae4579338ba698ae7ee4ba456
 DIST netbeans-trunk-nightly-201501210001-src.zip 201405381 SHA256 95369f4a232531feb195f2d41c14b7ec9791bbd86282fc8155bb1828affe6afa SHA512 4e710bc5905ea83167152e3252a4309d6a4f6fe8f0ccd8f50bd6389635cb2c4fa1cda60c9c9df8d70149ef84bba66527a8c94b1822710421aa704d374a0132b5 WHIRLPOOL c6780c694d1acabd53ca2b23ac660d587b02f63f3f8b5a98c7e293af4e099dfc46dcd5dcd939d7133edb5885388150fd28723b6325678519a80f2cd0ea673ac8
 DIST netbeans-trunk-nightly-201501220002-src.zip 201432275 SHA256 1969c39ce22136b5ff98f7959bf96088b7caaf9ea46df54ff0ed01ca857de8df SHA512 dae7c345289746e85ea6bf99a6352fcb53ec02c8828bf447a686aed0cea577de11e75e89451abf76a1dee3b1d91aaa204dbbe3057ca40c58759f16a4d768b7a9 WHIRLPOOL 39163c8ccac8111c9ab2a0787a2bd137a680bd16eccf4a7e526cfe34c74df0efa957b320df52b92fe9f1dbd134e7e2b2e1479c237b78e7a060c3893aac8838f9
+DIST netbeans-trunk-nightly-201501230002-src.zip 201448361 SHA256 9705937c7762d0df36dd885713111a80c01b67f17c2257423961ec7c25acf546 SHA512 c6a11a10357a44e899e621d4402daa6b435ec285c467d44d636e3c3c457f025225bb7594b84c7ee526fd7c416441960350645f098860e858cdf7106ccf694ee4 WHIRLPOOL 03b767b926ff881cea4b2227b11e0ef9b7b866d88d6b05f7f90419de7ff19216fbb785a9bf74c5db5b533b17186393e1d4280dc3c38dcdd9afa8440239fc6113
 EBUILD netbeans-javafx-7.1.2.ebuild 3593 SHA256 76a29b37765000745794e6ae20c6b8528d8637507a257ffef3bef2ce648f05cc SHA512 a04618bda036e6652c7208f90a4dd91e07e75b85243580263f6ec846425ab907a87c318117990d4e8d9044bcd7a0ca8b63bc32bdd0d84e5373a10e67a77b79c0 WHIRLPOOL 11acad585f7315ae6b4edd53c764167567a948cb0e2037d95f2f4de34765909b71d095540c054f4cef3ba70224d294b42720536566e445cbdd06ebf2ad903841
 EBUILD netbeans-javafx-7.2.ebuild 3576 SHA256 3441b901a5074013351bc6c7ba6c424455e2affe52e448f2cfac0058c82345e2 SHA512 ee384d6e4ac767ade82b5d337d7a1c5d2b463c15a7596d91e1a850b37349f88d7867a0ffa11a118c48e2ed463f38dcfa791ec42b3fe85ea1e6bf7c4b27f9b073 WHIRLPOOL 15c7d20f2caa39c6cfcba2f846736754b049483f135ac90ced399672932a6a73467f0b4016550c3b2d8583be20d1467486f5652111893ec16111095a3e9c941c
 EBUILD netbeans-javafx-7.3.ebuild 4476 SHA256 9f268a852d45f37f9d22c3bb58d36be17f438e4b4cb5105d88ac4404731facb3 SHA512 3fa0e48e949d0df0a4404c04379623529f73ff15259f4164fddd10afb9faa046ceed16aac1a7b14728af89bf3a4ed7037638fb7e7e932a64cc71e84f7ecaa44a WHIRLPOOL 0395ca679fa41610c61dceb6ac018d7a76b62c08ca740de2fa2d98523f8e5f840a2d0a8c357b674d171841f93d980b536a671a1f12b5261d402c03b691ac6504
@@ -80,5 +81,6 @@ EBUILD netbeans-javafx-9999_p20150119.ebuild 4723 SHA256 0b3275a0b4924eb68e19e8e
 EBUILD netbeans-javafx-9999_p20150120.ebuild 4723 SHA256 9b12fe42fa5a2c05cfc2dbfeac85b493538584b49e9318e1e4d0bb5fe71ffbf3 SHA512 fc73b0fc4dade61e2bde4c8164ef42e2bc0b1e36d5985e6b2f0a6c58a6ba2229411d26e7772a05801eccf3c5e7506f9f166b7e13a2761335beba4a21a381c0f5 WHIRLPOOL 41100bda521a11267f2aa51e95ac97e4c905c790153c904b7db85cb1abb52ba054d297f94112cd0e46276c74cd5a8bde4c5de99bba9f8c5b482e6ff0902adec6
 EBUILD netbeans-javafx-9999_p20150121.ebuild 4723 SHA256 45c88d9c7fe3bc3497e87af7b928351df50d66a4e9c319c7f95dc1a2671c48f6 SHA512 6cbbe2bec75956c408e615a5510efb66c9e22c7d1bae41e9b1d5e74052915b3e480a046365106e86f0195e7ceeaac7c9c9b43125b4b2b7105d1f05b30d9900c0 WHIRLPOOL c5a3565514949ba0720f9330f31a0efeba030c2c8b470093fd5afc1c4f63865802ac0db098e9be8808328b67eddeb9cebbe85fbec8bb5cd153ea3b1f5f28a717
 EBUILD netbeans-javafx-9999_p20150122.ebuild 4723 SHA256 425378abfebce0514b5737cc0093fd0f9ed3e0442b8e3f15bdfd112b0f191468 SHA512 a34fa87ede2eaa54e340f168ae73e169c74141c2843f04b19dbb4467064502b56ef27a002de058b6e91e2fb25267d9aaeed7eac62c8a78b78d0356de3ac4570c WHIRLPOOL ce9a1e5487bdc4e43e67234b12add377bc5f821bcceabb5b60ae9fdd58359cb9ab52be8d8fc2e3be7922a43885221eb6256e8343e17d72aadb6ec7a5c741e060
-MISC ChangeLog 134060 SHA256 ebd371955df5dca2e8ef126f8da4aca6c7258820512756d919863d87371afa35 SHA512 f812dbf5ab87d440109e7d6e9c1fd1ceab6455f79e75c0aacaedf50660796325dc55b12259317b2dd862669f0defe0979cff4b7a26ec9414e441b9d342b749f7 WHIRLPOOL a9fe83e30b3973ce2280d64e007fb4b578173acc6736fc5f832d3ed36f4319192c1bef7839f4a82edf35d256285caafd8b233cd7ede578ebd89581cc70ae3413
+EBUILD netbeans-javafx-9999_p20150123.ebuild 4723 SHA256 4daffdf712aa9ab26788b0c5faf96fe41c434ee24f7928ddb7511da4ea6d1a70 SHA512 2ce51e68d87df620139d5f967759677dbb414882ca20ad36d071cbc12df12f2f685b589d8752372f2011b44e7e0b3595e2184ba19bb8829c1813e025e1ed0d39 WHIRLPOOL 04608fdb284789198a92f35fa99b4d49bca699d2059aab2781b76a1052c4bb2c02135422f0fb8ea4192949395f9bc5848f1f52de436908ccef886f019a0556d1
+MISC ChangeLog 134233 SHA256 72e9c30af08fadfcd0b5cbc36b2755284518cd1d6a81074c0beecf59678687c5 SHA512 6a374bc93810c1916968dc5672397d26899ec79906431e59476783e796831ffa4c58ff3980f29ca27b868f88a80c6956d3ade9afd2698040b0e7798d9c76f43a WHIRLPOOL fbd5b1ce947788dff6c9537a08048849eca82b25eb27307dccb4acf4ca522052b0ba5fe09a3b96243912fdc573e018ee803a47f4dc5a13c2503f8580411ef111
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150123.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150123.ebuild
new file mode 100644
index 0000000..04bf2b0
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150123.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-01-23_00-02-29/zip/netbeans-trunk-nightly-201501230002-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/0F7FC8D69950B86D5F67529B5C551DB84C5BCF87-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}"/0F7FC8D69950B86D5F67529B5C551DB84C5BCF87-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.10.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/ChangeLog b/dev-java/netbeans-mobility/ChangeLog
index f74cd34..5b2e3ce 100644
--- a/dev-java/netbeans-mobility/ChangeLog
+++ b/dev-java/netbeans-mobility/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-mobility-9999_p20150123 (23 Jan 2015)
+
+  23 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-mobility-9999_p20150123.ebuild:
+  bumped to the latest sources
+
 *netbeans-mobility-9999_p20150122 (22 Jan 2015)
 
   22 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 86f076a..013bb45 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -50,6 +50,7 @@ DIST netbeans-trunk-nightly-201501190001-src.zip 201391445 SHA256 ce4ec7706f8073
 DIST netbeans-trunk-nightly-201501200001-src.zip 201396862 SHA256 1a9378d8f52c4f617653d096aff287cf62212af8a6f878fe54cc468e4dd4bed7 SHA512 92fd39cda2d11816b9a01e0e5c26b3f527354a69efdc940cb27d5b17ee6493a07225d2698260db2bdc220e01d166ac42b5fb62f809d1e2eb84419c6e6abb3e14 WHIRLPOOL c3ba7155b5d376041d750c42f1ff8f8dec5bdbfedb470dea483a665978ef3982f087cb7a521f7892c264bb38d0876e4e7a08346ae4579338ba698ae7ee4ba456
 DIST netbeans-trunk-nightly-201501210001-src.zip 201405381 SHA256 95369f4a232531feb195f2d41c14b7ec9791bbd86282fc8155bb1828affe6afa SHA512 4e710bc5905ea83167152e3252a4309d6a4f6fe8f0ccd8f50bd6389635cb2c4fa1cda60c9c9df8d70149ef84bba66527a8c94b1822710421aa704d374a0132b5 WHIRLPOOL c6780c694d1acabd53ca2b23ac660d587b02f63f3f8b5a98c7e293af4e099dfc46dcd5dcd939d7133edb5885388150fd28723b6325678519a80f2cd0ea673ac8
 DIST netbeans-trunk-nightly-201501220002-src.zip 201432275 SHA256 1969c39ce22136b5ff98f7959bf96088b7caaf9ea46df54ff0ed01ca857de8df SHA512 dae7c345289746e85ea6bf99a6352fcb53ec02c8828bf447a686aed0cea577de11e75e89451abf76a1dee3b1d91aaa204dbbe3057ca40c58759f16a4d768b7a9 WHIRLPOOL 39163c8ccac8111c9ab2a0787a2bd137a680bd16eccf4a7e526cfe34c74df0efa957b320df52b92fe9f1dbd134e7e2b2e1479c237b78e7a060c3893aac8838f9
+DIST netbeans-trunk-nightly-201501230002-src.zip 201448361 SHA256 9705937c7762d0df36dd885713111a80c01b67f17c2257423961ec7c25acf546 SHA512 c6a11a10357a44e899e621d4402daa6b435ec285c467d44d636e3c3c457f025225bb7594b84c7ee526fd7c416441960350645f098860e858cdf7106ccf694ee4 WHIRLPOOL 03b767b926ff881cea4b2227b11e0ef9b7b866d88d6b05f7f90419de7ff19216fbb785a9bf74c5db5b533b17186393e1d4280dc3c38dcdd9afa8440239fc6113
 EBUILD netbeans-mobility-7.0.1.ebuild 8655 SHA256 992e214ff2926e2f0db623d96b717bf8f8e4ceb47e96e69b3c6b8f67d6a8d130 SHA512 d51bc003f4b637cfe71c9f49a96427e535596542ac195a9621bc4f92c04a6f720a87fac6eb267732f869ba105f263d9d36f848b54a89c734b6a68a78ed323808 WHIRLPOOL 515da7153b12c3b5779cfad16e3800b4d26ba4b174027d9a7b06a26754fad065751c7eda137ba6199315d024a322d59e7ea39a1b2f4244ea75b30770ac505791
 EBUILD netbeans-mobility-7.1.2.ebuild 7543 SHA256 bb3f1245ad68133798fa507f06dd1ffbc1d55f6ba38f4cccc29ff0240e5b5f22 SHA512 41f663977a0716c5449db597d5f90054717ff3579a9137a910d1943d3e0b39379c34c0d9aa9c98d231037a042074c8ecf5fc62c018cd7cd5e8680734ff854c51 WHIRLPOOL c3c6feb41ce3df356f617ca80530673ac653cdf50da0aead00518854d0850d6420333529aa6591e15ddd4053249191fcb47100c5f39a804352722e54f802bae4
 EBUILD netbeans-mobility-7.2.ebuild 6571 SHA256 58af97ca9a6adc56fa6abe91777a1ac35a3a9b7d68af1e73c23a45dc5631abb2 SHA512 ac42c3a3daa7d55c9c13d1c99dd6880d5d99741f80cfceb683da27e30c70d6228d9434571f2405d0dbbf27d2203e3f877da6347794b07b98331edd1631d3a69d WHIRLPOOL 5a6af3cbcd08180dcdf708a038f3119faacb9c78532b4bb1945c7260fb0a8232af57745e41a73311fafffe185c969e0c88ac34970caab7708313f53417695374
@@ -85,5 +86,6 @@ EBUILD netbeans-mobility-9999_p20150119.ebuild 4418 SHA256 625352f3e597b36221b0a
 EBUILD netbeans-mobility-9999_p20150120.ebuild 4418 SHA256 b66c5873d21fd6d8d27606551b2e2b03468962d17109b86abed22c283c71e810 SHA512 6e9c52b42b28f5893f6083ad1892909fc4c74c90ba748f4e3667456af350d79d785958ee6745225a36efa8ded5c5efe2e37b329cf943b165de414639a523311e WHIRLPOOL 1f682d1e7a4a50c45e90d362de05e9c6450d6a7d8406d9afc056cea7e2e0793be431bd0775038f81ddd043d50cd1399f61599415c7a3d54cc9ce0f43211ad75a
 EBUILD netbeans-mobility-9999_p20150121.ebuild 4418 SHA256 9797b56d0c37de8f3a91a9ccd03f726cc3e37b753f002d82f2664baee1ea1d4f SHA512 553d477529a552f585b752ce6ba0eebe6c95dc83d6feb34c0adb40c785c4f17304e78a0bd98657d2e391d880fb1a1bfd925f77ab4c0c6a593ce4c869060e56a3 WHIRLPOOL f2847a9a863b2b0c237454b33596395e28fb2e286064487ce6d824fb733383fdb513502c2aa47a9c9e6fa15a39b3f77a2eed1862a9af99604afbb24c5624ab20
 EBUILD netbeans-mobility-9999_p20150122.ebuild 4418 SHA256 d2d3917c5cce91f80c85f11b07eb14e14cb9f774e26c0ce4f7293fc5aedbe8d3 SHA512 983e8ece99df63b0c8c805c66b30b39eb5a015ed7b721a49d25c6db6a19462c2a00e8ccd20d25f4d599fa5c8c7d8993dd69b0f44be75a4c9a908c9e7a340579d WHIRLPOOL bd7184c68b88efd3c3ba5e6afae26d166fd36ae0cd79f831b636990641f339c3351bbf712992c6c550322ad1b8e61c7286e64b54d019ab8c3d5ef3e21555a70b
-MISC ChangeLog 151432 SHA256 3aeef19227edd9f6967e06ddfaeba010a8d6d126bd6cd19afb10418d277e6126 SHA512 c7a062525f09671ea910cc0acc077be35d9ead27e43cff440fad70ae534190f3e91c7e59ba1e71005b38bc107f68aafe49b4f862487c793462a9fb3d8350ef7c WHIRLPOOL 8eda56629747c7bc917f8f72cd44036e055d815342ec712cdba73d2f245a115fe9204692040644b1c9ee0d0e5ed370a79d02935c13ef13ba53c5aaf69856ad17
+EBUILD netbeans-mobility-9999_p20150123.ebuild 4418 SHA256 8893aacc346dc8a6596f7c5f0104d4965c4923b53b21c37b36c75d3538561c24 SHA512 b8dc0b2c280aef5d2983184b92c601a893d6b39cf76ac3360e9e5303b309f8e685a6a417b53bf55ae6e0fc4d341a74f74b3267ec765828e202ea84a05e2011f5 WHIRLPOOL 70197d455478f3bedb2c7a3da8249ba500c1114c87069af37ee025e8d837dfe69907bc03597d7b5f80b409124a6afb39eb793b621aa4a6f29b6012b77ed8f5ab
+MISC ChangeLog 151609 SHA256 006e82db2dc6be9e08cdbb5c3e58b170bea5d759c582ff1ac11783d176396a62 SHA512 563dc64efb69cd394d060576a18935ae7b19f15ffd0b6291d9f2372408482b02620c14cd97e3e9c09ec40d5d87c5487ad3a6614f7ef26bece646a5c99e3ace91 WHIRLPOOL 13c3f1e61c3ae27263c681928632728b5ca767cec3c6c3336719219d992df4f919cd04554d771fa1de0294a7f228250db9acba4a6e069c66259130b87ebcc9a9
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150123.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150123.ebuild
new file mode 100644
index 0000000..cd92dbf
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150123.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-01-23_00-02-29/zip/netbeans-trunk-nightly-201501230002-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/ChangeLog b/dev-java/netbeans-nb/ChangeLog
index a2d40be..8725844 100644
--- a/dev-java/netbeans-nb/ChangeLog
+++ b/dev-java/netbeans-nb/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-nb-9999_p20150123 (23 Jan 2015)
+
+  23 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-nb-9999_p20150123.ebuild:
+  bumped to the latest sources
+
 *netbeans-nb-9999_p20150122 (22 Jan 2015)
 
   22 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index fa90301..c4de150 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -49,6 +49,7 @@ DIST netbeans-trunk-nightly-201501190001-src.zip 201391445 SHA256 ce4ec7706f8073
 DIST netbeans-trunk-nightly-201501200001-src.zip 201396862 SHA256 1a9378d8f52c4f617653d096aff287cf62212af8a6f878fe54cc468e4dd4bed7 SHA512 92fd39cda2d11816b9a01e0e5c26b3f527354a69efdc940cb27d5b17ee6493a07225d2698260db2bdc220e01d166ac42b5fb62f809d1e2eb84419c6e6abb3e14 WHIRLPOOL c3ba7155b5d376041d750c42f1ff8f8dec5bdbfedb470dea483a665978ef3982f087cb7a521f7892c264bb38d0876e4e7a08346ae4579338ba698ae7ee4ba456
 DIST netbeans-trunk-nightly-201501210001-src.zip 201405381 SHA256 95369f4a232531feb195f2d41c14b7ec9791bbd86282fc8155bb1828affe6afa SHA512 4e710bc5905ea83167152e3252a4309d6a4f6fe8f0ccd8f50bd6389635cb2c4fa1cda60c9c9df8d70149ef84bba66527a8c94b1822710421aa704d374a0132b5 WHIRLPOOL c6780c694d1acabd53ca2b23ac660d587b02f63f3f8b5a98c7e293af4e099dfc46dcd5dcd939d7133edb5885388150fd28723b6325678519a80f2cd0ea673ac8
 DIST netbeans-trunk-nightly-201501220002-src.zip 201432275 SHA256 1969c39ce22136b5ff98f7959bf96088b7caaf9ea46df54ff0ed01ca857de8df SHA512 dae7c345289746e85ea6bf99a6352fcb53ec02c8828bf447a686aed0cea577de11e75e89451abf76a1dee3b1d91aaa204dbbe3057ca40c58759f16a4d768b7a9 WHIRLPOOL 39163c8ccac8111c9ab2a0787a2bd137a680bd16eccf4a7e526cfe34c74df0efa957b320df52b92fe9f1dbd134e7e2b2e1479c237b78e7a060c3893aac8838f9
+DIST netbeans-trunk-nightly-201501230002-src.zip 201448361 SHA256 9705937c7762d0df36dd885713111a80c01b67f17c2257423961ec7c25acf546 SHA512 c6a11a10357a44e899e621d4402daa6b435ec285c467d44d636e3c3c457f025225bb7594b84c7ee526fd7c416441960350645f098860e858cdf7106ccf694ee4 WHIRLPOOL 03b767b926ff881cea4b2227b11e0ef9b7b866d88d6b05f7f90419de7ff19216fbb785a9bf74c5db5b533b17186393e1d4280dc3c38dcdd9afa8440239fc6113
 EBUILD netbeans-nb-7.0.1.ebuild 5116 SHA256 17ac4a9aa7931d052a899ad8649bed42d5c37a06d913e0dc8ded118d7ef01c47 SHA512 932964fcc4d8d614a2ad8531eecd9298b89f06ac97db68e140e77bceb5d9c08c35524ae4766c18f5467bb01391a9c9f29cd4c5e45c29664b91340a33b0804d7e WHIRLPOOL 0e935fc1c63b61a97e60941111cd30fe4f7b740743013074f7722f3556473ccdba8bcd70ac6f544c67e2a60dd2d7c96abc9bf6bfc51aa6e9ff3135d041ebf3a1
 EBUILD netbeans-nb-7.1.2.ebuild 4987 SHA256 075ef11ab57b236061e4df3e905524ecfba2966c5d735d113b878a03219a9cc1 SHA512 321182e1780acfdbff56c1c84748897cf8c4dcf9fc94d0a6db71a018968e8f96e479a2dbb2f97655d50ee836ac1a81fdd62f6f04ba1b2d54157158e577c2b986 WHIRLPOOL 3d3742c6e90f0231ecabf5200446d00900204f51b9fb2be92954668dae86584d8ef477be11cad462a9721a04a1bc97673b8d8d808ef49f0345d979022471d919
 EBUILD netbeans-nb-7.2.ebuild 4970 SHA256 79d73ca57dd63e25afccd44816dd248e79f6974dd7e9ebbf4b3b11eb659092d9 SHA512 083317f6944c5fe38507fbca18804888e25c23070420a3080bb68bf00be95e520541c381482a6c55ff60656b36f8dd3fac60f2c605e4e3ee0ae92427faa468da WHIRLPOOL 7f02ab258612c5035b26326f25aaa08bf60fc0ff3108a2bf61dbcde9fe845e647f91319938206742a5f131fe905678833f3ad2449f68efef7e6ed4203f7538f3
@@ -84,5 +85,6 @@ EBUILD netbeans-nb-9999_p20150119.ebuild 5013 SHA256 b9008bbdb6f1c0131b1372cae80
 EBUILD netbeans-nb-9999_p20150120.ebuild 5013 SHA256 1981eb380d880576444bb00c7547670c2df74e1d5a7fbd9a48a300ef99572e30 SHA512 bd6891d40f3c5b328d017d5671d0e5a97c4b9e085b502145c9f6833b1a7cc461b790a4a296270db6a3458cf0f73ff95dea3dc56cab238192e05a5ee09de3a761 WHIRLPOOL 62de3cc3328d8611cdc9f6b7d1516184f318b69f64fd880ceea4cba01d222de2da7bbe06fb137390e498b094fcf6c237370f6335918bb5b7d156b4f7a4713fa1
 EBUILD netbeans-nb-9999_p20150121.ebuild 5013 SHA256 e7182890b33feb0285a6a401f65dfa65a2ee4c7ffe939cbad8dc91e8b0afc722 SHA512 6c262d5e25512bd1aff4341bf4565c4e1b6a8a115b4e62fa29bb8297ddde8c58e2addbdbb4be051877e31f505787ad78a8338211f324164d7a88fe3a7404334f WHIRLPOOL ddfa023af0ac7aff9894ab5b1fce882544f09832994a7dda01948271ae892a6f8a36b3a75848c5221f2e3ceac1bae63f3b3e88c4803cdf9dfafda998682c3f12
 EBUILD netbeans-nb-9999_p20150122.ebuild 5013 SHA256 2866bf3beb5bdc1043d25e7cc44c2aec27d0338052b0f6990a27b433eb57697f SHA512 5eeba7d48d4313430c302c9568453f7993b63e69fa448299a5ca311bcdd4b91097812e0901c944c81a8fb81a7cfa6f6b48dfc8e301b6d57a7198c9a1bc980c59 WHIRLPOOL 1782ead61af7fad59f73dd7cf1d0cd28b1b61743c348febac93174f6173fe7183d2987942d25f87f45f3dad1d5642d9523e9236fa718f63906a1763e307de8be
-MISC ChangeLog 140423 SHA256 c41a70ceff3279ad06b23e50918ba4d906ea41fd5ef35d0c40850ebc34477a5d SHA512 55facf8b132bc6dfdfeed7b51566b45cfa18add6439fe1944458529940c8beeb7aac365d67f02d063d7a30a978330d10305b5a8bdcdeb9604f2e4dae958bed3b WHIRLPOOL da8ef34487ecb594c79c36a95c13146e7d5bb2dee926747095e689b16d192fe090cc8ae00c481956ba97d94591726402743eb29a75290b2acd54f20fbcd3fe1c
+EBUILD netbeans-nb-9999_p20150123.ebuild 5013 SHA256 e7c13df7a996b12c993470ecac723169bf4ae82899137e64ff57fbb0c4e64a6b SHA512 b8fb1f062032a25d24f07be67668f6d59d0b64e5b127af2e606bd10df473affc5ad135f0dd3f86eb2cab23a328577e18c2be32c8e20c10f0322aa20e4939a431 WHIRLPOOL 4cc8096beb12f320ce8827f6fcfd0cc857d2af1d2be369b69272141f953a537a89f015207dbd1bfd2981aac2e122e6906530b70aaea4549be5365f35589655e3
+MISC ChangeLog 140588 SHA256 67a6d8e54d52ff60a21ed31069e86f7d08fe45e6628912549668e3754a31f0e4 SHA512 92dd868758ccbde5f917600d2e2270ac95e12a7e590e8f1bcda2c5ad13dec10082d8987d23a0c8463eb4a912e28ebd50d70b7671724c86a4179040d1623a2b8d WHIRLPOOL 5092d74d0e1cad283e714be7b2be991b04620678507aad64a76941159739414b4b359b5830fb772992eab260c5543b637186eb5cba542fbae0420d3722d9195f
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20150123.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20150123.ebuild
new file mode 100644
index 0000000..b5ab814
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20150123.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-01-23_00-02-29/zip/netbeans-trunk-nightly-201501230002-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 http://www.gentoo.org/doc/en/keychain-guide.xml"
+	fi
+}

diff --git a/dev-java/netbeans-php/ChangeLog b/dev-java/netbeans-php/ChangeLog
index 2aec56a..cbcbff5 100644
--- a/dev-java/netbeans-php/ChangeLog
+++ b/dev-java/netbeans-php/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-php-9999_p20150123 (23 Jan 2015)
+
+  23 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-php-9999_p20150123.ebuild:
+  bumped to the latest sources
+
 *netbeans-php-9999_p20150122 (22 Jan 2015)
 
   22 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index 05c3f26..a5ecf92 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -52,6 +52,7 @@ DIST netbeans-trunk-nightly-201501190001-src.zip 201391445 SHA256 ce4ec7706f8073
 DIST netbeans-trunk-nightly-201501200001-src.zip 201396862 SHA256 1a9378d8f52c4f617653d096aff287cf62212af8a6f878fe54cc468e4dd4bed7 SHA512 92fd39cda2d11816b9a01e0e5c26b3f527354a69efdc940cb27d5b17ee6493a07225d2698260db2bdc220e01d166ac42b5fb62f809d1e2eb84419c6e6abb3e14 WHIRLPOOL c3ba7155b5d376041d750c42f1ff8f8dec5bdbfedb470dea483a665978ef3982f087cb7a521f7892c264bb38d0876e4e7a08346ae4579338ba698ae7ee4ba456
 DIST netbeans-trunk-nightly-201501210001-src.zip 201405381 SHA256 95369f4a232531feb195f2d41c14b7ec9791bbd86282fc8155bb1828affe6afa SHA512 4e710bc5905ea83167152e3252a4309d6a4f6fe8f0ccd8f50bd6389635cb2c4fa1cda60c9c9df8d70149ef84bba66527a8c94b1822710421aa704d374a0132b5 WHIRLPOOL c6780c694d1acabd53ca2b23ac660d587b02f63f3f8b5a98c7e293af4e099dfc46dcd5dcd939d7133edb5885388150fd28723b6325678519a80f2cd0ea673ac8
 DIST netbeans-trunk-nightly-201501220002-src.zip 201432275 SHA256 1969c39ce22136b5ff98f7959bf96088b7caaf9ea46df54ff0ed01ca857de8df SHA512 dae7c345289746e85ea6bf99a6352fcb53ec02c8828bf447a686aed0cea577de11e75e89451abf76a1dee3b1d91aaa204dbbe3057ca40c58759f16a4d768b7a9 WHIRLPOOL 39163c8ccac8111c9ab2a0787a2bd137a680bd16eccf4a7e526cfe34c74df0efa957b320df52b92fe9f1dbd134e7e2b2e1479c237b78e7a060c3893aac8838f9
+DIST netbeans-trunk-nightly-201501230002-src.zip 201448361 SHA256 9705937c7762d0df36dd885713111a80c01b67f17c2257423961ec7c25acf546 SHA512 c6a11a10357a44e899e621d4402daa6b435ec285c467d44d636e3c3c457f025225bb7594b84c7ee526fd7c416441960350645f098860e858cdf7106ccf694ee4 WHIRLPOOL 03b767b926ff881cea4b2227b11e0ef9b7b866d88d6b05f7f90419de7ff19216fbb785a9bf74c5db5b533b17186393e1d4280dc3c38dcdd9afa8440239fc6113
 EBUILD netbeans-php-7.0.1.ebuild 4151 SHA256 3aee393fe89aa4788ccd17af46f1df43a5681c28af6d580724d8db0f5e804ff0 SHA512 60106805595338b83e17d906c199c54dc4cc5d979f964a41f9938a508e8514670f4e5538eeecd91f8cd06dd2b4376119674f9a7a9f2fac6c1255e14929f2bc19 WHIRLPOOL 1a09962a5bd67a4fd4eed48af3f185146d2de6f506952f626756aabf6a157678fe71e0752ed5988ff414803b83150d9b8b4de956895667e331659bb59f94e09c
 EBUILD netbeans-php-7.1.2.ebuild 3940 SHA256 779f3bceb2b5a49e923fff28c36c653e31e2d11e186fabab1e656c3314b48d28 SHA512 1296c8ccbec945e66588c2a1a490d3ea93a28672e77751e16c3dff1f1aa6e3a00b454345f0b888c684a0d31fe05aad4f44310998eb72bf1febba85da1bcdd08b WHIRLPOOL b0238f8c5aa4a8c0a5cff82b0daa29860fe39712e96110916cd8a26938ca07b8e05c308e1387c84e7d693026590846392227e95668d150bbc7f1cbc660676eec
 EBUILD netbeans-php-7.2.ebuild 4159 SHA256 bb5c66ed19c9341332e1e42efb29a4ab5d19a22c995bae93efc952ec105ad493 SHA512 c919b120bdc51b56f58b390e9a017f9e059c6b5709220e80138caf7ca3e58d432f53c9ed28f899dc9537851a4cb8cafa9e7067eaefc5d5798b05fb0be9d5bd5f WHIRLPOOL 9857d2e6ac50c4daf5c8afc0a5b65b068b6010ecf2ef04f063bc184810c18b50feda683d2d80c84c0e621909bb05b19731135f2a69f1e56db927c42e8057a658
@@ -87,5 +88,6 @@ EBUILD netbeans-php-9999_p20150119.ebuild 4423 SHA256 7bec48e383dae477d40987f7cc
 EBUILD netbeans-php-9999_p20150120.ebuild 4423 SHA256 5d84459ce0b1f2f9f20b1f7bddf28edda6e06452dbb1e9e394c3c54b1fa9aae6 SHA512 d1341e3e29574bcd95a2ded7f4b7887ebfc3e88eec31f9adfd8b4a92a13dd1bc794c0b4826cf054fe2f5d44aeb42e9b766fc267b32a8adb2b984d038abd77a4c WHIRLPOOL 9aa2845d37b87419ea26af49cdd3c35ef40b2b280a9c1b6fa582c966f4bce8ddf52d24a294bcac1d60556b7b88cf79c06c2d4f32eb2b294c87d61a4bb151e7f9
 EBUILD netbeans-php-9999_p20150121.ebuild 4423 SHA256 4ac38ae07b1eee9060dd933352e5cb52ba6e2191203827ac19f527912d54f56f SHA512 e49164cfb5865900f8c8fbd1436a6da0e2b341289a5fe91614fe9caf77da12b6ba4b7837b18e5bd1a9b857e1818d7b76d63434891211ba05660c1c3ba6cf635f WHIRLPOOL 3ac05e374dc91047f8d5e66cf74055f434dc8dd8342d77a1e06bac3a78a423583c4f33b5834a0fec7c68ade2f4354ef2707762794185bcdfef9352ecdf4b489a
 EBUILD netbeans-php-9999_p20150122.ebuild 4423 SHA256 bf7798e230059f1345dc60b8bf5a8905b2210f5f53e0fe204070fdb3e0f04064 SHA512 ae57d65b3288c7dbfe3cc8a6132fa2138160aa9ba9cf30b5b66e5f6282eaa9458f9557abeb785c51307e34a362ae55a11af7f388a94cf6533f3c1e4912c25780 WHIRLPOOL 19cc5b17a8f647fa59be2da22923f241e5d2b3edb9ebc75c0ba5a3371180cb62a373b93f011d9a6e1cdf0494bbe24c76bbbdf9e68a9de11394463712b7f4d847
-MISC ChangeLog 141263 SHA256 acc7d6ee890d3cf0ca3d97abce3cdad5b0bb0e62517850c3780a21e8c75166bf SHA512 69ce5a43fae7f9374d7e3dc6985123952c0e1bbada57423c3dbb4286760bf13d85dab202a9f9a1b519872f5d4ab201e4e41a8778db789aff59c5015a61230986 WHIRLPOOL 91a24dc83b561a50b2ccae2b833ec0d3a91ff7a1121e2b7c15539d2de3c0932033f50a38d07f5eadbf5426a51233072caec09dc947d61153783dc188067d1e26
+EBUILD netbeans-php-9999_p20150123.ebuild 4423 SHA256 f589a6df3bba9afa52d5686840b4589770fd2cc553ec9e1948a48b8fc3f9242f SHA512 c9166c3592f806bc48c9fdb64b5086a5191ed7f709d0403c8b9ba354205f8a01fa1b75a4470324f486201a22aee21ddbc3483fce70600093888b071168b9633e WHIRLPOOL 9e8767f4b9dc17f2dc14471931a47503d1d43b5c4622e17aaf1353e227413d7116c60bf103a5a66350c86eeb57a85640829024d98adb789ab4d87ea6692b7cf5
+MISC ChangeLog 141430 SHA256 5ef12e7673a083132a8449a56508b5853520083c68c9d69285678be4a127484b SHA512 70ea0aef75cec29a1ba3f40f86f96e30d86a412bb650af136d53894dae0319da4eaa19a4134a568b9ac84a0e01ace95a39bde88a41db4f268ecf6449c8c8bda3 WHIRLPOOL f31215def3a9eaf1e3dfdc95e1308605ef0bebe14a86d26bbf7609e6570064e45db743da90b91e69940d8c32d8267962e183025d3a0c0430dad40c036f3f1b99
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20150123.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20150123.ebuild
new file mode 100644
index 0000000..6275194
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20150123.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-01-23_00-02-29/zip/netbeans-trunk-nightly-201501230002-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/BFB982F9B33E2F1A1766C212C8208793F9B7E77C-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}"/BFB982F9B33E2F1A1766C212C8208793F9B7E77C-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/ChangeLog b/dev-java/netbeans-platform/ChangeLog
index d1214ee..5573cc6 100644
--- a/dev-java/netbeans-platform/ChangeLog
+++ b/dev-java/netbeans-platform/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-platform-9999_p20150123 (23 Jan 2015)
+
+  23 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-platform-9999_p20150123.ebuild:
+  bumped to the latest sources
+
 *netbeans-platform-9999_p20150122 (22 Jan 2015)
 
   22 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 612db5a..0ec7ad6 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -75,6 +75,7 @@ DIST netbeans-trunk-nightly-201501190001-src.zip 201391445 SHA256 ce4ec7706f8073
 DIST netbeans-trunk-nightly-201501200001-src.zip 201396862 SHA256 1a9378d8f52c4f617653d096aff287cf62212af8a6f878fe54cc468e4dd4bed7 SHA512 92fd39cda2d11816b9a01e0e5c26b3f527354a69efdc940cb27d5b17ee6493a07225d2698260db2bdc220e01d166ac42b5fb62f809d1e2eb84419c6e6abb3e14 WHIRLPOOL c3ba7155b5d376041d750c42f1ff8f8dec5bdbfedb470dea483a665978ef3982f087cb7a521f7892c264bb38d0876e4e7a08346ae4579338ba698ae7ee4ba456
 DIST netbeans-trunk-nightly-201501210001-src.zip 201405381 SHA256 95369f4a232531feb195f2d41c14b7ec9791bbd86282fc8155bb1828affe6afa SHA512 4e710bc5905ea83167152e3252a4309d6a4f6fe8f0ccd8f50bd6389635cb2c4fa1cda60c9c9df8d70149ef84bba66527a8c94b1822710421aa704d374a0132b5 WHIRLPOOL c6780c694d1acabd53ca2b23ac660d587b02f63f3f8b5a98c7e293af4e099dfc46dcd5dcd939d7133edb5885388150fd28723b6325678519a80f2cd0ea673ac8
 DIST netbeans-trunk-nightly-201501220002-src.zip 201432275 SHA256 1969c39ce22136b5ff98f7959bf96088b7caaf9ea46df54ff0ed01ca857de8df SHA512 dae7c345289746e85ea6bf99a6352fcb53ec02c8828bf447a686aed0cea577de11e75e89451abf76a1dee3b1d91aaa204dbbe3057ca40c58759f16a4d768b7a9 WHIRLPOOL 39163c8ccac8111c9ab2a0787a2bd137a680bd16eccf4a7e526cfe34c74df0efa957b320df52b92fe9f1dbd134e7e2b2e1479c237b78e7a060c3893aac8838f9
+DIST netbeans-trunk-nightly-201501230002-src.zip 201448361 SHA256 9705937c7762d0df36dd885713111a80c01b67f17c2257423961ec7c25acf546 SHA512 c6a11a10357a44e899e621d4402daa6b435ec285c467d44d636e3c3c457f025225bb7594b84c7ee526fd7c416441960350645f098860e858cdf7106ccf694ee4 WHIRLPOOL 03b767b926ff881cea4b2227b11e0ef9b7b866d88d6b05f7f90419de7ff19216fbb785a9bf74c5db5b533b17186393e1d4280dc3c38dcdd9afa8440239fc6113
 EBUILD netbeans-platform-7.0.1.ebuild 5049 SHA256 b67cf0867358fea808614c02b8b6ea2ab88223f8642175ac3f91dc8c610aca4e SHA512 611b8e831a95d1b4e1c3a1f5e4904c84f9606298a94eb0900ac06cc88670849d218a3a03cce07b2463e206da01ce2931cdb6677948d20d8326908a36851589e6 WHIRLPOOL 01769eca4eb20c2702a432a6180eed16a9a50687016e307e585ab5de5cab8b3b664e456d489ff15d9f5af349f791b161eecb9fef7bfaba09a70e1eaab5d545a0
 EBUILD netbeans-platform-7.1.2.ebuild 5034 SHA256 a069e7e45f768e590e5b30fdda26185d8fde492355e4c530ce44169def991cc6 SHA512 31cfb0d9f13eacfcafd49be995bc456d17a689776e032f68ed4585e068a49f6e992c37c57f23c5e27176fb060996bcfc86b0446ae26efbc488909102fc10c979 WHIRLPOOL 1bd35ac39366fd13192e4a6a177280727bceb2f5f12ff684a288725954a29a240f2d264c3ef2ca38fa3e133063cdd943cce1d0f493f0f8ea9a621833c8f0031b
 EBUILD netbeans-platform-7.2.ebuild 5432 SHA256 227add7f41117667d8487f2bf8eb846c21529e7b2c49dac46e4b3b33062f69b0 SHA512 e49958f21358fe9689336d5cd5edbe435d0a2fd12c315174dcb408bf6ed4e6515d39d458554fb576c342a43f0af50c327bada8fa0b2eb485e14c01ddcdb6248d WHIRLPOOL 4f9101a2d5495fb6002b7791822f85091309c04d6c475060c116725f8da32f9ed270f0c27a9f6a2bd2aa0bd7417b18e9165d1feff7e98f6205bdafff3223e5a3
@@ -110,5 +111,6 @@ EBUILD netbeans-platform-9999_p20150119.ebuild 8293 SHA256 7b1c39cfd122cb6e3cdc9
 EBUILD netbeans-platform-9999_p20150120.ebuild 8293 SHA256 e4a66347d02b09c2ac8593265ea5382ea05051060ceb2c48d05b92d0c7cb347d SHA512 edfed7980d33ca696ac3a082015410d4ce8b4624502d9b107b5161015c7d20cc113d14d99b4c20884dd74f47bb3a9ccac88f527c74f841dd3aefbae18b6680ce WHIRLPOOL 568c2a705de3ce4ab78bca8abb3e13ef9ad897e9112db78b80317c55d7816a30bae91e2a74f4cee9f974d14105814301e0bc32b4f8c40903839be68fbdf8c5f0
 EBUILD netbeans-platform-9999_p20150121.ebuild 8293 SHA256 016a9e7afa5068f4fd5226fa98c435f98f518c452dd308c42d9f7585edf40603 SHA512 d54c1cbdc89a1bf533818065cfc2f879c6b6eaffba68f8c8fb56ca453dffc8c8a350647577379ffb25a4a59d4e41534501ee88cabf63177cfa0d3f787762096f WHIRLPOOL 632eb7d507f817f7fae472dc00c367c7e861df505f70aea79e3d4eb6fc2c69e8de52b08e3c2ff5ce0f615703b0a72f2a523f94a82ea5b3a4f8851dec866b1f9e
 EBUILD netbeans-platform-9999_p20150122.ebuild 8293 SHA256 d9205d91b20f007fdda9addd00a6accb5e2792ea8fecb7f46bdb10984e5034f2 SHA512 40a6d2916b1eea06f4dea1ffbb0098d8d8af05a9963916d3cc375ff6bb245b1dea7c3b28cd096df3549c4f92891496d0a1b6132fddc362af251376bf2be32454 WHIRLPOOL 5d325ac6bd79062ea825d7f8b53360dfcc718686ea3f2e77c676a5d4dd8d265eee2fa7e7a354b46d1499e4f5dbb5c30f415f2ea8035bb02749bba786ca6b456c
-MISC ChangeLog 152028 SHA256 254d0ea573b99a8434aebab6d252bfa102b192ea3131cac05f36c8132512171e SHA512 0658ed06bbdc448bdb4f194c9fe99a45da3590e2f2f6f0302689cd15ed2a4a990ab6d23c3b77e2bb80d2e0fdfce3ce0401dabb0a29411b39f3af1764882bbbed WHIRLPOOL 89d87692f461339a1de0546d6a018fc1e88f72a10622440d16e46e8f58a1718d42f6ba3e842c9677a22b90fd58daa638588b7facd65396fdd6320c95591ee3b4
+EBUILD netbeans-platform-9999_p20150123.ebuild 8293 SHA256 3da2388b12b7533366a207bd31c5b3e54023ff990a70a2c88c3ec2269d3a4adc SHA512 469958c405db5fbc795425ee449bab9ec19a06fa5d0f8105a245eb24c93f56664685c6e0c04e1271fafccc5001582c8b85c86aae9a593b659dab428ef64c7a60 WHIRLPOOL baa8126e48073de7dc059e585223c0a80ecca43e37bbd4ed4402b080164128da45ff09b524e7fe4ab8b8197fe8b6429d857a6ab71c9db79eb6618fc33c0cc85d
+MISC ChangeLog 152205 SHA256 774348a8d26c6a4060c9ecbc835f22330024ca593c098058a1f17b6f5b501bfd SHA512 6483cf327a736a1212eef4d34b8362fa2ae2083d7253f259ba35ec1b4d99a408b7d68a522bc3c413d4f59a72ee079beb2888b504d80ada514a35ad49a40324f1 WHIRLPOOL 6f8fd652adb831179c17dc12717127cd00c64a58e3dd20d6326fe60b1effdb6f55fdcd510f814bbe56e98573d73cb7892dd2ed3196b25d26222a21743852b7cc
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20150123.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20150123.ebuild
new file mode 100644
index 0000000..d98ad52
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20150123.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-01-23_00-02-29/zip/netbeans-trunk-nightly-201501230002-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/B250509C67194E89C3A27F96933DB7EB0E027E56-ko4j.jar
+	http://hg.netbeans.org/binaries/E556F74DF0942B304F94D9F82CAA8102FED6356E-net-java-html.jar
+	http://hg.netbeans.org/binaries/C74AC1ED160379872826FDC4A3C0CA924A3A0A83-net-java-html-boot.jar
+	http://hg.netbeans.org/binaries/03FE10857B0689B1F98B8D96DE87E80DF5D87A69-net-java-html-boot-fx.jar
+	http://hg.netbeans.org/binaries/31C9329E78A222E38CB86716ACFCEF81EF0BA1FD-net-java-html-boot-script.jar
+	http://hg.netbeans.org/binaries/24ED356FF3C72665CB5FB972B428824FABBC1987-net-java-html-geo.jar
+	http://hg.netbeans.org/binaries/432EDFB05C0F44E6ADAC4B1F3E08C67D1F52FB4B-net-java-html-json.jar
+	http://hg.netbeans.org/binaries/A7B6C3470DB8821A3587CE04844FF504A7C62354-net-java-html-sound.jar
+	http://hg.netbeans.org/binaries/B27F1304F18FEDE876F940AEFA6C9EB5632619D7-org.eclipse.osgi_3.9.1.v20140110-1610.jar
+	http://hg.netbeans.org/binaries/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar
+	http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip
+	http://hg.netbeans.org/binaries/AC97B566699146713B3CF0ABC226B5C08EF7CF33-testng-6.8.1-dist.jar
+	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/javahelp:0
+	>=dev-java/jna-3.4:0
+	>=dev-java/osgi-core-api-5:0
+	dev-java/swing-layout:1[source]"
+# 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}"/B250509C67194E89C3A27F96933DB7EB0E027E56-ko4j.jar o.n.html.ko4j/external/ko4j.jar || die
+	ln -s "${DISTDIR}"/E556F74DF0942B304F94D9F82CAA8102FED6356E-net-java-html.jar net.java.html/external/net-java-html.jar || die
+	ln -s "${DISTDIR}"/C74AC1ED160379872826FDC4A3C0CA924A3A0A83-net-java-html-boot.jar net.java.html.boot/external/net-java-html-boot.jar || die
+	ln -s "${DISTDIR}"/03FE10857B0689B1F98B8D96DE87E80DF5D87A69-net-java-html-boot-fx.jar net.java.html.boot.fx/external/net-java-html-boot-fx.jar || die
+	ln -s "${DISTDIR}"/31C9329E78A222E38CB86716ACFCEF81EF0BA1FD-net-java-html-boot-script.jar net.java.html.boot.script/external/net-java-html-boot-script.jar || die
+	ln -s "${DISTDIR}"/24ED356FF3C72665CB5FB972B428824FABBC1987-net-java-html-geo.jar net.java.html.geo/external/net-java-html-geo.jar || die
+	ln -s "${DISTDIR}"/432EDFB05C0F44E6ADAC4B1F3E08C67D1F52FB4B-net-java-html-json.jar net.java.html.json/external/net-java-html-json.jar || die
+	ln -s "${DISTDIR}"/A7B6C3470DB8821A3587CE04844FF504A7C62354-net-java-html-sound.jar net.java.html.sound/external/net-java-html-sound.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}"/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar libs.osgi/external/osgi.cmpn-4.2.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}"/AC97B566699146713B3CF0ABC226B5C08EF7CF33-testng-6.8.1-dist.jar libs.testng/external/testng-6.8.1-dist.jar || 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.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.osgi/external osgi-core-api osgi-core-api.jar osgi.core-5.0.0.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-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/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 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 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
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/platform
+}

diff --git a/dev-java/netbeans-profiler/ChangeLog b/dev-java/netbeans-profiler/ChangeLog
index 96b8fea..ad71533 100644
--- a/dev-java/netbeans-profiler/ChangeLog
+++ b/dev-java/netbeans-profiler/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-profiler-9999_p20150123 (23 Jan 2015)
+
+  23 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-profiler-9999_p20150123.ebuild:
+  bumped to the latest sources
+
 *netbeans-profiler-9999_p20150122 (22 Jan 2015)
 
   22 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 8377f12..f8d7657 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -41,6 +41,7 @@ DIST netbeans-trunk-nightly-201501190001-src.zip 201391445 SHA256 ce4ec7706f8073
 DIST netbeans-trunk-nightly-201501200001-src.zip 201396862 SHA256 1a9378d8f52c4f617653d096aff287cf62212af8a6f878fe54cc468e4dd4bed7 SHA512 92fd39cda2d11816b9a01e0e5c26b3f527354a69efdc940cb27d5b17ee6493a07225d2698260db2bdc220e01d166ac42b5fb62f809d1e2eb84419c6e6abb3e14 WHIRLPOOL c3ba7155b5d376041d750c42f1ff8f8dec5bdbfedb470dea483a665978ef3982f087cb7a521f7892c264bb38d0876e4e7a08346ae4579338ba698ae7ee4ba456
 DIST netbeans-trunk-nightly-201501210001-src.zip 201405381 SHA256 95369f4a232531feb195f2d41c14b7ec9791bbd86282fc8155bb1828affe6afa SHA512 4e710bc5905ea83167152e3252a4309d6a4f6fe8f0ccd8f50bd6389635cb2c4fa1cda60c9c9df8d70149ef84bba66527a8c94b1822710421aa704d374a0132b5 WHIRLPOOL c6780c694d1acabd53ca2b23ac660d587b02f63f3f8b5a98c7e293af4e099dfc46dcd5dcd939d7133edb5885388150fd28723b6325678519a80f2cd0ea673ac8
 DIST netbeans-trunk-nightly-201501220002-src.zip 201432275 SHA256 1969c39ce22136b5ff98f7959bf96088b7caaf9ea46df54ff0ed01ca857de8df SHA512 dae7c345289746e85ea6bf99a6352fcb53ec02c8828bf447a686aed0cea577de11e75e89451abf76a1dee3b1d91aaa204dbbe3057ca40c58759f16a4d768b7a9 WHIRLPOOL 39163c8ccac8111c9ab2a0787a2bd137a680bd16eccf4a7e526cfe34c74df0efa957b320df52b92fe9f1dbd134e7e2b2e1479c237b78e7a060c3893aac8838f9
+DIST netbeans-trunk-nightly-201501230002-src.zip 201448361 SHA256 9705937c7762d0df36dd885713111a80c01b67f17c2257423961ec7c25acf546 SHA512 c6a11a10357a44e899e621d4402daa6b435ec285c467d44d636e3c3c457f025225bb7594b84c7ee526fd7c416441960350645f098860e858cdf7106ccf694ee4 WHIRLPOOL 03b767b926ff881cea4b2227b11e0ef9b7b866d88d6b05f7f90419de7ff19216fbb785a9bf74c5db5b533b17186393e1d4280dc3c38dcdd9afa8440239fc6113
 EBUILD netbeans-profiler-7.0.1.ebuild 3222 SHA256 b1bab800a27c30aaea26b8ff5ab21abdd1bec16b9890133429eca9ea77c018fe SHA512 d6198f44a06561b7e2598fdd6a37f8a3dc13c38f63dfbf6a86a083adbf71e9c62af87cb4e1b5b8dd2dc99feeeb99a7afcbb8f7747c378ad92c71263cc91a6c54 WHIRLPOOL c62613f511636b1f0393ac32c6b50641cdf7df9f9fdc95fd5acbe1a602ffe42fdabb556f989552b05b0607a5ad9d324a2019440c3ae66c50995ef3fc8775f385
 EBUILD netbeans-profiler-7.1.2.ebuild 3231 SHA256 94d87bf6f86add3bdc27f9f20084f35fe584fc2bd697acafa8c23cce16a0d1ee SHA512 dcc8da918a6b6e07ccae513fb4296d16891e205b49098fb8269d16beb9b1367b1920797cc78053b83f4321c1b69faa393365265c72213bb2abfb9d3f84f66319 WHIRLPOOL 18325a1df836e7242838920483c41d43f37b9dae8322d36a2a562b414baa0dc76971f581204ce76a6d64196dd60643089e8704da69617590cda61ce54ce82e8d
 EBUILD netbeans-profiler-7.2.ebuild 3214 SHA256 ddcba9ba672ad566ef256538fc8631ae691aa7c6574269199f26df5382c37f4b SHA512 1bb7eb95381861b8265ab366fe3c7a9b99971d1c4600eb6c7bffb521f4cebb32bcf3d662f82c811d47fe95e77cd39e48f3665f0fcabf9145eb171c2746d89684 WHIRLPOOL 7f74c2be9ec4e7ff419086f1da3b1a12b1c187102def004316ef89ed28f30da62542ed3409a51473a8d9d68d18a30de36b1d0307cd8eeb7e580668fe896c5aa5
@@ -76,5 +77,6 @@ EBUILD netbeans-profiler-9999_p20150119.ebuild 3478 SHA256 53c24023b661cd64e8efd
 EBUILD netbeans-profiler-9999_p20150120.ebuild 3478 SHA256 979d9ced9f2bf0446673a337b3fcba84b41cbe8c8fd2931992aadbac0aa418f0 SHA512 d2127fdd30a4908a2f71bef0f39d879e9e2f4a0caee72a063f62fb7ec4c269d742f13dae2adef9be04dd1d9165f8e523958d3b1d4e6948b5e3c9587cad943413 WHIRLPOOL 0d13dc72c5867fd533f2d91766594bc4529833ab90eb5092523b69c3715a6a8b9c8930c1740b6c71b00626f2c89603e8c1c1e686d2d60860826475c923913c63
 EBUILD netbeans-profiler-9999_p20150121.ebuild 3478 SHA256 3981848791a9eeb1e99636790d688d3a9f7a9bcdc1c251bea9b8f1444af0495a SHA512 2dd8c9c13aff3ced69eb6556352d9adc2e979ac2032f5c598221844abe4b3a1954fb1f84b0bc69521e106fa2c594225ccb7e122b5cf928b67c3d6e280e8ab0c8 WHIRLPOOL fcb556be8e6ce60e1625938ba35c0048f94513082790975270597dec286b3955f466f5a9a80cbb1d32964234039f4a087ce8157eba008ea508098de5c18f7375
 EBUILD netbeans-profiler-9999_p20150122.ebuild 3478 SHA256 02f5abdac1aa688199a68802bb94deba20499c854406dab6d4d2bcae06cac962 SHA512 7a31fedf4755915bf22e0ca095fea89a1f123dbeefad874531b4c06374e1c1c73a109210a7a4d481f63097de46ee45513a7042ae228e08099d29d73a290b172a WHIRLPOOL 168d63c5a425f5fd15678542f4e6659ce90c1db2cbe948ea10d4ca3f31741e6bb6b2e3f06ed37f0d6d490220b721821eff11d5e3306fa0cb18d32b2c93847b2e
-MISC ChangeLog 151489 SHA256 c9f304979453e38dca8c2e27c3a2a0ca3011915d9f7c9e97415466443ae41987 SHA512 f6417671193dccf72507f769c131ea0fa45816e99aea6a783ba5d5e479f1a91ef8193458076514842ac70b5a4a849398feb92e321c2bfce6eb3ca9905755a4f7 WHIRLPOOL bceaf1fdb95c42f117b24c762e10a0640e33fa6190084c70c367471ac51d5e3e7212aa119c5959ff7e487351925e3102a6004388e354aa347f4704830eb4d6af
+EBUILD netbeans-profiler-9999_p20150123.ebuild 3478 SHA256 6572c1c5c12510c2df90f888ee28cc862b294ece70a3721fb63beb405efc37d4 SHA512 4c3241ee1e3946bd25e1b2f7181a7df0e51fa8cd3288b0b403b61528b28d7fba18d95e610d9a829bb43c08934170fcd25bbe7caf1d620f9645965684b864b324 WHIRLPOOL e5f250fdca285575274b2e6243604949fb14eb6b13e861dfc86c5bd699260a9c29d4ab692ffda7ac17af6e660621e8d4dae739342dc61a58c7b2a6f61cb6cec3
+MISC ChangeLog 151666 SHA256 825ae089f91dff380991031da6249dd160c124a9cc3f224a5b04e035468adcc8 SHA512 dff3cb26cf66f78d41043abb2f295d8ddabf5f4b31bca59e75d568ccc04d4b4c32335c14c3d82bb8fb3f95620a1bfc1d2a5f6b56813b27154ad26307a33daa2f WHIRLPOOL bb269b2dc98bd1f4362a24438e003af25cc4f0c4894002c59ff4a6de5db2bc6d6c17ca897543d2ce323909454a0c2d201c2e9277f46312a463f40840286d4a32
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150123.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150123.ebuild
new file mode 100644
index 0000000..4600b39
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150123.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-01-23_00-02-29/zip/netbeans-trunk-nightly-201501230002-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/ChangeLog b/dev-java/netbeans-webcommon/ChangeLog
index 3b18989..a40afed 100644
--- a/dev-java/netbeans-webcommon/ChangeLog
+++ b/dev-java/netbeans-webcommon/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-webcommon-9999_p20150123 (23 Jan 2015)
+
+  23 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-webcommon-9999_p20150123.ebuild:
+  bumped to the latest sources
+
 *netbeans-webcommon-9999_p20150122 (22 Jan 2015)
 
   22 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index a8b1109..38b08b0 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -47,6 +47,7 @@ DIST netbeans-trunk-nightly-201501190001-src.zip 201391445 SHA256 ce4ec7706f8073
 DIST netbeans-trunk-nightly-201501200001-src.zip 201396862 SHA256 1a9378d8f52c4f617653d096aff287cf62212af8a6f878fe54cc468e4dd4bed7 SHA512 92fd39cda2d11816b9a01e0e5c26b3f527354a69efdc940cb27d5b17ee6493a07225d2698260db2bdc220e01d166ac42b5fb62f809d1e2eb84419c6e6abb3e14 WHIRLPOOL c3ba7155b5d376041d750c42f1ff8f8dec5bdbfedb470dea483a665978ef3982f087cb7a521f7892c264bb38d0876e4e7a08346ae4579338ba698ae7ee4ba456
 DIST netbeans-trunk-nightly-201501210001-src.zip 201405381 SHA256 95369f4a232531feb195f2d41c14b7ec9791bbd86282fc8155bb1828affe6afa SHA512 4e710bc5905ea83167152e3252a4309d6a4f6fe8f0ccd8f50bd6389635cb2c4fa1cda60c9c9df8d70149ef84bba66527a8c94b1822710421aa704d374a0132b5 WHIRLPOOL c6780c694d1acabd53ca2b23ac660d587b02f63f3f8b5a98c7e293af4e099dfc46dcd5dcd939d7133edb5885388150fd28723b6325678519a80f2cd0ea673ac8
 DIST netbeans-trunk-nightly-201501220002-src.zip 201432275 SHA256 1969c39ce22136b5ff98f7959bf96088b7caaf9ea46df54ff0ed01ca857de8df SHA512 dae7c345289746e85ea6bf99a6352fcb53ec02c8828bf447a686aed0cea577de11e75e89451abf76a1dee3b1d91aaa204dbbe3057ca40c58759f16a4d768b7a9 WHIRLPOOL 39163c8ccac8111c9ab2a0787a2bd137a680bd16eccf4a7e526cfe34c74df0efa957b320df52b92fe9f1dbd134e7e2b2e1479c237b78e7a060c3893aac8838f9
+DIST netbeans-trunk-nightly-201501230002-src.zip 201448361 SHA256 9705937c7762d0df36dd885713111a80c01b67f17c2257423961ec7c25acf546 SHA512 c6a11a10357a44e899e621d4402daa6b435ec285c467d44d636e3c3c457f025225bb7594b84c7ee526fd7c416441960350645f098860e858cdf7106ccf694ee4 WHIRLPOOL 03b767b926ff881cea4b2227b11e0ef9b7b866d88d6b05f7f90419de7ff19216fbb785a9bf74c5db5b533b17186393e1d4280dc3c38dcdd9afa8440239fc6113
 EBUILD netbeans-webcommon-7.2.ebuild 2665 SHA256 9328ea550dfeca5be5c2b03aa5f512d451f1673e49a40994155fca0b2fb2f79d SHA512 d8b80b79e78769a70d01605a79a8a91f7e839d4138b4cbf28cafca6f56ae3d7003c2f5f40aff77bbe3f2882f43a7d7dca3f0428f0f2723a42ae5b49e4c71ffff WHIRLPOOL 31254cbd2fc6cfb2d1bed4d22958595dbbf73032439f19e684463efbe466ee80c144f77ab00ced7a07815b1cdc1d45a87ceda83e7a2fd20ac2ce65e45d30a093
 EBUILD netbeans-webcommon-7.3.ebuild 2986 SHA256 327c0a73fb20778d9fbe4a12024fa065e4102a7aff3fcbda7448874656a46420 SHA512 3d270e940424b3bcdc8c7f8ff2016d33eb55420ac4037f4e406b688c2acea1b07a04625772265ac293d80c0d1afe3bbe6f865051ed9234b700619bd0781d8b39 WHIRLPOOL 5bc288949ed3aa9c3c4cd4cd33b817fe317754229ad30e80da8cfea817bfb77e988a1d6d3280aaef90619968e0309fad212deff0f7970f04438494a893a30a5b
 EBUILD netbeans-webcommon-7.4.ebuild 4727 SHA256 54a0b63527001da34a21ae3ed69c2cfbf9a446ee69bda4bb6ac5ebb939ebb68d SHA512 96895c972cf7092426ec8bc06dccc6ab4f33334da4e67fd4da01e586801110bda8d955f2f29ecd93b8bb58ae64c4af4139e9954a784c10dec925e2beaeab2394 WHIRLPOOL aa7b3b59d315bd37553052470b1f56f435979569e5ef033493cf6f93c29827f2ecd30f6b874f07a0cd8824469c6546982ac3ed360bf3b6cbf211d95943a3398a
@@ -80,5 +81,6 @@ EBUILD netbeans-webcommon-9999_p20150119.ebuild 4997 SHA256 59521a9e2b8a0063d64c
 EBUILD netbeans-webcommon-9999_p20150120.ebuild 4997 SHA256 1acfbe6ec2a711b4e039afbad0ef493f3873ca0dcb48bd81fe614cb1d45f141c SHA512 5f6b6a5f34042ebc6e190895d9ec4347026978df20c5ce0adedf16932b6f274135d9d75d221dcc29f96b716ec0a20f0e71aa62724d56b9081bfcf5829690ff73 WHIRLPOOL 99bc42a5e1dbb5b6841ed01868f7efc26ebd30643d165d4146a6b052d6214fc1f4c6b4eecb8be474aea0a9870fe67c507ef3cab960bb5ed46282bc4b143ce726
 EBUILD netbeans-webcommon-9999_p20150121.ebuild 4997 SHA256 d56d9ff9db835e2abbe82ca31ee31d419f483732c49cb2c14e9e5e4d39087cab SHA512 73eddde719d7ef04a51c5767077a23c1fee07f3b6213651cc1ec33c7028c63316424e363d9820d5294795dffb0b941ef4578fe003f70775260c47c90e29c4433 WHIRLPOOL f7b737e744e288dd1cedbbc8b5b6dad38d86b5bd0ddc0f83042f4d3c43f2be9c0ff0801e2e2ce2b66b7aca5ad92c4a77c83e8bfcdf1f2108b4d97178c6936b52
 EBUILD netbeans-webcommon-9999_p20150122.ebuild 4997 SHA256 8353e7a7a141ea1ff6646831fcbc9966b01c2ff84a0a9614abbe34e39070a97c SHA512 5bd87166df163ebc0d07e75e707187ee6fd065570a20867e57f9fb76945b7605c6e1df6f8336c9135019606a8f3b31a48d1fe2e56c97fd3146dc0d7117a32e8b WHIRLPOOL 6e6de5d9e654e4cc45fb3e66aca06e01f611c30af022c5b133e1c93320cf91ce78a5d403842b923baf049db9c4e11cabc5d3e51b0f38b28921bee2b42a6e45a6
-MISC ChangeLog 124351 SHA256 41420db534d43911c2cca4f37fbc7ac304f451db008accdd49ed9fb1cb069f1d SHA512 6ace4709e4406610e72e5abb16c5184d071404cd6df259cb3a6a2025f6e231f9fb7b420ba1a24a77dba0a45f9d76a0a4a09298ae30d2ab26a733509208648a10 WHIRLPOOL d48c2b6f3ce98d53b83143dbd7853b98811484c55bc1eff0cbd4993eae2cada2aa4cadf1bf208e0eb0e40c8d3ca21177fcd51d240c84b89a899a795dba2bc229
+EBUILD netbeans-webcommon-9999_p20150123.ebuild 4997 SHA256 cd40d7820f1430cf078e035620d9663ec72be8e87bb5d60c8dacd4ba19dde1d4 SHA512 ceb926102f2e10ab87463032d49c15a958707f455e8477781326835bb12fa2e4f5aa07acaa253a88ca142909f67f0a10220d3e8aed7886e0752746a6055f18bc WHIRLPOOL cd5ffb6c448f356ed806804498ecc6288cd7a77483cddd3f6be0610565d9f0213f2278261eaf743d8bcc1d48f7619f8ebdf3c7284ee747d3e996cd207b132de5
+MISC ChangeLog 124530 SHA256 a63c730188a1dbad67d8feb0d0c2b734ee35c2ba9f0d523def1aff653c030677 SHA512 6d0b78da72edb9bee55d6ff3faf9ea168591204ab1123cc4d676b22a0515129d09201c4c59f0bf3779dbf73c2d0d14b8cdb7fe12f58ec43144ea509bfbb4d069 WHIRLPOOL 8dd6f37dff2bf35c6226813a0e1a504340493f2f893a79c4c0a1a377a8c73a3da281565aada569527da1cd52cb502aff0d0fdb9caf432a3a57bf82c8b320fa0d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150123.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150123.ebuild
new file mode 100644
index 0000000..127a526
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150123.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-01-23_00-02-29/zip/netbeans-trunk-nightly-201501230002-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/ChangeLog b/dev-java/netbeans-websvccommon/ChangeLog
index 66a3e21..ca7a0d3 100644
--- a/dev-java/netbeans-websvccommon/ChangeLog
+++ b/dev-java/netbeans-websvccommon/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-websvccommon-9999_p20150123 (23 Jan 2015)
+
+  23 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-websvccommon-9999_p20150123.ebuild:
+  bumped to the latest sources
+
 *netbeans-websvccommon-9999_p20150122 (22 Jan 2015)
 
   22 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 7679c76..8a929be 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -41,6 +41,7 @@ DIST netbeans-trunk-nightly-201501190001-src.zip 201391445 SHA256 ce4ec7706f8073
 DIST netbeans-trunk-nightly-201501200001-src.zip 201396862 SHA256 1a9378d8f52c4f617653d096aff287cf62212af8a6f878fe54cc468e4dd4bed7 SHA512 92fd39cda2d11816b9a01e0e5c26b3f527354a69efdc940cb27d5b17ee6493a07225d2698260db2bdc220e01d166ac42b5fb62f809d1e2eb84419c6e6abb3e14 WHIRLPOOL c3ba7155b5d376041d750c42f1ff8f8dec5bdbfedb470dea483a665978ef3982f087cb7a521f7892c264bb38d0876e4e7a08346ae4579338ba698ae7ee4ba456
 DIST netbeans-trunk-nightly-201501210001-src.zip 201405381 SHA256 95369f4a232531feb195f2d41c14b7ec9791bbd86282fc8155bb1828affe6afa SHA512 4e710bc5905ea83167152e3252a4309d6a4f6fe8f0ccd8f50bd6389635cb2c4fa1cda60c9c9df8d70149ef84bba66527a8c94b1822710421aa704d374a0132b5 WHIRLPOOL c6780c694d1acabd53ca2b23ac660d587b02f63f3f8b5a98c7e293af4e099dfc46dcd5dcd939d7133edb5885388150fd28723b6325678519a80f2cd0ea673ac8
 DIST netbeans-trunk-nightly-201501220002-src.zip 201432275 SHA256 1969c39ce22136b5ff98f7959bf96088b7caaf9ea46df54ff0ed01ca857de8df SHA512 dae7c345289746e85ea6bf99a6352fcb53ec02c8828bf447a686aed0cea577de11e75e89451abf76a1dee3b1d91aaa204dbbe3057ca40c58759f16a4d768b7a9 WHIRLPOOL 39163c8ccac8111c9ab2a0787a2bd137a680bd16eccf4a7e526cfe34c74df0efa957b320df52b92fe9f1dbd134e7e2b2e1479c237b78e7a060c3893aac8838f9
+DIST netbeans-trunk-nightly-201501230002-src.zip 201448361 SHA256 9705937c7762d0df36dd885713111a80c01b67f17c2257423961ec7c25acf546 SHA512 c6a11a10357a44e899e621d4402daa6b435ec285c467d44d636e3c3c457f025225bb7594b84c7ee526fd7c416441960350645f098860e858cdf7106ccf694ee4 WHIRLPOOL 03b767b926ff881cea4b2227b11e0ef9b7b866d88d6b05f7f90419de7ff19216fbb785a9bf74c5db5b533b17186393e1d4280dc3c38dcdd9afa8440239fc6113
 EBUILD netbeans-websvccommon-7.0.1.ebuild 2692 SHA256 a18cf7fe0a1e38749826cb12651be06c210b038be50117647496ee6cbd184cda SHA512 32b32894713d7235ebd03446c5c411d22eb8701b96e3d3ac54eca78b2abc833babf279085cea3b74bb7bddc6d89a283a21c58a0b0462042ddd10e22dfcadeb84 WHIRLPOOL 59c18168245767acd1f8e53046f8942698237aa6fd903a669c626b7f17cf3d39247b7ae57f2984562230267885a4b6a62be43dc8a330f1dfeb2cc7acbbd7d3c6
 EBUILD netbeans-websvccommon-7.1.2.ebuild 2701 SHA256 3b2a1cf0d32db3c55b66d1c6b8c4ae2ad5487d3fdb27752468ce5c860f9b9515 SHA512 b9be64755f00157c2d6984887b8c0fdc1e34470f21df1fd72b3e399d3ec894af01c9b79fd604778213ac2086a6c96bf66366e8c2c8bf97f7fee23d16ceb36974 WHIRLPOOL 91559de8c8f6391c3c69888854778a91a1a7e0052ae69eb9762bcbd64d8bc5587fb84ebb55d7d0375da5a7855aa8672abfd035b6a38b3eeb5c23a4cd59b3cdce
 EBUILD netbeans-websvccommon-7.2.ebuild 2684 SHA256 8bf8cad1e0469713c63280620fed089600191230f501a78b834b010f8fa9b3e9 SHA512 fe885f92a7c6cfac532c8e40e4df6283253c43294e9d82ee4d0d070425496eee3792479c268b46bf1fd484f753ca1f21e7ca38a5d71816b6d4fd219082e8e276 WHIRLPOOL 9d2d622d4a800470c874d8751e9c2055e0a4ef72ad01a01aefda4e95a7f295d55fc95fdb55fdd1f631212e1f610bdc7a6b4ee631b92492bb85f73b0d9fb4ba26
@@ -76,5 +77,6 @@ EBUILD netbeans-websvccommon-9999_p20150119.ebuild 2727 SHA256 1ac36d17eaf05534e
 EBUILD netbeans-websvccommon-9999_p20150120.ebuild 2727 SHA256 1fc1715c4144ffbe58189d38bd4eb0f056c292da8b39cfdcc77a28cdf04a06c7 SHA512 d241104d507f705aa56e05a22a981c9c26d100e22524525cac9ad9fa07f4d0665740452a5c9021d50198d499589196eec22723c2643eeba59cede092a7ec3359 WHIRLPOOL 6f1b51a34eb1b49a7b8e37efd2ec38167a750d2dabdfaae77c479d17638ace9ea8498509927e1c2b56e370c4a8d20370a407a1fbb086b7e202f0917b4ba53b47
 EBUILD netbeans-websvccommon-9999_p20150121.ebuild 2727 SHA256 a76572d45b7042d5ea496bb1a5fde5b65da7d5462e9a90b8f600e9c66829d1a8 SHA512 ced8b1a1db1ef50052d3a1a9a634b9f1bd735801c782f24d70e43c345cb3d64c7a1aeb8735c5f2216f9ed09b78b6541001a970f02e14da98433b0993b53ca928 WHIRLPOOL 522487a58482a206a3018e099990e717a39b4db3594e03558576358ffded4773de23e26dc08cdc608b6258f8542672f31e129bbecab60f731906280f50eb442a
 EBUILD netbeans-websvccommon-9999_p20150122.ebuild 2727 SHA256 166c0b97cf82e4e8ac0340b0178341f0702a8b5dacee9c6313ed082a46c649b1 SHA512 cf7e9b9df39949ba983dce565b7e56ce2aeaa54a7a3b3cc607bbbf1ee3104796b56ef108c205b0a6a0089c7ecc0ceabf540b4489fb8aa2cdb814255544da3b95 WHIRLPOOL bb6d1dacb0b307ff4336b9aaf85be6034a05c41c8d98406292d01f4c9668ff0129baa636eb21dfc2805d49453715f001e56a3e3cc5b6d7bc0c10981cdfc1a696
-MISC ChangeLog 158678 SHA256 50a0e23978550bb0b37df95e7136a2a15b2f0f4de50306751bd3fd1a615da41b SHA512 bbc8e956bab35ae5c4240274b6a9f294137fdf8f368107b8b4bcc43afb2cd1fb78d09c0bfb60050c3679601075d24d96e3167cd5a7e41d17381aba5c4fa78445 WHIRLPOOL e7d8e909201f0aa0dbff0c53c44cb6bde82ca680c86c4ee2cac2daa0fa162f7570a34545acad1ec3c482a8732f01448c7f2f26db023827d2c9612d6c3d236cbf
+EBUILD netbeans-websvccommon-9999_p20150123.ebuild 2727 SHA256 a0357d9105b22041be1e84ce57aae7b603cb26e16e5c5484dda754c0b590843e SHA512 6e6a93870393918f2460f21f74a1140f1fe664a0dcecbde4eb708db65d019a73227645e72c079b7d2c3a4f04853077cf2f9cbf7462597c862b695502684570a6 WHIRLPOOL c8a337a4bbf3bd8947f60885db94f4718f56500fc90cf3d4d9559600355d1afabe95a651a3ab810a1eb0ed927619a67f2a25cc4da8247c507e2008fcb6919ecd
+MISC ChangeLog 158863 SHA256 b570702ee0cc01028d5cad7b344519f2b0bf5adfccaa9ef57ab7b65fcb43967d SHA512 b806a7489a21c4aa8b7f089c66ceba727af053a39a38803a3e0b21f0c8aad9b9fc3581780f058b1bde1f126712a4ae4f7a5778e237f6484f376fe3b7ec265d1a WHIRLPOOL 684fc1eecfe3ff2d0dce1c4b44b0cfde741b040b3775184d427217c18a934dbd1262b78f351fb10bacf718ee835b41cfa5729f5300aa7dae2702e8a2f5d537b9
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150123.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150123.ebuild
new file mode 100644
index 0000000..f152122
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150123.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-01-23_00-02-29/zip/netbeans-trunk-nightly-201501230002-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/ChangeLog b/dev-util/netbeans/ChangeLog
index 576241b..705b971 100644
--- a/dev-util/netbeans/ChangeLog
+++ b/dev-util/netbeans/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-9999_p20150123 (23 Jan 2015)
+
+  23 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-9999_p20150123.ebuild:
+  bumped to the latest sources
+
 *netbeans-9999_p20150122 (22 Jan 2015)
 
   22 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 1c477bf..77e52ac 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -49,6 +49,7 @@ DIST netbeans-trunk-nightly-201501190001-src.zip 201391445 SHA256 ce4ec7706f8073
 DIST netbeans-trunk-nightly-201501200001-src.zip 201396862 SHA256 1a9378d8f52c4f617653d096aff287cf62212af8a6f878fe54cc468e4dd4bed7 SHA512 92fd39cda2d11816b9a01e0e5c26b3f527354a69efdc940cb27d5b17ee6493a07225d2698260db2bdc220e01d166ac42b5fb62f809d1e2eb84419c6e6abb3e14 WHIRLPOOL c3ba7155b5d376041d750c42f1ff8f8dec5bdbfedb470dea483a665978ef3982f087cb7a521f7892c264bb38d0876e4e7a08346ae4579338ba698ae7ee4ba456
 DIST netbeans-trunk-nightly-201501210001-src.zip 201405381 SHA256 95369f4a232531feb195f2d41c14b7ec9791bbd86282fc8155bb1828affe6afa SHA512 4e710bc5905ea83167152e3252a4309d6a4f6fe8f0ccd8f50bd6389635cb2c4fa1cda60c9c9df8d70149ef84bba66527a8c94b1822710421aa704d374a0132b5 WHIRLPOOL c6780c694d1acabd53ca2b23ac660d587b02f63f3f8b5a98c7e293af4e099dfc46dcd5dcd939d7133edb5885388150fd28723b6325678519a80f2cd0ea673ac8
 DIST netbeans-trunk-nightly-201501220002-src.zip 201432275 SHA256 1969c39ce22136b5ff98f7959bf96088b7caaf9ea46df54ff0ed01ca857de8df SHA512 dae7c345289746e85ea6bf99a6352fcb53ec02c8828bf447a686aed0cea577de11e75e89451abf76a1dee3b1d91aaa204dbbe3057ca40c58759f16a4d768b7a9 WHIRLPOOL 39163c8ccac8111c9ab2a0787a2bd137a680bd16eccf4a7e526cfe34c74df0efa957b320df52b92fe9f1dbd134e7e2b2e1479c237b78e7a060c3893aac8838f9
+DIST netbeans-trunk-nightly-201501230002-src.zip 201448361 SHA256 9705937c7762d0df36dd885713111a80c01b67f17c2257423961ec7c25acf546 SHA512 c6a11a10357a44e899e621d4402daa6b435ec285c467d44d636e3c3c457f025225bb7594b84c7ee526fd7c416441960350645f098860e858cdf7106ccf694ee4 WHIRLPOOL 03b767b926ff881cea4b2227b11e0ef9b7b866d88d6b05f7f90419de7ff19216fbb785a9bf74c5db5b533b17186393e1d4280dc3c38dcdd9afa8440239fc6113
 EBUILD netbeans-7.0.1-r2.ebuild 6736 SHA256 e808fba2ddb516270d93b5cf67cff60d98b37ca58a158878f2e3b3ad696cfc82 SHA512 653fb585d9eaa20fcf88d778a7f34d63c9f29f2af2153a432fcab6d977ef9619c699b19587a48b148ccf717f4b31a43859b81cff80d5d84ad273c5fa16e8f565 WHIRLPOOL 257f2466c3ad198a05db9d5e377cad2707f8a4daf1f421e516d7435670a85fd4bb5f6b3ab657ebda8cc23937e1b4e1f4acce8cccd85bccddc5a7b1f9abbde0ce
 EBUILD netbeans-7.1.2.ebuild 6976 SHA256 4222e248dfb664ccfea85d4938ad691d3685f32d8e9b33289d1dda088057261b SHA512 cc0a20bd542b61621fe08d5413611f7bcbbebf0c37d5f67c590c31324e74eb5594e72efacc86d843ff3abffc98c4859c2733c63ce6f993baf51e24d69197b64d WHIRLPOOL 30fb7b0cbf22fc39a8dabefd27a0073ce73e62ef082d55839fb7f815bb73bc5c3c24c3418ce175f355d7c64138ef7e9616da41c68b3b57a70353d16c6113daf7
 EBUILD netbeans-7.2.ebuild 7057 SHA256 29140b2779f1a24722499605101c286d05415b4f97d2363afedef711cc586067 SHA512 0776f530f9530c533b13019f7b34fc664990a16926bcff768d0a9f3b9035de82dcd2ed66425ad8da27c65aa69fe3e6be966e0a1ee1bc222949e5d42e14f7f7f1 WHIRLPOOL 9fcb95348171fb0bd8d794b80b51b2e3ce36fd84ccc81653bdd0172cbfa99791e527b33c895ebf7b4d81c228f17d4afab367eb55ceffe28df835b2d09dc8f778
@@ -84,5 +85,6 @@ EBUILD netbeans-9999_p20150119.ebuild 7216 SHA256 b5b2e582ed7951a59ca92f94626a75
 EBUILD netbeans-9999_p20150120.ebuild 7216 SHA256 a46b7bf70116ab124fbc25bb50bed53d93b6986204d5cd09b35ab7b982bbfc21 SHA512 c3a358dd649e655ce3860fbe52ab0071659afac6afc9afff3568765a9924c7e5b8bf3a1398c52b32e24feed5aa5e34cec4d69a5d4c37bd0553410ae816a4dcc4 WHIRLPOOL 49b0466d93ab1cbc9f3d80d483ae88d742ac37c8a0ca5c8b17ae46a8f08160466bfeb5c73e488696a1d34a8b13c6bbee6cf593d992f84fb92aad8f48797652a1
 EBUILD netbeans-9999_p20150121.ebuild 7216 SHA256 99b5df25d40b8176f19ddac7ab07df0c9d7aa835b7f5376e28786926101d039a SHA512 afe5ac269ef0109fb8c98782ee7f401ac38837a4d61e6ae4e19a1e2b434820ca8008e3ded0fb492e47fb4044213ae85ed0056a3c96c9da7351adb8fa6b6da5b1 WHIRLPOOL 4fba1b27b127a0efa04316eda04c479b569836d7cdb49b078ac0d4a26b467b0b248a14323395b8003a10d2976b0a8e1a6e4d268bcbc57d7bad5e99b0d813d3a8
 EBUILD netbeans-9999_p20150122.ebuild 7216 SHA256 4d4b7c7906ad1ef7649ace1cfbf888cbf12d713b389d86a5f5cfc636a512876e SHA512 01dc0cad4801155fd636e961abf40dda7f88c13f2e6b6dba9dd9c73a04be7cbaf66d70e9bc7e117707ccabdedd9f25c4c00e9c18eb33f467cc9da6872f9b1f07 WHIRLPOOL 6488fe5b5013c032b9f8435c2e1adb5de6e386ad6e47f8f9226a88fe5a6deb4eb7c85bfd036086645dbb6d3f8f52454a3a0b48f48cbc41a4f1ca7f594b0fd9e7
-MISC ChangeLog 135148 SHA256 2a3cd2dd63e8359e9bfcadc0530e08646b45febe9455a8aeacfeebac285b8ef1 SHA512 d30af7d25eb56bccb96a4369635d9dfdd4100fbc4773ceba1315876d317246a491b9a3ba2f831eb28efc91097afd6d89d176d42589e7a33c0daacbe82a784ffd WHIRLPOOL fe208bf637653a65e240f6ccb096015926fcffe1b62fa9c79e778acd83a8651aa9b1f5436aa35d19f627ba5bdc12409138ce1720d93ce5522aef5ef2ce062dd9
+EBUILD netbeans-9999_p20150123.ebuild 7216 SHA256 271b88289a09f6086cf7e8c831793352995ea57610e3c956cc505582afb26147 SHA512 d8515eef9c6732b8e0b35b25e6435772e3f333555a5f9da4b4c8c85696e5598cb7e3bee3a3a3fbae81b5782007ffaf6fcf31973328bb58d1ecc0ea28debb4cc0 WHIRLPOOL 80ddaf71d35103d05105fafc72876581e79fa4c8c9ab436b6bd9c0e146702291bc8679977b56a3fad0c1763df18e9647c145065d27f094fcbda5601f1021ca1c
+MISC ChangeLog 135307 SHA256 37b9ebc8055e82d8e74a70d153adc0d18d39bb6e02ea2e2f5bbd2e953de70ad6 SHA512 c7053420945ba2eb32957ab41b14cdb396cff3ed9bbf86955dbd5e6a1627203a43c342164a86d4d5c9064cd72d4d276e040be0966ea17b8117fbe513d80cb4ef WHIRLPOOL 25b8eb8132a6577809f2da69f73d821d47dbb8cbf654fd922cbc15fbeef64cd5a61a6483909d17e11143ceb639ccd266046d6810208eac9f3da85d27d5458796
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

diff --git a/dev-util/netbeans/netbeans-9999_p20150123.ebuild b/dev-util/netbeans/netbeans-9999_p20150123.ebuild
new file mode 100644
index 0000000..8f7b539
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20150123.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-01-23_00-02-29/zip/netbeans-trunk-nightly-201501230002-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] 4+ messages in thread

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-mobility/, dev-java/netbeans-websvccommon/, ...
@ 2015-08-04  8:14 Miroslav Šulc
  0 siblings, 0 replies; 4+ messages in thread
From: Miroslav Šulc @ 2015-08-04  8:14 UTC (permalink / raw
  To: gentoo-commits

commit:     3f04b8bb27efefaef91ef407175774e366b27572
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  4 08:14:07 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Aug  4 08:14:07 2015 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=3f04b8bb

netbeans: bumped to the latest sources

 dev-java/netbeans-apisupport/ChangeLog             |   6 +
 dev-java/netbeans-apisupport/Manifest              |   4 +-
 .../netbeans-apisupport-9999_p20150804.ebuild      | 111 ++++++
 dev-java/netbeans-cnd/ChangeLog                    |   6 +
 dev-java/netbeans-cnd/Manifest                     |   5 +-
 .../netbeans-cnd-9999_p20150804.ebuild             | 127 +++++++
 dev-java/netbeans-dlight/ChangeLog                 |   6 +
 dev-java/netbeans-dlight/Manifest                  |   4 +-
 .../netbeans-dlight-9999_p20150804.ebuild          | 101 ++++++
 dev-java/netbeans-enterprise/ChangeLog             |   6 +
 dev-java/netbeans-enterprise/Manifest              |   4 +-
 .../netbeans-enterprise-9999_p20150804.ebuild      | 266 +++++++++++++++
 dev-java/netbeans-ergonomics/ChangeLog             |   6 +
 dev-java/netbeans-ergonomics/Manifest              |   4 +-
 .../netbeans-ergonomics-9999_p20150804.ebuild      | 101 ++++++
 dev-java/netbeans-extide/ChangeLog                 |   6 +
 dev-java/netbeans-extide/Manifest                  |   4 +-
 .../netbeans-extide-9999_p20150804.ebuild          | 108 ++++++
 dev-java/netbeans-groovy/ChangeLog                 |   6 +
 dev-java/netbeans-groovy/Manifest                  |   4 +-
 .../netbeans-groovy-9999_p20150804.ebuild          | 111 ++++++
 dev-java/netbeans-harness/ChangeLog                |   6 +
 dev-java/netbeans-harness/Manifest                 |   4 +-
 .../netbeans-harness-9999_p20150804.ebuild         | 114 +++++++
 dev-java/netbeans-ide/ChangeLog                    |   6 +
 dev-java/netbeans-ide/Manifest                     |   4 +-
 .../netbeans-ide-9999_p20150804.ebuild             | 377 +++++++++++++++++++++
 dev-java/netbeans-java/ChangeLog                   |   6 +
 dev-java/netbeans-java/Manifest                    |   4 +-
 .../netbeans-java-9999_p20150804.ebuild            | 273 +++++++++++++++
 dev-java/netbeans-javacard/ChangeLog               |   6 +
 dev-java/netbeans-javacard/Manifest                |   4 +-
 .../netbeans-javacard-9999_p20150804.ebuild        | 134 ++++++++
 dev-java/netbeans-javadoc/ChangeLog                |   6 +
 dev-java/netbeans-javadoc/Manifest                 |   4 +-
 .../netbeans-javadoc-9999_p20150804.ebuild         | 168 +++++++++
 dev-java/netbeans-javafx/ChangeLog                 |   6 +
 dev-java/netbeans-javafx/Manifest                  |   4 +-
 .../netbeans-javafx-9999_p20150804.ebuild          | 124 +++++++
 dev-java/netbeans-mobility/ChangeLog               |   6 +
 dev-java/netbeans-mobility/Manifest                |   4 +-
 .../netbeans-mobility-9999_p20150804.ebuild        | 126 +++++++
 dev-java/netbeans-nb/ChangeLog                     |   6 +
 dev-java/netbeans-nb/Manifest                      |   4 +-
 .../netbeans-nb/netbeans-nb-9999_p20150804.ebuild  | 148 ++++++++
 dev-java/netbeans-php/ChangeLog                    |   6 +
 dev-java/netbeans-php/Manifest                     |   4 +-
 .../netbeans-php-9999_p20150804.ebuild             | 127 +++++++
 dev-java/netbeans-platform/ChangeLog               |   6 +
 dev-java/netbeans-platform/Manifest                |   4 +-
 .../netbeans-platform-9999_p20150804.ebuild        | 166 +++++++++
 dev-java/netbeans-profiler/ChangeLog               |   6 +
 dev-java/netbeans-profiler/Manifest                |   4 +-
 .../netbeans-profiler-9999_p20150804.ebuild        | 121 +++++++
 dev-java/netbeans-webcommon/ChangeLog              |   6 +
 dev-java/netbeans-webcommon/Manifest               |   4 +-
 .../netbeans-webcommon-9999_p20150804.ebuild       | 123 +++++++
 dev-java/netbeans-websvccommon/ChangeLog           |   6 +
 dev-java/netbeans-websvccommon/Manifest            |   4 +-
 .../netbeans-websvccommon-9999_p20150804.ebuild    |  94 +++++
 dev-util/netbeans/ChangeLog                        |   6 +
 dev-util/netbeans/Manifest                         |   4 +-
 dev-util/netbeans/netbeans-9999_p20150804.ebuild   | 264 +++++++++++++++
 63 files changed, 3474 insertions(+), 21 deletions(-)

diff --git a/dev-java/netbeans-apisupport/ChangeLog b/dev-java/netbeans-apisupport/ChangeLog
index 7f1b3cb..63af9d6 100644
--- a/dev-java/netbeans-apisupport/ChangeLog
+++ b/dev-java/netbeans-apisupport/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-apisupport-9999_p20150804 (04 Aug 2015)
+
+  04 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-apisupport-9999_p20150804.ebuild:
+  updated to the latest sources
+
 *netbeans-apisupport-9999_p20150803 (03 Aug 2015)
 
   03 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index fdd4db2..f4312f5 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae284
 DIST netbeans-trunk-nightly-201507310002-src.zip 208736792 SHA256 f2794218686a678f2e826bb542663753c97f1b5cf839657ed6540b36d85e0eed SHA512 31cab9432e2668d4a90c99e561faa6a78c89210bd76625e4274c45ff634783967e9170bbd504e60fcd08df88c57b57f5c357f30c9c8dc06d6d0c0ae72f3ef0a3 WHIRLPOOL fccf16a822b7d43c1dd709c2357cb2fa6ec518e291f4f306c5c2aa4838f734ef9d2c800795dde592d17b3685826e00d26611e8b3cc4c68e6ee5332cff9aa7129
 DIST netbeans-trunk-nightly-201508010002-src.zip 208741865 SHA256 2ade7e4e9f2b80801888cd2281c99f5a3236ecbe0ea86d58e12224922ebf3f32 SHA512 25c2c59cb3c4a636dc8fd9d366017faa24e23b3c0c293a39f07ce889cbed199994f2e3ddb526f371e35a1d93a1baf4380ddf9e9ed8df8050808327351ac9de38 WHIRLPOOL 161e4359caba6c0248bd91e3ab17c78198b160e3317a6a20d12a5f964a9f8a3aa0aadd533fdc5e72d752e6d023637ce67bd38ea7de44b8525ea79b3aa321301e
 DIST netbeans-trunk-nightly-201508030002-src.zip 208748030 SHA256 933445356a68c17218a1e5d047568b7493208f5e4ac5cb083b6c0c840080e08f SHA512 000a443f1e02911e29996d0ab6021863faf1ea3649cb71dff7df5c262087dda663d4d670f64a238df86220fb1bf0fb713a990bd78671077ac86d5e0c7d0a52a6 WHIRLPOOL c71739d059f35e7f3f6b301f7291f8ddec3d286eec918a18f9ce924068f1ff84a3138c50f5c59d4efb297b5aa8c748988c6695656deb47a4fe49fcaf35b86bd3
+DIST netbeans-trunk-nightly-201508040002-src.zip 208761490 SHA256 b001f001aff1c4a6e29cf289beeefea7e766fd278a7144a028970bd9b65b0459 SHA512 87a1c41db0c76a01150c08247dc76f397e0e9ac2d87ff3fc5a6f7d91265812bc8471ae87edd781ea2518c8b47f48ad374b4fddccb38ba1ef888e001c3b295224 WHIRLPOOL bae5b1c4f71cb87f223d8232c29da2fdfc3a3482db42cd3783f2c249aeb7c409f2b40fe815e290006797307a5ba296316f21a44988cb098659b6d1969359c371
 EBUILD netbeans-apisupport-7.0.1.ebuild 3134 SHA256 41c32033c9945a39c0aebb6b0271767031d53a47e5c8365d9e3a7c86712e24cd SHA512 dd4bdde9574a87b46b02fd7204b1e90394bd87dc572dfa015b601203b026b35571f20323db834a310f90aefe6e4a822044b0d71d535a7351137219b50ecb2aa8 WHIRLPOOL f3721521a33b337d7dc24d6b49b0b2fe723f5ec446a5a4befb085051140a41bfd2d3081876e9f02f8b9932a3a0997b92211cd964fe372e40b42813df5db5170e
 EBUILD netbeans-apisupport-7.1.2.ebuild 3143 SHA256 cf24048c0ecca98a7d6371624bb0ddfb78663bead073d515a7c84229dbec00a8 SHA512 ec44c263e786210fd64c9ebb253bc9d4fc34d3be9493157dad06007c19734672bfd767765c003393d1e5cc6755fd5d1eda956b00c2092e98592a73ec1af4e729 WHIRLPOOL d619c304a994a2b818d892fb6315d092588f2ebf95e566f7a909f92daf21bb368a28c4e1af876ae585980dc82996e62aba30b12c41461103c23620a215480b76
 EBUILD netbeans-apisupport-7.2.ebuild 3126 SHA256 b0d64795b8403a932e3e20721a116c755c4de66fc36f7191476fcb4a226bad13 SHA512 cea062a72a8e75a9c2fe91c323f83d542a70149336360e1c41479f401fcae5ead6a301c8a7d5704d5beb27f7810b5d1e3cff0196cce7a26890a001c570179f6a WHIRLPOOL c286f4e4d3a02cbeb1a6e13b2005dc5435a6e9ec026a98fcc00bb83222014b800cd83f437c69352b48d16bdf442a6c7ebbed6aff86f10b3c5e6cdfb7edd9e184
@@ -72,5 +73,6 @@ EBUILD netbeans-apisupport-9999_p20150730.ebuild 3390 SHA256 9e67ae8db251259a105
 EBUILD netbeans-apisupport-9999_p20150731.ebuild 3390 SHA256 8539dfe0cfc10617039c2f8d898980edb951c4136895d9afe34f9d878c757024 SHA512 8b99ae5b64ce2cd803a8d643ffaaf7ae919361b93aa42987e6988d78b924f396da6e95436650a2ec362ff39ba53ae27828c5aea57aa59c5bfd93290f2cf7b397 WHIRLPOOL 6551f46972e7a0461cbe4a402bdceb26e9339ad0557bfacf2d981e55b0b2a86e485a346fa24eef98141468d3697313c13bccffca94d516d43ad57c255ff5f7b5
 EBUILD netbeans-apisupport-9999_p20150801.ebuild 3390 SHA256 b07e5fe4a1dbbe58da757f4c5f3aef9554aa58b181c3a8ad9cabdeec1183564c SHA512 d63aaf9b942a1a62bcbb39f1dd94cb9b1ff55176625b9b3cdce372d2f6a77e948a7f62492160e8e580e61c92472c5768a3f5f6a2432c79415cf4ba4c7505d2cd WHIRLPOOL f24f705d66c4ae88115ebc037be148678c971b501e815c807ad1a683ee76516c4043ba4a69262818024a73d1d5708a0f37d2f1ad829dcc049fb6bc8fc6f33450
 EBUILD netbeans-apisupport-9999_p20150803.ebuild 3390 SHA256 79c1d9ea1c5125f5001bbbd962ff646f39f239a85dcd3f4f755ec1a7dd6de08a SHA512 b71e4a81aa471d030fa71f8e9634d6e0eb58c359624af19b47125125f9b528381b7eb4ffef3032f9896f7b9e475500c54e0c47ddc53a89ea9ccdcd44422af87b WHIRLPOOL 27c98bbe09ddf9073ead7c827123ae0eb9fcc8a061c340a9d53f03a17c994d792251a3e648c919a0d6264735d225120d375119e49d8ee75cc2c8c062532315c0
-MISC ChangeLog 181243 SHA256 c4def4bf627ebaf7aa3f84eec2127931ed705cda6836cee0e14226bb2c37234c SHA512 1274356a1a389febfe5628525fe05259152636ad055b99f492f532d1d29f7a74a2641bb98c6268929b61f8aab9e592cba906adfaf1e2cac32380359fc3e9abcd WHIRLPOOL 9750d7fe8f6c96ae6facddf9e0a1a0d4fc098e460b7cd6f3c23879541ec3ad489778b79dd1da3962de7ff9adc87e32cd8bc86bbee13abdab4f96f69cf9d7050e
+EBUILD netbeans-apisupport-9999_p20150804.ebuild 3390 SHA256 8cabcfdc6dab27b4a985146c920a00cdff2d8b57b283a6829d127c30a8eb6bec SHA512 5e0822cc8581cc90ec76dba7359f0a337b977c93449876a0cfa7ddfb38c1f084ad33a9d9d7995b7859a5b0fe596777da225dae071dcf3130898dac08414130bb WHIRLPOOL be9dea8ef2f09645f1e913682ca8452ff26df05609fdedca8b88e7e8eb4b13560af5a0d802f8ed54c88941161c9c0b49832cfff5ce09214a9f2940106b628308
+MISC ChangeLog 181425 SHA256 46ca7cdd44442fcd69c449cb864664c80e994fd39666118d3ff93805b88c54cd SHA512 a542b258c8ef397c9da4458a19db51142b68619493c8b62bafcd36794e70533653f6cf293d23b704023ffba9cf2f7a68e73b0bcc32bea9858dc51ef37fef1d97 WHIRLPOOL d1c5e293496529deb4a4e83a2d092c926781742d7a7dea9944979f6a2dd7a82a3e93e89d16b03062bfb50d31b1d3d825fbd0fe0244d772f0b4b016ef30d19983
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150804.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150804.ebuild
new file mode 100644
index 0000000..af80fd7
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150804.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-04_00-02-28/zip/netbeans-trunk-nightly-201508040002-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/ChangeLog b/dev-java/netbeans-cnd/ChangeLog
index 0227da7..bc35b98 100644
--- a/dev-java/netbeans-cnd/ChangeLog
+++ b/dev-java/netbeans-cnd/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-cnd-9999_p20150804 (04 Aug 2015)
+
+  04 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-cnd-9999_p20150804.ebuild:
+  updated to the latest sources
+
 *netbeans-cnd-9999_p20150803 (03 Aug 2015)
 
   03 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index 095b3ea..a9b17d5 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -3,6 +3,7 @@ DIST 24C58A1D3C410AD3E23CD828871630C17068B238-cnd-build-trace-1.0.zip 28980 SHA2
 DIST 296C195B720404C2683BA2F65E2A423DD0611B8B-open-fortran-parser-0.7.1.2.zip 86627 SHA256 de7cf8ce10a3d50eefa5e493953404be7db138007aa9fb53b894e307ea033195 SHA512 0c052abbda51e910e89c378c15ff31a905af2c7beca587219e9191e9ed64af863b3d9261375a48c18d3ee79c9bac9a5517da9e7693d2e9db91d2937d8174314c WHIRLPOOL 898b55abaa5381f3f414e70d7e8e3738775f04493f12020b2e845a0bb3081bcd6ac524d85b9ba599fcf4cde26f24cb7d9f6207cc2d1d30271af6abfceefdbdb4
 DIST 2BCF2047382FB68A2F275677745C80E79B4046AB-cnd-rfs-1.0.zip 152701 SHA256 ee454c52dab7af01a0c292bbbd9bd5fa62e07480d4284a34e38746aba4bb501b SHA512 222ae7d6fc8a1f5610a107264fd249180a7a865094979dd5426fb266b94e1d24ef421199cdcb923ab58577c292a183863c45a1434b4dcb35bd67dbdcde945e54 WHIRLPOOL 821c0e5e9534955ee9b4200476fa1fe65b453520551cb71a71a225bb96ac69ba6c408e9d59b5df7008ec1b8d173035e76358172cf3ebafbbd50d0971db3a8983
 DIST 38733D0432C0C5CBE3AF36465AB7DE2B6170E98D-clank_0.3.6.zip 7401678 SHA256 a0b45cf016068c6e7ae6a19ffa22c1bd809b367836eeb67f745f04e250e64173 SHA512 d05a9add9c941065bf1a44360a9588fe6ee0798589302582ecbe13458e0e6441e9414808f5417a8f834e5c3d71dfd397b9b5a30fec1ed344228efcddcb008a35 WHIRLPOOL 381f2d5dbde553d82c30c72495b7dbcd13070549649340e650ceba4634a2b75316946951c9dc6328c0dc8df79b021600f98bf81cbb75b9683779b7cd4443552f
+DIST 3A8AF153DB7B434C6E97911B66A1DF27ADD37FF3-clank_0.3.6.zip 9108458 SHA256 a9d77eb8504727eff8690eca0d8f12f738209e37f79f63b8229324fd0121164b SHA512 6d408c4c6a983ca71fbac4e716aae79384ea31843d33036d333441744b6f3a1183d7554b33b8b3fd12272c5b774f88cd889b969a03904bd9783977bcd0d70919 WHIRLPOOL a7f4a70ddd3e8cbb7e16d78167dd17d2aa4a79f96498b0384c30f12a24e38884f2ca62b31bd0db4fb1ed0c998c26bdf17338a8bb80ff6eb4e22191b938a6908f
 DIST 415A808B75F9EDB3CD6F4689DCEF9C399BF802A8-clank_0.3.6.zip 7308384 SHA256 c4cf1547275956b7f04d8d848ddbd6a7ca4bdbf3a95c43ec02732f2ae5654c87 SHA512 1dd82de19366260def1ce8b6df89600f4402d2d189a2d7e21041d78866ba7fdaf3e3785a9cf5e8382aba745cd284cb2e3f3d37fd9607bcd16d73c1aa566b1294 WHIRLPOOL 10453cb76df030a2ee67dcc3c7514a0991953c266e7b77f11c1c92f26cc7e0075168ec469b0286ad7f9f3833517cd5b9f8daad24d2a5760f2fd979308e164c02
 DIST 4C887D71C3E281E552FA33270BD7EDB4C231E071-clank_0.3.6.zip 8107482 SHA256 77e8417093db44ae6894337285fefb927306fe85cda69c8e05b0de8b7f78a757 SHA512 5a359cd4093fb8af3abe88f346ad8b5228459245734d3e543d5941efb2c0af50fe79861cc2674fbe61234e3c7df39972197bc8bdd897ea05a016e4ed2c2aa64e WHIRLPOOL e53b1cc20f3fdf48e67f033cbae77ddf5496f67ef1a2480372f3afc1c65067575a0aabc56c2d0392f21e388a81cbc83e1147dbacd13f7eb963acd712ece4a39c
 DIST 4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar 164365 SHA256 8633aa79a2566f51a089195e09a4581af3ee71bfc13eb234af5e0cf6383078b4 SHA512 f1300e2d1e47659f6113a0a3dcc953766b5a8ab32f13bedf4d6ac652ffcf828c17474d47edec08d7ad9039d7abb8570770b48fa53b8ff6b47a028836490777bc WHIRLPOOL 765c87803d9cf622ae7936cb922ad9bff8823a09baf01a6c8b4a81df8ba5fd7cd17b513b36da9910b75349de45185f4641680f35be8335e08b9c30283b6d3345
@@ -67,6 +68,7 @@ DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae284
 DIST netbeans-trunk-nightly-201507310002-src.zip 208736792 SHA256 f2794218686a678f2e826bb542663753c97f1b5cf839657ed6540b36d85e0eed SHA512 31cab9432e2668d4a90c99e561faa6a78c89210bd76625e4274c45ff634783967e9170bbd504e60fcd08df88c57b57f5c357f30c9c8dc06d6d0c0ae72f3ef0a3 WHIRLPOOL fccf16a822b7d43c1dd709c2357cb2fa6ec518e291f4f306c5c2aa4838f734ef9d2c800795dde592d17b3685826e00d26611e8b3cc4c68e6ee5332cff9aa7129
 DIST netbeans-trunk-nightly-201508010002-src.zip 208741865 SHA256 2ade7e4e9f2b80801888cd2281c99f5a3236ecbe0ea86d58e12224922ebf3f32 SHA512 25c2c59cb3c4a636dc8fd9d366017faa24e23b3c0c293a39f07ce889cbed199994f2e3ddb526f371e35a1d93a1baf4380ddf9e9ed8df8050808327351ac9de38 WHIRLPOOL 161e4359caba6c0248bd91e3ab17c78198b160e3317a6a20d12a5f964a9f8a3aa0aadd533fdc5e72d752e6d023637ce67bd38ea7de44b8525ea79b3aa321301e
 DIST netbeans-trunk-nightly-201508030002-src.zip 208748030 SHA256 933445356a68c17218a1e5d047568b7493208f5e4ac5cb083b6c0c840080e08f SHA512 000a443f1e02911e29996d0ab6021863faf1ea3649cb71dff7df5c262087dda663d4d670f64a238df86220fb1bf0fb713a990bd78671077ac86d5e0c7d0a52a6 WHIRLPOOL c71739d059f35e7f3f6b301f7291f8ddec3d286eec918a18f9ce924068f1ff84a3138c50f5c59d4efb297b5aa8c748988c6695656deb47a4fe49fcaf35b86bd3
+DIST netbeans-trunk-nightly-201508040002-src.zip 208761490 SHA256 b001f001aff1c4a6e29cf289beeefea7e766fd278a7144a028970bd9b65b0459 SHA512 87a1c41db0c76a01150c08247dc76f397e0e9ac2d87ff3fc5a6f7d91265812bc8471ae87edd781ea2518c8b47f48ad374b4fddccb38ba1ef888e001c3b295224 WHIRLPOOL bae5b1c4f71cb87f223d8232c29da2fdfc3a3482db42cd3783f2c249aeb7c409f2b40fe815e290006797307a5ba296316f21a44988cb098659b6d1969359c371
 EBUILD netbeans-cnd-7.0.1.ebuild 4602 SHA256 1336b76de715719ef59a3601dd5ad3b24992f58096f874f0e37935ec0d088d8e SHA512 38745c3ad6364198516ebb64002185fd05c34dee75acdb3933221d772177d5d6fcda853bb63991f0d071b21079fdab0c090db93e59cddd8daeb8f8d571a18a41 WHIRLPOOL cc196275289a01c1168b8c2710e0be0c2483cc86dc47b8fb3383ce1141f7bc11565e2b2feb95436cf448c09aaac7ee8c8804316ce6782d8853c0742367c0963a
 EBUILD netbeans-cnd-7.1.2.ebuild 4218 SHA256 6c80020e4204226274f4a24413dad8bf134f5beb7aee4ecc53d6b4d709093bb2 SHA512 299c07f5e5d930045e8c8ef3d04009beee7035daa2022a803e6dcb16b380096bbf5014c2d684094705d06b4608afcf6925266ef609a483a86452b03505dcb67c WHIRLPOOL 6d6c8bddf3490282b9134315f9bc94ff55675160056fa4c98c302a59d943a9cb38f23ffb9ca313c82061d84d0ae86898ce72d16756d41c468737e319e68f06ce
 EBUILD netbeans-cnd-7.2.ebuild 4201 SHA256 0f77a1a343d437e2eb1236722b27b2f2f03901ecc1afde29e1d38e54aef7c81d SHA512 b5fc985d1280ab900cb5125691a0ff99bab075ff5e93ded9af256310a7dcbea87a28a52ba383875caa24fd0ff28bc8dff4fc0fa0242987a673fdc729f7234b58 WHIRLPOOL 19e79dc426fb05ffb48ff9b13de3bab40f483b6dd9d79514e8f819029c278ee47a09c9531b5b4dba2014f805d502e66745f3355e2932e24e0dd9b5e3e273d2c2
@@ -100,5 +102,6 @@ EBUILD netbeans-cnd-9999_p20150730.ebuild 4796 SHA256 9afca2683b1c39fee7e02702de
 EBUILD netbeans-cnd-9999_p20150731.ebuild 4796 SHA256 88c9aee6a037a3fa3f207e962e07c41971575a909b9a64add005bdbc2e25be42 SHA512 4e0de5d5ca98f33358c38a86e3e02f0d374c9f10b00e1ff4af06b2ae84de3f891a0f347e098ef081e787c990cf4da0304d7e56a44a2fb57a128c51144c79e63a WHIRLPOOL 20ea256070611a9870685316f5d69b077279ea82b43f708e485dc40e82894dcc9270cb651056db7192acea2a450f575304c543af599e38de089b987e2088751a
 EBUILD netbeans-cnd-9999_p20150801.ebuild 4796 SHA256 534a147d634e1e346648e532b8d4417ecaf3b38d3fd54e68871d5b163c528f6a SHA512 8f3776a2bc96427e12563d5c1890ec9e147230dbcc61473fffe6a1df0909fc73d2570c8f82924baa058bb79f40c114d5b79bc27d67e3907be90044312a28b9bb WHIRLPOOL a5cf966328f484f1608196938189c6b947d60652214374c814eeded3958481d118d121b5ce31ba82745473b7a0a5648b89094bdfa4674407d84557c817b45b71
 EBUILD netbeans-cnd-9999_p20150803.ebuild 4796 SHA256 079b31ad24d8c743a89c42bf7688750ff343db10cdd2f652951b82e8809bc816 SHA512 be5b6a759253a9820c13e2e315ad9605e46d5d8b8087f85fd871a32a331815e11e1c82ecef586e9ffde76fd38a7f9261d01c9f46eacd48690b0893ad5fd2a3d9 WHIRLPOOL 7392955c95ee686653d4e9d0a460018e510a57d91297f37f5d372e3815c30dbd52f48f7e0ebd7b03c1e7de906b952652e8d52029aed8cfffb2c84d83660fdfe1
-MISC ChangeLog 165390 SHA256 5eb009c46cc2e2f2f329d368491dd72109296617db60d901eb3f1d4db2c1df42 SHA512 17ea83afbbd9e203887e3ff4e96d877b1740c92bff972dd98016de2eea15815368e77249cf9968f1598687c2ec75f3f39f8ae5fc62163e1607c22d290048c34b WHIRLPOOL 539107359c4ec77454cd9c41463714a4d1646d8805b6718f3ede03a12ffe9e55386a68828a519a263f25e17e66f203c67b86671f763e3bcfe5ed93a7a04c2c91
+EBUILD netbeans-cnd-9999_p20150804.ebuild 4796 SHA256 fd17c8b0d16a51015ce4ce20a0df3f03ecd37199a0c01f5af51f42a4b3365660 SHA512 c886fbe646b94e2f6daf026588549101c4c162a406f522079836f5023195b15b66e549c13eba91cd6cc0b798baa3e29589b00952ffb3973d104470353a47a78b WHIRLPOOL 98e5cf832aaf3b21177c0940213411626bba54ef404130619f052b9ef61a118ae71220031cd49b009033c24d5b5c90e4e9b61a889daabca7bf080c3baae50fe0
+MISC ChangeLog 165558 SHA256 1c7af69b27e65184ab53557f6ddc2623db0c9e3bad8e56ded555f3098e1ca68a SHA512 66e1e8400635936093303747da66808990ae776872f0e902b29bf42f759a296bed9ea54356988195931297a0b39e3de2305612d96524ee3dc464e52c3f531241 WHIRLPOOL b0f92916214ee0947277c18ba73fc850c5ebf3023f316eb6bd8cee6743557a5ecb0c6d1d2a67ef1559f8ee163c5dcc9228ec6bbd91a62cfec45a51b874c00d5f
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150804.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150804.ebuild
new file mode 100644
index 0000000..159b1c7
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150804.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-04_00-02-28/zip/netbeans-trunk-nightly-201508040002-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/3A8AF153DB7B434C6E97911B66A1DF27ADD37FF3-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}"/3A8AF153DB7B434C6E97911B66A1DF27ADD37FF3-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/ChangeLog b/dev-java/netbeans-dlight/ChangeLog
index af14b46..0b481a8 100644
--- a/dev-java/netbeans-dlight/ChangeLog
+++ b/dev-java/netbeans-dlight/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-dlight-9999_p20150804 (04 Aug 2015)
+
+  04 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-dlight-9999_p20150804.ebuild:
+  updated to the latest sources
+
 *netbeans-dlight-9999_p20150803 (03 Aug 2015)
 
   03 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 9280453..c749013 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -46,6 +46,7 @@ DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae284
 DIST netbeans-trunk-nightly-201507310002-src.zip 208736792 SHA256 f2794218686a678f2e826bb542663753c97f1b5cf839657ed6540b36d85e0eed SHA512 31cab9432e2668d4a90c99e561faa6a78c89210bd76625e4274c45ff634783967e9170bbd504e60fcd08df88c57b57f5c357f30c9c8dc06d6d0c0ae72f3ef0a3 WHIRLPOOL fccf16a822b7d43c1dd709c2357cb2fa6ec518e291f4f306c5c2aa4838f734ef9d2c800795dde592d17b3685826e00d26611e8b3cc4c68e6ee5332cff9aa7129
 DIST netbeans-trunk-nightly-201508010002-src.zip 208741865 SHA256 2ade7e4e9f2b80801888cd2281c99f5a3236ecbe0ea86d58e12224922ebf3f32 SHA512 25c2c59cb3c4a636dc8fd9d366017faa24e23b3c0c293a39f07ce889cbed199994f2e3ddb526f371e35a1d93a1baf4380ddf9e9ed8df8050808327351ac9de38 WHIRLPOOL 161e4359caba6c0248bd91e3ab17c78198b160e3317a6a20d12a5f964a9f8a3aa0aadd533fdc5e72d752e6d023637ce67bd38ea7de44b8525ea79b3aa321301e
 DIST netbeans-trunk-nightly-201508030002-src.zip 208748030 SHA256 933445356a68c17218a1e5d047568b7493208f5e4ac5cb083b6c0c840080e08f SHA512 000a443f1e02911e29996d0ab6021863faf1ea3649cb71dff7df5c262087dda663d4d670f64a238df86220fb1bf0fb713a990bd78671077ac86d5e0c7d0a52a6 WHIRLPOOL c71739d059f35e7f3f6b301f7291f8ddec3d286eec918a18f9ce924068f1ff84a3138c50f5c59d4efb297b5aa8c748988c6695656deb47a4fe49fcaf35b86bd3
+DIST netbeans-trunk-nightly-201508040002-src.zip 208761490 SHA256 b001f001aff1c4a6e29cf289beeefea7e766fd278a7144a028970bd9b65b0459 SHA512 87a1c41db0c76a01150c08247dc76f397e0e9ac2d87ff3fc5a6f7d91265812bc8471ae87edd781ea2518c8b47f48ad374b4fddccb38ba1ef888e001c3b295224 WHIRLPOOL bae5b1c4f71cb87f223d8232c29da2fdfc3a3482db42cd3783f2c249aeb7c409f2b40fe815e290006797307a5ba296316f21a44988cb098659b6d1969359c371
 EBUILD netbeans-dlight-7.0.1.ebuild 3624 SHA256 499a9303a1972ee89dfa2685e1dc1e4511c7531ff3b29caadd1136ba25dee82e SHA512 ad60adc5d64f93d03e27170311ce7bd0a6952c8b41cdc51385f8efc9140593201064d162b3130bff7a003570de11963d375d3676476115b1129ac74632d4a227 WHIRLPOOL d68dcdba50b2565d40e1adc484b51c1ed0171c2fcf99fbee08a221e6d9767f96d161d45eda612eb4c4d62e0db6826e2cd124b83e11ee2f7c9bfb6a440ec6821d
 EBUILD netbeans-dlight-7.1.2.ebuild 2935 SHA256 dc7d110b80174b1baeaca9c005e2cc9167540f186c7794067cfb45d335251b9a SHA512 7dc2db63ee40a3e64375eb49e669c54f88cc532d7ac8c7320329f8378a3be15ebc4536208ea2975c7fe4a9b3f2ac60d0ec5b8c9a9da392587fb04838f101e0ec WHIRLPOOL 1801653d9e146eba02642dbdb0a39c235a40e5d3d5ac8d4d5b8d2a570aa62330638355ee8df76693db177c58bbf31271342215c70d7e198e4b6bd905984ed9c7
 EBUILD netbeans-dlight-7.2.ebuild 2650 SHA256 9b0c0049b7cf6894cd44327c3697d4ddfb0dba2aebd6aabc1821b550932cd69d SHA512 0584c2a1cc65193673bded284c454b430fa3f5774c33d704922977d25ed26bf88d090670e330299c85ada2e897e5f124ae9f635a6f8be7d7fd10740482df7eae WHIRLPOOL 1c27b0c84a34865cb8a84062127f49aefcd245fa16fb825d7ee57d24c3f5841935242c16b3250319078762ce4e8aa5bc8dbd8dbe497b39af8e027b9e39ee585f
@@ -79,5 +80,6 @@ EBUILD netbeans-dlight-9999_p20150730.ebuild 2995 SHA256 d84fe5648153e8541466deb
 EBUILD netbeans-dlight-9999_p20150731.ebuild 2995 SHA256 4f9c5a4d043088d9ed1c595826a775fc3eb50e9730c7d21eaecbdb138dfba44a SHA512 1e0475da6ef59e375473015c697c0ad67cc785ed090ee05b1d3810ab4c195cc6e58ef78086b7ff0fc650992482299e22aa49dc10194d81df63a262dd6d192156 WHIRLPOOL c43efed4e50c7e2a6d9e4f17fd7a7106f9338d96565dc43c2b8d529c4c506a9cfc921990c37597e081ebd994b37240a134de8835d6e449446a7fc39083bf10e1
 EBUILD netbeans-dlight-9999_p20150801.ebuild 2995 SHA256 cfd3f15b18ed32e44a9ade5eb23a71b64b652974dece7147fa98e8e35b08dbab SHA512 5e46602bc487527321af8e5dece6f61963b89846fd37bb1d466d678344d35766f10a1f0a84aadd6566c1a15837b90a9deac95d829d0fa7039b4bc404db422a94 WHIRLPOOL f4107ff02123cfc1893e64d13fcee62550d726582899ade0dad1c1100b551a671c83b6174a877ca5b55e74771b01aa3d6e2a08235a35efd7785273f6c18c3612
 EBUILD netbeans-dlight-9999_p20150803.ebuild 2995 SHA256 ac07fc700c717b717defd189c849fa7e2bdb70368c2773f66001bf9c5a6bce0f SHA512 380323a633232c031b3c424fd4bb18d172485fbdf57cdbe8cc2ffb0c92328dd80cf82dc88d125145c36f08dba30d6b9dca45cb1382714a927029a7b294b85246 WHIRLPOOL 2eb487045ced9ac90a3791dfd263ad73bf066451eb2843f5e57615c3eddc293880f96049008e7d458b4e7245eea80aecfd9887239b4710406abc9f163fc8e3e8
-MISC ChangeLog 172636 SHA256 8bd81c1f9b9d19afdca8f422b6b606248882db33c044545ce6925dd4a2b9ef21 SHA512 c59f84d09ef9267394bbe05b2e767ad944164ad3a5302367f261a7d2d3b9315db2fe550e80ae15f8137ba3206353db2c2bec8c8a3a345530d2204b39474e4f44 WHIRLPOOL c2dba386af60bd0b6aa9263284fe9517a56f7d7cb16c151d6db0dd364708518891d15d2e4d29b3dd43b9c756992d562a6a75a7ae61b19efb4b1cd4b1b68de36d
+EBUILD netbeans-dlight-9999_p20150804.ebuild 2995 SHA256 40d1a6f4b7dded0fad824f01dfa2b21eb24fd3d2913317e47e4cf49780eec794 SHA512 8457aa1df443156495609ba072254e6a9aa6df095c91951b3a047928faa90e853d9774850460a1bb65227a8d4cd0311ab04b5951f7a64a7a9891dc15b0903575 WHIRLPOOL 53672445e024f1f171e1ec5a79532084fd16590c6a54f101554309ac57da04e1d30fa5e122cc0a0717fc9056e895e54d38f77ddc45421448ca39242f29e6c2bc
+MISC ChangeLog 172810 SHA256 f3e1b4cbf553c0df819d7f19a1971b22934ef5caf3e7b4394056f5a2ed35fbe9 SHA512 a17fe5491b391a613a407d76e08b5188cfa7ec04e06b024a8fce147d38689ea79b525b586a2d6437bf505f52f492156d7c5d5a1b751a3b049dc2e4e5e09280d3 WHIRLPOOL dac1149b690f42668daa506423b480f44db8012585810c26a54ef50e6df0c1b3d3d32988b663f0ecb400bc1e050cb82ed59d91773dc35aad5f9619e3ba2040f8
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150804.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150804.ebuild
new file mode 100644
index 0000000..dfa3438
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150804.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-04_00-02-28/zip/netbeans-trunk-nightly-201508040002-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/ChangeLog b/dev-java/netbeans-enterprise/ChangeLog
index 950aa71..23c0524 100644
--- a/dev-java/netbeans-enterprise/ChangeLog
+++ b/dev-java/netbeans-enterprise/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-enterprise-9999_p20150804 (04 Aug 2015)
+
+  04 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-enterprise-9999_p20150804.ebuild:
+  updated to the latest sources
+
 *netbeans-enterprise-9999_p20150803 (03 Aug 2015)
 
   03 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index f7308fa..b0e3534 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -128,6 +128,7 @@ DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae284
 DIST netbeans-trunk-nightly-201507310002-src.zip 208736792 SHA256 f2794218686a678f2e826bb542663753c97f1b5cf839657ed6540b36d85e0eed SHA512 31cab9432e2668d4a90c99e561faa6a78c89210bd76625e4274c45ff634783967e9170bbd504e60fcd08df88c57b57f5c357f30c9c8dc06d6d0c0ae72f3ef0a3 WHIRLPOOL fccf16a822b7d43c1dd709c2357cb2fa6ec518e291f4f306c5c2aa4838f734ef9d2c800795dde592d17b3685826e00d26611e8b3cc4c68e6ee5332cff9aa7129
 DIST netbeans-trunk-nightly-201508010002-src.zip 208741865 SHA256 2ade7e4e9f2b80801888cd2281c99f5a3236ecbe0ea86d58e12224922ebf3f32 SHA512 25c2c59cb3c4a636dc8fd9d366017faa24e23b3c0c293a39f07ce889cbed199994f2e3ddb526f371e35a1d93a1baf4380ddf9e9ed8df8050808327351ac9de38 WHIRLPOOL 161e4359caba6c0248bd91e3ab17c78198b160e3317a6a20d12a5f964a9f8a3aa0aadd533fdc5e72d752e6d023637ce67bd38ea7de44b8525ea79b3aa321301e
 DIST netbeans-trunk-nightly-201508030002-src.zip 208748030 SHA256 933445356a68c17218a1e5d047568b7493208f5e4ac5cb083b6c0c840080e08f SHA512 000a443f1e02911e29996d0ab6021863faf1ea3649cb71dff7df5c262087dda663d4d670f64a238df86220fb1bf0fb713a990bd78671077ac86d5e0c7d0a52a6 WHIRLPOOL c71739d059f35e7f3f6b301f7291f8ddec3d286eec918a18f9ce924068f1ff84a3138c50f5c59d4efb297b5aa8c748988c6695656deb47a4fe49fcaf35b86bd3
+DIST netbeans-trunk-nightly-201508040002-src.zip 208761490 SHA256 b001f001aff1c4a6e29cf289beeefea7e766fd278a7144a028970bd9b65b0459 SHA512 87a1c41db0c76a01150c08247dc76f397e0e9ac2d87ff3fc5a6f7d91265812bc8471ae87edd781ea2518c8b47f48ad374b4fddccb38ba1ef888e001c3b295224 WHIRLPOOL bae5b1c4f71cb87f223d8232c29da2fdfc3a3482db42cd3783f2c249aeb7c409f2b40fe815e290006797307a5ba296316f21a44988cb098659b6d1969359c371
 EBUILD netbeans-enterprise-7.0.1.ebuild 16338 SHA256 03ea08daaf5d4c5592937929bac33b4af3bac00a23f2167a7ef7b3c172a72abe SHA512 4d24162c7920b9a1c65e6c6753900ead387a4941c2db98b522631bb09889c281bce048a74e2e584f8b5732cfaad1d7125e0cfd37aa2dc81fe85160b0e123ccd8 WHIRLPOOL 35eb648c37cb6e59aca7969c1074c2c280814529aa7ec3c3191b0d3f2a92fa24e1a8d981f343e4217fff52f6100b4884b970df734c45145759889aa6e6661ff2
 EBUILD netbeans-enterprise-7.1.2.ebuild 18060 SHA256 f63721b8ce5e1afbc58f783348f66f1e3501be519a1c9c1287ef860acc64ceda SHA512 2ca89ec8f89f106a284136d4d0ed52fe3bcf49c650d56ded6e62306c531e5e41f62b8aa923cb544842cf6e34e5f433fecb278bc1515abac987e2d00fb68ffa26 WHIRLPOOL 879067d72285aa6c7273e84ddc3dfef7d09c7cb9f9a6c279fddfbd3eea6439dea053d3c648fcd56d47ef2292db14d101307eb1aa8b3081dfcdbc3dac4d0c3ed9
 EBUILD netbeans-enterprise-7.2.ebuild 17752 SHA256 2f46916df731fe33c5d4626ae580a77686c392932a3388f755324bc3184bd636 SHA512 3543d033b971108fa2b8e6633ed640e812a83b34807e1cb5a69d425823d1fec1c13ecba3cc36fa4504fbfd6297e7eff1ecabe07d01725d9f13c99ffd70d220ba WHIRLPOOL 512753153bbf714ae3fbf9c580f350234d88bd5ce5690e7bc0fadd1c355bd38c2a5c1e9adb7993c3678d759661bbfb1654b0630e3535a2fb9198742fa7fd2c1e
@@ -161,5 +162,6 @@ EBUILD netbeans-enterprise-9999_p20150730.ebuild 15937 SHA256 b15d462d4e5a48a815
 EBUILD netbeans-enterprise-9999_p20150731.ebuild 15937 SHA256 ec9eb8265a4be177797abaef2b30966cc666138c84de15ee2905b22ebe465aa7 SHA512 fb776131ff87fee183cc49f51b87ba92e8cff873e6bc9baa542ec5698b962614d8e688e28b013669de1020e35191f3f226b91538e90e4e48024ea9c86ce3558f WHIRLPOOL 94839a8423dac5dfb2c57c0ec25381fbc42246194277251b4bb76629e9b95bc58276e2ca61f66ae116d0b1a50d63eb6e7da31d521c679e5981a8a15c23206661
 EBUILD netbeans-enterprise-9999_p20150801.ebuild 15937 SHA256 a56828c48349c37457fb225d83801a34a8690b9bad349cd8f1b71260a5b072fa SHA512 b727dee5be8cfb8a57dd7616633aa24d93a666a6fbfa4d676856ab6c7b744296d414b408f91fd387b8c83950ef18ee6ba1f9b17a8c0d88711483f38ff2b7b7f8 WHIRLPOOL 940d97d36ed106c76251b249b3d63ad8aaeece2e4cb35d0c8d8c8f6011d12241682cabef8123be56468b67bc37aa3fdeefd56ce447f842cedc4a07b784734b96
 EBUILD netbeans-enterprise-9999_p20150803.ebuild 15937 SHA256 8f68b85ec72bd40f801ca6ee9019db8d49726e6e18291be48b7b138970578324 SHA512 b50ae017b9677ab6170a086168b58df92cd93d64efc6c01db873b6d1028ca2daf5f7d4905d01adabf5906224ca876d3fa5fc76f95c77adf5fc82de2a67e9c32e WHIRLPOOL 8ad088278d2da7fe44864f817ead8f3308f666d62c631d4ef6332367ee988494e6482865c747fdd0c7557547dba8939a14bb40590ec01d871c692e9571f3bcc3
-MISC ChangeLog 181882 SHA256 d4faf89c79f5eee1417b5790275b90cf130d5180a5f60508992874e22e4eaa72 SHA512 568e2b51492c7ac32e4e45f648f0c027f37307995e3885984ab1155533251007e5406dce9f8a4c7d807dc64e83de5bdb302f5805be8d884b7fa75941a23c553b WHIRLPOOL 2c8580f881b4343287e9f5cbef196c91641c62516e981da810de64b822fdc8c9554c675689c95a4b36541cef77db6db18e439713f1dfdcd1c59d9bdf88b6569f
+EBUILD netbeans-enterprise-9999_p20150804.ebuild 15937 SHA256 b1b94b27b30038c5054c302ae258861926ff9f3e0823c24b3d6b7ac9f87aebce SHA512 44cdbb5654edf638a5711abc8c4b1f8d322005a706dc1a9a042f8c91e7d6266b4139925f26a0402f3dd49238d762e4cb7e5ee68ae30ba556e4aff1a01c7314fc WHIRLPOOL 9d2c3e61929290d3df831f6698150be19c1840b39f9a5584fc221e2293b4324e5a8f30ee95d5284476132a320e492b209939ee8c44870afbc86c43991e106050
+MISC ChangeLog 182064 SHA256 5d79ef4cd0764317df0b2f1965bb878bc425d904273ef823fb9f3b1da0847d3d SHA512 fcf48a25e9bebec31a709eb9557dd0a6f01776c05f445f87ad0ab4647be6a03f4cde5420e5b9c864dd4da7c03b5a9e74ab2a952b3269bf01c2eff7f269261aab WHIRLPOOL 2fcdb95178a8b347a2877ff4e350f9c5e9795099dcf88388cb5618d09c77d63c765e448f596fc3b44bc0587bc5bc1fd6dfa1f58910750d1d29f1b4592c26f5d5
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150804.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150804.ebuild
new file mode 100644
index 0000000..bcadb64
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150804.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-04_00-02-28/zip/netbeans-trunk-nightly-201508040002-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/ChangeLog b/dev-java/netbeans-ergonomics/ChangeLog
index e23f4f9..6f28d0e 100644
--- a/dev-java/netbeans-ergonomics/ChangeLog
+++ b/dev-java/netbeans-ergonomics/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-ergonomics-9999_p20150804 (04 Aug 2015)
+
+  04 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ergonomics-9999_p20150804.ebuild:
+  updated to the latest sources
+
 *netbeans-ergonomics-9999_p20150803 (03 Aug 2015)
 
   03 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index e787a72..29fe1d1 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae284
 DIST netbeans-trunk-nightly-201507310002-src.zip 208736792 SHA256 f2794218686a678f2e826bb542663753c97f1b5cf839657ed6540b36d85e0eed SHA512 31cab9432e2668d4a90c99e561faa6a78c89210bd76625e4274c45ff634783967e9170bbd504e60fcd08df88c57b57f5c357f30c9c8dc06d6d0c0ae72f3ef0a3 WHIRLPOOL fccf16a822b7d43c1dd709c2357cb2fa6ec518e291f4f306c5c2aa4838f734ef9d2c800795dde592d17b3685826e00d26611e8b3cc4c68e6ee5332cff9aa7129
 DIST netbeans-trunk-nightly-201508010002-src.zip 208741865 SHA256 2ade7e4e9f2b80801888cd2281c99f5a3236ecbe0ea86d58e12224922ebf3f32 SHA512 25c2c59cb3c4a636dc8fd9d366017faa24e23b3c0c293a39f07ce889cbed199994f2e3ddb526f371e35a1d93a1baf4380ddf9e9ed8df8050808327351ac9de38 WHIRLPOOL 161e4359caba6c0248bd91e3ab17c78198b160e3317a6a20d12a5f964a9f8a3aa0aadd533fdc5e72d752e6d023637ce67bd38ea7de44b8525ea79b3aa321301e
 DIST netbeans-trunk-nightly-201508030002-src.zip 208748030 SHA256 933445356a68c17218a1e5d047568b7493208f5e4ac5cb083b6c0c840080e08f SHA512 000a443f1e02911e29996d0ab6021863faf1ea3649cb71dff7df5c262087dda663d4d670f64a238df86220fb1bf0fb713a990bd78671077ac86d5e0c7d0a52a6 WHIRLPOOL c71739d059f35e7f3f6b301f7291f8ddec3d286eec918a18f9ce924068f1ff84a3138c50f5c59d4efb297b5aa8c748988c6695656deb47a4fe49fcaf35b86bd3
+DIST netbeans-trunk-nightly-201508040002-src.zip 208761490 SHA256 b001f001aff1c4a6e29cf289beeefea7e766fd278a7144a028970bd9b65b0459 SHA512 87a1c41db0c76a01150c08247dc76f397e0e9ac2d87ff3fc5a6f7d91265812bc8471ae87edd781ea2518c8b47f48ad374b4fddccb38ba1ef888e001c3b295224 WHIRLPOOL bae5b1c4f71cb87f223d8232c29da2fdfc3a3482db42cd3783f2c249aeb7c409f2b40fe815e290006797307a5ba296316f21a44988cb098659b6d1969359c371
 EBUILD netbeans-ergonomics-7.0.1.ebuild 2884 SHA256 e8e4a785fc11b6d0d3c722826761581b8c9c779c5460dc7d1487b3154f4402ab SHA512 3ba2810e650726f48fbdb1bc0c58b6ee1e7d9d29d4be3b27c00bc981b773f26d979fd90154184276e044eafd1d4d8940b47d6f0f58589f9cff7fbadef5fbb05f WHIRLPOOL 5fab7fe6492f91bd0e97a8a95c0652266d771e9b60957e16ce6ff683c1e38081372151cd8c7bea44ee1f1dd7bf435f8b00b9a1a23e4c6106c990794c6093ba10
 EBUILD netbeans-ergonomics-7.1.2.ebuild 2893 SHA256 cd56250980429160b8fa9deb17f15050d016394d5fdef19bf772cf29988c86d8 SHA512 32d4556218791a32efb8cf8ec8303f7e8f27bfb03b97af0c66cee717563c7e02fcd9e350b0425ec0cec28ab09865d4815aba1471ee958e05e7c42e421a7f71c2 WHIRLPOOL 318c8528c2338c1e2f6e342c263be52753fa74c9ac934b0ee60fe0fff2146e86d1761fef8eaeca8eab844709bea2196fbe181fad1f689a9d5b9994da3271b4db
 EBUILD netbeans-ergonomics-7.2.ebuild 2876 SHA256 ca7184ac24c255941c4ec3e686c4237ef0af4be7242c44417fa799813083515e SHA512 c6537bedf2fed4ea914c74a208124fe692af837ab2c81c98b8aa0347cb9d5af496378a8c042437facced26d3b42b101225dfa8b81dfc3d6ec4e3e5613e359f72 WHIRLPOOL c7e4c08ace118690f454dbf6a9040bff3e7013c646947fd02b05bca2b4d802393b6eca3234c6228f8e4df4da1ed193ecfd93c848038e4dd9ae3f50959692aa15
@@ -72,5 +73,6 @@ EBUILD netbeans-ergonomics-9999_p20150730.ebuild 2919 SHA256 4e8310005c36503d28e
 EBUILD netbeans-ergonomics-9999_p20150731.ebuild 2919 SHA256 016b7ea355e14b1378a24557bac70c0b082a8e8221223db360128c669e8e2923 SHA512 f4653727270056be2e6f8f18819060c3680f17e92e55699c744e00da64c15bdd8efd887fb176f0a2a71128f2cf1b25efc49cd5287ab14ce8239c7292a6d07456 WHIRLPOOL 899f09dffc01dd2f535132ca0c4a0687001ba476001ac08512ea78b1cca4c6d426bc068565457f86583309a298f0921e4cda6c11091937b7f9e9490b69d5b6a2
 EBUILD netbeans-ergonomics-9999_p20150801.ebuild 2919 SHA256 af2178befef2a366ca42f8369f5f8d0bed902170711398606523b95e163cd36a SHA512 efc4b5ec7734f1443ed06f5b8db374495401a8e5cacaab29095b2d299be64824c67d73025a98a157c5c7d1e044b7a472befacd848ac9db24e0568f193b481087 WHIRLPOOL 90a9465ce4fa0e618120a29b38a15d4f4f6a297f38cd89022bacabf29ede0423ff92128e3606a19ec454872fe696baad618ccd1498dee8bdce8802dd9dd6d798
 EBUILD netbeans-ergonomics-9999_p20150803.ebuild 2919 SHA256 e0b8f85c81a246bd12dea6331eba9ad112b7828be522dc7a84b77c3df4c41be2 SHA512 446abe687666770cf0c68fa2a3a1984c51330d961314260b1bc0175b617a6282432f700524b36e357d97a57162cb3e29a480da633039fe84f644f187a32633c2 WHIRLPOOL 9d99eb329a7bf226f42fabb7998323b0a2f59b1c6c108796b9899ae53c278820731de8ad549972ab305f1dd06f1d49bfdb09cf113b724d054bc850985ecd1230
-MISC ChangeLog 181243 SHA256 cacf572886c134b6ba6f8dbae8d912eb0342f03de1e30ff676c93be44f03985a SHA512 a7889554746bee5b7130eea03772c088cdf63d085642c02b18d81d0a1c05eb810f1763008d512997b98131bb19da6e77929458d7d75799fefb7c63132b408780 WHIRLPOOL ec6ef039eb12cf38fa77e831af92ff64f1fecc77b0149d740e0c0f7c0fb5616cbc10deb8411f4862b7ef849884c6f69727f13149e30021e5fa4933e424226cc1
+EBUILD netbeans-ergonomics-9999_p20150804.ebuild 2919 SHA256 e42849213f6ea1b34729ee9ad20db69730b84c3f1bfa1323f652b7e7c05e2017 SHA512 b7255aa7982aa396c9ed1687451dd3a08f8f4de831a09b12d96c39f8e1ac4c68eb51b92e367209c832646db3e57fc4717477595b235c82c99a6806784ea6f9e6 WHIRLPOOL d46b5df4d0bbc3f4468946b6099ec54f2295df0dd8bbd041c6350e6a4558e3107d7833cdba7e845557a1ca4149577ca5e0e8e29b7cbfcca82784726aef3b2b06
+MISC ChangeLog 181425 SHA256 2940837aad245efa6e334e9534a70eb163dd3321c8c9e78081b36487998b3960 SHA512 63f392c06e4879db776b7692c57dadfb2578b565c925f7eafc78c84406e2836c01fda3bdb07dbe24f4895b72ffa9c4ee1da2c4e091a53a1a562f744a6747b5be WHIRLPOOL d55cd1b8b210c5449513bc35f0caf84c5edf23b577b552003cc291e4e4f42c98b80b3ed71d1157566580be8c427d0da9540f0b7530a587bd52bb7370b2d95169
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150804.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150804.ebuild
new file mode 100644
index 0000000..4dedb5e
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150804.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-04_00-02-28/zip/netbeans-trunk-nightly-201508040002-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/ChangeLog b/dev-java/netbeans-extide/ChangeLog
index f974094..a8d813b 100644
--- a/dev-java/netbeans-extide/ChangeLog
+++ b/dev-java/netbeans-extide/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-extide-9999_p20150804 (04 Aug 2015)
+
+  04 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-extide-9999_p20150804.ebuild:
+  updated to the latest sources
+
 *netbeans-extide-9999_p20150803 (03 Aug 2015)
 
   03 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index ec1a407..bbe6e9a 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -37,6 +37,7 @@ DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae284
 DIST netbeans-trunk-nightly-201507310002-src.zip 208736792 SHA256 f2794218686a678f2e826bb542663753c97f1b5cf839657ed6540b36d85e0eed SHA512 31cab9432e2668d4a90c99e561faa6a78c89210bd76625e4274c45ff634783967e9170bbd504e60fcd08df88c57b57f5c357f30c9c8dc06d6d0c0ae72f3ef0a3 WHIRLPOOL fccf16a822b7d43c1dd709c2357cb2fa6ec518e291f4f306c5c2aa4838f734ef9d2c800795dde592d17b3685826e00d26611e8b3cc4c68e6ee5332cff9aa7129
 DIST netbeans-trunk-nightly-201508010002-src.zip 208741865 SHA256 2ade7e4e9f2b80801888cd2281c99f5a3236ecbe0ea86d58e12224922ebf3f32 SHA512 25c2c59cb3c4a636dc8fd9d366017faa24e23b3c0c293a39f07ce889cbed199994f2e3ddb526f371e35a1d93a1baf4380ddf9e9ed8df8050808327351ac9de38 WHIRLPOOL 161e4359caba6c0248bd91e3ab17c78198b160e3317a6a20d12a5f964a9f8a3aa0aadd533fdc5e72d752e6d023637ce67bd38ea7de44b8525ea79b3aa321301e
 DIST netbeans-trunk-nightly-201508030002-src.zip 208748030 SHA256 933445356a68c17218a1e5d047568b7493208f5e4ac5cb083b6c0c840080e08f SHA512 000a443f1e02911e29996d0ab6021863faf1ea3649cb71dff7df5c262087dda663d4d670f64a238df86220fb1bf0fb713a990bd78671077ac86d5e0c7d0a52a6 WHIRLPOOL c71739d059f35e7f3f6b301f7291f8ddec3d286eec918a18f9ce924068f1ff84a3138c50f5c59d4efb297b5aa8c748988c6695656deb47a4fe49fcaf35b86bd3
+DIST netbeans-trunk-nightly-201508040002-src.zip 208761490 SHA256 b001f001aff1c4a6e29cf289beeefea7e766fd278a7144a028970bd9b65b0459 SHA512 87a1c41db0c76a01150c08247dc76f397e0e9ac2d87ff3fc5a6f7d91265812bc8471ae87edd781ea2518c8b47f48ad374b4fddccb38ba1ef888e001c3b295224 WHIRLPOOL bae5b1c4f71cb87f223d8232c29da2fdfc3a3482db42cd3783f2c249aeb7c409f2b40fe815e290006797307a5ba296316f21a44988cb098659b6d1969359c371
 EBUILD netbeans-extide-7.4.ebuild 3311 SHA256 8585e0b9eac3b9bb35d5b5e0152936f84708a824d76831930a3dfd3d196556b0 SHA512 19eceec7a634923b4712eb277a1ff9900a2eb4d9ac0a2c699175333c263f0c02baaf24eb30bd7919444f5c9df751186689b2d4359ca1c88dca02884d7c18c3cd WHIRLPOOL e64509f198c4d09851f98d5bd2ddd5b469b0a7c0f3122f391c17833e5d6d77b7a6c2fd9e942e34f2df42047504ad40593f97af9b2898450e769c7b012355c316
 EBUILD netbeans-extide-8.0.2.ebuild 3313 SHA256 d147df43b8e55de81e0429604a2497a82861864ae50fbb85368a3070e1c266c9 SHA512 8f2722ce12c1582ca6e9ed348fcb37b9969585037b5432e592e5dd6ef4b3e49c58783da5fe20f088bee07514e3b42de7aa36607900b285c32c4b91fa218df90c WHIRLPOOL 0fb074484787a5e0e688dc734efe027ff6dfd082dd63bc9bccc612f915fbbe33a4f93db6c43d345abc9c191e22ec196aada1e889d1240968916d54c69497a2d6
 EBUILD netbeans-extide-8.0.ebuild 3305 SHA256 b2d57e2e2d92760ead3d383fe4dd5b4fb9fc2807a9b58c6f40b44fc24072b8bb SHA512 6e7f12758188a564ef6b5cf8b0ffdf79e30d1021172d10f215d04e727bc4001e4385fd0961a26a6bb42638089e0919b1d4628a13ba11a3deac94d4693c7210d5 WHIRLPOOL adac8461de43669b7bb98ea8920c0a2944837211a37503b957221149d4b91c4bd92b6db160191990b838c474495c65f62c8a4bb9fdbcaa371b4648a335b1afa9
@@ -66,5 +67,6 @@ EBUILD netbeans-extide-9999_p20150730.ebuild 3383 SHA256 fb5ea1313370371921139c6
 EBUILD netbeans-extide-9999_p20150731.ebuild 3383 SHA256 39fa8d9070e33927331aeabd8ac0d4fac7bca2cdc129dabddad4f620cf085f40 SHA512 b94c0a680763c32071cf539521f4784316acd0091089a47ac6e6e8bc46155631158839b369ef1ca31cbfacadb2009965ce92bf7d0d0bb4b89d45f3dfd8f3e966 WHIRLPOOL ae8760e8dd96acc341b1f700852998be7efe3179583961a021e735985940b87e5db6cc40cd5ef5ea6a8aff5c8c651b8d19b173d92e41d8f3a5bc9cde56ed9697
 EBUILD netbeans-extide-9999_p20150801.ebuild 3383 SHA256 d478d0d29948a63b5db3f6a0e2b1898d58a449ee9881e87b3fcee59ef853084c SHA512 9e50a0865303ffccd60ec42e719d33957daf2ee3cfcf0dfe583a6cbd5a81826c1fa4d6dd8a31246275f2156e0e1f84d073abd7f991bbab32dff17b36f15988c1 WHIRLPOOL 29e2a0dad187f8db0946958e842bff7ec61038363b340e92f27c2801e39ea754997da204ffc3437b91cd782b8ec096c551cf7902b6b3d77a43578887b578d18d
 EBUILD netbeans-extide-9999_p20150803.ebuild 3383 SHA256 551fbfe1847fc1dc666d2d2db81faf9aed2146205717c6813ef0f9a398359531 SHA512 e85363a597f5f7363e01548ee75a786c0ca505e4d38a2a25dde4796d68e6d12d06b5ec65fe00e0012806d48f5fc1c88922c041065be298fec357c61a993adfd9 WHIRLPOOL 9b3d900f9ee3d086bc2cce7c073b5b252541064565aa4fd647783f258700e24762e051db54bcee3eaac3f7b5cf37557b447f098f3505f18062a64ee7b50d9917
-MISC ChangeLog 104546 SHA256 85fffd49addd7dd77fbdd85d36e1be91255552a81ffbb8a2ea371cc2711a8a0f SHA512 2a888ee935b0c77e6155f8aee8cd754e330b0eb16200323ccdcfa29139ffbe3c4d251bc4773c3eb205085f6987de5337b1e5cec10c35cccff1ead7e66c5bf144 WHIRLPOOL 8eccc29238749877670c46b3acf12c1067d6264ccee55a35918e2080989cb361916c911baec97249dbd6f4ddc2a019ac83b6fe2462b661fbd5ccac0c2aa4aecc
+EBUILD netbeans-extide-9999_p20150804.ebuild 3383 SHA256 37c0d207b4026a14f4cd55caa4b1e8332e61f6a956ee17261b7f410e94ee996c SHA512 8e54a6a1736d35a6dbda53f9d19d6f9600567a149f02f29a282a6d79ae37325ecd2e34d0b9c42c9aaf8d552a696ea08d6bdbf71813e8bb1b700edc5f093d7827 WHIRLPOOL 77447716c3d431e9a642f333108f161f8d00fda9e0396b885e58f3c8be4b223f49f8b330444aad2bc77f42513fc224e814d8f8d27ba3b3588b21931b90f0a599
+MISC ChangeLog 104720 SHA256 7ff83d944149a3461d85d3e5bc514f182a87f1fc01e22f7b5bd85816468cd1ea SHA512 c6fda082271f42999969dd2e5c5635126e08900f935b22ef0fea17d41a2e6f083cf042b08a9c6dacff6197b85563e8323be3f8049417805ade004fa1bf1bd1ee WHIRLPOOL cfe201efb426a189dd662682e0e47edf77e9c593b712cd646701cf412dc559f438d22a5468066bea24f9a907985b822f29aa4b8c75ed8072cee7a844bfa82b5f
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20150804.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20150804.ebuild
new file mode 100644
index 0000000..838dcf4
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20150804.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-04_00-02-28/zip/netbeans-trunk-nightly-201508040002-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/ChangeLog b/dev-java/netbeans-groovy/ChangeLog
index 68f8198..00028f1 100644
--- a/dev-java/netbeans-groovy/ChangeLog
+++ b/dev-java/netbeans-groovy/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-groovy-9999_p20150804 (04 Aug 2015)
+
+  04 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-groovy-9999_p20150804.ebuild:
+  updated to the latest sources
+
 *netbeans-groovy-9999_p20150803 (03 Aug 2015)
 
   03 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 310eaea..91bbcae 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -43,6 +43,7 @@ DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae284
 DIST netbeans-trunk-nightly-201507310002-src.zip 208736792 SHA256 f2794218686a678f2e826bb542663753c97f1b5cf839657ed6540b36d85e0eed SHA512 31cab9432e2668d4a90c99e561faa6a78c89210bd76625e4274c45ff634783967e9170bbd504e60fcd08df88c57b57f5c357f30c9c8dc06d6d0c0ae72f3ef0a3 WHIRLPOOL fccf16a822b7d43c1dd709c2357cb2fa6ec518e291f4f306c5c2aa4838f734ef9d2c800795dde592d17b3685826e00d26611e8b3cc4c68e6ee5332cff9aa7129
 DIST netbeans-trunk-nightly-201508010002-src.zip 208741865 SHA256 2ade7e4e9f2b80801888cd2281c99f5a3236ecbe0ea86d58e12224922ebf3f32 SHA512 25c2c59cb3c4a636dc8fd9d366017faa24e23b3c0c293a39f07ce889cbed199994f2e3ddb526f371e35a1d93a1baf4380ddf9e9ed8df8050808327351ac9de38 WHIRLPOOL 161e4359caba6c0248bd91e3ab17c78198b160e3317a6a20d12a5f964a9f8a3aa0aadd533fdc5e72d752e6d023637ce67bd38ea7de44b8525ea79b3aa321301e
 DIST netbeans-trunk-nightly-201508030002-src.zip 208748030 SHA256 933445356a68c17218a1e5d047568b7493208f5e4ac5cb083b6c0c840080e08f SHA512 000a443f1e02911e29996d0ab6021863faf1ea3649cb71dff7df5c262087dda663d4d670f64a238df86220fb1bf0fb713a990bd78671077ac86d5e0c7d0a52a6 WHIRLPOOL c71739d059f35e7f3f6b301f7291f8ddec3d286eec918a18f9ce924068f1ff84a3138c50f5c59d4efb297b5aa8c748988c6695656deb47a4fe49fcaf35b86bd3
+DIST netbeans-trunk-nightly-201508040002-src.zip 208761490 SHA256 b001f001aff1c4a6e29cf289beeefea7e766fd278a7144a028970bd9b65b0459 SHA512 87a1c41db0c76a01150c08247dc76f397e0e9ac2d87ff3fc5a6f7d91265812bc8471ae87edd781ea2518c8b47f48ad374b4fddccb38ba1ef888e001c3b295224 WHIRLPOOL bae5b1c4f71cb87f223d8232c29da2fdfc3a3482db42cd3783f2c249aeb7c409f2b40fe815e290006797307a5ba296316f21a44988cb098659b6d1969359c371
 EBUILD netbeans-groovy-7.0.1.ebuild 3296 SHA256 29c3d304eca5999e78550fd715dbcbef9d15639d4e4f17fa0e45a46803080729 SHA512 43a0ddb43354bb3c0b8e29004ab547da508662d037b0006dfd24250c49470ddc0384bfffb6423f1e3eeaca98410c5de8b314a69970189306869a16380ab098a1 WHIRLPOOL bf626cecf6dec0c51e7e0b95ac4ff26a795e44a5dabd25719eeb2244742d96d33cb20ebbd9a68728dc27d28b8e558a7e2a3ee318c2e4fde234e0b5e8d32e6a58
 EBUILD netbeans-groovy-7.1.2.ebuild 3305 SHA256 1e00f335b8cc1e90deec3c3251629ba699286b25be5b6945d135d271004dc34b SHA512 3a1d67d02054478ed15e11789292fcce3fcfd343b8feebde5e07a9463c380c644310603a3f9f984e8071b0b097075809dce423b888e1f2aed316cb90a562d20e WHIRLPOOL a790c1e186c4d1949de6b4dd975b929c132e3e7b7c455c7867bd1445f59fb6ace72b5c9adf09d0c6079718fdc6c34a0c5f0c9c437517b55b7ae109ce3e20b064
 EBUILD netbeans-groovy-7.2.ebuild 3160 SHA256 6d709b7cc07d7ebb59c3ede0a19c9890ca3230144d7f455cf24d984ac2f633b0 SHA512 e30c8d58165b87a39a356f8b813c593910cd2c247de41420369fee21157c2f2881db34612711f77c9ecd9501aa6d7235ab7bc41d4092be1e68fab778c16d8288 WHIRLPOOL 4a6495ca077f3c374105b25698c8251aaa89daf56c2749bdc73867b0ea1ae404cfc7b2a8b435ef7b19f00aee8128be051c04d6a24fb631379fbe98d6854a507b
@@ -76,5 +77,6 @@ EBUILD netbeans-groovy-9999_p20150730.ebuild 3422 SHA256 6cbb55db70c8950e51631d0
 EBUILD netbeans-groovy-9999_p20150731.ebuild 3422 SHA256 ff3405ce8b134fdec229ac91f2922735d5a8ca7dcbe8a292965732bc089593ed SHA512 89d3d1580b6616666af0002ea68e70ab4804fc9ca0584227049ffd7197896b500db983b830d7967eb704c6edffc27f5d6ca7b86211566e69d04e07f1e740ccf6 WHIRLPOOL f38544fd67c1f84ef9c379ab63c79c220659c1d5e4911eddc6760431579ed589e4e19233586904d80c30a0ea05ed2924712ed3b26bded3386ede92e713b676d3
 EBUILD netbeans-groovy-9999_p20150801.ebuild 3422 SHA256 c8251f94ce0d6a7cc16fc08823f5aeab19e18fab2234b19c9ed9a8fde9482be9 SHA512 eac25b62351ab62e2814a12812f553ffc6c949f49e2a90a91f3e84660267fbde6b7d032ae61d01305c1d3e6b4380d33736c92c2bf863163b02a91f282d20982c WHIRLPOOL 82dfac9e812da4ec42ecb2ab0b8f74e84f91bc413cef857bb3d1fbefa06544b042ceef8278f98ddf21a7d29f62906e277643973c569f34836657e9349ae0ff20
 EBUILD netbeans-groovy-9999_p20150803.ebuild 3422 SHA256 ea843ad158af81488850f41710d7d0bf965d6fd5ed996535449a1987d2c227f8 SHA512 9077aeb5c92780065bca7405432699195c5a97b41e724757b9dbe23e31985481664742e9449436e057b73cf4db892b3801fd3dd7f23659a29676d8cb0ba41aaa WHIRLPOOL 5527ca45f1e87e2452b8ae8b26034f28fa6520b90ee3f0967161bab86d2b6d74a544ee997b1ba06d22dcae9cdc94f323641987a222836782e824fb9925e12dce
-MISC ChangeLog 172526 SHA256 8a743b1a1609d76f35fe2e1e8926da6e6c9eed7d7c93b1d736624ef132fdaa12 SHA512 4be8ebc9a0e2a731065e6ebb03d89c61478c617c0f9e9a706692d68938866cdeb486316ba0b08eb92b06da4825af9d37b197440837738e833e6931fb43fe4cef WHIRLPOOL 053a4efd270b1d356733ad247924b71c45fbe8dfce4b912d2dac9a45664597e7c4c6005b55db1916943c28657658a0f05f8fc6643974f7b4f29b874072499a41
+EBUILD netbeans-groovy-9999_p20150804.ebuild 3422 SHA256 3a3eb4a582925d69721718af292837f2e2b6b7318428cf16472a79a80e140a03 SHA512 63e522a73431dcf8dd799df22451daac7294b70c597b21c83a43985fa6142dc4bb17549706b40e777bbe76c70da0edebbe71542733ede02f187aebfc39b278ee WHIRLPOOL 41809ebbb79649bbf993c8bd38657a09451360c32cd85291ab451602518746c697c20f2bff3296cfd7fbcdd3c0bf553738f291fa923e6025b14f9180d8bc6208
+MISC ChangeLog 172700 SHA256 30f54405abbcee30ae2cf4644b2dd678473bd3586963bef114afbb2875b24ae0 SHA512 5ddd332cede227239c2c9bedc03f197ce37067729f3a0828646aacd99b94d7752dacf456f89a0055dacfa325bff40127b1e0e5880c6d4211187d8f25b977d3f7 WHIRLPOOL 620685f832130cd5afe31c206fc8d4d3aba8131438ac1bbcefd617ad2e405b630294eb56d976641d74363a9f7f574992261214be8263ad27a1c2f98f911821ff
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150804.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150804.ebuild
new file mode 100644
index 0000000..cc0d154
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150804.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-04_00-02-28/zip/netbeans-trunk-nightly-201508040002-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/ChangeLog b/dev-java/netbeans-harness/ChangeLog
index e060e9b..3522469 100644
--- a/dev-java/netbeans-harness/ChangeLog
+++ b/dev-java/netbeans-harness/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-harness-9999_p20150804 (04 Aug 2015)
+
+  04 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-harness-9999_p20150804.ebuild:
+  updated to the latest sources
+
 *netbeans-harness-9999_p20150803 (03 Aug 2015)
 
   03 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 7f56761..6178b7c 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -45,6 +45,7 @@ DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae284
 DIST netbeans-trunk-nightly-201507310002-src.zip 208736792 SHA256 f2794218686a678f2e826bb542663753c97f1b5cf839657ed6540b36d85e0eed SHA512 31cab9432e2668d4a90c99e561faa6a78c89210bd76625e4274c45ff634783967e9170bbd504e60fcd08df88c57b57f5c357f30c9c8dc06d6d0c0ae72f3ef0a3 WHIRLPOOL fccf16a822b7d43c1dd709c2357cb2fa6ec518e291f4f306c5c2aa4838f734ef9d2c800795dde592d17b3685826e00d26611e8b3cc4c68e6ee5332cff9aa7129
 DIST netbeans-trunk-nightly-201508010002-src.zip 208741865 SHA256 2ade7e4e9f2b80801888cd2281c99f5a3236ecbe0ea86d58e12224922ebf3f32 SHA512 25c2c59cb3c4a636dc8fd9d366017faa24e23b3c0c293a39f07ce889cbed199994f2e3ddb526f371e35a1d93a1baf4380ddf9e9ed8df8050808327351ac9de38 WHIRLPOOL 161e4359caba6c0248bd91e3ab17c78198b160e3317a6a20d12a5f964a9f8a3aa0aadd533fdc5e72d752e6d023637ce67bd38ea7de44b8525ea79b3aa321301e
 DIST netbeans-trunk-nightly-201508030002-src.zip 208748030 SHA256 933445356a68c17218a1e5d047568b7493208f5e4ac5cb083b6c0c840080e08f SHA512 000a443f1e02911e29996d0ab6021863faf1ea3649cb71dff7df5c262087dda663d4d670f64a238df86220fb1bf0fb713a990bd78671077ac86d5e0c7d0a52a6 WHIRLPOOL c71739d059f35e7f3f6b301f7291f8ddec3d286eec918a18f9ce924068f1ff84a3138c50f5c59d4efb297b5aa8c748988c6695656deb47a4fe49fcaf35b86bd3
+DIST netbeans-trunk-nightly-201508040002-src.zip 208761490 SHA256 b001f001aff1c4a6e29cf289beeefea7e766fd278a7144a028970bd9b65b0459 SHA512 87a1c41db0c76a01150c08247dc76f397e0e9ac2d87ff3fc5a6f7d91265812bc8471ae87edd781ea2518c8b47f48ad374b4fddccb38ba1ef888e001c3b295224 WHIRLPOOL bae5b1c4f71cb87f223d8232c29da2fdfc3a3482db42cd3783f2c249aeb7c409f2b40fe815e290006797307a5ba296316f21a44988cb098659b6d1969359c371
 EBUILD netbeans-harness-7.0.1.ebuild 3579 SHA256 f4d09cb7bd5e8485caf75a3020ddb8102d3ea326878ac384ef4aecb011a1f6a5 SHA512 390c26b4a3dbc81ad1ef210b3ea668926398cb38ea13fa37dceb6782b4478b1ceb7a49e9db300f691fb8b31c21c56b25f4c3237c0890f0c637ca45f596c88294 WHIRLPOOL ae1e34af6dd61c30f645f39a825b6235e3eb1f9a42dd23431225513733209a2eb225a741b75342f827a4be0ffbf41b9786a6a6430051f543c321abe3c20da6bd
 EBUILD netbeans-harness-7.1.2.ebuild 3587 SHA256 e0adc470109009641bf48569623bf0fc51a400ac1ba686475c7dae1a5b561c96 SHA512 e4157a6b294c17fd7430802b33253d473120dc16173557e0d7840078f4043a383d5e3672af64f124509e54cc85d590abfa4375f181a32ab8b49e976cb6613cea WHIRLPOOL 423a5844a2c55ea99db4ac78e1c605a55a04f634601c0ac054e739c0ab4a3e9c765778dbd81ccf4a1e50e9d9e4cc29ecfad2ec64b483197927f434b67cd4d773
 EBUILD netbeans-harness-7.2.ebuild 3421 SHA256 47a5281d140b47e0235592c58657a9065d1827175ccca7d0c73fd81e90710090 SHA512 403fd1f49e11b27ef8002c4066fc911dbeadcccc7adddcdded86c6cd95e8bddaf0603c0ccafd0e91ef31a0909508deab1eb326e98e621bcbae7304413acca291 WHIRLPOOL fe3c5f95a606db39861a80201c185cb5a25e2d80698ac78ff724587b54e859f861b834b89aa79aac22f2c5da700532eaafae67fbcc33259ee07d578ba5c7f9ee
@@ -78,5 +79,6 @@ EBUILD netbeans-harness-9999_p20150730.ebuild 4131 SHA256 a7a162ff6dab4fcec33e9b
 EBUILD netbeans-harness-9999_p20150731.ebuild 4131 SHA256 90dfe437e65390c834b3816ca5a1401eb744785f9e6334c2590a53ec8d8f46e6 SHA512 7fcca5ac708f07223e96cee9f5533e62a9e95c882580e10651c97eeac1d02571a3612aba6a3ba4e237013b0a0f2a92249511a67f740a54b6db033b84637f707b WHIRLPOOL c2e58db171c8858f50a63cc15a675316688c71c8fed0ecb4760018310eddf7bb9bf533f68856410832496c5d1ad485841c3d46e02edd007b4b236f4be5f1863c
 EBUILD netbeans-harness-9999_p20150801.ebuild 4131 SHA256 29ed2cb63d26495f768bc43a10b1d9bb2cd49a34aa73e3a116fc7f62d6dd67f7 SHA512 7ffb47bb36aeabf1fd6141063eea7927ceb7b4bbb09be116e21f6f1ac3ea3149382e2f3408642629529728f6938bea0eaaadd46380ba74d1312364788fdfb632 WHIRLPOOL 3ac85cd6189667e6aa8c36fe7d51804babb598e1b0a24016baee1cadc62efe549258e0056afcc4430671b878d5f30d2216e8b3d57127ffd1b202539b4d09bca0
 EBUILD netbeans-harness-9999_p20150803.ebuild 4131 SHA256 d17a4eed1a4081a5e7e7121dd8322cbfe35360ea576af0829e03adcd6e391e1b SHA512 b9cbe296621ce49ba40748f44318ad1144b74d4ac61590be00d620fa0013b5f5934407375515d160f1d58dbabe29b677507ec3fbafaa55bcd47fbd7d687bdbd0 WHIRLPOOL 1ab8e541182f1c39c4f0ef49287bc8cbcaaf787c070d3105a45eb9b9a5893db0fec7e3714188353d49d46e5c63c04862cbbe153a59035fa39e68fe460c80da12
-MISC ChangeLog 174734 SHA256 80be36e700d999a9b9688af7de88be77e971132e88ed07a0621932294548373f SHA512 85f5349a5d56601c04c704f3136417d46959c7734358ae9b871bfa4302fa600d763189f473157f5bb6a434d0d0d51d27dc180cdc20efd322f856fa5e2112ad91 WHIRLPOOL 8895014da3cb9a2ecc6e89072cb59d948ed175c207bc74cd7a4366c026ad2e8587150d16efc7f9f20790ca934fd1b6f667bfb1df5527221210c8bf58de8c811a
+EBUILD netbeans-harness-9999_p20150804.ebuild 4131 SHA256 44f6efcad40a1d1145942b05049bad461cde137f9f448e6942d97bb93b59f182 SHA512 5fb700116926b5fbe23e7d15fd44b92f9f1130794c1e127a1f50d555e00184ed6c28eb1cf8a21abf5074e7b36b0f44014a9c46e1456c20984a5e41bc5d271fc0 WHIRLPOOL a1eca6f27bc07f65e9675ec916028b3bc8d0bfcbfb5ddc8c53ec490a2500984b3eeda8062884df616e5e5027425da210e858e2b40b502854c2fdae9cdb09d1a0
+MISC ChangeLog 174910 SHA256 9a46a79f20de69e4c3913e23397dfa370bb29f01a0c95405a363c8ac920152d1 SHA512 50700e4478656ed6c147545916c87304ce7b3059e419f7342d6e58a3bfaede33f393afac7b9ea7267f1301e8ee014f4efe32ef029b357ac10a1be5e036d6d9bc WHIRLPOOL d026ddb47d5efacce5f88039788830dd64e95da990bd04438ebefb8ab89657dc952feda77dd4fa60e3e1e61582e3a035586818360e31957f68a4ba6a3d9ec377
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20150804.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20150804.ebuild
new file mode 100644
index 0000000..004787d
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20150804.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-04_00-02-28/zip/netbeans-trunk-nightly-201508040002-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/ChangeLog b/dev-java/netbeans-ide/ChangeLog
index a16c65a..42a9023 100644
--- a/dev-java/netbeans-ide/ChangeLog
+++ b/dev-java/netbeans-ide/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-ide-9999_p20150804 (04 Aug 2015)
+
+  04 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ide-9999_p20150804.ebuild:
+  updated to the latest sources
+
 *netbeans-ide-9999_p20150803 (03 Aug 2015)
 
   03 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 3a7e1b1..a4e5ebf 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -250,6 +250,7 @@ DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae284
 DIST netbeans-trunk-nightly-201507310002-src.zip 208736792 SHA256 f2794218686a678f2e826bb542663753c97f1b5cf839657ed6540b36d85e0eed SHA512 31cab9432e2668d4a90c99e561faa6a78c89210bd76625e4274c45ff634783967e9170bbd504e60fcd08df88c57b57f5c357f30c9c8dc06d6d0c0ae72f3ef0a3 WHIRLPOOL fccf16a822b7d43c1dd709c2357cb2fa6ec518e291f4f306c5c2aa4838f734ef9d2c800795dde592d17b3685826e00d26611e8b3cc4c68e6ee5332cff9aa7129
 DIST netbeans-trunk-nightly-201508010002-src.zip 208741865 SHA256 2ade7e4e9f2b80801888cd2281c99f5a3236ecbe0ea86d58e12224922ebf3f32 SHA512 25c2c59cb3c4a636dc8fd9d366017faa24e23b3c0c293a39f07ce889cbed199994f2e3ddb526f371e35a1d93a1baf4380ddf9e9ed8df8050808327351ac9de38 WHIRLPOOL 161e4359caba6c0248bd91e3ab17c78198b160e3317a6a20d12a5f964a9f8a3aa0aadd533fdc5e72d752e6d023637ce67bd38ea7de44b8525ea79b3aa321301e
 DIST netbeans-trunk-nightly-201508030002-src.zip 208748030 SHA256 933445356a68c17218a1e5d047568b7493208f5e4ac5cb083b6c0c840080e08f SHA512 000a443f1e02911e29996d0ab6021863faf1ea3649cb71dff7df5c262087dda663d4d670f64a238df86220fb1bf0fb713a990bd78671077ac86d5e0c7d0a52a6 WHIRLPOOL c71739d059f35e7f3f6b301f7291f8ddec3d286eec918a18f9ce924068f1ff84a3138c50f5c59d4efb297b5aa8c748988c6695656deb47a4fe49fcaf35b86bd3
+DIST netbeans-trunk-nightly-201508040002-src.zip 208761490 SHA256 b001f001aff1c4a6e29cf289beeefea7e766fd278a7144a028970bd9b65b0459 SHA512 87a1c41db0c76a01150c08247dc76f397e0e9ac2d87ff3fc5a6f7d91265812bc8471ae87edd781ea2518c8b47f48ad374b4fddccb38ba1ef888e001c3b295224 WHIRLPOOL bae5b1c4f71cb87f223d8232c29da2fdfc3a3482db42cd3783f2c249aeb7c409f2b40fe815e290006797307a5ba296316f21a44988cb098659b6d1969359c371
 EBUILD netbeans-ide-7.0.1.ebuild 22653 SHA256 4c1b3e46e2a6cb89d902c7f4fe6ad9306cbd0c9463a514e87d4c6ec019dc0356 SHA512 5dd526a85a70720686c612efb3aa5602c395111d507b91ae4db04c5814b27bafd1480ab7e44e1148b7412f768543110ff58abdf676de303cd3be9d87b87bd373 WHIRLPOOL abaedc56df115c6050ad7824929ee959ba1669fc1f3f9d4cd1eb9f9f948a608828621f46aeedd0b6062c85b1ad4481d12f952a504559e52c110ff37b88ae0d72
 EBUILD netbeans-ide-7.1.2-r1.ebuild 26831 SHA256 2643a4435aa093e292a2728583d8ffbf213dac6a13dad8e47029ed13a2478493 SHA512 5ba14c7b820f2daae788588ae2fdebdc8af6bb870d6ed56adcc2d43810e5dbd2ea21ae639e6b864d6d0b1e69c9aa4f86dfb15e99eb4a170434aadf0109ad876a WHIRLPOOL c9367735f073f9fcf6bb992b6d481aaea1ebe8526907cb6366d432a3f47a0c4d76bc9224206e0e512708dfe896b465878a2a1ad68836c7cd9b51a3a4efa2aecc
 EBUILD netbeans-ide-7.1.2.ebuild 26834 SHA256 1e57e60a1a00b4530f917319b5d8eef915b9669b9dd3ab82b5afabe171d8959a SHA512 4242265c0783a87c028f955425c86596038aa477e3256ff8ba244220a573486bb7f2e47b07b3c94fbef07940a3b32c313a1320b58656a67cb15a490e7307b1ca WHIRLPOOL 1e23b1e4370292500f154527ecd7a0e7ca315ee73588806413f630355677ee8fe9318a0e672b5f6ad60f829c0a5579b37eedbd737bc8ec154aba9f59c53bd337
@@ -285,5 +286,6 @@ EBUILD netbeans-ide-9999_p20150730.ebuild 30340 SHA256 85e711d85b2d4dff1254b9db9
 EBUILD netbeans-ide-9999_p20150731.ebuild 30340 SHA256 87c77a6385ef651d14eda7f77c2fe5d290cd9f22ea8d5db6af43ae62dbe10da2 SHA512 95d057f7d6e6a6d2126545ed79e6c4d0511bb0d1ab369de74b9a4a255345a8f6b6e207d1a83868af2614953a68efa260ad65b3cfa5013d6eb0c28c80cda79ab7 WHIRLPOOL f226f3be8b52d9e1efc5f3f44641b33406d8bf5ec81886dbceab28520f8c4fad24998027974224d2874b83c032d9ad706507caaf9e3b021e717f2b6bcd3a1cd6
 EBUILD netbeans-ide-9999_p20150801.ebuild 30340 SHA256 c1e6c4225c75ef76b109836648f17c663bcdba32adc16b6c8022c34d093dc8d9 SHA512 9a2ee4f51d24799ff4e36a35063469994bef1d42ef6a253028df5215327708355700088fbbcec4e007efd5211d42464fbda7659e5e396d66a582e461b90d01e9 WHIRLPOOL 682596aaf71631c8761415fac4e753b36c5c5acb2a84f86ce08ef5ca9dff47eca480cf3eeb30c1e6c04c05858d9e222db2536c4925775b59a62ad9e62aaf6cc6
 EBUILD netbeans-ide-9999_p20150803.ebuild 30340 SHA256 02a7615aca64e86a2a91d13d6b12a19f37ab4c4ef3f7f784b6dcbc03b3195a16 SHA512 f754b6de928e7c2012f06b7cca81aa59d3b096f63f2f61bb8781a428219e6101fca58e46b36fb8f08cc67120fe2d8fb803a54445cc7e435b2f2f286f829d7c94 WHIRLPOOL a787b3a7c7fb2c4bbb3267c7428bb96d439bb9cd878a4e3835b615b2cf3ee37c7ebaa225a3f29c136c4b24f39785f47c3beb1ee1a24a715da09cce03d47782ea
-MISC ChangeLog 166312 SHA256 9a6527c5a79effe40f54dc4a318eee2eba41c672f8291806687d51fec631337c SHA512 29ad41243bebf35f9fa4d3ce1a1267c1bf39ea72760f443561bd44ab98a474b7d8acf98c351bf0be4ccabb59be4ec54e2b2b6d6dc640ce3a4b9b5c1f4186392c WHIRLPOOL 47a93016a4cccc94597c4a185ec1d4485e8c954ab12871fc6d8c24a841509839c6d7e5f8defaa5992a61b46a903b7973bd5c199201fbbe8783c7905f9e71d73d
+EBUILD netbeans-ide-9999_p20150804.ebuild 30340 SHA256 2bac2b00467ea17cd02d3ff817af6d1249a79be9cd69bfeb285013934769e340 SHA512 a01bb29275fb1cf76b1e764396dbbbfa0651f8aace995c6a37399a89a32ed229b7a1b7c946502635335b804f544e0d61abf343421c2fc5ca859b2b4a97ea07ac WHIRLPOOL acefb0816585debf803b126e11add4f989cabbcd5782d5af0b16687242f9df930fffb666f5592026048513f57ead920bee208c95d431314ff9b468fa65f5401d
+MISC ChangeLog 166480 SHA256 0039fae9c0633c526ed93a191d7fd29807613071c3e1a5d4dd58528b3f28c023 SHA512 c00c7ce857427ef20da00952c38f34646cbd56c7b8cbffacc8be2ee33347f6b0bdee095abd7aa1ba858f76ef56ac1cbf0ac966a9d74597b70763ec253d860141 WHIRLPOOL f5a0ace7cc0729fe88fe7fb53a2383856d079416f37d6a45f5ad6b6e33f35bcbd390f6c3f72cc662dc83a632e0b9f8a5fada568c8e6fec751bc8f129a5033f30
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20150804.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20150804.ebuild
new file mode 100644
index 0000000..2230a70
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20150804.ebuild
@@ -0,0 +1,377 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-04_00-02-28/zip/netbeans-trunk-nightly-201508040002-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/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-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}"/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-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.51.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/ChangeLog b/dev-java/netbeans-java/ChangeLog
index 3a90a48..eb94522 100644
--- a/dev-java/netbeans-java/ChangeLog
+++ b/dev-java/netbeans-java/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-java-9999_p20150804 (04 Aug 2015)
+
+  04 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-java-9999_p20150804.ebuild:
+  updated to the latest sources
+
 *netbeans-java-9999_p20150803 (03 Aug 2015)
 
   03 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 7175acc..a49cacd 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -125,6 +125,7 @@ DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae284
 DIST netbeans-trunk-nightly-201507310002-src.zip 208736792 SHA256 f2794218686a678f2e826bb542663753c97f1b5cf839657ed6540b36d85e0eed SHA512 31cab9432e2668d4a90c99e561faa6a78c89210bd76625e4274c45ff634783967e9170bbd504e60fcd08df88c57b57f5c357f30c9c8dc06d6d0c0ae72f3ef0a3 WHIRLPOOL fccf16a822b7d43c1dd709c2357cb2fa6ec518e291f4f306c5c2aa4838f734ef9d2c800795dde592d17b3685826e00d26611e8b3cc4c68e6ee5332cff9aa7129
 DIST netbeans-trunk-nightly-201508010002-src.zip 208741865 SHA256 2ade7e4e9f2b80801888cd2281c99f5a3236ecbe0ea86d58e12224922ebf3f32 SHA512 25c2c59cb3c4a636dc8fd9d366017faa24e23b3c0c293a39f07ce889cbed199994f2e3ddb526f371e35a1d93a1baf4380ddf9e9ed8df8050808327351ac9de38 WHIRLPOOL 161e4359caba6c0248bd91e3ab17c78198b160e3317a6a20d12a5f964a9f8a3aa0aadd533fdc5e72d752e6d023637ce67bd38ea7de44b8525ea79b3aa321301e
 DIST netbeans-trunk-nightly-201508030002-src.zip 208748030 SHA256 933445356a68c17218a1e5d047568b7493208f5e4ac5cb083b6c0c840080e08f SHA512 000a443f1e02911e29996d0ab6021863faf1ea3649cb71dff7df5c262087dda663d4d670f64a238df86220fb1bf0fb713a990bd78671077ac86d5e0c7d0a52a6 WHIRLPOOL c71739d059f35e7f3f6b301f7291f8ddec3d286eec918a18f9ce924068f1ff84a3138c50f5c59d4efb297b5aa8c748988c6695656deb47a4fe49fcaf35b86bd3
+DIST netbeans-trunk-nightly-201508040002-src.zip 208761490 SHA256 b001f001aff1c4a6e29cf289beeefea7e766fd278a7144a028970bd9b65b0459 SHA512 87a1c41db0c76a01150c08247dc76f397e0e9ac2d87ff3fc5a6f7d91265812bc8471ae87edd781ea2518c8b47f48ad374b4fddccb38ba1ef888e001c3b295224 WHIRLPOOL bae5b1c4f71cb87f223d8232c29da2fdfc3a3482db42cd3783f2c249aeb7c409f2b40fe815e290006797307a5ba296316f21a44988cb098659b6d1969359c371
 EBUILD netbeans-java-7.0.1-r2.ebuild 14932 SHA256 3d8eeb5c3aea368c5064e83e9519b2982a3d0f999db11344ba33605f46f865b0 SHA512 0c99037f44aa968f357724650189fe0f6fc89496fbf73f6c5a9bcd589afa5af4974f058a8eea2b6a97e1884f4cabba8b5ecf0214b7e840870358f0e55abbc595 WHIRLPOOL 4c1ccada62d0c8883033500ead9586e5bfcd360e6030b3d8368b0b16b9ed01cc03d3c3d5888de437a16d5382b5fe9ec7c02f3e200c3c19bc9a43f011f32d3a68
 EBUILD netbeans-java-7.1.2-r1.ebuild 14936 SHA256 6082d8d5022e011e7aa9d4ff92bf9a144a4f733b879127552c0ca55566b0f18c SHA512 c03a674b6d93a4261bff40ad9aaad6fa9bc0451d6017aeb51f14c42113cc2ff12f84ff5a6cc01c01b43c7ce1b4d885da5c9cb4c0e13601c8ff780eb140060ac6 WHIRLPOOL d32f06a7bd7d4924f14fcb2ed67fd2f5a1766087e4f46ed77d12d472c4c133eef5431d75a709da1abcf8b8cff5afef303dd57e82e4022651a7278076502300d6
 EBUILD netbeans-java-7.2.ebuild 12206 SHA256 da05f74f2c02e4aac745dcf1be75069cc7070f241d063c19c40465e139ac135f SHA512 62be228321e175ad03c2a7d9270065445ba9e1ca08a1a51927027ddbc78aa43a0c57c6b4193add993764235068c7128655f2f12e00fcd17fbac807334f2483c6 WHIRLPOOL 5f518535df8a5f1e1e4f0bc5c845ca063317221c619c3e8928c89a4f2bb30be5a03838f5a610bcda58959d535e4fb152f92f4edd780bcd423918b448d7ddf2e1
@@ -161,5 +162,6 @@ EBUILD netbeans-java-9999_p20150730.ebuild 14824 SHA256 67072d22553ac772665d6494
 EBUILD netbeans-java-9999_p20150731.ebuild 14824 SHA256 cea27f8f7558675da359bd729f8afb55e11961fe577330593fc048826d5346c6 SHA512 7b5d31e28d47a4313e9dd32bca0aab5a3bc215160f314160581badf1bf4a1b8f20690b2ddfa89a114eef713ea6bfc2f4fbf89dcd19ddcfb17ce0e0a6b5112d0f WHIRLPOOL c780d686e084b469e137073927636101557bd10de1eeb4d32b6c12efc7d128f7edcf5ba66748f81ade9e08db8ddcbfdbdc7a4e9801bda6f4e970b0136a91ba32
 EBUILD netbeans-java-9999_p20150801.ebuild 14824 SHA256 de02fac7dc2e95989963287136e039a8804216a21a3b0bac157c752ff8a0774d SHA512 7dbad8cb2a583ca69383274b3d4b624c246ed59d58b92dfe78eb937fcf10dedf711778fbf203ed763090883dc0bd2cb9fd42355bead824ab78f1e5d535ee1f32 WHIRLPOOL 2b7f7eec06e6d97e17ffc32232590a6f17208563282d814d8190f5c096fa7b69fbd121db00cb3458e673ce42283bd33d77b3c9645ee7df173d99ea922df74c73
 EBUILD netbeans-java-9999_p20150803.ebuild 14824 SHA256 715bb7be7c2de116b1afe8c190d08ecff0f161567486dd59df8de833d12655f1 SHA512 0d742dfe9f17123646e3c0da0c18702698940c3a853723fce27c67eede55d6f1cf66bb004f4bd83709546e3a10cf789edba9dd705339184f169ab758acbe7c30 WHIRLPOOL 6fe3071fe790647ec84026e1963f88bfcb2c0e013117d468b71d11a01db9d9d9e358f4e426333e8300c2d25b61f0b564a2627aea7db8c5fba54349bb78ca1f69
-MISC ChangeLog 169785 SHA256 db938c79f10fb4f06c728a061237cc8c8787f7c2e57b2619605c9ba36e61f5ef SHA512 1e6452dd054defcb3b00e63d6e86ec13d32371ffe1f52d5937a03eab837a930180276df4a0f9b485e0763366cdf601ff4837924ce0ec5b842683f9f6b5162d49 WHIRLPOOL cc01b5aeb9ae09bda1841d86cf7b82717341dc22a9489a5197d1a6fd2a2fd902be6a73d96f4d7b8762687022a35ae368e09e4bd074ceb8948bae1557839ac019
+EBUILD netbeans-java-9999_p20150804.ebuild 14824 SHA256 8a51867fbf4233981237398924d4ff1d3e77a553eecfd2f045743742a18599c2 SHA512 aa7ab2bcb9c663a3d080ca649202937d22488401d0fa1aff18681e74351a9fe465e803f0be23a69b2703126cf8bc178d6d692e5d4cd52534d316f086dc036437 WHIRLPOOL ecf7e200c266865ca1bcc3a2dbbe547b7770388dd80bf6e6f3e4356aa28286129a225032c57fe814b489cc2384543312b65f2542a23054f106ebe6e53d28fd83
+MISC ChangeLog 169955 SHA256 0ed49119112deaed4f2c09c94974aefd732eb5699ea2f9b13ad19a0753806c0b SHA512 ff7b6e117358f8b2ecc168871545263e9e12c861e3605412efcb589b18d3597d776a305f22d8f9e49c91b5103b65034e8bf4db52731e882e9eb3ad38cbe31733 WHIRLPOOL dc91082a915129af5095beaf3314dad4465b94fb306432a8cb3ed283616acd9e292604450a2d4afdf84306bfa8309c54999e5968e34293a77f998a7a282b7e93
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20150804.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20150804.ebuild
new file mode 100644
index 0000000..009bc8b
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20150804.ebuild
@@ -0,0 +1,273 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-04_00-02-28/zip/netbeans-trunk-nightly-201508040002-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/A4E5CDD544195DC6BFCFB16D6F4FB14A1CC18C1F-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}"/A4E5CDD544195DC6BFCFB16D6F4FB14A1CC18C1F-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/ChangeLog b/dev-java/netbeans-javacard/ChangeLog
index c6d8245..91c74f8 100644
--- a/dev-java/netbeans-javacard/ChangeLog
+++ b/dev-java/netbeans-javacard/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javacard-9999_p20150804 (04 Aug 2015)
+
+  04 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javacard-9999_p20150804.ebuild:
+  updated to the latest sources
+
 *netbeans-javacard-9999_p20150803 (03 Aug 2015)
 
   03 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 1842a82..28f7bf1 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -42,6 +42,7 @@ DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae284
 DIST netbeans-trunk-nightly-201507310002-src.zip 208736792 SHA256 f2794218686a678f2e826bb542663753c97f1b5cf839657ed6540b36d85e0eed SHA512 31cab9432e2668d4a90c99e561faa6a78c89210bd76625e4274c45ff634783967e9170bbd504e60fcd08df88c57b57f5c357f30c9c8dc06d6d0c0ae72f3ef0a3 WHIRLPOOL fccf16a822b7d43c1dd709c2357cb2fa6ec518e291f4f306c5c2aa4838f734ef9d2c800795dde592d17b3685826e00d26611e8b3cc4c68e6ee5332cff9aa7129
 DIST netbeans-trunk-nightly-201508010002-src.zip 208741865 SHA256 2ade7e4e9f2b80801888cd2281c99f5a3236ecbe0ea86d58e12224922ebf3f32 SHA512 25c2c59cb3c4a636dc8fd9d366017faa24e23b3c0c293a39f07ce889cbed199994f2e3ddb526f371e35a1d93a1baf4380ddf9e9ed8df8050808327351ac9de38 WHIRLPOOL 161e4359caba6c0248bd91e3ab17c78198b160e3317a6a20d12a5f964a9f8a3aa0aadd533fdc5e72d752e6d023637ce67bd38ea7de44b8525ea79b3aa321301e
 DIST netbeans-trunk-nightly-201508030002-src.zip 208748030 SHA256 933445356a68c17218a1e5d047568b7493208f5e4ac5cb083b6c0c840080e08f SHA512 000a443f1e02911e29996d0ab6021863faf1ea3649cb71dff7df5c262087dda663d4d670f64a238df86220fb1bf0fb713a990bd78671077ac86d5e0c7d0a52a6 WHIRLPOOL c71739d059f35e7f3f6b301f7291f8ddec3d286eec918a18f9ce924068f1ff84a3138c50f5c59d4efb297b5aa8c748988c6695656deb47a4fe49fcaf35b86bd3
+DIST netbeans-trunk-nightly-201508040002-src.zip 208761490 SHA256 b001f001aff1c4a6e29cf289beeefea7e766fd278a7144a028970bd9b65b0459 SHA512 87a1c41db0c76a01150c08247dc76f397e0e9ac2d87ff3fc5a6f7d91265812bc8471ae87edd781ea2518c8b47f48ad374b4fddccb38ba1ef888e001c3b295224 WHIRLPOOL bae5b1c4f71cb87f223d8232c29da2fdfc3a3482db42cd3783f2c249aeb7c409f2b40fe815e290006797307a5ba296316f21a44988cb098659b6d1969359c371
 EBUILD netbeans-javacard-7.0.1.ebuild 4961 SHA256 566bc7e3275c97d0fe3d68c843b53aee641548ec39a8143aebd56d248da3c32c SHA512 5973c8d4254943473209b0881c0fbe40ac6b61563d508e58adc248dd40c8c2d6b742bd6c1667ee11fb404f9d2e62f08a8e4d822a2a3db9fccab254f73828c3b0 WHIRLPOOL fd1e08943ce754a2abfe8c8b83954399287500ce574a46fe0d76f94b300fd2a5978957f94a3ac1d85781330248a46fefacfbae25db95669c3de910145ef96424
 EBUILD netbeans-javacard-7.1.2.ebuild 4970 SHA256 15ff13152b140edaa549ea6515949d99cdb2a4656918566179836ab2277f01b8 SHA512 b7e52b477f6ba645084034eb27e848fb48361351937fc45455bf4b7d74acbdd257427ec589286f0edc71cc98c8cdb114e55988b6d3dc92143e13f407e3b45a52 WHIRLPOOL 85ab6dc2c230ea89fd19d7602ac24e3d2b0f226590998e6a6e277c24ef60a7e86874f7e95e90921d255e84f05e04ad1998ee7361b4d26c6f14828076792a933c
 EBUILD netbeans-javacard-7.2.ebuild 4718 SHA256 d173c848e825b342a52073ba16b7784016f92124d4bc3b5ad8beebb7a7dda772 SHA512 019183c236c59ec2b961445c49643c6da0b376048f1be1d58677a753890bcb03db126f6441221c7572a74fe45c4c27aeee4acb38db620f9203ad04ae8ff2c426 WHIRLPOOL f2a10183045edd22ef4419b630cedafc093b326eb593178a0f50e8d82ebb25ab732fb8c561d49969073d9fce551c5b9150fb1900b49458ed53f0234baa29a78e
@@ -75,5 +76,6 @@ EBUILD netbeans-javacard-9999_p20150730.ebuild 4982 SHA256 433c1c35a0d23a8faa58d
 EBUILD netbeans-javacard-9999_p20150731.ebuild 4982 SHA256 b21863514228a9a060f20f2d6f9c855590419d98138563d5741d0aa793671776 SHA512 3e23ae91e3093fa53c86aac8ca5991cbbd0bc869ea6953ebf97d2e6870950fd869d9d1b5f8da6c09b8012d8982f9c2ac8eb8766e7deee5e49bdfb83fb7a801bb WHIRLPOOL 6edfb4ed472f901c8337bdf7774baf726eea4379b0f94e51e52e25c4003aba7db35e00e60a0558a4422a8b98bb07fc95d6d7cdcf9acf7f59b9d526aeea19e969
 EBUILD netbeans-javacard-9999_p20150801.ebuild 4982 SHA256 6e5aee567dd281d7b9a65275e8b4ed034083b4f3f10ab8ac8f649207b45ff17d SHA512 e14aa2cb1af593cb79cf490099299a0113615fc263fe294ba5847695fb656330ce0de23da49ae037e557dd388602f43b5e3b867f3373235da04e469b782acb2f WHIRLPOOL 434e0379bdddd7977ea50f88c07050cae42de8a6cadf82d5c02f976ce78e3532424910cdb96ca9ada11ce7a8b23342b3f1a6e56240522b6d450e372132afa590
 EBUILD netbeans-javacard-9999_p20150803.ebuild 4982 SHA256 c1c4371369efea6676bdbdfea6bf39ea4b69043ed7ebb45a1d9ba6b2feafd8ad SHA512 2e1895efc622f5c10a82a82f7f11fa7c46a896abf3bfe436683dfa7a471f873d1f0c0533528e5c2cc1ac7b3779bd8c6d7dc9cbf46b5a4730beaba6107eeecc09 WHIRLPOOL f5634e839e5479b549fe8fb14fcedcdd3eec2012095883401672db69d6ae12dad8f004f4e1e17718f8f4e6e23f1e5e905dd464f480daf651337a94310d84d48b
-MISC ChangeLog 176942 SHA256 3387f1d3f5ca4bb10e6e418858cd2f7c7d7700924f8ca5942fe57286bf9ce5df SHA512 d0d57bc9d46ca682d29d53f8d86cb396631088e2fef00ccd522293454a05e51098ce997e386d3ab0b06d5d9a7cd773fe785c2b9887a005b82fe6621d43ae3263 WHIRLPOOL 1973f39e772e4d905c8a55aa1b7be3b9941cacbec3e5396e23a10a0d9877dc968bd43d03ed1a874426d5faff165303f762ff8275e0133c23e44f43b5c30f9e46
+EBUILD netbeans-javacard-9999_p20150804.ebuild 4982 SHA256 f676f958b5f1dbcdff8b9e22a958b756f056d22834e791e51ab5a88947dc8032 SHA512 052f054b27cbbaa5d0df25c2b0c996ebf50fadb2c24ecfb12d790455aa0eaa387eec58c807d2ccfd24626cd04ce639c0d778608f9bb4739b641c13c4aea44dc9 WHIRLPOOL 76ce76c67cf2aa3a6d23488cb4cc1398febe121e16b919cb6bef6d11d86d56aeedb785e8a146a397d5ad86945ad20842aca2971ad8bda03622862a9b51093bf5
+MISC ChangeLog 177120 SHA256 a92d277e41f773442adbfd2bb8a828c0c846798e3ef39d80603c4853f2c27438 SHA512 2cbd304f62016df85fbcd8dc4a0bda410b442239cf1b8982d8715903eea5a81fbfdff70ad6552d47202e0f1a62fc8485307ee0294a6a66c5e17f32baa2bdc0f4 WHIRLPOOL 80d5cccb78f41ef44ff55d1c6c78a6a60b75e4bd8140c903dd03c482fe79c91dac8e0d2203d5a2f34cd48fbd5053b0abf560e695bb7f4bedeeeaa6e0f27b5242
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150804.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150804.ebuild
new file mode 100644
index 0000000..bef835e
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150804.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-04_00-02-28/zip/netbeans-trunk-nightly-201508040002-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/ChangeLog b/dev-java/netbeans-javadoc/ChangeLog
index a532c92..a2652a4 100644
--- a/dev-java/netbeans-javadoc/ChangeLog
+++ b/dev-java/netbeans-javadoc/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javadoc-9999_p20150804 (04 Aug 2015)
+
+  04 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javadoc-9999_p20150804.ebuild:
+  updated to the latest sources
+
 *netbeans-javadoc-9999_p20150803 (03 Aug 2015)
 
   03 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index e9490e2..5d4cb35 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -45,6 +45,7 @@ DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae284
 DIST netbeans-trunk-nightly-201507310002-src.zip 208736792 SHA256 f2794218686a678f2e826bb542663753c97f1b5cf839657ed6540b36d85e0eed SHA512 31cab9432e2668d4a90c99e561faa6a78c89210bd76625e4274c45ff634783967e9170bbd504e60fcd08df88c57b57f5c357f30c9c8dc06d6d0c0ae72f3ef0a3 WHIRLPOOL fccf16a822b7d43c1dd709c2357cb2fa6ec518e291f4f306c5c2aa4838f734ef9d2c800795dde592d17b3685826e00d26611e8b3cc4c68e6ee5332cff9aa7129
 DIST netbeans-trunk-nightly-201508010002-src.zip 208741865 SHA256 2ade7e4e9f2b80801888cd2281c99f5a3236ecbe0ea86d58e12224922ebf3f32 SHA512 25c2c59cb3c4a636dc8fd9d366017faa24e23b3c0c293a39f07ce889cbed199994f2e3ddb526f371e35a1d93a1baf4380ddf9e9ed8df8050808327351ac9de38 WHIRLPOOL 161e4359caba6c0248bd91e3ab17c78198b160e3317a6a20d12a5f964a9f8a3aa0aadd533fdc5e72d752e6d023637ce67bd38ea7de44b8525ea79b3aa321301e
 DIST netbeans-trunk-nightly-201508030002-src.zip 208748030 SHA256 933445356a68c17218a1e5d047568b7493208f5e4ac5cb083b6c0c840080e08f SHA512 000a443f1e02911e29996d0ab6021863faf1ea3649cb71dff7df5c262087dda663d4d670f64a238df86220fb1bf0fb713a990bd78671077ac86d5e0c7d0a52a6 WHIRLPOOL c71739d059f35e7f3f6b301f7291f8ddec3d286eec918a18f9ce924068f1ff84a3138c50f5c59d4efb297b5aa8c748988c6695656deb47a4fe49fcaf35b86bd3
+DIST netbeans-trunk-nightly-201508040002-src.zip 208761490 SHA256 b001f001aff1c4a6e29cf289beeefea7e766fd278a7144a028970bd9b65b0459 SHA512 87a1c41db0c76a01150c08247dc76f397e0e9ac2d87ff3fc5a6f7d91265812bc8471ae87edd781ea2518c8b47f48ad374b4fddccb38ba1ef888e001c3b295224 WHIRLPOOL bae5b1c4f71cb87f223d8232c29da2fdfc3a3482db42cd3783f2c249aeb7c409f2b40fe815e290006797307a5ba296316f21a44988cb098659b6d1969359c371
 EBUILD netbeans-javadoc-7.0.1.ebuild 5814 SHA256 68531c51838c95012830f5ae09e2386ea3179c2b31bfd5191f67993e3b3dbe2f SHA512 3bfe0ecc46f371d2553b031a5699229fb874dad1e94415635558b7d46b6764c31337d03444753e687b19a7c0976c68cb72007ccc82df7d1e5848a81f241f80c3 WHIRLPOOL 6571f7a73c262b3b67407840523b79eecc14bad9678cff05fb32a2811049158400870de51bbcef97ecb3f18f8ff59f965bdca8e788918d53822b92e2f20f75f5
 EBUILD netbeans-javadoc-7.1.2.ebuild 5855 SHA256 af28efb956ac3b7147e254ca3083dfaab11b84ea42e20677ebdd18aa29ff87e0 SHA512 ee06c552782170b51cfe70d603792b4240aef6064ba0a5074f394701a43285ed1e4030f539622c616be3175dab013e791c1a3a1193ad379193f5fa3e92eefa40 WHIRLPOOL dfcc63d6c9fcf094e2998ce1c08e29b4d4acbefbe9bea6498c2e28f84576f628da50164a1e0ab3ff5528720fe54cae71f2f5e6f84aedca5b639f13053464e6c1
 EBUILD netbeans-javadoc-7.2.ebuild 5805 SHA256 20d01deae745a7e8d84ffe55ca63ad74342bd8528c0dd15a20aac6570a1a83e3 SHA512 3947f1ab3efc236b8faa14736406ee3e537bbdbe377ea1bbd4f1eafa06a36d2863f8700dc7c84e6c8501abdf130a78e87ad6a0f52c5172bf0ab52f288617bc86 WHIRLPOOL 8301cce0679ed5f68a09e2e968ab2ba0955547f438758b042a04744539324fd79d83d853dfb8b48421f6dac616362cf1a9dd2a0e0ff8763dc2e12a470d16b95f
@@ -78,5 +79,6 @@ EBUILD netbeans-javadoc-9999_p20150730.ebuild 6234 SHA256 0942cd98e72ce51fbe9c92
 EBUILD netbeans-javadoc-9999_p20150731.ebuild 6234 SHA256 30d960f58c467921cdd63a316b8fa96d393e0cc896790692afbb2879aa0b67ae SHA512 19520d88cc8f83ca5ca6e512817ecea276c212ddfbba3decfcaa2cc37560dd6c6c6c7ec73892edb2a5f22437ee7ab1b2e6c4da7a1fd087123f604ea4bce64ccd WHIRLPOOL ca208b3bd8cc9ce0c33b3d89618a4288b63aa2e2dfd4d8e19deceece1ac6c7db2fcc1bfc5ec91a84e99b6948fd0e0adb7774fb26244b382a72aa4fa2012fbc6e
 EBUILD netbeans-javadoc-9999_p20150801.ebuild 6234 SHA256 03de92babc01e84089dfdfa1ea1c592ac09bf615cf7edb6d5d91982982e206a8 SHA512 4e14fa6145bf432358b9bfa3410cfef1d368b337c6e2c6fb9dde969be6291daa01aadb8c09fc6394a3d75e54b5934308575952e97924fd35424a29d83a898d66 WHIRLPOOL c80a6028636676c2735a87b7b48939ff0e2538d39f77dbf8b7953d71e97348de2cf6909bd291b2b497d00cc95b5a5198f4f0248995d7d81b2dceb5dde3697238
 EBUILD netbeans-javadoc-9999_p20150803.ebuild 6234 SHA256 46b1e16415c054e7b46a2d5dee47221e982e940d7527815d9583ff5f88810148 SHA512 2809b91207e2d8a27090d9c0d22cef5b48a3f393f59422f57e0d1bbae27f99c53c0632769023f0a2b989e535cfac1f2788569384aaa0d20636cd287e85ba1f6c WHIRLPOOL b296de929bf9da7cff5f70367fe2a99131b0812adb1173ec6157be3f7d0e6610c1a68bf8bc961a2f03abaabc81d643a043aba48d9d393a051f8fac238c1697d9
-MISC ChangeLog 174560 SHA256 45b0c58cc16b72ae32dbee2977d887468fa5090d6b9794114f1d43c2deab911e SHA512 5a4f9e154780ac01723b81c62e29988ad69565a218c13784e7a00006ecc2b5b8d068e461261b24abab3c7889762b94c9d4303444c045de7c012a0248d3bc2dcb WHIRLPOOL 3e5b52dab5881d9725645cd65d4823b162cd9546905166192163d109a657e868b7fba7b44a70d38bbd68471786f7a3b164ecb406fbe40c7fa61bad031d0ff2c8
+EBUILD netbeans-javadoc-9999_p20150804.ebuild 6234 SHA256 c22bb01c15c8108de9a43d9e6ef3da10acda064dbe99f1df926d4779d1130fa8 SHA512 f8a2a06bbc7b5fb89efbd5ec7036f5f9aa88b53841fc8d7429c398adadb3eeabd01524f4e95b9341bc05f7c3286ab6064ef5162150d3ca9c0433f2b500de12e2 WHIRLPOOL 5c528d76d3e65794bcc75e5b8385f5d0717efb89c9a25d8b3cd76ddd282b97ea5e11a1da9f1cb3816fd2e4dd251774acd2cbb20210cb9b9abab1126ef7b7ed90
+MISC ChangeLog 174736 SHA256 254ce53f1423385ddd20b3cb4a288ce412a839ffa0e2e9d97d25ef2937363de3 SHA512 8529986375888c118db2e254313983a018abb435bcfd912d7e27ba62b6e57843f13af07a899858d73298a2e9cdaad731b3c5ecb4406a4a648e84a4ceddf7099d WHIRLPOOL af35d85da7c11e23b2e93dcb64b5e88c4b6375fda170cd770c241e03c1472162a17d1a936428914b7d7b94384bce777cbe69b55f02d6c1071710bc87f3c4f36b
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150804.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150804.ebuild
new file mode 100644
index 0000000..7a5399a
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150804.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-04_00-02-28/zip/netbeans-trunk-nightly-201508040002-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/ChangeLog b/dev-java/netbeans-javafx/ChangeLog
index d24b8c1..445b295 100644
--- a/dev-java/netbeans-javafx/ChangeLog
+++ b/dev-java/netbeans-javafx/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javafx-9999_p20150804 (04 Aug 2015)
+
+  04 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javafx-9999_p20150804.ebuild:
+  updated to the latest sources
+
 *netbeans-javafx-9999_p20150803 (03 Aug 2015)
 
   03 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index c164773..9febc81 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -45,6 +45,7 @@ DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae284
 DIST netbeans-trunk-nightly-201507310002-src.zip 208736792 SHA256 f2794218686a678f2e826bb542663753c97f1b5cf839657ed6540b36d85e0eed SHA512 31cab9432e2668d4a90c99e561faa6a78c89210bd76625e4274c45ff634783967e9170bbd504e60fcd08df88c57b57f5c357f30c9c8dc06d6d0c0ae72f3ef0a3 WHIRLPOOL fccf16a822b7d43c1dd709c2357cb2fa6ec518e291f4f306c5c2aa4838f734ef9d2c800795dde592d17b3685826e00d26611e8b3cc4c68e6ee5332cff9aa7129
 DIST netbeans-trunk-nightly-201508010002-src.zip 208741865 SHA256 2ade7e4e9f2b80801888cd2281c99f5a3236ecbe0ea86d58e12224922ebf3f32 SHA512 25c2c59cb3c4a636dc8fd9d366017faa24e23b3c0c293a39f07ce889cbed199994f2e3ddb526f371e35a1d93a1baf4380ddf9e9ed8df8050808327351ac9de38 WHIRLPOOL 161e4359caba6c0248bd91e3ab17c78198b160e3317a6a20d12a5f964a9f8a3aa0aadd533fdc5e72d752e6d023637ce67bd38ea7de44b8525ea79b3aa321301e
 DIST netbeans-trunk-nightly-201508030002-src.zip 208748030 SHA256 933445356a68c17218a1e5d047568b7493208f5e4ac5cb083b6c0c840080e08f SHA512 000a443f1e02911e29996d0ab6021863faf1ea3649cb71dff7df5c262087dda663d4d670f64a238df86220fb1bf0fb713a990bd78671077ac86d5e0c7d0a52a6 WHIRLPOOL c71739d059f35e7f3f6b301f7291f8ddec3d286eec918a18f9ce924068f1ff84a3138c50f5c59d4efb297b5aa8c748988c6695656deb47a4fe49fcaf35b86bd3
+DIST netbeans-trunk-nightly-201508040002-src.zip 208761490 SHA256 b001f001aff1c4a6e29cf289beeefea7e766fd278a7144a028970bd9b65b0459 SHA512 87a1c41db0c76a01150c08247dc76f397e0e9ac2d87ff3fc5a6f7d91265812bc8471ae87edd781ea2518c8b47f48ad374b4fddccb38ba1ef888e001c3b295224 WHIRLPOOL bae5b1c4f71cb87f223d8232c29da2fdfc3a3482db42cd3783f2c249aeb7c409f2b40fe815e290006797307a5ba296316f21a44988cb098659b6d1969359c371
 EBUILD netbeans-javafx-7.1.2.ebuild 3593 SHA256 76a29b37765000745794e6ae20c6b8528d8637507a257ffef3bef2ce648f05cc SHA512 a04618bda036e6652c7208f90a4dd91e07e75b85243580263f6ec846425ab907a87c318117990d4e8d9044bcd7a0ca8b63bc32bdd0d84e5373a10e67a77b79c0 WHIRLPOOL 11acad585f7315ae6b4edd53c764167567a948cb0e2037d95f2f4de34765909b71d095540c054f4cef3ba70224d294b42720536566e445cbdd06ebf2ad903841
 EBUILD netbeans-javafx-7.2.ebuild 3576 SHA256 3441b901a5074013351bc6c7ba6c424455e2affe52e448f2cfac0058c82345e2 SHA512 ee384d6e4ac767ade82b5d337d7a1c5d2b463c15a7596d91e1a850b37349f88d7867a0ffa11a118c48e2ed463f38dcfa791ec42b3fe85ea1e6bf7c4b27f9b073 WHIRLPOOL 15c7d20f2caa39c6cfcba2f846736754b049483f135ac90ced399672932a6a73467f0b4016550c3b2d8583be20d1467486f5652111893ec16111095a3e9c941c
 EBUILD netbeans-javafx-7.3.ebuild 4476 SHA256 9f268a852d45f37f9d22c3bb58d36be17f438e4b4cb5105d88ac4404731facb3 SHA512 3fa0e48e949d0df0a4404c04379623529f73ff15259f4164fddd10afb9faa046ceed16aac1a7b14728af89bf3a4ed7037638fb7e7e932a64cc71e84f7ecaa44a WHIRLPOOL 0395ca679fa41610c61dceb6ac018d7a76b62c08ca740de2fa2d98523f8e5f840a2d0a8c357b674d171841f93d980b536a671a1f12b5261d402c03b691ac6504
@@ -77,5 +78,6 @@ EBUILD netbeans-javafx-9999_p20150730.ebuild 4723 SHA256 42aff9ca84192bf7713b7c1
 EBUILD netbeans-javafx-9999_p20150731.ebuild 4723 SHA256 2b83208f33464fa4d2c7581235691fd4b328cf963f251af275590ba48a4f6b2e SHA512 5f01bed019519bac5a1e4e5e8a4d6ea02646a672b009835f7b9054497fca75663fbc2826b9cf86a1d7916ca2a5c01778f9a8bbb881f088fac320bb4766241059 WHIRLPOOL 2af991d1d31e2b299c8d847de4d676e1a41dd255e14eda1391361dac7eb315087f652b611dc454aca1c48b767f650dd4ebf2dd2fa531e5f6e1699e91d21d189d
 EBUILD netbeans-javafx-9999_p20150801.ebuild 4723 SHA256 baecf0118cbd25818f4a121e9a874ee46e798f2881195ab08f718d1096fac03c SHA512 799d4ff04f2b2bcc4c1238955575ea8242f7a9f12215c147ab1fd84d7ce55a26f79dcc1c6d67769c347420035ed85352c27d6944770b998f5fa73cecb9c63b06 WHIRLPOOL 13a24db9ce5c272e7afad62f839d545bdd603c176c92f472b85c2fff6a296ab64ac39ba083e0c67ce1221d40f19230f5cc0c8684681007e6966faf544ff5cffd
 EBUILD netbeans-javafx-9999_p20150803.ebuild 4723 SHA256 12c8ae9e42f12155f44fd5d8ffe60a59e5450ee4738454649d0c3f6e051ad265 SHA512 3f90ec7a03aad00e87b76af9d370d929a145d69c1b675959f7d5c9775dea9e4e98bf0be098dc0107177af584d0e32a9fbd61db1402c0d99d460c1cea6fdbaee7 WHIRLPOOL 405bdbf39d29f13b5be946b5f74682456cb9e213b6e1f7ec47590ca95f39539329edc0452afb98a5f5308c04437ed0f40e198a0bab8c2e5473a438beda8406e4
-MISC ChangeLog 159045 SHA256 c14ec82003a93b5e130607e28cd48cb33ea5b7f4e0292611b7e2359d4baa3b9b SHA512 0f47bd58f674e3d80b898cb717b485988189be90f04bc02c458045f1781609e558e7d51e2658a25479ec31df0d86c6b2dcf424441e208b0db757e6c4f2f7460b WHIRLPOOL 799efb2f61e0dde549bfd094cd41b3100759ccd429e075fcb03e3c7c97baeaa157387cb181500f3cb3207e35fa1d746e0a5da8082ac09cea9fef9872b59bdfd3
+EBUILD netbeans-javafx-9999_p20150804.ebuild 4723 SHA256 93ef750dcfa2dcb194b7dc3add3121860300da027925ff555176dfd75f8fe6e0 SHA512 a62f2b341a0642a29065d8ba4f21de812bd888c22e3ff21e478cf3f25a2ef28c018776e589ca1927c871ac6ec53d103d794fc70d13fb31b9e66afdb36858d47a WHIRLPOOL 5e247dbe1d2da2328139870122d401a423dedecc9e76af72ca6f2ac06093e2382429b6e208062ff4c3f2095a17868f93657a80c71c482efea252844a10d4ae19
+MISC ChangeLog 159219 SHA256 365a413abcfe6846eb76d8b1944ab5b380c017e00819058845d81aafe7e48a3e SHA512 f6dde616cd1279fc38b6b8c2a24824310ed5095ed56b1549c290f592ab053fab028cdbcc2810abd07ad90a75425333facf5bea641e1ca51ed752a1a1b14bfeb8 WHIRLPOOL cfcb34971cc24a828e46424da6107b3e05be29a8ca3593e99ee9d8a47f4af5b8706f98e85e99eb60c02d2e64e382f1d57a9dc44e798d742b2611900106a5f1be
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150804.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150804.ebuild
new file mode 100644
index 0000000..1d37404
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150804.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-04_00-02-28/zip/netbeans-trunk-nightly-201508040002-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/ChangeLog b/dev-java/netbeans-mobility/ChangeLog
index cf3dce9..3b0a6e6 100644
--- a/dev-java/netbeans-mobility/ChangeLog
+++ b/dev-java/netbeans-mobility/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-mobility-9999_p20150804 (04 Aug 2015)
+
+  04 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-mobility-9999_p20150804.ebuild:
+  updated to the latest sources
+
 *netbeans-mobility-9999_p20150803 (03 Aug 2015)
 
   03 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 0a25091..59b099e 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -48,6 +48,7 @@ DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae284
 DIST netbeans-trunk-nightly-201507310002-src.zip 208736792 SHA256 f2794218686a678f2e826bb542663753c97f1b5cf839657ed6540b36d85e0eed SHA512 31cab9432e2668d4a90c99e561faa6a78c89210bd76625e4274c45ff634783967e9170bbd504e60fcd08df88c57b57f5c357f30c9c8dc06d6d0c0ae72f3ef0a3 WHIRLPOOL fccf16a822b7d43c1dd709c2357cb2fa6ec518e291f4f306c5c2aa4838f734ef9d2c800795dde592d17b3685826e00d26611e8b3cc4c68e6ee5332cff9aa7129
 DIST netbeans-trunk-nightly-201508010002-src.zip 208741865 SHA256 2ade7e4e9f2b80801888cd2281c99f5a3236ecbe0ea86d58e12224922ebf3f32 SHA512 25c2c59cb3c4a636dc8fd9d366017faa24e23b3c0c293a39f07ce889cbed199994f2e3ddb526f371e35a1d93a1baf4380ddf9e9ed8df8050808327351ac9de38 WHIRLPOOL 161e4359caba6c0248bd91e3ab17c78198b160e3317a6a20d12a5f964a9f8a3aa0aadd533fdc5e72d752e6d023637ce67bd38ea7de44b8525ea79b3aa321301e
 DIST netbeans-trunk-nightly-201508030002-src.zip 208748030 SHA256 933445356a68c17218a1e5d047568b7493208f5e4ac5cb083b6c0c840080e08f SHA512 000a443f1e02911e29996d0ab6021863faf1ea3649cb71dff7df5c262087dda663d4d670f64a238df86220fb1bf0fb713a990bd78671077ac86d5e0c7d0a52a6 WHIRLPOOL c71739d059f35e7f3f6b301f7291f8ddec3d286eec918a18f9ce924068f1ff84a3138c50f5c59d4efb297b5aa8c748988c6695656deb47a4fe49fcaf35b86bd3
+DIST netbeans-trunk-nightly-201508040002-src.zip 208761490 SHA256 b001f001aff1c4a6e29cf289beeefea7e766fd278a7144a028970bd9b65b0459 SHA512 87a1c41db0c76a01150c08247dc76f397e0e9ac2d87ff3fc5a6f7d91265812bc8471ae87edd781ea2518c8b47f48ad374b4fddccb38ba1ef888e001c3b295224 WHIRLPOOL bae5b1c4f71cb87f223d8232c29da2fdfc3a3482db42cd3783f2c249aeb7c409f2b40fe815e290006797307a5ba296316f21a44988cb098659b6d1969359c371
 EBUILD netbeans-mobility-7.0.1.ebuild 8655 SHA256 992e214ff2926e2f0db623d96b717bf8f8e4ceb47e96e69b3c6b8f67d6a8d130 SHA512 d51bc003f4b637cfe71c9f49a96427e535596542ac195a9621bc4f92c04a6f720a87fac6eb267732f869ba105f263d9d36f848b54a89c734b6a68a78ed323808 WHIRLPOOL 515da7153b12c3b5779cfad16e3800b4d26ba4b174027d9a7b06a26754fad065751c7eda137ba6199315d024a322d59e7ea39a1b2f4244ea75b30770ac505791
 EBUILD netbeans-mobility-7.1.2.ebuild 7543 SHA256 bb3f1245ad68133798fa507f06dd1ffbc1d55f6ba38f4cccc29ff0240e5b5f22 SHA512 41f663977a0716c5449db597d5f90054717ff3579a9137a910d1943d3e0b39379c34c0d9aa9c98d231037a042074c8ecf5fc62c018cd7cd5e8680734ff854c51 WHIRLPOOL c3c6feb41ce3df356f617ca80530673ac653cdf50da0aead00518854d0850d6420333529aa6591e15ddd4053249191fcb47100c5f39a804352722e54f802bae4
 EBUILD netbeans-mobility-7.2.ebuild 6571 SHA256 58af97ca9a6adc56fa6abe91777a1ac35a3a9b7d68af1e73c23a45dc5631abb2 SHA512 ac42c3a3daa7d55c9c13d1c99dd6880d5d99741f80cfceb683da27e30c70d6228d9434571f2405d0dbbf27d2203e3f877da6347794b07b98331edd1631d3a69d WHIRLPOOL 5a6af3cbcd08180dcdf708a038f3119faacb9c78532b4bb1945c7260fb0a8232af57745e41a73311fafffe185c969e0c88ac34970caab7708313f53417695374
@@ -81,5 +82,6 @@ EBUILD netbeans-mobility-9999_p20150730.ebuild 4418 SHA256 90ee43a5d568d434912f0
 EBUILD netbeans-mobility-9999_p20150731.ebuild 4418 SHA256 f2c93a98cd70a128e672154f300324d3c16c7fa03a563656cba7940fbcedd3ba SHA512 825927647003ac614330a342289b5aae5b519932501c2e77037e8616fca55be2810abb15e6ca1374ea25020486c02a4f340deecec05fd94457be32e2c5b4e7fe WHIRLPOOL 5ba190f5e7ed66043bbb97bd5162d7ea1dd139714af44b7153c1fe7fc16c9ee6ad31c82c2484aa8f83db6f5ad97770922e6f2cbaa6d78686ade55e334c7afdad
 EBUILD netbeans-mobility-9999_p20150801.ebuild 4418 SHA256 faf9180dd09ecec4d7fbcd546985a3cc6fc8e355f6fc8af3fb1a1a62ac794fd3 SHA512 bc0fed236916e737a1367145dbfb641fa2360d9a35cc57803c73bd27eaeba5601967897e70fa73da8ceadce9ca7da2a3cdbe2ee9954eb4deba957fc33f08ef2f WHIRLPOOL 0730270b65049431addd5f983b253a1399ab0c013fa0b3bb3fcb078058b684d1c7feebeba56d955cd115303ae5a9e295de293b3bbe45e7f5eec7ef499fe632d1
 EBUILD netbeans-mobility-9999_p20150803.ebuild 4418 SHA256 7f96c52f1a5dd8123f28c5d80c30a13fe385a44501b5c06bc195842026fc9b18 SHA512 a0ba1e992bb425c95c2811bd9c30cd46bda4ef9303f616446a27d97691f0a78d932f65c511dd2655c2177f973477d37a42b61abb497d34ab1507047dc437ff26 WHIRLPOOL 84825224f719accfd17e7ceb876ea2440af357a184dee3d440e536e8a249fce1b570e774c8102df137c557e59ee86701fe641a78576192d88f891b7f3e96bf7c
-MISC ChangeLog 177083 SHA256 be53e9f1379c2c5284fe90f10657a98a78c72e8b678762ffcdaa4a571c8628ae SHA512 42b185f456136560a64a81af7ca86656d7dae437374b1864c676342464e7960b148b7a9f231bbc5692eb1c8a3c30099d451b60c87f83de271178d343cd07824e WHIRLPOOL 11eff6958bf5449150bff5625c9e1fbbb731dff099cef4269bb90d4ca9931b88d225305e067431d30aafa95d4afae26862202a48f79b2c4c0f0d7f90a89394ff
+EBUILD netbeans-mobility-9999_p20150804.ebuild 4418 SHA256 81d9f7e892ae814e703b7eb1518b2f60075bf956e3084820d03a6da21f36f4c2 SHA512 977331a49dee42e6eb948afc0d76d609c90c16366f9d560ad48d932a8b3454963af33f6f2de9d5bcd7d91e0d16949c2b11300dedfe24c872cdbe5bb7828f52f2 WHIRLPOOL 70f847185f48911a552a6bc94b72650c8e5d796b9299a936b64d952703add8b495407b0d42187d1d7d8ca87a30c9d8ddb8da94896fc935c79fd9e1f1d0b84fd1
+MISC ChangeLog 177261 SHA256 70488d336f11c1ef59943ea99248c7299f5a43a59486f677214eb14a1d15811d SHA512 a363e5233fb44af85cb1e5c758542d1117521fbd74baca0b1a495221426fe19ea72bf3009102c0c2d6f8800a1aeb8a17cb8a493b8d7806b7a9322cbd1570f2f8 WHIRLPOOL 5d1dde04a8c51532ac3da36c9fb03e4ac420a29d348c586a87c3721a1a04fb152b5ebcffd23ec9edcd1695d716ac9e958a72850dc95f479ad9651726ec20ccef
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150804.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150804.ebuild
new file mode 100644
index 0000000..4090e3a
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150804.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-04_00-02-28/zip/netbeans-trunk-nightly-201508040002-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/ChangeLog b/dev-java/netbeans-nb/ChangeLog
index cf5236f..e4bfe4f 100644
--- a/dev-java/netbeans-nb/ChangeLog
+++ b/dev-java/netbeans-nb/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-nb-9999_p20150804 (04 Aug 2015)
+
+  04 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-nb-9999_p20150804.ebuild:
+  updated to the latest sources
+
 *netbeans-nb-9999_p20150803 (03 Aug 2015)
 
   03 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 15cc148..c10c328 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -47,6 +47,7 @@ DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae284
 DIST netbeans-trunk-nightly-201507310002-src.zip 208736792 SHA256 f2794218686a678f2e826bb542663753c97f1b5cf839657ed6540b36d85e0eed SHA512 31cab9432e2668d4a90c99e561faa6a78c89210bd76625e4274c45ff634783967e9170bbd504e60fcd08df88c57b57f5c357f30c9c8dc06d6d0c0ae72f3ef0a3 WHIRLPOOL fccf16a822b7d43c1dd709c2357cb2fa6ec518e291f4f306c5c2aa4838f734ef9d2c800795dde592d17b3685826e00d26611e8b3cc4c68e6ee5332cff9aa7129
 DIST netbeans-trunk-nightly-201508010002-src.zip 208741865 SHA256 2ade7e4e9f2b80801888cd2281c99f5a3236ecbe0ea86d58e12224922ebf3f32 SHA512 25c2c59cb3c4a636dc8fd9d366017faa24e23b3c0c293a39f07ce889cbed199994f2e3ddb526f371e35a1d93a1baf4380ddf9e9ed8df8050808327351ac9de38 WHIRLPOOL 161e4359caba6c0248bd91e3ab17c78198b160e3317a6a20d12a5f964a9f8a3aa0aadd533fdc5e72d752e6d023637ce67bd38ea7de44b8525ea79b3aa321301e
 DIST netbeans-trunk-nightly-201508030002-src.zip 208748030 SHA256 933445356a68c17218a1e5d047568b7493208f5e4ac5cb083b6c0c840080e08f SHA512 000a443f1e02911e29996d0ab6021863faf1ea3649cb71dff7df5c262087dda663d4d670f64a238df86220fb1bf0fb713a990bd78671077ac86d5e0c7d0a52a6 WHIRLPOOL c71739d059f35e7f3f6b301f7291f8ddec3d286eec918a18f9ce924068f1ff84a3138c50f5c59d4efb297b5aa8c748988c6695656deb47a4fe49fcaf35b86bd3
+DIST netbeans-trunk-nightly-201508040002-src.zip 208761490 SHA256 b001f001aff1c4a6e29cf289beeefea7e766fd278a7144a028970bd9b65b0459 SHA512 87a1c41db0c76a01150c08247dc76f397e0e9ac2d87ff3fc5a6f7d91265812bc8471ae87edd781ea2518c8b47f48ad374b4fddccb38ba1ef888e001c3b295224 WHIRLPOOL bae5b1c4f71cb87f223d8232c29da2fdfc3a3482db42cd3783f2c249aeb7c409f2b40fe815e290006797307a5ba296316f21a44988cb098659b6d1969359c371
 EBUILD netbeans-nb-7.0.1.ebuild 5106 SHA256 3c68751bf5face5f80e2d7dcedb7466e69343f2d06c0a4dd30a722a987fbb207 SHA512 d79343e0ca8655b074a8f96b9898e4bc0123d60e346602ba8d7a239597993cadb33a036b43862ef1a39630e4f0ba7e79892d8b2eed8b30535f12a5d0b9f4b581 WHIRLPOOL 9f2cd645e34fbcfa8f0059fbda4f355f411aaff7966121360dfe5b3c769966c5a4586bbc04142b279e3a3fa323bc4b51a6349cf3eafe89063db44fcae58ef119
 EBUILD netbeans-nb-7.1.2.ebuild 4977 SHA256 265f9e4a9490937a65632ddaef48e3a731154b07b9ee5f9536a991181fc2fcbd SHA512 65d1065993dba3b1fece428beb1b75f17d89eddb08aacd2cbf5ecd3ee5ca844e75e9100c324ecdeeed5b138b1da4ab8cd5a4598e584a17545ffc2c52ea763779 WHIRLPOOL 9b63f2b5671bd38d24ff6b280de37fc19c74170bf80c22818da5e8af415a85211c6cfcf690e68d7697c41a1b749a3c7b48ec9b362782df140856f892d381e360
 EBUILD netbeans-nb-7.2.ebuild 4960 SHA256 bef2020a6e0d722ca77c0931b9a06014cedc822f14a21d8d916200e358dcdfb8 SHA512 988d902bbef52e123b5800e56049210d69c4dd6dbeca80396aeac58c70d90b76da65b338e664368ea3f9a3973b7b94ffd0a47a77b01be53452c2cc04c4067442 WHIRLPOOL a27fa8a1a066499a3fc2cb82e955b6b18b1725889b088ea1e94528cde3ec58f3b46c1e757fa597af6ad4ba96218dacfacff9561799f46add316e233d46127d28
@@ -80,5 +81,6 @@ EBUILD netbeans-nb-9999_p20150730.ebuild 5003 SHA256 2cd87115aa8d82423528d11c8da
 EBUILD netbeans-nb-9999_p20150731.ebuild 5003 SHA256 8097aad2f282f19c474cc145f0669d51aa8a06954299f92fce2f90746a2e0496 SHA512 bb3a3a5b5b7c14f3ae2790ed1199280436eea12af19eacfd041101490f64aefc817dca567afab05e6e73285fef95a2903f081c0fedeecdbd95cfa8e6acc73f98 WHIRLPOOL aa8544fa96a9364da483c1de99a57f9495fc96b4cad3a9828d6d9db2fb19628f68f9baf88ce63e7efcb2bcb061774841889d4abbcb3d913a299f2dbc710f0124
 EBUILD netbeans-nb-9999_p20150801.ebuild 5003 SHA256 6a693b4176aab9789f8c0354cf488154a3b06143aa6a7e9f457c0e3253f4f2bf SHA512 2c507488f701ed6254860ecf34c9b0f1626892b27f9e06b1aa3045099b258928820f9d988592d5da4f9fa310c654d271573a584f56e873b0a58bd462e37659e1 WHIRLPOOL 9c57eca46f263f9e785460362c328edd214d2cfb832d59a2ed48e05a6f76c7e73bfc2bf7088bf8cd35cdbe0034d5d2e7565ea3383ac77a7e243aab3106fa496b
 EBUILD netbeans-nb-9999_p20150803.ebuild 5003 SHA256 0928e147aeaf5605d1ada6ba25cc1305193e7ea885d33215cae382a4c78ddc77 SHA512 47109e41665cc334f3233ec10b669d10d304d6d9b0e5dd19966b00699c0c7e845a867bcf61a410b8e8a442d5b1e696a6b44aa06ab0e1abb60f94ba39c97bc096 WHIRLPOOL 906722f2763904ca0933d1c6ece21f277cd5ffdd2881f99ab75c02a48306f992d975dce723bfe6c9a7592c3dfa878dd25636260b8b6d067f6bb1ed7cb83e9a2b
-MISC ChangeLog 165301 SHA256 de6200a39a2b162b1fd1a23b8345b13bd598a7f17e74a1fe4c72ffd592068401 SHA512 c3f68ab9f9cc5c72437ec4da9a7ecc1f945b85c9fc5fa974c48c6494d722ef01eee794287834838b8b79e625376d34b459207256104c3be042655728fdb727d1 WHIRLPOOL 8c898c5b556db303e28852ab36d77e48858f544a1885745c76b43b6f1bb7193f611739645e078c2b119f4dd2509fd36b147f1ff5bdc2770120362a57d89c8cbe
+EBUILD netbeans-nb-9999_p20150804.ebuild 5003 SHA256 8460f2f119f1705eb4c78aa56f7f58860f7affa426f2f408b6a998aaf84d0d7b SHA512 a98ababe8b35e499834b09293938370725733d3d667a0647880c7dab860e056214566d8718b00762b130ec7f37e50e3d5af1b15894273651175c3e7b344a6c8f WHIRLPOOL 52280ac64d6e8ce9f5c9bc1795acafe73929254aa73fbc6ae15cbbf27aa64c7e2ef176c3aa77157661429ec215f937241f18d5ff1f9fa82855527414d329a711
+MISC ChangeLog 165467 SHA256 4d768c94b5e5c2628ac7aa3f2baeece0f3c411f7ab7882da04d59c7d9335550d SHA512 5b7bcfeb1a9403ede02817da9bda5d26b0f071fefd3a70a9d570f55417a40502c57c248f6f6e8d622385855da2ed271bc4da408eb0cf0d7caa9bf36d8f9f8745 WHIRLPOOL a6bcb561258126bf0c16a9012e24fc68e65b64a1b19b3e304ea6c5d4f1923cde2dbf150e75c4ef99e42833bb6934b9439fe648d76f1c59fb7d893549190557f4
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20150804.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20150804.ebuild
new file mode 100644
index 0000000..c8f3d24
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20150804.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-04_00-02-28/zip/netbeans-trunk-nightly-201508040002-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/ChangeLog b/dev-java/netbeans-php/ChangeLog
index 33f24e1..d5fc8a7 100644
--- a/dev-java/netbeans-php/ChangeLog
+++ b/dev-java/netbeans-php/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-php-9999_p20150804 (04 Aug 2015)
+
+  04 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-php-9999_p20150804.ebuild:
+  updated to the latest sources
+
 *netbeans-php-9999_p20150803 (03 Aug 2015)
 
   03 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index 3203515..127d4ab 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -51,6 +51,7 @@ DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae284
 DIST netbeans-trunk-nightly-201507310002-src.zip 208736792 SHA256 f2794218686a678f2e826bb542663753c97f1b5cf839657ed6540b36d85e0eed SHA512 31cab9432e2668d4a90c99e561faa6a78c89210bd76625e4274c45ff634783967e9170bbd504e60fcd08df88c57b57f5c357f30c9c8dc06d6d0c0ae72f3ef0a3 WHIRLPOOL fccf16a822b7d43c1dd709c2357cb2fa6ec518e291f4f306c5c2aa4838f734ef9d2c800795dde592d17b3685826e00d26611e8b3cc4c68e6ee5332cff9aa7129
 DIST netbeans-trunk-nightly-201508010002-src.zip 208741865 SHA256 2ade7e4e9f2b80801888cd2281c99f5a3236ecbe0ea86d58e12224922ebf3f32 SHA512 25c2c59cb3c4a636dc8fd9d366017faa24e23b3c0c293a39f07ce889cbed199994f2e3ddb526f371e35a1d93a1baf4380ddf9e9ed8df8050808327351ac9de38 WHIRLPOOL 161e4359caba6c0248bd91e3ab17c78198b160e3317a6a20d12a5f964a9f8a3aa0aadd533fdc5e72d752e6d023637ce67bd38ea7de44b8525ea79b3aa321301e
 DIST netbeans-trunk-nightly-201508030002-src.zip 208748030 SHA256 933445356a68c17218a1e5d047568b7493208f5e4ac5cb083b6c0c840080e08f SHA512 000a443f1e02911e29996d0ab6021863faf1ea3649cb71dff7df5c262087dda663d4d670f64a238df86220fb1bf0fb713a990bd78671077ac86d5e0c7d0a52a6 WHIRLPOOL c71739d059f35e7f3f6b301f7291f8ddec3d286eec918a18f9ce924068f1ff84a3138c50f5c59d4efb297b5aa8c748988c6695656deb47a4fe49fcaf35b86bd3
+DIST netbeans-trunk-nightly-201508040002-src.zip 208761490 SHA256 b001f001aff1c4a6e29cf289beeefea7e766fd278a7144a028970bd9b65b0459 SHA512 87a1c41db0c76a01150c08247dc76f397e0e9ac2d87ff3fc5a6f7d91265812bc8471ae87edd781ea2518c8b47f48ad374b4fddccb38ba1ef888e001c3b295224 WHIRLPOOL bae5b1c4f71cb87f223d8232c29da2fdfc3a3482db42cd3783f2c249aeb7c409f2b40fe815e290006797307a5ba296316f21a44988cb098659b6d1969359c371
 EBUILD netbeans-php-7.0.1.ebuild 4151 SHA256 3aee393fe89aa4788ccd17af46f1df43a5681c28af6d580724d8db0f5e804ff0 SHA512 60106805595338b83e17d906c199c54dc4cc5d979f964a41f9938a508e8514670f4e5538eeecd91f8cd06dd2b4376119674f9a7a9f2fac6c1255e14929f2bc19 WHIRLPOOL 1a09962a5bd67a4fd4eed48af3f185146d2de6f506952f626756aabf6a157678fe71e0752ed5988ff414803b83150d9b8b4de956895667e331659bb59f94e09c
 EBUILD netbeans-php-7.1.2.ebuild 3940 SHA256 779f3bceb2b5a49e923fff28c36c653e31e2d11e186fabab1e656c3314b48d28 SHA512 1296c8ccbec945e66588c2a1a490d3ea93a28672e77751e16c3dff1f1aa6e3a00b454345f0b888c684a0d31fe05aad4f44310998eb72bf1febba85da1bcdd08b WHIRLPOOL b0238f8c5aa4a8c0a5cff82b0daa29860fe39712e96110916cd8a26938ca07b8e05c308e1387c84e7d693026590846392227e95668d150bbc7f1cbc660676eec
 EBUILD netbeans-php-7.2.ebuild 4159 SHA256 bb5c66ed19c9341332e1e42efb29a4ab5d19a22c995bae93efc952ec105ad493 SHA512 c919b120bdc51b56f58b390e9a017f9e059c6b5709220e80138caf7ca3e58d432f53c9ed28f899dc9537851a4cb8cafa9e7067eaefc5d5798b05fb0be9d5bd5f WHIRLPOOL 9857d2e6ac50c4daf5c8afc0a5b65b068b6010ecf2ef04f063bc184810c18b50feda683d2d80c84c0e621909bb05b19731135f2a69f1e56db927c42e8057a658
@@ -84,5 +85,6 @@ EBUILD netbeans-php-9999_p20150730.ebuild 4423 SHA256 529764502cff24b10ec331e0ec
 EBUILD netbeans-php-9999_p20150731.ebuild 4423 SHA256 3c3a4e083d65e7238c7f35b3b9d0b7f056f974e7b256abdd760aa75f87ec35c7 SHA512 0dcff13d4590c82b6f6c9fa17c1b57af41f45f1a5624a90831481de2e1ac2b039fe8bd05bceabed4bf17537e17d8411313a8ffd16475592fad1dfae9ef79ec74 WHIRLPOOL e64a4ff0961578f30614ab6a48967a25b9c4d0fcde2f44e542c4968984ff69cb873ed2666ee6398cc72f01b097a148f6ef68b3fae0b73bb10785c03086ebb844
 EBUILD netbeans-php-9999_p20150801.ebuild 4423 SHA256 de5f663933b4733a5d16c49d7508545eeee4ad68481b4463bf3f6e4097c4e81e SHA512 9e517f3176dd82081c02838318b56c22683a16f9c47836245f457721a0aefdc02cb835ae9a53c6a080279e3c411eac8ce78559b1938f35c505fa708695518362 WHIRLPOOL 8d67c6a70c146484ebb337aa941e4ac1a06df0e7012b22f59fea7dd130ded235602d8d8cdf4fc9081a3b986720c33d87a5326f4b9915779e408305a387daeeda
 EBUILD netbeans-php-9999_p20150803.ebuild 4423 SHA256 196117d43272d65d160a242ba9a4ca6b7cb28518f67fe5b96c3fa7f1bfcf1481 SHA512 0f53726d663d68362bcc947eecc4655d638bee682e08c548082f3ffb5f31e2265777b9476e424ce7eaf30df6bfdcf72e212b8b648a331c8cc485cf150b3f4557 WHIRLPOOL ba6fb9b400bfd0e05dda4688aae2fc8b8a301f382dae2410531c4613535420d2c3912a4c227fdaa2f834152b205d358d6e2503fdf67d68e0649d3af19436394b
-MISC ChangeLog 165141 SHA256 2d34e79e5df407697a1959e253d12e1ca7ce480c5ac78be160c65afcb5e9d210 SHA512 0ca1b0786c07a663caff14d1a54be8663eb13a53d1bd073721970401e3cd7e7667351606cb690a71ca6ecf7eebfa3df5545bc953f82ec5b2030a459c5c6b61ff WHIRLPOOL 66cdf28c2ca03f06e82e66db50f6c25b0ae5f509337fd50539e3db0512bcea8cdfdeac8f8fdeaf9d6055ddd4409bd3b19d332c3a14494c2569b306ab1a3f23fc
+EBUILD netbeans-php-9999_p20150804.ebuild 4423 SHA256 0bd97a93019df459b6637762c707185e2a0654491b65174a25378a56196d6227 SHA512 85c7a7f5692e98e1539dd50c3f4d2b0778e8da3b642d303e400df2fbb568c79aa1d56e5f311067b31054045332a632b2ad054fcbbd473596a1d0359cd044aa0e WHIRLPOOL 054303a264626d0318fe15fc0d40674e47fb94940391576a990b820cb9b81f13604907ee115a24c78dc689c71ee96f1ec8faf204bb41517cfd19f70d1e39c1e6
+MISC ChangeLog 165309 SHA256 0ec6069dbeb82cd3b793d9928b7ab158a1ca42bf1acb1b3a508e3e318d005777 SHA512 42b37ca07e1eb261b163e39a437eefb2ce175e388a4aaf182bf4aeedc51dd54c4619ba3b1dba098a99e1ea0eba6fc95b524a950924dcd5aec1718590026b2dbe WHIRLPOOL ce28ea3657f1f2f26495248c7405252f443da818bec36f0b2f8c5a7dcf73696d1f0b16f42c1cd8f28dfa6525df3159aa8ee63e661543386d7e1a560e0b5b5830
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20150804.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20150804.ebuild
new file mode 100644
index 0000000..c01f55c
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20150804.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-04_00-02-28/zip/netbeans-trunk-nightly-201508040002-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/52AE855B57FF0326574A5B07D0BDDD9D8010D3C4-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}"/52AE855B57FF0326574A5B07D0BDDD9D8010D3C4-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/ChangeLog b/dev-java/netbeans-platform/ChangeLog
index f5f32a1..4bc0d53 100644
--- a/dev-java/netbeans-platform/ChangeLog
+++ b/dev-java/netbeans-platform/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-platform-9999_p20150804 (04 Aug 2015)
+
+  04 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-platform-9999_p20150804.ebuild:
+  updated to the latest sources
+
 *netbeans-platform-9999_p20150803 (03 Aug 2015)
 
   03 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index cffef3c..cb4643b 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -65,6 +65,7 @@ DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae284
 DIST netbeans-trunk-nightly-201507310002-src.zip 208736792 SHA256 f2794218686a678f2e826bb542663753c97f1b5cf839657ed6540b36d85e0eed SHA512 31cab9432e2668d4a90c99e561faa6a78c89210bd76625e4274c45ff634783967e9170bbd504e60fcd08df88c57b57f5c357f30c9c8dc06d6d0c0ae72f3ef0a3 WHIRLPOOL fccf16a822b7d43c1dd709c2357cb2fa6ec518e291f4f306c5c2aa4838f734ef9d2c800795dde592d17b3685826e00d26611e8b3cc4c68e6ee5332cff9aa7129
 DIST netbeans-trunk-nightly-201508010002-src.zip 208741865 SHA256 2ade7e4e9f2b80801888cd2281c99f5a3236ecbe0ea86d58e12224922ebf3f32 SHA512 25c2c59cb3c4a636dc8fd9d366017faa24e23b3c0c293a39f07ce889cbed199994f2e3ddb526f371e35a1d93a1baf4380ddf9e9ed8df8050808327351ac9de38 WHIRLPOOL 161e4359caba6c0248bd91e3ab17c78198b160e3317a6a20d12a5f964a9f8a3aa0aadd533fdc5e72d752e6d023637ce67bd38ea7de44b8525ea79b3aa321301e
 DIST netbeans-trunk-nightly-201508030002-src.zip 208748030 SHA256 933445356a68c17218a1e5d047568b7493208f5e4ac5cb083b6c0c840080e08f SHA512 000a443f1e02911e29996d0ab6021863faf1ea3649cb71dff7df5c262087dda663d4d670f64a238df86220fb1bf0fb713a990bd78671077ac86d5e0c7d0a52a6 WHIRLPOOL c71739d059f35e7f3f6b301f7291f8ddec3d286eec918a18f9ce924068f1ff84a3138c50f5c59d4efb297b5aa8c748988c6695656deb47a4fe49fcaf35b86bd3
+DIST netbeans-trunk-nightly-201508040002-src.zip 208761490 SHA256 b001f001aff1c4a6e29cf289beeefea7e766fd278a7144a028970bd9b65b0459 SHA512 87a1c41db0c76a01150c08247dc76f397e0e9ac2d87ff3fc5a6f7d91265812bc8471ae87edd781ea2518c8b47f48ad374b4fddccb38ba1ef888e001c3b295224 WHIRLPOOL bae5b1c4f71cb87f223d8232c29da2fdfc3a3482db42cd3783f2c249aeb7c409f2b40fe815e290006797307a5ba296316f21a44988cb098659b6d1969359c371
 EBUILD netbeans-platform-7.0.1.ebuild 5049 SHA256 b67cf0867358fea808614c02b8b6ea2ab88223f8642175ac3f91dc8c610aca4e SHA512 611b8e831a95d1b4e1c3a1f5e4904c84f9606298a94eb0900ac06cc88670849d218a3a03cce07b2463e206da01ce2931cdb6677948d20d8326908a36851589e6 WHIRLPOOL 01769eca4eb20c2702a432a6180eed16a9a50687016e307e585ab5de5cab8b3b664e456d489ff15d9f5af349f791b161eecb9fef7bfaba09a70e1eaab5d545a0
 EBUILD netbeans-platform-7.1.2.ebuild 5034 SHA256 a069e7e45f768e590e5b30fdda26185d8fde492355e4c530ce44169def991cc6 SHA512 31cfb0d9f13eacfcafd49be995bc456d17a689776e032f68ed4585e068a49f6e992c37c57f23c5e27176fb060996bcfc86b0446ae26efbc488909102fc10c979 WHIRLPOOL 1bd35ac39366fd13192e4a6a177280727bceb2f5f12ff684a288725954a29a240f2d264c3ef2ca38fa3e133063cdd943cce1d0f493f0f8ea9a621833c8f0031b
 EBUILD netbeans-platform-7.2.ebuild 5432 SHA256 227add7f41117667d8487f2bf8eb846c21529e7b2c49dac46e4b3b33062f69b0 SHA512 e49958f21358fe9689336d5cd5edbe435d0a2fd12c315174dcb408bf6ed4e6515d39d458554fb576c342a43f0af50c327bada8fa0b2eb485e14c01ddcdb6248d WHIRLPOOL 4f9101a2d5495fb6002b7791822f85091309c04d6c475060c116725f8da32f9ed270f0c27a9f6a2bd2aa0bd7417b18e9165d1feff7e98f6205bdafff3223e5a3
@@ -98,5 +99,6 @@ EBUILD netbeans-platform-9999_p20150730.ebuild 9244 SHA256 4c7b1a2af829ad060267a
 EBUILD netbeans-platform-9999_p20150731.ebuild 9244 SHA256 6d0b186af8056320b121a27e00eb6a5dbcc152a59c9d4cfd8282c47b17760b1b SHA512 70a797b3d42ce999ffb54089edb6bc24fa8104e7b5fcbf32127dc6ba09e3e93a60fd3a151ca359f4089a2ccc4329ad9b8c35cebcb070704d2fbde18ade459116 WHIRLPOOL 4db79eab85b92b27a68b73c17badefd2d4d86d656c41ccd75201e18466ebd5e82cec480bfc27a09076d9b7c658f8ddbe84b2686999b56fd09a4503ed16b95b58
 EBUILD netbeans-platform-9999_p20150801.ebuild 9244 SHA256 caa91f5b1f095f70a59d04a2e7d906972f950ac70200284b45f448af6a0792dc SHA512 217b26d160428affaf8f4058841ced8b6bf3ba86146ef34f9edab93d9b67aeb1b81a8309926e8c96fa3c222d8c031e5b5dd003023fb73b3576a1dbc33aa75370 WHIRLPOOL c20dab9577f4a5b5cc3e24b8ed7e0fefd13ea1b7c5a8ab670ee05c4643f638331f3ff9b025d144e3406c2b64b37dbe0ab3dab2d7a4547d7250c5fc6c5f1533ad
 EBUILD netbeans-platform-9999_p20150803.ebuild 9244 SHA256 0910f8266f070af49f8ff6f0b64186f01d479eb95cb8e08aa21d6fc9d1495b74 SHA512 7ce1fcb4c15ec58f8ad9b9988adf8b8d9be3d97738ace47a5914641e2b00273c1936cb8f167c2f811107fa7dd202b66e78254efdf14b01740eca69272a1df901 WHIRLPOOL 8452273c0a8ed71b94f8337cb5fc1a83dd8d9039c5d34c8df11b93665576589f657908cdeb9f2ebb881008aa6f191c94675b39708c4f54cef4328bb3627460ee
-MISC ChangeLog 177679 SHA256 36c180b3c114697b77b7a4064097acdb2dcd46b71c33d55f72eea89ccac1fa26 SHA512 bf806d6b8b0164044cd0c8a31dbac2919b61298c72e5100889d56ab72eba9306adaaa3bde621740c115fcda1bee92e3d3dfe0f2e68221040999f11192fb574c5 WHIRLPOOL 77e610ccb6190619a39f3ba457602e7d86219db9ca7b34be9202269a4696c431a0061a361efa3124815595fc28ff724333f5c178feb3f35f6022fa3e448ab7d1
+EBUILD netbeans-platform-9999_p20150804.ebuild 9244 SHA256 2df8e602aad108e3441e511f16505b3f37ad99b7396cf785c2eb5eb69b8b444f SHA512 81cbee251a6c16d7cadc164f06790d8207a6328c45baaca8dd64a3d76049568b12eff0c83524b92d945f545a731e1680e5e0b17705e6b68fc1f2b59b6fdcb54f WHIRLPOOL e0a2b7780e053d2ec4d82e1cafff5259d05dba48e3994e03ba809287cf8983c49841d4f0299e01950151f1081f06819043b9c06a6f82fe7191c314eb41d861a3
+MISC ChangeLog 177857 SHA256 96853e46e0bc7bffadd927a31a72e8081a4fdedb5e0dce99afd4c1ba7b76ab2f SHA512 5611699a909d0578b2ef57f3e38258b8b0b3d2e9449e10edbfdc0e026a12b17977f943cd6a4edf43860414b6b5ea33042cb76a6bd3198777e9be551526005b0e WHIRLPOOL a07bd5f3225fbcc76db3333fa22f4d6a9e68a527037d483bf667f291751068619a08b4b6a533c570d55695163e8f3746973498bce92c4114daff32762a14e362
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20150804.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20150804.ebuild
new file mode 100644
index 0000000..4f0a741
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20150804.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-04_00-02-28/zip/netbeans-trunk-nightly-201508040002-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/B250509C67194E89C3A27F96933DB7EB0E027E56-ko4j.jar
+	http://hg.netbeans.org/binaries/E556F74DF0942B304F94D9F82CAA8102FED6356E-net-java-html.jar
+	http://hg.netbeans.org/binaries/C74AC1ED160379872826FDC4A3C0CA924A3A0A83-net-java-html-boot.jar
+	http://hg.netbeans.org/binaries/03FE10857B0689B1F98B8D96DE87E80DF5D87A69-net-java-html-boot-fx.jar
+	http://hg.netbeans.org/binaries/31C9329E78A222E38CB86716ACFCEF81EF0BA1FD-net-java-html-boot-script.jar
+	http://hg.netbeans.org/binaries/24ED356FF3C72665CB5FB972B428824FABBC1987-net-java-html-geo.jar
+	http://hg.netbeans.org/binaries/432EDFB05C0F44E6ADAC4B1F3E08C67D1F52FB4B-net-java-html-json.jar
+	http://hg.netbeans.org/binaries/A7B6C3470DB8821A3587CE04844FF504A7C62354-net-java-html-sound.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}"/B250509C67194E89C3A27F96933DB7EB0E027E56-ko4j.jar o.n.html.ko4j/external/ko4j.jar || die
+	ln -s "${DISTDIR}"/E556F74DF0942B304F94D9F82CAA8102FED6356E-net-java-html.jar net.java.html/external/net-java-html.jar || die
+	ln -s "${DISTDIR}"/C74AC1ED160379872826FDC4A3C0CA924A3A0A83-net-java-html-boot.jar net.java.html.boot/external/net-java-html-boot.jar || die
+	ln -s "${DISTDIR}"/03FE10857B0689B1F98B8D96DE87E80DF5D87A69-net-java-html-boot-fx.jar net.java.html.boot.fx/external/net-java-html-boot-fx.jar || die
+	ln -s "${DISTDIR}"/31C9329E78A222E38CB86716ACFCEF81EF0BA1FD-net-java-html-boot-script.jar net.java.html.boot.script/external/net-java-html-boot-script.jar || die
+	ln -s "${DISTDIR}"/24ED356FF3C72665CB5FB972B428824FABBC1987-net-java-html-geo.jar net.java.html.geo/external/net-java-html-geo.jar || die
+	ln -s "${DISTDIR}"/432EDFB05C0F44E6ADAC4B1F3E08C67D1F52FB4B-net-java-html-json.jar net.java.html.json/external/net-java-html-json.jar || die
+	ln -s "${DISTDIR}"/A7B6C3470DB8821A3587CE04844FF504A7C62354-net-java-html-sound.jar net.java.html.sound/external/net-java-html-sound.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/ChangeLog b/dev-java/netbeans-profiler/ChangeLog
index c733144..e856db2 100644
--- a/dev-java/netbeans-profiler/ChangeLog
+++ b/dev-java/netbeans-profiler/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-profiler-9999_p20150804 (04 Aug 2015)
+
+  04 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-profiler-9999_p20150804.ebuild:
+  updated to the latest sources
+
 *netbeans-profiler-9999_p20150803 (03 Aug 2015)
 
   03 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 12353f1..42d46ef 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae284
 DIST netbeans-trunk-nightly-201507310002-src.zip 208736792 SHA256 f2794218686a678f2e826bb542663753c97f1b5cf839657ed6540b36d85e0eed SHA512 31cab9432e2668d4a90c99e561faa6a78c89210bd76625e4274c45ff634783967e9170bbd504e60fcd08df88c57b57f5c357f30c9c8dc06d6d0c0ae72f3ef0a3 WHIRLPOOL fccf16a822b7d43c1dd709c2357cb2fa6ec518e291f4f306c5c2aa4838f734ef9d2c800795dde592d17b3685826e00d26611e8b3cc4c68e6ee5332cff9aa7129
 DIST netbeans-trunk-nightly-201508010002-src.zip 208741865 SHA256 2ade7e4e9f2b80801888cd2281c99f5a3236ecbe0ea86d58e12224922ebf3f32 SHA512 25c2c59cb3c4a636dc8fd9d366017faa24e23b3c0c293a39f07ce889cbed199994f2e3ddb526f371e35a1d93a1baf4380ddf9e9ed8df8050808327351ac9de38 WHIRLPOOL 161e4359caba6c0248bd91e3ab17c78198b160e3317a6a20d12a5f964a9f8a3aa0aadd533fdc5e72d752e6d023637ce67bd38ea7de44b8525ea79b3aa321301e
 DIST netbeans-trunk-nightly-201508030002-src.zip 208748030 SHA256 933445356a68c17218a1e5d047568b7493208f5e4ac5cb083b6c0c840080e08f SHA512 000a443f1e02911e29996d0ab6021863faf1ea3649cb71dff7df5c262087dda663d4d670f64a238df86220fb1bf0fb713a990bd78671077ac86d5e0c7d0a52a6 WHIRLPOOL c71739d059f35e7f3f6b301f7291f8ddec3d286eec918a18f9ce924068f1ff84a3138c50f5c59d4efb297b5aa8c748988c6695656deb47a4fe49fcaf35b86bd3
+DIST netbeans-trunk-nightly-201508040002-src.zip 208761490 SHA256 b001f001aff1c4a6e29cf289beeefea7e766fd278a7144a028970bd9b65b0459 SHA512 87a1c41db0c76a01150c08247dc76f397e0e9ac2d87ff3fc5a6f7d91265812bc8471ae87edd781ea2518c8b47f48ad374b4fddccb38ba1ef888e001c3b295224 WHIRLPOOL bae5b1c4f71cb87f223d8232c29da2fdfc3a3482db42cd3783f2c249aeb7c409f2b40fe815e290006797307a5ba296316f21a44988cb098659b6d1969359c371
 EBUILD netbeans-profiler-7.0.1.ebuild 3222 SHA256 b1bab800a27c30aaea26b8ff5ab21abdd1bec16b9890133429eca9ea77c018fe SHA512 d6198f44a06561b7e2598fdd6a37f8a3dc13c38f63dfbf6a86a083adbf71e9c62af87cb4e1b5b8dd2dc99feeeb99a7afcbb8f7747c378ad92c71263cc91a6c54 WHIRLPOOL c62613f511636b1f0393ac32c6b50641cdf7df9f9fdc95fd5acbe1a602ffe42fdabb556f989552b05b0607a5ad9d324a2019440c3ae66c50995ef3fc8775f385
 EBUILD netbeans-profiler-7.1.2.ebuild 3231 SHA256 94d87bf6f86add3bdc27f9f20084f35fe584fc2bd697acafa8c23cce16a0d1ee SHA512 dcc8da918a6b6e07ccae513fb4296d16891e205b49098fb8269d16beb9b1367b1920797cc78053b83f4321c1b69faa393365265c72213bb2abfb9d3f84f66319 WHIRLPOOL 18325a1df836e7242838920483c41d43f37b9dae8322d36a2a562b414baa0dc76971f581204ce76a6d64196dd60643089e8704da69617590cda61ce54ce82e8d
 EBUILD netbeans-profiler-7.2.ebuild 3214 SHA256 ddcba9ba672ad566ef256538fc8631ae691aa7c6574269199f26df5382c37f4b SHA512 1bb7eb95381861b8265ab366fe3c7a9b99971d1c4600eb6c7bffb521f4cebb32bcf3d662f82c811d47fe95e77cd39e48f3665f0fcabf9145eb171c2746d89684 WHIRLPOOL 7f74c2be9ec4e7ff419086f1da3b1a12b1c187102def004316ef89ed28f30da62542ed3409a51473a8d9d68d18a30de36b1d0307cd8eeb7e580668fe896c5aa5
@@ -72,5 +73,6 @@ EBUILD netbeans-profiler-9999_p20150730.ebuild 3478 SHA256 6cedf01725b36d273acbf
 EBUILD netbeans-profiler-9999_p20150731.ebuild 3478 SHA256 0cda1df28839ad19e60f80856be8e94168c6f43ee56536d1b366ca7b3804f1f2 SHA512 69e9e4abacee44cff32164248268de2d4c6ad0e636050842be3633bc706210bf8261ce5a604652cd4f383ce73dee2e8717e12f6c8743d9ba4f40771927c1592b WHIRLPOOL 000ecfa2c2ad880ae3fbd56e61011e50a46ea4a9ee415499f2f3c89c10650a496425704e382971acb8f053554fc71388850f3ef8d8267ac73d9966c590d62276
 EBUILD netbeans-profiler-9999_p20150801.ebuild 3478 SHA256 fa737f5ff1cd24e350fa6a592faeb10f982f7aa8355ce7cf5006a8249b31e9ed SHA512 f6c907fa15a64b6e29fbb6713a4bb7257708167fb7e4fa2170241f1146a03a5d0832d06ac4029d51a645d44b4763c89bef931d5bca5f257e9e21a633d769534e WHIRLPOOL 2f417f75b1669a1345fb56bf12c5d403940c24478345f2777c58d11c30f3b066e348a5957eb05cd2d810c4088d795d02d34a43685e642e6c698f500510908459
 EBUILD netbeans-profiler-9999_p20150803.ebuild 3478 SHA256 455148003d67eaf91b46f01ffdc23604494877f767698d6f3fc1d6a980660b1a SHA512 c5595bc96b4d85468d43ddef85aee5045936f053998d6f3d5aeaf0649ea84cfefcf9439a62fb3a7b1b923d136279ce5a8bef1623e9c357d8f546d63bffe837ce WHIRLPOOL fb185ea142eed9efb8a57747b3a1ffde38032e2954a1ff5605930d8e9f48d611e855df4ffb4fb360fcd55368b2ec911b707ffd967e860b8e94421c4749207e29
-MISC ChangeLog 177140 SHA256 7651d66aecd25816c158d7b9924568ebc0f262c011fe6043acc049e2395f282d SHA512 b23762b48793efb3e4c81847c6fb16b5c2895d1a2b020d9cb0917d089f66a3b2649e6a881222c4c9244f2fd310bdd7a44e8c925766fd49e4a20f378ffbe81e4d WHIRLPOOL 38ecd9b8b21a580baee3e56f34e6de4c0d956e77b6255e437aa59015487729d2a56c71c15983cb0148ae2d885cfe7136272883be58bcb2e6539dc92d800cc8b3
+EBUILD netbeans-profiler-9999_p20150804.ebuild 3478 SHA256 2bc6d4b8f610bbcf6f7f0967c404031bfb53a65ef76dff6ea4b57fdbecfeb799 SHA512 1797a1ffbf8a2f9f6255ab97f031d9cf170a7540073fc0bdd0338fa03f6a40f50fcb412b76b956ae00ca582a8cb65b844f04c9ffa88121de7fe905c19b7e40b8 WHIRLPOOL bd3b895d16911ed55635207471c85e34320a28efab52b40b0884f41914db4dfe399bceea4aa62287b895376c00c8937c413f6b525f1e005c7c338696362ff90d
+MISC ChangeLog 177318 SHA256 eb244d6a9ab49c1c0f3901e53af4982cc208898d021449b945f03679fcdc8a9f SHA512 55bb51026346ef94820bb7158390a37405fdd267607cefd82003b3f1378d7d68bd353f2b1a185e3208edff801088654cd06c339cec6223c0c4f4bd8cd01fd190 WHIRLPOOL 3d67d2ca00352443ec4f7d9db9abb12cdcef042873636dc47914170ac42a13d641a1916d70065893585fc88d3678919081036718b2ab9b12299a35712ad302d5
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150804.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150804.ebuild
new file mode 100644
index 0000000..a8c5e0d
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150804.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-04_00-02-28/zip/netbeans-trunk-nightly-201508040002-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/ChangeLog b/dev-java/netbeans-webcommon/ChangeLog
index c9ad5af..9acf70c 100644
--- a/dev-java/netbeans-webcommon/ChangeLog
+++ b/dev-java/netbeans-webcommon/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-webcommon-9999_p20150804 (04 Aug 2015)
+
+  04 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-webcommon-9999_p20150804.ebuild:
+  updated to the latest sources
+
 *netbeans-webcommon-9999_p20150803 (03 Aug 2015)
 
   03 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index 4b4dd9f..8c73c29 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -45,6 +45,7 @@ DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae284
 DIST netbeans-trunk-nightly-201507310002-src.zip 208736792 SHA256 f2794218686a678f2e826bb542663753c97f1b5cf839657ed6540b36d85e0eed SHA512 31cab9432e2668d4a90c99e561faa6a78c89210bd76625e4274c45ff634783967e9170bbd504e60fcd08df88c57b57f5c357f30c9c8dc06d6d0c0ae72f3ef0a3 WHIRLPOOL fccf16a822b7d43c1dd709c2357cb2fa6ec518e291f4f306c5c2aa4838f734ef9d2c800795dde592d17b3685826e00d26611e8b3cc4c68e6ee5332cff9aa7129
 DIST netbeans-trunk-nightly-201508010002-src.zip 208741865 SHA256 2ade7e4e9f2b80801888cd2281c99f5a3236ecbe0ea86d58e12224922ebf3f32 SHA512 25c2c59cb3c4a636dc8fd9d366017faa24e23b3c0c293a39f07ce889cbed199994f2e3ddb526f371e35a1d93a1baf4380ddf9e9ed8df8050808327351ac9de38 WHIRLPOOL 161e4359caba6c0248bd91e3ab17c78198b160e3317a6a20d12a5f964a9f8a3aa0aadd533fdc5e72d752e6d023637ce67bd38ea7de44b8525ea79b3aa321301e
 DIST netbeans-trunk-nightly-201508030002-src.zip 208748030 SHA256 933445356a68c17218a1e5d047568b7493208f5e4ac5cb083b6c0c840080e08f SHA512 000a443f1e02911e29996d0ab6021863faf1ea3649cb71dff7df5c262087dda663d4d670f64a238df86220fb1bf0fb713a990bd78671077ac86d5e0c7d0a52a6 WHIRLPOOL c71739d059f35e7f3f6b301f7291f8ddec3d286eec918a18f9ce924068f1ff84a3138c50f5c59d4efb297b5aa8c748988c6695656deb47a4fe49fcaf35b86bd3
+DIST netbeans-trunk-nightly-201508040002-src.zip 208761490 SHA256 b001f001aff1c4a6e29cf289beeefea7e766fd278a7144a028970bd9b65b0459 SHA512 87a1c41db0c76a01150c08247dc76f397e0e9ac2d87ff3fc5a6f7d91265812bc8471ae87edd781ea2518c8b47f48ad374b4fddccb38ba1ef888e001c3b295224 WHIRLPOOL bae5b1c4f71cb87f223d8232c29da2fdfc3a3482db42cd3783f2c249aeb7c409f2b40fe815e290006797307a5ba296316f21a44988cb098659b6d1969359c371
 EBUILD netbeans-webcommon-7.2.ebuild 2665 SHA256 9328ea550dfeca5be5c2b03aa5f512d451f1673e49a40994155fca0b2fb2f79d SHA512 d8b80b79e78769a70d01605a79a8a91f7e839d4138b4cbf28cafca6f56ae3d7003c2f5f40aff77bbe3f2882f43a7d7dca3f0428f0f2723a42ae5b49e4c71ffff WHIRLPOOL 31254cbd2fc6cfb2d1bed4d22958595dbbf73032439f19e684463efbe466ee80c144f77ab00ced7a07815b1cdc1d45a87ceda83e7a2fd20ac2ce65e45d30a093
 EBUILD netbeans-webcommon-7.3.ebuild 2986 SHA256 327c0a73fb20778d9fbe4a12024fa065e4102a7aff3fcbda7448874656a46420 SHA512 3d270e940424b3bcdc8c7f8ff2016d33eb55420ac4037f4e406b688c2acea1b07a04625772265ac293d80c0d1afe3bbe6f865051ed9234b700619bd0781d8b39 WHIRLPOOL 5bc288949ed3aa9c3c4cd4cd33b817fe317754229ad30e80da8cfea817bfb77e988a1d6d3280aaef90619968e0309fad212deff0f7970f04438494a893a30a5b
 EBUILD netbeans-webcommon-7.4.ebuild 4727 SHA256 54a0b63527001da34a21ae3ed69c2cfbf9a446ee69bda4bb6ac5ebb939ebb68d SHA512 96895c972cf7092426ec8bc06dccc6ab4f33334da4e67fd4da01e586801110bda8d955f2f29ecd93b8bb58ae64c4af4139e9954a784c10dec925e2beaeab2394 WHIRLPOOL aa7b3b59d315bd37553052470b1f56f435979569e5ef033493cf6f93c29827f2ecd30f6b874f07a0cd8824469c6546982ac3ed360bf3b6cbf211d95943a3398a
@@ -76,5 +77,6 @@ EBUILD netbeans-webcommon-9999_p20150730.ebuild 4997 SHA256 b8f8c9af064a8c03f3f2
 EBUILD netbeans-webcommon-9999_p20150731.ebuild 4997 SHA256 8b5a4d28edd985cddcfedaa17ae86bdba271b7a7a1ec7e80daaab38d27403cbe SHA512 c1a2a85d9a384fe7cfde5d5dad44f0987fd7034402a55ed62eae604fbe8b30147f571820cd40e70194dc47bf15b5723fbc455ad74ec62ed878eb6fb8eb05bb5b WHIRLPOOL c1f7e0cc8fe16a0097ee439e32982cc29ebf659c81d720261449e2e7504f3d106dccde70a29050a110f78f66ef10f7b8aaacbd09dcbfc553ae98904dec5c8cc2
 EBUILD netbeans-webcommon-9999_p20150801.ebuild 4997 SHA256 0babe71313353859161afbb67bbc1771e046bd3b8f9a61532014615acaefc73b SHA512 d4cbaef5ca086761571126f9fde84f4ae3d85f7d62bddf0c91f7efd75219e9f3a89d0e7eefdec16505f706abd3ac238d3403e88431db86030db40850ca59157f WHIRLPOOL 0af94d4b2af4c854beee8d421f44864084296bba6b9f7af71a799a6c05124629a7dfd277fef1d0beb8b40cff0ba012090c80897c8dc7a3021a27c611558eedca
 EBUILD netbeans-webcommon-9999_p20150803.ebuild 4997 SHA256 05fc6b38b7a2f40baf7aa2a54baf85dc4f9e78f4894279dd30a1681f852ac6a3 SHA512 45e34f542c769c1016565439bd825dda57a40f2cf25a6bd27974313bffb8f0dc60bf514e2d346892f25a8f21a9258837d612f323a984e85709dc434b5ffc4a08 WHIRLPOOL 7e696fd38247c6d205db8f66175a53d317b4a0cdb1149735abf1a7c2241ed52e86431e462beda2d2204e136e9857c90ec43cc42ddc6510435385c17eaf6cf3a6
-MISC ChangeLog 150335 SHA256 528a6cf208c714018e6997a8cf52fc5cd99cb6b2f31865ebb0c62118fee139c7 SHA512 c473f535c28d68f49e274b02a273acd660a57bfe8608202a2576a162aa3ce7a7e1fc62ab61928f102a82d3e85b0cec884a2672c9082e7e79760b461641ee8404 WHIRLPOOL 8d320fe8b114735889cc9a0202ec931186204566ac0b4d85cbe59dfa89fbb1b712c6ad914b4cfc0ca3b7c3018cc01974297eeeb8265b8a4f255c3c6414426567
+EBUILD netbeans-webcommon-9999_p20150804.ebuild 4997 SHA256 2ee56e7faae37fbdfa3eb305fd1a5bf11528f825cef20134fb3b7f4a427a2f82 SHA512 95c62efe6b7faef971a38056fea116a5ff30870395d89516e780dfb2da3324f97581ed1bee3eff5512eff1afeeb21e196352c113d8e0d0dfc26040fca8172fc6 WHIRLPOOL f8cdf66b8faaddb27ea44df8a7047a34d378378d2e36dd5f460d624a0f5df95c6f59a00548a76796816824a82caab5ec05b480fb53c7ce629ec2034375b5217b
+MISC ChangeLog 150515 SHA256 d5d6c756b28fd7cfc9c0ea8eb5e35e765e4005551308552cc8a9c1e973a60e8f SHA512 94376b516ae375ee9821c0d0d94bb7ceda1612a7bf9b12c916a9694c1868409de97b54e5c6ad7d9ccc118e34ba8f7e668278be9b9b55693ddd6e82ee17cc8a69 WHIRLPOOL 0a4fc6eb4b5f2c98c716a8639cec659147a91eadd6f5296a4e3d0d0150a0bb7c9ce930848cffc41f7e7fa95152f61034f8622a9c87436a15f26b67c2ef05c210
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150804.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150804.ebuild
new file mode 100644
index 0000000..99d8e69
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150804.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-04_00-02-28/zip/netbeans-trunk-nightly-201508040002-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/ChangeLog b/dev-java/netbeans-websvccommon/ChangeLog
index 4a08da7..f7c20aa 100644
--- a/dev-java/netbeans-websvccommon/ChangeLog
+++ b/dev-java/netbeans-websvccommon/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-websvccommon-9999_p20150804 (04 Aug 2015)
+
+  04 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-websvccommon-9999_p20150804.ebuild:
+  updated to the latest sources
+
 *netbeans-websvccommon-9999_p20150803 (03 Aug 2015)
 
   03 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 599e216..fe35c4c 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae284
 DIST netbeans-trunk-nightly-201507310002-src.zip 208736792 SHA256 f2794218686a678f2e826bb542663753c97f1b5cf839657ed6540b36d85e0eed SHA512 31cab9432e2668d4a90c99e561faa6a78c89210bd76625e4274c45ff634783967e9170bbd504e60fcd08df88c57b57f5c357f30c9c8dc06d6d0c0ae72f3ef0a3 WHIRLPOOL fccf16a822b7d43c1dd709c2357cb2fa6ec518e291f4f306c5c2aa4838f734ef9d2c800795dde592d17b3685826e00d26611e8b3cc4c68e6ee5332cff9aa7129
 DIST netbeans-trunk-nightly-201508010002-src.zip 208741865 SHA256 2ade7e4e9f2b80801888cd2281c99f5a3236ecbe0ea86d58e12224922ebf3f32 SHA512 25c2c59cb3c4a636dc8fd9d366017faa24e23b3c0c293a39f07ce889cbed199994f2e3ddb526f371e35a1d93a1baf4380ddf9e9ed8df8050808327351ac9de38 WHIRLPOOL 161e4359caba6c0248bd91e3ab17c78198b160e3317a6a20d12a5f964a9f8a3aa0aadd533fdc5e72d752e6d023637ce67bd38ea7de44b8525ea79b3aa321301e
 DIST netbeans-trunk-nightly-201508030002-src.zip 208748030 SHA256 933445356a68c17218a1e5d047568b7493208f5e4ac5cb083b6c0c840080e08f SHA512 000a443f1e02911e29996d0ab6021863faf1ea3649cb71dff7df5c262087dda663d4d670f64a238df86220fb1bf0fb713a990bd78671077ac86d5e0c7d0a52a6 WHIRLPOOL c71739d059f35e7f3f6b301f7291f8ddec3d286eec918a18f9ce924068f1ff84a3138c50f5c59d4efb297b5aa8c748988c6695656deb47a4fe49fcaf35b86bd3
+DIST netbeans-trunk-nightly-201508040002-src.zip 208761490 SHA256 b001f001aff1c4a6e29cf289beeefea7e766fd278a7144a028970bd9b65b0459 SHA512 87a1c41db0c76a01150c08247dc76f397e0e9ac2d87ff3fc5a6f7d91265812bc8471ae87edd781ea2518c8b47f48ad374b4fddccb38ba1ef888e001c3b295224 WHIRLPOOL bae5b1c4f71cb87f223d8232c29da2fdfc3a3482db42cd3783f2c249aeb7c409f2b40fe815e290006797307a5ba296316f21a44988cb098659b6d1969359c371
 EBUILD netbeans-websvccommon-7.0.1.ebuild 2692 SHA256 a18cf7fe0a1e38749826cb12651be06c210b038be50117647496ee6cbd184cda SHA512 32b32894713d7235ebd03446c5c411d22eb8701b96e3d3ac54eca78b2abc833babf279085cea3b74bb7bddc6d89a283a21c58a0b0462042ddd10e22dfcadeb84 WHIRLPOOL 59c18168245767acd1f8e53046f8942698237aa6fd903a669c626b7f17cf3d39247b7ae57f2984562230267885a4b6a62be43dc8a330f1dfeb2cc7acbbd7d3c6
 EBUILD netbeans-websvccommon-7.1.2.ebuild 2701 SHA256 3b2a1cf0d32db3c55b66d1c6b8c4ae2ad5487d3fdb27752468ce5c860f9b9515 SHA512 b9be64755f00157c2d6984887b8c0fdc1e34470f21df1fd72b3e399d3ec894af01c9b79fd604778213ac2086a6c96bf66366e8c2c8bf97f7fee23d16ceb36974 WHIRLPOOL 91559de8c8f6391c3c69888854778a91a1a7e0052ae69eb9762bcbd64d8bc5587fb84ebb55d7d0375da5a7855aa8672abfd035b6a38b3eeb5c23a4cd59b3cdce
 EBUILD netbeans-websvccommon-7.2.ebuild 2684 SHA256 8bf8cad1e0469713c63280620fed089600191230f501a78b834b010f8fa9b3e9 SHA512 fe885f92a7c6cfac532c8e40e4df6283253c43294e9d82ee4d0d070425496eee3792479c268b46bf1fd484f753ca1f21e7ca38a5d71816b6d4fd219082e8e276 WHIRLPOOL 9d2d622d4a800470c874d8751e9c2055e0a4ef72ad01a01aefda4e95a7f295d55fc95fdb55fdd1f631212e1f610bdc7a6b4ee631b92492bb85f73b0d9fb4ba26
@@ -72,5 +73,6 @@ EBUILD netbeans-websvccommon-9999_p20150730.ebuild 2727 SHA256 8d99e2f17a20dd763
 EBUILD netbeans-websvccommon-9999_p20150731.ebuild 2727 SHA256 f4990095d5ded72f92c8dd78adbff2e4ae71103fc5468690f74cf2b3241628db SHA512 707b87df31116d4d9d1d1da552c15a9e41b6d3e667b550de966829b7716c4af810c061d411a31f2d385e7f54973a080afad280c20c951dc0c4ffbe0916aa247a WHIRLPOOL 0432cb9405cb7f43a166e4e12c800b659ec6ea79d8f885c6e28812c3a9e9cbc8bb65e191db1c8c459be556cc0ed794646d593727f56faf4f541b3b527ddcb9e5
 EBUILD netbeans-websvccommon-9999_p20150801.ebuild 2727 SHA256 bd0b5d7b7e290a84dbf5ca0c5bd1abd462fa326ef7a0377bb8202c58f4f0fe0e SHA512 7cb64f1ce4244a692d7eeb72bce2c737f91aecfef2ea6d9dcb89f2360fdabe741ab49e281b560b42ff49201a37ef9be723fa20478f7ef5b82bf2cd6e89c18543 WHIRLPOOL ac19ebbf397779b57aa8ee177bdcd49e953afc8239b193c421e4e13e6320ebfa51d8b8813767cca08c561d4f16e7de8b6086642dceeab8b2d5a23cbefe815a21
 EBUILD netbeans-websvccommon-9999_p20150803.ebuild 2727 SHA256 0b4e1060cf47223a7f9292d72d097979c98bd17e373390f605c27bd9c9c6f329 SHA512 8cb0e719b3ab38e6ad534e2cd9021e0c5572943506e89f438b4832069cea730c0164fe0a41e58db8c5d91c87881cd5623057a2048eb8f2e6da15756ba3589983 WHIRLPOOL 2bef19eee9fee2999101607955a28e6fd175444fb7679932090c1b6f4216f6b846bce7d48d7d63bd5be0824408a49492c026e96b94f2fa417fcf1977c615f6ef
-MISC ChangeLog 185838 SHA256 50acd7c2f74ddf179475ef56477708052eb358eb1bceacd281bc97725339c637 SHA512 d44a4e436ee08952f264ae34f7775de3438f6eb25cd015dcb504e8934d10903b7f7cc0205621d91c5b6d9502132e3c4237b2ea5bbfeadfb71191928bab693dc3 WHIRLPOOL 19d6a5c04f6d0926d5cc459231f635e9576ec191cd3d90e8bbded3cd7d61fdb04e244364792fa6b4da08edda641f7b853688d272e9fd5d2906a0eafa14013c0e
+EBUILD netbeans-websvccommon-9999_p20150804.ebuild 2727 SHA256 ad28ca1da8df543c6930499f238867a77f80deaa35bdbd5dee69c046320d8e3d SHA512 0a21f5a876cd7333b79f321baa4f363f48d3b15f68ad6267485ea0961a2f16e9e1ed94fa72fbd126ea7434050109f8d301b93a93f0b004d44fb127f8e9c96fd0 WHIRLPOOL cee0517d37db8a7cae77102ac1afb3645aa7c636696f94b2f5f77078357642d3db2c86e2dbff20a86f3d2673d538f6ef06e2de6366fdee59c3459f918ebfbe7b
+MISC ChangeLog 186024 SHA256 89f84b11445f14657a9d1b5dea0b2bd3843187fbbae25b7b1e6c0d0c2a4fbf48 SHA512 18aa9cf973211961c93a9125cc1f3de7d34a1b6b9e0381e97573af2d2dc84a9490a3ecf89f12ff2ed79dc82d3474135624477be5d7cc6d50232ef5d8f340a815 WHIRLPOOL 95bcd482e8542c86d7b128bce5d89357cd217363eebbc58d8486e6a225f0c0a7101d4c9de15a80c73674d744ad3a9b6be2a42d1f76cc5090c504ec424f535665
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150804.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150804.ebuild
new file mode 100644
index 0000000..e63c878
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150804.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-04_00-02-28/zip/netbeans-trunk-nightly-201508040002-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/ChangeLog b/dev-util/netbeans/ChangeLog
index ec2d94f..db428d0 100644
--- a/dev-util/netbeans/ChangeLog
+++ b/dev-util/netbeans/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-9999_p20150804 (04 Aug 2015)
+
+  04 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-9999_p20150804.ebuild:
+  updated to the latest sources
+
 *netbeans-9999_p20150803 (03 Aug 2015)
 
   03 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index a892c8f..7c83aa2 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -47,6 +47,7 @@ DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae284
 DIST netbeans-trunk-nightly-201507310002-src.zip 208736792 SHA256 f2794218686a678f2e826bb542663753c97f1b5cf839657ed6540b36d85e0eed SHA512 31cab9432e2668d4a90c99e561faa6a78c89210bd76625e4274c45ff634783967e9170bbd504e60fcd08df88c57b57f5c357f30c9c8dc06d6d0c0ae72f3ef0a3 WHIRLPOOL fccf16a822b7d43c1dd709c2357cb2fa6ec518e291f4f306c5c2aa4838f734ef9d2c800795dde592d17b3685826e00d26611e8b3cc4c68e6ee5332cff9aa7129
 DIST netbeans-trunk-nightly-201508010002-src.zip 208741865 SHA256 2ade7e4e9f2b80801888cd2281c99f5a3236ecbe0ea86d58e12224922ebf3f32 SHA512 25c2c59cb3c4a636dc8fd9d366017faa24e23b3c0c293a39f07ce889cbed199994f2e3ddb526f371e35a1d93a1baf4380ddf9e9ed8df8050808327351ac9de38 WHIRLPOOL 161e4359caba6c0248bd91e3ab17c78198b160e3317a6a20d12a5f964a9f8a3aa0aadd533fdc5e72d752e6d023637ce67bd38ea7de44b8525ea79b3aa321301e
 DIST netbeans-trunk-nightly-201508030002-src.zip 208748030 SHA256 933445356a68c17218a1e5d047568b7493208f5e4ac5cb083b6c0c840080e08f SHA512 000a443f1e02911e29996d0ab6021863faf1ea3649cb71dff7df5c262087dda663d4d670f64a238df86220fb1bf0fb713a990bd78671077ac86d5e0c7d0a52a6 WHIRLPOOL c71739d059f35e7f3f6b301f7291f8ddec3d286eec918a18f9ce924068f1ff84a3138c50f5c59d4efb297b5aa8c748988c6695656deb47a4fe49fcaf35b86bd3
+DIST netbeans-trunk-nightly-201508040002-src.zip 208761490 SHA256 b001f001aff1c4a6e29cf289beeefea7e766fd278a7144a028970bd9b65b0459 SHA512 87a1c41db0c76a01150c08247dc76f397e0e9ac2d87ff3fc5a6f7d91265812bc8471ae87edd781ea2518c8b47f48ad374b4fddccb38ba1ef888e001c3b295224 WHIRLPOOL bae5b1c4f71cb87f223d8232c29da2fdfc3a3482db42cd3783f2c249aeb7c409f2b40fe815e290006797307a5ba296316f21a44988cb098659b6d1969359c371
 EBUILD netbeans-7.0.1-r2.ebuild 6736 SHA256 e808fba2ddb516270d93b5cf67cff60d98b37ca58a158878f2e3b3ad696cfc82 SHA512 653fb585d9eaa20fcf88d778a7f34d63c9f29f2af2153a432fcab6d977ef9619c699b19587a48b148ccf717f4b31a43859b81cff80d5d84ad273c5fa16e8f565 WHIRLPOOL 257f2466c3ad198a05db9d5e377cad2707f8a4daf1f421e516d7435670a85fd4bb5f6b3ab657ebda8cc23937e1b4e1f4acce8cccd85bccddc5a7b1f9abbde0ce
 EBUILD netbeans-7.1.2.ebuild 6976 SHA256 4222e248dfb664ccfea85d4938ad691d3685f32d8e9b33289d1dda088057261b SHA512 cc0a20bd542b61621fe08d5413611f7bcbbebf0c37d5f67c590c31324e74eb5594e72efacc86d843ff3abffc98c4859c2733c63ce6f993baf51e24d69197b64d WHIRLPOOL 30fb7b0cbf22fc39a8dabefd27a0073ce73e62ef082d55839fb7f815bb73bc5c3c24c3418ce175f355d7c64138ef7e9616da41c68b3b57a70353d16c6113daf7
 EBUILD netbeans-7.2.ebuild 7057 SHA256 29140b2779f1a24722499605101c286d05415b4f97d2363afedef711cc586067 SHA512 0776f530f9530c533b13019f7b34fc664990a16926bcff768d0a9f3b9035de82dcd2ed66425ad8da27c65aa69fe3e6be966e0a1ee1bc222949e5d42e14f7f7f1 WHIRLPOOL 9fcb95348171fb0bd8d794b80b51b2e3ce36fd84ccc81653bdd0172cbfa99791e527b33c895ebf7b4d81c228f17d4afab367eb55ceffe28df835b2d09dc8f778
@@ -80,5 +81,6 @@ EBUILD netbeans-9999_p20150730.ebuild 7216 SHA256 6a7ea3f6c1c5014f6d58ffe6acb1c1
 EBUILD netbeans-9999_p20150731.ebuild 7216 SHA256 aeb3458b2d66d1aa1f8a9458b1d1a023eeceaeeb55e374561df3c1df0c259844 SHA512 09867d773f8f6aa27871d650e1751b15571434843c84b85776285faf5e46bd113a60644586f0ac35ab969fa64766a802840a516387133c8cd6c3aac7a7f17e4b WHIRLPOOL bc2549b1562c8eaf6a6524051de25b4869e4564e1585eae5a218c7dd3991123af9ba106868e770566d8b2d91d73a1b6c210f62f71bed19b5936ca8dd31532ac5
 EBUILD netbeans-9999_p20150801.ebuild 7216 SHA256 b0369c1a5fddeb43d91147b9b4ed9378a6764d0d1e5b688a9181be48a88e2fab SHA512 022e55478764faaea17f815db1140b1f50f22938b99a5a13fb11b20db8ee3c8151a814cea01b0339797594d01abe141daaa74d271c77add89a1f49eceb7abeab WHIRLPOOL 0742a5397416fc2afa4640bc7dbf644b520b747c868c0632bdb1fce070aa2434b634c5970a5c5b16350db13b7c5b9778c8ead0d0be5e7fec52530e8c8a96651a
 EBUILD netbeans-9999_p20150803.ebuild 7216 SHA256 4eacdc7dc432c28af186bd513a896d98c3f3feef06e1f976a19555d8b3154d46 SHA512 67fe0b8c0db7276e5d16ade381f37186a5b2405ec6dabe41dcfdc8db4cb2d8d08ddc52af463d800adc390eac430210a16f87c1ae16b844ce89b15df3da33117f WHIRLPOOL 46ce3ce7c938fb53642a2c48d725c2ccae2a107f76012ca1d34822a915a6cf887ec2c0e66943a8ad7ee3f989f19f7dd540a26f3643482e123b503e479115f888
-MISC ChangeLog 157694 SHA256 6ddbbc0f606a4f808531583c390802abcb643882503637b591978be3b160f96c SHA512 04aa7097cfd454f6ff068924036fa658739efa70ea9ea18f64a6f0ea1c806d404a683da6462ce2abd1df69dd081e695df94801da067025cac66bfc3a39dc11b2 WHIRLPOOL 79ccc56db8c8301ba3af11348cf53d3f999964517a43b5bc2dd7ca20063a60fa2b7972ba8b6ceafb391bc757fe1d28ccbfba48c37868b5840d309308e2e049a0
+EBUILD netbeans-9999_p20150804.ebuild 7216 SHA256 4b6fce6e6afa6fc523b3861709e065c83cd3d5e12529cd68052ad6eb5b1ace73 SHA512 d90300dba4c6fa499badcd055455f0d6e0a429196298841b7ec78cc043a3b38a121c0a18be34246b658d70ef263784a79b5d1705f48c9f60cdabe359bfb1697a WHIRLPOOL d24fc657f92451b43851fa3d27210040c2108411a13c10ec297981e4c82f48b377759d77c2e17fbd3a345e03814bd2539f23c4d4a004ab6a3c7246de67e3d396
+MISC ChangeLog 157854 SHA256 1aae167c7f5fc118a5a79cff0d092200d03529170e4e918e821ba7242aad92a4 SHA512 e89bf6c51bdb2a190b20a56eafdbaa94f9ad0cc9d5f97aa57158285a593ad6bb1a53c138426c21329d378e60dcb97f6b4c7c5b09f418834053951b076b040113 WHIRLPOOL 55673fa0352b5359f5efd983a2030100d97d4b72c0fbd3f0d69db1a2a2ba9f4e7b63cfa1eeb6f1f6d615bcc8b88f7613d451d52ebb923afab659a796063b9937
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

diff --git a/dev-util/netbeans/netbeans-9999_p20150804.ebuild b/dev-util/netbeans/netbeans-9999_p20150804.ebuild
new file mode 100644
index 0000000..12e40e7
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20150804.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-08-04_00-02-28/zip/netbeans-trunk-nightly-201508040002-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] 4+ messages in thread

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-mobility/, dev-java/netbeans-websvccommon/, ...
@ 2016-02-02 12:08 Miroslav Šulc
  0 siblings, 0 replies; 4+ messages in thread
From: Miroslav Šulc @ 2016-02-02 12:08 UTC (permalink / raw
  To: gentoo-commits

commit:     1d62da15bb323d85a88de811dc3d7bb83a8b57fa
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  2 11:12:06 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Feb  2 11:12:06 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=1d62da15

netbeans: removed obsolete ebuilds

Package-Manager: portage-2.2.27

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 61bc6ab..011746c 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
 DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
@@ -20,7 +19,6 @@ DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9a
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 EBUILD netbeans-apisupport-8.0.2.ebuild 3314 SHA256 b68fe791f275fe4fcc8b00888688949b8927cb39db2cf9ad7860017c6d20adee SHA512 35c4bbcd34ec0eaef8a2de86c13333d2bf092db61af48558c3e173bb17dbf8fcd15001307bd7c498f4ccdbaa4277e1ee42ff0909af6170039165b547f646c383 WHIRLPOOL 206fe8d5f64e76827d3eb958a629ba087e8a16c2797752f5d9e62dff4166653677587a81be19e0a2c6adcf49292255d532e1f542c02550b1cf6ffd51467bde3c
 EBUILD netbeans-apisupport-8.1.ebuild 3338 SHA256 d249a09cd1a527bfc4f0dc87b1768aad9f05fc7fe7079fad0094c27d416d030c SHA512 47e5db58581625b23157ef7a7b6e340fce1327db85e015369ac32791178a0836af3348397ac6ff4439ab246170d3318c2062994c81019ff361084f00d432c9c8 WHIRLPOOL 8e379c9219b7730a15c10216bed00c3ec104f84b252d32da629f066095897398a4d8818e07cda5afdf94b115b97ead8de6a9529f38c81c1c41144067f119e54e
-EBUILD netbeans-apisupport-9999_p20151229.ebuild 3384 SHA256 a9e8aca349720d3269ba2d112180084112ea2ee7184043e7a9c31dbded2a894c SHA512 a3aeebd561b2e88ae1712e955a797a9e949646758ff5ac66a58dc432d9082270bdf72c866b7c76d767b6febc0ca636805ca82445e58641685d668cb44c20f8e8 WHIRLPOOL 24d00d4c926f4080ef38f75e8e93ef19b4fa0bef2155bd633e6b02f99613db07d74125a18e511eaebd10cb324d2f4b78f36377fd5ccef4384b81fb066cd84fcc
 EBUILD netbeans-apisupport-9999_p20160104.ebuild 3384 SHA256 1b7544b71eb8ca0b29fd04285cf3f1fd7a1b3ed24bee476e091d398e2a8af20d SHA512 f4937cd18f555b2e916f49cba0cf94ec26e0131ff840f52d61d82abb7496b74fd0693051770f6db41c2bb35bfb086cd2e63028ed77234f90669db1ed4379b883 WHIRLPOOL 13003602162a041610cc0448d4adeeef075c346b997c2f49b8084350ea63bb6ecc4e6f1c0ebaa699dd2cf5688e43d58575d39ac91d8bb717c83d41a0721b646f
 EBUILD netbeans-apisupport-9999_p20160108.ebuild 3384 SHA256 d8dc22131998f889bcca0e7b4e6d43b3ec298135e386d7f06883b5aa10c71c9c SHA512 289bae2cd42d587b2721a2e43d887055dd4f292b127b8f1a1424525fb42e755140968ad0c1c5a69cd15d989a5efe63c8cbe5c32a1babf705cd4288552ceba274 WHIRLPOOL 16169c9745087e1e7a336db58321bb406c9e9ad2ca69c3d860e9d74815c323116197db668c62d37189252806b3fc60f72c48c77e53ae0cd96acef6c349fd819c
 EBUILD netbeans-apisupport-9999_p20160111.ebuild 3384 SHA256 65e8ac7c05eec6a2d8124789137e8763bfc06c691bc7c1fd1674a17effb3459e SHA512 8b3b80fd87d07bc1cff7883c986a9aa1dd54f60a34d448e04a29f760d0b23295c9d120f99c2d16ba482a76a8ccd9e84500486dfcbb7a9e7a7868c62fe2b8eacd WHIRLPOOL b1a550ce648252e91082550c15e24ecfc842206c50f97372e50fc960475f8b65a68162ba8711e4e5ac0be9fbc7f1dba9931bfa8b337631c203baeb5bccdb83f4

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20151229.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20151229.ebuild
deleted file mode 100644
index dd1ceeb..0000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20151229.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# 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-12-29_00-02-04/zip/netbeans-trunk-nightly-201512290002-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 f26a5b0..7c0f819 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -17,7 +17,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
 DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9a
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 EBUILD netbeans-cnd-8.0.2.ebuild 4510 SHA256 0a9a4e58e28f395b5bcb017016b6ddb1b77afe393d0e5bd81cc05e3a32076c71 SHA512 2b1fedfe292fa140920fd11829e77127f9535e08b8307886accfa37e6d11195a1204e6b71b2640937da0711c3ce0bbf80c0eaa3c248a64fd61b6a3d99d5de14e WHIRLPOOL 10b1518360ade5d6f1f27c79a10f630b94a2ec5062e18df11f9828d4b374e6cbdea0b9f770e01c117ca90fa194dff9bd3be6a468075c2d35167fb78a7bb32794
 EBUILD netbeans-cnd-8.1.ebuild 4744 SHA256 e008e92761489558e039a07d4858b5a9745aa38c38c57668cba8b5f6a28dbd9b SHA512 724af3f292851fa1a04ccc95fe0a4f9d0fab5503ce31d2ff11be73779d67bd0f38835b334684f628f8eea2dde44543e6b872611b2bd6c01191ccfe26e69f4ec2 WHIRLPOOL 59ddd65a105dafeb8b783f457ec7a8c67a5a3aceb78ca60ac7c4f45f330b28b429ba6236a643ca0023189a9ebdb1ca0182ec0546943ec2494693859aa8f95515
-EBUILD netbeans-cnd-9999_p20151229.ebuild 4790 SHA256 40e984d3e7b16b22d2287dca20a7a19605f5ddc8db4048fa93459625dcd4c22e SHA512 01130cdd859af8a9af42940077931b3d1b71382ab406de5e566f305210f21c1c99e67d957c8f7007103388cea621db54958bd519ed56734fff8e813c6cf18e92 WHIRLPOOL 2495372543e121638a7a42718a37b9eb8ab8b6e2677a44921f0ab9f261075f455e223da621ef59a25f178ddfa63206bbc19aef908417d078bfd29f2e13697f50
 EBUILD netbeans-cnd-9999_p20160104.ebuild 4790 SHA256 6c50d15e2cd72a6d604d038d57ebe93ece2e574d113f73d534e6048e1ec515e7 SHA512 c5ba5a6786c08dae2a90d73b8e5adc769f09212532fe65ce78a7ad8fd285d74905d19889995a65e92416fc8d58940cff7fdcec89339047a8a2ab7efe8388e8bd WHIRLPOOL bf2f4243f17b042e9f6400873a3edb7c6f9a03acab3a7bcc97c793e6267a2cc2f4bd7eab97ece26cc3502d628b728a28b90f0f000d8ad7c9786184fc31859d8c
 EBUILD netbeans-cnd-9999_p20160108.ebuild 4790 SHA256 0e7eabbd12b9f3326d5b5cb240535e7ce9fcb916f2826f078ccac8a70b0b89d1 SHA512 bbeeae09cdfc68ef09452e0793b82aa259d5548663334d42c105da1ff76eb2169d57e3aa3857808b8fe3841c55466efc8c946db431612984bbe5ecb8f82ce751 WHIRLPOOL 07a7d7aebd2bd08fd1167cc9d00657a01987f328e44c7659936b6ab862d4b6ecdb015e3044a44b991545fc6634b75a76dd087ea38b986466f393f5f5b40e77c3
 EBUILD netbeans-cnd-9999_p20160111.ebuild 4790 SHA256 3c86c5a49c8ba8089e3df0531851b6605b5932171ae0d4dd03a2ce152e71a1ad SHA512 2fb21ceab1667e3e120d326be172becfe5df9a0ddfb3dc1193af33a66dc4b7ea675f35a7fe4510a1fdce0eac7a5a25f529ba2b7329b202a7a04cdd3e6df84b99 WHIRLPOOL df46145b7d690ac2aff13a41e23b8849d701a5e361b5e707c99feda72bc0c25ae4fdf2b624a3714bdd7bc6d1ede2a261a18adbafe21bb922ec6f611646824717

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20151229.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20151229.ebuild
deleted file mode 100644
index 4168420..0000000
--- a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20151229.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# 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-12-29_00-02-04/zip/netbeans-trunk-nightly-201512290002-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/BD0FF6016C9AAF367D5F01625AC4E2BDE75EB355-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}"/BD0FF6016C9AAF367D5F01625AC4E2BDE75EB355-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 ef0fdd2..dfee776 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -9,7 +9,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
 DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
@@ -26,7 +25,6 @@ DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9a
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 EBUILD netbeans-dlight-8.0.2.ebuild 2898 SHA256 08402481b573b90396431be03bda45904b2dd29f0086e09a111fe362e310c3f7 SHA512 3f6d6c9ea0043382562fbe47ad16e3273032407a74cb44ec7ff26736f96483835af4be8674361e910912a550b9fe592cc5a28c2b93b6b993076553195c35eac5 WHIRLPOOL 9d8706ccbc0d97b0f5d64ebf22c36316b08d8fbccd57408119ca5f5faef08c7f82677bf67488ff611eabeaa730e4c9a730c50966d94d738cfe79330ac147863d
 EBUILD netbeans-dlight-8.1.ebuild 2922 SHA256 f003a099e3f82f5ab53dcc56d86c00a662c98f47480feacac2a77ffea90ccd0f SHA512 94706ac4d8570deb8860236300cfeddfb2c3cbfd385ecb438a039991deeb018f292f6dbb2267d7c701b7f1b5b88d200f2c25696fb3204fcf205c15155b26d1fc WHIRLPOOL 1e44f40c8e2c03b7aa7385ef20a3247ea15a4d4705ce4b5f860bffe236eb578ab3d912f2cc2457e5906158ae747edc3b6b92463336c69af9cd58eca3fccb223d
-EBUILD netbeans-dlight-9999_p20151229.ebuild 2968 SHA256 850bfd5b4c690305c784f03103eb6546fe8c9d8580e06f145ffe2d5e04688df5 SHA512 c3df9e2f1d1ce75cdc0cd9374dc8fbb0b6430cce225b3ec40c36a2116f7940a10ba4a72a52cd2aec276727abb1cee47e7528f3d3ffde7151a5e76687f766fad2 WHIRLPOOL 3454d360a63354a2f66a2f0111689ea4480008d1b812dd286c54f46c8e40f4aeb01a144d820a3c79261d89997398639140b3c275be323a1514893e24142a2743
 EBUILD netbeans-dlight-9999_p20160104.ebuild 2968 SHA256 0100bcc27ac6d26bbfb248f08baf151f02c4259bb0e0323bcac6aeb83e6583be SHA512 7fcda8e5abef409491dcde6b2ed7ca4244f1a4316d871a0a1dd1ce77bc1ddd9800b08ad9b22df38dc7f84850a8df0b298642f5631e7e4e799273a5254040fd93 WHIRLPOOL d18ddd21053660c3f67dcf35f47426effff0ccda85c5e72e553b22a36b342cd875d95fdab8ce41e7e91ae9684ff164cebac535c693edef3693bf3f86fa346a51
 EBUILD netbeans-dlight-9999_p20160108.ebuild 2968 SHA256 27f08dfec6e4bb02cbef6a9979b444f0dd74688ac3c44177fdf5444f2909a3bd SHA512 29864e22f61edc575e0bf79687f1857ac57bdd92d185ec72a79418204ef37a62c5f23e3880295445417ebb39c38905952a43f5c3df20196b0e22b3a26469bb2e WHIRLPOOL 6d02dae9d9cfbb27abdde72759982c089f6c6d2426062e215577ac77dada0a5c2e373c417a7517097a75c45e1d9cb6a09664d109d7033c67c92e59c68cc1f8f3
 EBUILD netbeans-dlight-9999_p20160111.ebuild 2968 SHA256 751be0cec30e7ac0e3dc808d1d5e655d76b44408591386e9ae397b4a061fee84 SHA512 eafa2cfc11ba5ef19fc9a792dc245873250b5ea5f9fec369f05f817d4dfca4477b012071f0abcf84a03a17657dfa098b645ad6663845e5ec3bdf1fb9ad719133 WHIRLPOOL 2c7752be1f799f4ce3e1ee0f5c96f59b5f043489739ffcc52f2ac03531cc1815a7dc8ef2f7e5c8d2103bbf8514adc7ca56cd6557c860a4839ef1b4935e59ab5d

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20151229.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20151229.ebuild
deleted file mode 100644
index 2e63c75..0000000
--- a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20151229.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# 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-12-29_00-02-04/zip/netbeans-trunk-nightly-201512290002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/D84D17804FB0587297CCB4CFF3918561212671A0-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}"/D84D17804FB0587297CCB4CFF3918561212671A0-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 fc44204..8e269d7 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -35,7 +35,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
 DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
@@ -52,7 +51,6 @@ DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9a
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 EBUILD netbeans-enterprise-8.0.2-r1.ebuild 15075 SHA256 41d376117ad1d8d59c8194debfd29dc42f5fd4de70aee12a2134ec143a604dda SHA512 4cd9de88e9a401cc0be88e3e2605abc411c47307818376b2bcc00f9ae570b21324f2bf00fd83e819bfa076da0fb07811fa1f0f9362a6cd0ee05b63221a199000 WHIRLPOOL 73f4518c14430fe7aa3614ebf1b11a06ba0e9bce7479af2770db3a114f149d575a16a655218f757ed416b5149228ac56dac700f5a8d5e034cc838bfa4092e636
 EBUILD netbeans-enterprise-8.1-r1.ebuild 15888 SHA256 d4c04ccfee01a46819020cb7cf8fd8297618f3c0431ae2d9dd7eec8131f988ab SHA512 6c7c39c378cb79d3f382cb80d07710a8c5233aaf0df8fb58889ee6aa6bde73624efa6aa49b43f84105685094a7aff89e4b6367ffd1fd113da27b42d50d07e983 WHIRLPOOL e678e2a6957e428c1b6e51469c0e7cc6a08da2c797f1575b6bb660a7f3281c00f071179de459e27c983304915b005baaf94ad4fae0a4c08162f218bf53b7d821
-EBUILD netbeans-enterprise-9999_p20151229.ebuild 15825 SHA256 b4258d1dc8bef26206ca4cf7ab15af9c2b8d5a299495add2dc32b86789a62d2c SHA512 434ee298b4ca4e8808b979f59eea633c3778d3778949b39497ce2378b3a034dc52dc3d75619b1217dd081a574acfa3a9d6f0e53e0da3b4037da6938eab190db7 WHIRLPOOL d9e2f2e6905213cd8446bedbf5f65995fc0fa0a2279cc54fbbf238c26faf2c613d29b1b9dcaae9d9070c1ccf5ea5237e8fbba08fc1265e3a97f7797236154670
 EBUILD netbeans-enterprise-9999_p20160104.ebuild 15825 SHA256 efe232a4ee688084bfd86d70c2fed4a9fa5cb591fd9ff4237e7c8954340c52da SHA512 ab3ec93b101b8091e979bb574435dde70b22e9b87c230542486843565db6a70521dd933b4f992a13a5ad4ba93f019823130c3e61c6115a4b74519c37a0759524 WHIRLPOOL 9d53fa6b979851c4d46b27cea723ed8d22e85e4e2438e56e7fcdc57745308e98f1927800a12e432de4d6c46eafe7e4e5ba71600e67f031a0394aa42c4e5656e2
 EBUILD netbeans-enterprise-9999_p20160108.ebuild 15825 SHA256 f34cb390190dc60d95784f28d943de98fbfe42eb32bab20cb7c964046295005a SHA512 d265877a76712c6a7a2589a93b90fae87d8bfc1c12aa4a5a9518cbcf366582751c993e47149df924add26d68e348d442f87903d3ec9a60246cc681f70898c8a6 WHIRLPOOL eadca79074ee37848e20e99cdd32b8f87452679899b1f0dabfad79ddc7cfdb1814ffd7a5268a9c1e459d7f0c2eeb821e21c35832750fa02914e5892222b0f2dc
 EBUILD netbeans-enterprise-9999_p20160111.ebuild 15825 SHA256 b5182122909cb40c05257c03a7df1775299bfb2212a029707587dbfd1db5d431 SHA512 f0bcb7c4209a85a9acb750bcd7da0159bba83954aa1b91f2b5f0f0397418dc114aa1f6da55b5371555485ffde62bc80b22bdb904e4634fba7546fd5d793c47b6 WHIRLPOOL 529edff06c75160e4a08bdb1d6056ccc3b387106def6a87984ee81e1dfec8720589d84dd8a03610955ec502f6842966d96cfc8cee7fa6bcbff825b5be4189ac1

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

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 80082f2..a446cb7 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
 DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
@@ -20,7 +19,6 @@ DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9a
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 EBUILD netbeans-ergonomics-8.0.2.ebuild 2843 SHA256 f9262f6ee7f2aed1fab9bf4cf756f565272e9894afa50b349735e39961e7acc3 SHA512 f158c27640541f7aef31da050e0811c07a251ae4797cc663b95a074a47eaf9d6bb7a9aa11ba38ea55e75c185f7dba74629ba6716a819e8ad68eb3db9ada71451 WHIRLPOOL 4fe9634fb673fb05dbba25996efc3a212ef3bb23ab6e7c732cb75de076feb930735e3901806fd9c801abc7ee8aa8eb800718065325d415371255a886474061d4
 EBUILD netbeans-ergonomics-8.1.ebuild 2867 SHA256 6d2c0b7221d47b64c77b243c8c5232c6d8c24d3199eae5799adafeac609b2e2a SHA512 6302c8c13d43ec51048e8b0439916746a01bb67f14e7cd21be95b4179df6106dcff1d3973b9191f7a36cf6f29d53b1d2308864f5f64d9f87f980ea264b1a97c0 WHIRLPOOL 63ceaad04323d9085dfb90d1e5075ad13f6e14e8991b13aafaf3fc174440152054f32498ac8d03f57917744887db3bc1efdfc30b473b8d1a33b514ec4960ea6f
-EBUILD netbeans-ergonomics-9999_p20151229.ebuild 2913 SHA256 659462872eb193d863de274e70b3c2f9833fd09aa92ba11a7a98ece702ab665d SHA512 f270f7bc01575ec00d7eae54d1ee9fb02ef49509404b0ab6f66e3bfd373d406b98f164b3e04cc1c499e76cc064a59f03aabad9d8a0e45d6aec57cfb010c53799 WHIRLPOOL 80f9fe9e2100b3a44c0a9c246f89a6d7cf3a7f0d40853316b01bc31b819c038ad48ef8972ce2c7bdc2aa33e6b59fe5d023553eeacd4e51b4d77271269740fd4a
 EBUILD netbeans-ergonomics-9999_p20160104.ebuild 2913 SHA256 f6962ca5bad97184363417c21b385b4a4e376dfa15b86a42fbb576f281d4edc5 SHA512 5f2dec61077a3750d7feeec4b5b58765f72f4aa8ce2e8966c7140d196cf4608953a3aa00a7c8b0d11150bf134b124200115ab65d0eea107bbd14841cfc46f435 WHIRLPOOL eec826fbe490527fb017b0f9ed8ca729168030261b49c5bd1c57f3bd824b7d76f4ac8bd022b0705443d0e7b2516c36a605737c1e30a2ca429e4f4276df07fbbb
 EBUILD netbeans-ergonomics-9999_p20160108.ebuild 2913 SHA256 4b1afd1b178c6d867c94d6e686561d8c72aeea70feecbacf6fbc6c886ed1c7f1 SHA512 d17c41b2d1750183086c0abbf2da232145102c0f875ae89c840aca85ec670b496e82d46c9558d701f93370998ee6c46eaabcb0eca29274e0d8993f7ae932e80e WHIRLPOOL f339153c2791b78dfa2cc16c208c79de5f66a99b184fcc420ba741b12f6e104334fdfc7de5371834b8d56b75929f498641c56196a307c3e7895e1bb2c3f197ed
 EBUILD netbeans-ergonomics-9999_p20160111.ebuild 2913 SHA256 18e5e4b54ad13418ad908a5e60f4cdd077bc9869da898a7065c81cf92b78e8af SHA512 d6aa0b564d484f5e98630180da459cfe6f9e9dc8f269a833103d0888b234a0b360d4a0d778972009857223bca1876dedfbfa0c82b6591ca54b591600345b4273 WHIRLPOOL 2bf3241d42687b0f4ede5be9a06865962eb4b51fec763b1a0248ffe16795e41b054f00afff69145893efe5ccac7397af0f7e9c1b76de5b150495ed5935387996

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20151229.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20151229.ebuild
deleted file mode 100644
index 7607df3..0000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20151229.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# 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-12-29_00-02-04/zip/netbeans-trunk-nightly-201512290002-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 de1d414..478cee2 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -5,7 +5,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
 DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
@@ -22,7 +21,6 @@ DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9a
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 EBUILD netbeans-extide-8.0.2.ebuild 3307 SHA256 084e952eae1708b0fab785fd34313985e864dbc74a8531a0d5cdcf906e88f85a SHA512 ade8dc37aa932d7ec20966199e521311716061c23df08d02635f78efd2776f1d7bf040b0f9c9488b947bbbdfb3e33fa764723e3dfffa2214892bc6d685428f6f WHIRLPOOL ad2c26b005675ebca7d902ff1e6caa28552f3fda6795e327cc3584cf109f0ad6efad6516e15af5e70d689be236298b0948003e09a3da4991b3e29a1c85607b2f
 EBUILD netbeans-extide-8.1.ebuild 3331 SHA256 7d81adb3cba102e13678052bfe288e8417753ebceb69f69ce528ede3fedcef04 SHA512 ae445552036799069f31b40c145879ac55cf0964e168f328ac84f2d434171de8c4848e3416ad7425563e8565c09f798c9520bb3cb7511348f5d6a7522b878e40 WHIRLPOOL 44142233d4d3047ebb5c152992b484e5fef1fddd04cf274cc370f00beece5a75a986e5fadedd4bc18a01559c4f6cb58289cefbfc24d8d098d70056707e8b8f57
-EBUILD netbeans-extide-9999_p20151229.ebuild 3377 SHA256 7031c0f8bf48bbaebffe6292961f8232147e830e8f415ce1b374c6e6d90a83d0 SHA512 e87e332e2ccc09d085a85f8b04fb5bcc87c5b1fb05df15b462aaa059b495445c827b6a62be90152eb32b53ad24321a906238a7ecc99a4514a08ad3958d2e6738 WHIRLPOOL 1851185f16dc912805cc2f82846a16fe6e0b709bbc25b1a11e0967e858039c30f91a291a092ce55f4651e8e499692bef14563e4dbda9dd2f9d2464007230b1a0
 EBUILD netbeans-extide-9999_p20160104.ebuild 3377 SHA256 67dab498c39d86278fec38b2a0faf691c889136520bc0692de03c19c2f94be9f SHA512 7cf6f05711df39c569228c0b62734955c8430ed981ddbbb6a7252c834bdb083f043398161b3a6b9cc3ead2666595bd27f51a9413c95ae9397f8cd4766f2c8953 WHIRLPOOL 15cb3f4ef19842935a829e24bedc9910989fc4caacd62750f46263af6c3f501c9b00985e7f7509b034f1b479341f04ed1f7a9a9d3c4a1d4b17ab99cf9785fa82
 EBUILD netbeans-extide-9999_p20160108.ebuild 3377 SHA256 c6676bf6c5ac323a20fafbb6d798413ae7aa982a414873a654ef73365af9c225 SHA512 ed177424f7ad0ecec26071d7c9669198de81aca39d3c0de233220db59b3264fb46756efb77ee791fc9ceb7c8dc31cd7ec4521514fdb7ed411250c5e7060fbf21 WHIRLPOOL 295756c0ae5eaf4f9055ef9f5e02bb3449375fd9564f1288e621d666e82828ae5e20097de5a2bce379214aa6e463cdf46bd4099627361e80d327601ab99eafce
 EBUILD netbeans-extide-9999_p20160111.ebuild 3377 SHA256 d07a40e7a6384cc8a267eaf3a14374e7c2b08635ac055a0c5cebe58f9b138a62 SHA512 1dfe6c2d5c29b7d8d0aaf8f2aac80dd1d8e20a3af8c11edee7fc98eef4eb9f3481150f8c6cdb74d3a9347d6e4a5b4eba709adf282692549df0e838212bb2c94d WHIRLPOOL 4545c48c0fae1bfbcc903dbb6e8b20117e1cada414f6e276a3e2f7bee56c8bb601bee08a5c6080e0d9aee180a350838de61444911c15dceeeb2c4117347ad939

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20151229.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20151229.ebuild
deleted file mode 100644
index 0ae343a..0000000
--- a/dev-java/netbeans-extide/netbeans-extide-9999_p20151229.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# 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-12-29_00-02-04/zip/netbeans-trunk-nightly-201512290002-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 eeda5c2..5d9468d 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -5,7 +5,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
 DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
@@ -22,7 +21,6 @@ DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9a
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 EBUILD netbeans-groovy-8.0.2.ebuild 3346 SHA256 907e6cd11c222f15c826494b44929483803f0e4249de0d54db51e6855b574148 SHA512 8bb37121e7e32621959318d109b1d982e2c705a9deb7171f5fef1dcaed55fc5718b0bc9e6bbb2592cdaa5e96d874bb6e6bfa96d06fe09f14d5250c1485eb1da5 WHIRLPOOL d5e09fa1e975835f05c6132c091fee4ae9fc9dd671af9f5f88a9195d5cd4a93804f96687ed3f2bd741117fa65773f2c464b3cfd6697425039cc51a940efa2a31
 EBUILD netbeans-groovy-8.1.ebuild 3370 SHA256 ca32569d438060704e4d5d5e46be2ebf20bffdb0ae2471d8718ada8676f32082 SHA512 40555d2ffa0ddab1e55ca514eddbd98c6e721caa230cd174050fb56f144def46f389b0ac018068c9f509936c83235b2d3423cae8676db7c96e8782b0da73e4ad WHIRLPOOL 7b2b021581db21aa8ff90ea188ddeea0974ec84fdb064cf367a56a6fa53487affe89edb1880a83934a2cf0c586060a9192838687ffebf33b55e79d9ddc7ac986
-EBUILD netbeans-groovy-9999_p20151229.ebuild 3416 SHA256 9ed0bd8bc7d926fd57aa49b6b5ebdda503b5e84031862b68561e49c17fd851a0 SHA512 dfa061673936bb2a6ae4c034d6d58846e3e9546adaff9916ed8bfea7eb838105b11ff000d018bdc75c90a243c29e51e41de21e83b92c16d2e7d02cd8e05e0643 WHIRLPOOL f4dc8105d0030ed389f77c02cf8c72d0e8252c7068fa7eb663b368e70e641651abbaac614d813b1f496f21960c9f962159578f0cbd52ed9186689b9a4448a8c8
 EBUILD netbeans-groovy-9999_p20160104.ebuild 3416 SHA256 06d03b6e5ae56ee23ec7291f7499b6bbb3007c151c225c31838b41aadb901565 SHA512 e2c9fa07945e0311a5f0d5c5546c00025c5d4d44edc1c97184cd7b8c44b380f6b0303afd88f066165ba7bb4523160753b4535cee5ab820fa97adf7a4d84e9581 WHIRLPOOL 5491d208c112958027225479a6075ee47c45637696a7ab735047715ab3eef3ad1c99c86307c1ee99fa9f498875fceb318526e87f3e0f9e7ac5d495706b06d21e
 EBUILD netbeans-groovy-9999_p20160108.ebuild 3416 SHA256 1c3253d2ff2f80bf8eefeda33cc6f75c7b9125ab3d4a294f646a3b2cebcd514a SHA512 e5d33196531e963597cc7c95dbf742eb4bd2ad1f83f3f2375ec10347a018bdb98403a7eae760956a8379327db5ad81c95051d28f8cfabe4b39da4aff3aec8219 WHIRLPOOL 64739e7e3f824eb4a0a17c786810f501949c5e80e47d09df46319d2e3dbb151faae19a2a3a229c82d1cbd762088932f9bf603bdf57a1510574f10fc4794a1993
 EBUILD netbeans-groovy-9999_p20160111.ebuild 3416 SHA256 2d65c80602130e87d39f8f3759521b3a2d5acd1ebb85ababb1425e52a2855d8f SHA512 f462d33ab3f255aa875a2673b39f2c8a4dae5e0b77521b75e99fa995aa7f427ea4bc6f2f9e346ae03cbae78d0c09b95b9ede48202960f8dc52bf91e3a3c6d6e3 WHIRLPOOL 8b0af3b18ca31e34a6a4f411a387dff97263c17020ca063f7f39d5bfbbc5569d486e99e9b259d09b162fefe6030993dd2a7949e6c8e487816716038181a77c26

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20151229.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20151229.ebuild
deleted file mode 100644
index 9f9f0aa..0000000
--- a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20151229.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# 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-12-29_00-02-04/zip/netbeans-trunk-nightly-201512290002-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 3f4e0a2..30450b2 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -8,7 +8,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
 DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
@@ -25,7 +24,6 @@ DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9a
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 EBUILD netbeans-harness-8.0.2.ebuild 4055 SHA256 2674d562adc57648c82cac9f714f74f9d29dd7b7ff7fa7f0ef37c43ef0975489 SHA512 7d72bed5b955b2365a4c11fcd97a2d6f2372ab939fb9a03b3ff7915053f24d695373c1aa154f6e6916d37ef3ace7b38864d575419460382760500576dae52e49 WHIRLPOOL 72f54a6cb83f282a75f0abb073109414a7b8bcd4e9263466281e68ff34148a7343ed3bd78ebdc8afd109b6b9f5b9f15bfd0e250f418fcaa4986a7c886b57b9f6
 EBUILD netbeans-harness-8.1.ebuild 4079 SHA256 116b90d6e6fd1b1ad8ce99c81104262a416a485b3a3110beed70e9381333cec2 SHA512 77ca4bbaf078adf6e13c0fea0a8e673262aaed60dd799ec161584589fb4c791d9bd758c87f4272297d863d3992b54a66b77b7bf05135cada530d111e1c428e68 WHIRLPOOL d385cd6292f31a5817a2c096f960330186a68242b51ed26e4272f33a690a98175e0b622a5d5309e1e6a72ff824662964785b7d235cf3a73ba4d715cd19e89dbb
-EBUILD netbeans-harness-9999_p20151229.ebuild 4126 SHA256 83fa7c63e708281a8f71121aedb75bf00031151e337442dc5a875755734730c7 SHA512 07b253f8136ec18d0df12556cd76b1c8eec5c4658401ee20a7f836c43860e4dc29609a2ae8edc1296fa3c09353c899f044293771c5cd0c2d9720f9a14a996cb3 WHIRLPOOL b22324479779826bfa201f7095ad4a80bd065089e1bca95ad542aaeae44e32a1e5d89a97a7c76fc82e10d2502291049977b2f8d16c6689a2178f7e0bbb37e330
 EBUILD netbeans-harness-9999_p20160104.ebuild 4126 SHA256 6bf8a72b198b98472cfe603cea05f99c6aef71fd9472f3a70945a7d60c3b424b SHA512 89ebd29de70b23981c3a87bff1c5296931902e5b391a5990af381fdcbfbb27f898841b89720c4ffdc59e2a2aba556ae0f463f92d016aa18a86ce9f73bc16064d WHIRLPOOL 050f630f2b743aad37480f278fdb753db2e2f4f699f7b5abdfc5bab62d7364b5e30a9c6ab91237554fc1f01ed5ab6342ac9370959683146cef57b65d977903dd
 EBUILD netbeans-harness-9999_p20160108.ebuild 4126 SHA256 ac9e052d58e0ef821f2030484f576bfb1778f31e0fbb4295f23cea5de0ae444a SHA512 994bef755ff15e22e2334f1f3fc6a095cfb6a1cfaedfe19ff5ce4932283bc3f2b356d6462d984730f66c002c3fb62fadc6821d80a12ef3a05935e326b42e7c64 WHIRLPOOL 94abc87b3a66da8a3b36e39cd1c34497a3196b88a83679ea230e2d963cab984dbdfb15c799096995cc809ee56c90562eb9f08feeb3a1cf66b540e73b7c88df0c
 EBUILD netbeans-harness-9999_p20160111.ebuild 4126 SHA256 6aa6a32589169d8d304f28ba0f3e69a39b1bb07bbd5178e421d5e7cc63e49ae0 SHA512 5438dfc1baaff1ba18628b568e625c32f0db392531753aadd16b6416eba57db8fa6d8e3874ef0ac5c4cb9b9d505a3c38fb69564e4c04a134872931cb083562eb WHIRLPOOL 82a10fac824a252e9526c16659d97243cae5abfd6caf05dd2d780990c8f89b2010e3af9765d43517e97a654c23e9f8b90c119a5a67b30051ce6b6694cf29b974

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

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 6577a0b..872f10e 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -136,7 +136,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
 DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
@@ -153,7 +152,6 @@ DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9a
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 EBUILD netbeans-ide-8.0.2.ebuild 29317 SHA256 42218788ab0fc7c7cd1bb42a8b0c72a66543a3260b752aa55365833c355bcc63 SHA512 c712b66b6bee654390a45e5c616479df2be624bb770f3838d4fcce875f71a8d165703dffd55c4fd7d30e19c392784203e5fe01e2404907d88c935d439efaf578 WHIRLPOOL 67763e4a36215ac002fd321556ce2269affc15ba48ad5069d7ccc746d918179994f174e09305a9d9ddadddbea690778c2769e0ea1993eafc09e01580485e2292
 EBUILD netbeans-ide-8.1.ebuild 30288 SHA256 783332022c33a787ededc22d5250e30e1a91676508076fddc69ec64bbe5a6e7c SHA512 402d72f8b1a4e849dfe86054d466afeb0ab3987cd5ee747d3173874cd875fe3572be9e3ccd639fadf9e329db92e7543fd68dffc497805aa4d40b1d008c4a79ad WHIRLPOOL fd2cd798a1763af3fae44bb0eef0a4c4d932ffead6427e27d3483639348d969598b9c81d8949a3950ace1e68d3dfa0e08fe0c787b201b0cc9a95ea0040d156bf
-EBUILD netbeans-ide-9999_p20151229.ebuild 30832 SHA256 343c5ea332b85d9773ef3f71d381d3dd3958f5975557de8f6c19f55ffe2cc44b SHA512 d575c83bff68fbfccd27862e5a3c166c427b1b5f0dbd52f10801d2654527801a807d0a692a780d29582c733cd873b8707cc076d7756adecec2e32ec31fdb4f00 WHIRLPOOL 74a477b12d37c9834d3f186b88ca1a9cbee175eee7e7e59527a7955c8d2922afbe80a17498f8d405dd0c8c80a03f052d84d9ebe9467ec8c4a21a9fab50aadfe4
 EBUILD netbeans-ide-9999_p20160104.ebuild 30832 SHA256 a8b1a0a3f049cb08ca20e2458cf0b1fc092a86803e50cda8560ab84310edd5a9 SHA512 e306444283088c8f9b4235e7570da2f7508d0b3a61578384f23150467dd873a8292608656c7129c10e3da34f413da7f9b5d045c533cc746d9685e43390f4b59c WHIRLPOOL 7c002e5145f6b07f23b214b44b390fc2ccd1c44720ac9378ad1e5be262b4d9ced1f13d8aceed181baeb5077d431136960f44783aa00009d2488882e966d0fa00
 EBUILD netbeans-ide-9999_p20160108.ebuild 30832 SHA256 0bc7c27b36ed19cfecdc744c24bf8633dde7a8de5b8596574a7b78609ce36352 SHA512 e67bbf338bd6328655489d258d1dc0ffc1b60e11f911dd02216bab41da337d03f79cac52832a6fd89c0d342913c4873a5d4511017266702ce8d81dcfa9c737a5 WHIRLPOOL 6418d332c041ff069b3009e7cdb7d7e9027b8710ab9780f82616aaf685eb5651ad65bb27c494d439d2f2bb16b1646078eb5f0c9c906c9238ac719a3e86cf8da5
 EBUILD netbeans-ide-9999_p20160111.ebuild 30832 SHA256 a86afff328df13ef40a2d1095c4caddf1c9b9d62f677c0932aa00e51d59a9c02 SHA512 9358184c003761a80e130292ab77731748b368fb7ee9c47288ff455fee18c61e1d9642f4e9b7dd8e66bf0e5958b3fa3c7095525eb85f86d0001f15b726b3ff6a WHIRLPOOL e765780b09c81374468442c533b3697a71d67e1e91c38c05bfc4c06d18eb0d34b0edc655fceba9dd6d336caae8e05bf6fb2d1922d28ce806017270f454a8be75

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20151229.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20151229.ebuild
deleted file mode 100644
index b434fcd..0000000
--- a/dev-java/netbeans-ide/netbeans-ide-9999_p20151229.ebuild
+++ /dev/null
@@ -1,384 +0,0 @@
-# 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-12-29_00-02-04/zip/netbeans-trunk-nightly-201512290002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
-	http://hg.netbeans.org/binaries/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar
-	http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
-	http://hg.netbeans.org/binaries/ACAB7C860DF78C4A528FD8A64F2C62A0A96639E5-com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar
-	http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar
-	http://hg.netbeans.org/binaries/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar
-	http://hg.netbeans.org/binaries/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar
-	http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip
-	http://hg.netbeans.org/binaries/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip
-	http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
-	http://hg.netbeans.org/binaries/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip
-	http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar
-	http://hg.netbeans.org/binaries/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar
-	http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
-	http://hg.netbeans.org/binaries/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/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar
-	http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
-	http://hg.netbeans.org/binaries/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar
-	http://hg.netbeans.org/binaries/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.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/3A7012C03E61CAF9539DAD8326659EB4CE3EA436-org.eclipse.mylyn.wikitext.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/8307A44D3F150F1BB317532097A0C7D125C00F2D-org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar
-	http://hg.netbeans.org/binaries/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar
-	http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar
-	http://hg.netbeans.org/binaries/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar
-	http://hg.netbeans.org/binaries/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar
-	http://hg.netbeans.org/binaries/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar
-	http://hg.netbeans.org/binaries/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.jar
-	http://hg.netbeans.org/binaries/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar
-	http://hg.netbeans.org/binaries/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar
-	http://hg.netbeans.org/binaries/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar
-	http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar
-	http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar
-	http://hg.netbeans.org/binaries/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-compress:0
-	dev-java/commons-httpclient:3
-	dev-java/commons-logging:0
-	dev-java/icu4j:4.4
-	dev-java/iso-relax:0
-	dev-java/jdbc-mysql:0
-	dev-java/jdbc-postgresql:0
-	>=dev-java/jsch-0.1.46:0
-	>=dev-java/json-simple-1.1:0
-	dev-java/jsr173:0
-	dev-java/jvyamlb:0
-	dev-java/log4j:0
-	dev-java/lucene:3.5
-	dev-java/rhino:1.6
-	dev-java/saxon:9
-	dev-java/smack:2.2
-	dev-java/sun-jaf:0
-	dev-java/tomcat-servlet-api:2.2
-	dev-java/ws-commons-util:0
-	dev-java/xerces:2"
-#	dev-vcs/subversion>=1.8.4:0[java] missing from the tree
-#	app-text/jing:0 our version is probably too old
-#	dev-java/commons-io:1 fails with "Missing manifest tag OpenIDE-Module"
-#	dev-java/commons-lang:2.1 fails with "Missing manifest tag OpenIDE-Module"
-#	dev-java/freemarker:2.3
-#	dev-java/guava:15 fails with "Missing manifest tag OpenIDE-Module"
-#	dev-java/ini4j:0 our version is too old
-#	dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours
-#	dev-java/jzlib:0 fails with "Missing manifest tag OpenIDE-Module"
-#	dev-java/trilead-ssh2:0 in overlay
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	dev-java/commons-codec:0
-	${CDEPEND}
-	dev-java/javacc:0
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ide -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-JAVA_PKG_WANT_SOURCE="1.7"
-JAVA_PKG_WANT_TARGET="1.7"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r14-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
-	ln -s "${DISTDIR}"/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar libs.nashorn/external/asm-all-4.0.jar || die
-	ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
-	ln -s "${DISTDIR}"/ACAB7C860DF78C4A528FD8A64F2C62A0A96639E5-com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar || die
-	ln -s "${DISTDIR}"/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar o.apache.commons.io/external/commons-io-1.4.jar || die
-	ln -s "${DISTDIR}"/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar o.apache.commons.lang/external/commons-lang-2.6.jar || die
-	ln -s "${DISTDIR}"/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar libs.commons_net/external/commons-net-3.3.jar || die
-	ln -s "${DISTDIR}"/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip css.editor/external/css21-spec.zip || die
-	ln -s "${DISTDIR}"/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip css.editor/external/css3-spec.zip || die
-	ln -s "${DISTDIR}"/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip derby/external/derbysampledb.zip || die
-	ln -s "${DISTDIR}"/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip dlight.nativeexecution/external/exechlp-1.0.zip || die
-	ln -s "${DISTDIR}"/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar libs.freemarker/external/freemarker-2.3.19.jar || die
-	ln -s "${DISTDIR}"/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar c.google.guava/external/guava-15.0.jar || die
-	ln -s "${DISTDIR}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
-	ln -s "${DISTDIR}"/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}"/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar c.jcraft.jzlib/external/jzlib-1.0.7.jar || die
-	ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.process/external/libpam4j-1.1.jar || die
-	ln -s "${DISTDIR}"/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar libs.nashorn/external/nashorn-02f810c26ff9-patched.jar || die
-	ln -s "${DISTDIR}"/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar html.validation/external/non-schema.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}"/3A7012C03E61CAF9539DAD8326659EB4CE3EA436-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.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}"/8307A44D3F150F1BB317532097A0C7D125C00F2D-org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar || die
-	ln -s "${DISTDIR}"/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar extexecution.process/external/processtreekiller-1.0.7.jar || die
-	ln -s "${DISTDIR}"/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar libs.svnClientAdapter.svnkit/external/svnkit_1.7.8.r9538_v20130107_2001.jar || die
-	ln -s "${DISTDIR}"/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar o.apache.xml.resolver/external/resolver-1.2.jar || die
-	ln -s "${DISTDIR}"/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar libs.svnClientAdapter.svnkit/external/sqljet-1.1.10.jar || die
-	ln -s "${DISTDIR}"/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.10.3.jar || die
-	ln -s "${DISTDIR}"/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.10.3.jar || die
-	ln -s "${DISTDIR}"/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.10.3.jar || die
-	ln -s "${DISTDIR}"/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.jar libs.svnClientAdapter.javahl/external/svnjavahl-1.8.4.jar || die
-	ln -s "${DISTDIR}"/3B91269E9055504778F57744D24F505856698602-svnkit-1.7.0-beta4-20120316.233307-1.jar libs.svnClientAdapter.svnkit/external/svnkit-1.7.0-beta4-20120316.233307-1.jar || die
-	ln -s "${DISTDIR}"/015525209A02BD74254930FF844C7C13498B7FB9-svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar libs.svnClientAdapter.svnkit/external/svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar || die
-	ln -s "${DISTDIR}"/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar libs.swingx/external/swingx-all-1.6.4.jar || die
-	ln -s "${DISTDIR}"/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar httpserver/external/tomcat-webserver-3.2.jar || die
-	ln -s "${DISTDIR}"/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar swing.validation/external/ValidationAPI.jar || die
-	ln -s "${DISTDIR}"/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 db.drivers/external jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
-	java-pkg_jar-from --into db.drivers/external jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
-	java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar
-	java-pkg_jar-from --into html.parser/external icu4j-4.4 icu4j.jar icu4j-4_4_2.jar
-	java-pkg_jar-from --into html.validation/external iso-relax isorelax.jar isorelax.jar
-	java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
-	java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
-	java-pkg_jar-from --into libs.commons_compress/external commons-compress commons-compress.jar commons-compress-1.8.1.jar
-	# java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.19.jar
-	java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
-	java-pkg_jar-from --into libs.lucene/external lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
-	java-pkg_jar-from --into libs.smack/external smack-2.2 smack.jar smack.jar
-	java-pkg_jar-from --into libs.smack/external smack-2.2 smackx.jar smackx.jar
-	# java-pkg_jar-from --into libs.svnClientAdapter.javahl/external subversion svn-javahl.jar svnjavahl-1.8.4.jar
-	java-pkg_jar-from --into libs.xerces/external xerces-2 xercesImpl.jar xerces-2.8.0.jar
-	java-pkg_jar-from --build-only --into o.apache.commons.codec/external commons-codec commons-codec.jar apache-commons-codec-1.3.jar
-	java-pkg_jar-from --into o.apache.commons.httpclient/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.1.jar
-	java-pkg_jar-from --into o.apache.commons.logging/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
-	java-pkg_jar-from --into o.apache.ws.commons.util/external ws-commons-util ws-commons-util.jar ws-commons-util-1.0.1.jar
-	java-pkg_jar-from --into servletapi/external tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
-	java-pkg_jar-from --into xml.jaxb.api/external sun-jaf activation.jar activation.jar
-	java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_1.0_api.jar
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	unset DISPLAY
-	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
-}
-
-src_install() {
-	pushd nbbuild/netbeans/ide >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/ide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	rm -fr "${D}"/${INSTALL_DIR}/bin/nativeexecution || die
-	rm -fr "${D}"/${INSTALL_DIR}/modules/lib || die
-
-	insinto ${INSTALL_DIR}/bin/nativeexecution
-	doins bin/nativeexecution/*
-
-	pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution >/dev/null || die
-	for file in *.sh ; do
-		fperms 755 ${file}
-	done
-	popd >/dev/null || die
-
-	if use x86 ; then
-		doins -r bin/nativeexecution/Linux-x86
-		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86 >/dev/null || die
-		for file in * ; do
-			fperms 755 ${file}
-		done
-		popd >/dev/null || die
-	elif use amd64 ; then
-		doins -r bin/nativeexecution/Linux-x86_64
-		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86_64 >/dev/null || die
-		for file in * ; do
-			fperms 755 ${file}
-		done
-		popd >/dev/null || die
-	fi
-
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules
-	pushd "${instdir}" >/dev/null || die
-	rm com-jcraft-jsch.jar && java-pkg_jar-from --into "${instdir}" jsch jsch.jar com-jcraft-jsch.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext
-	pushd "${instdir}" >/dev/null || die
-	rm commons-compress-1.8.1.jar && java-pkg_jar-from --into "${instdir}" commons-compress commons-compress.jar commons-compress-1.8.1.jar
-	# rm freemarker-2.3.19.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.19.jar || die
-	rm icu4j-4_4_2.jar && java-pkg_jar-from --into "${instdir}" icu4j-4.4 icu4j.jar icu4j-4_4_2.jar
-	rm isorelax.jar && java-pkg_jar-from --into "${instdir}" iso-relax isorelax.jar
-	rm json-simple-1.1.1.jar && java-pkg_jar-from --into "${instdir}" json-simple json-simple.jar json-simple-1.1.1.jar
-	rm jvyamlb-0.2.7.jar && java-pkg_jar-from --into "${instdir}" jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
-	rm log4j-1.2.15.jar && java-pkg_jar-from --into "${instdir}" log4j log4j.jar log4j-1.2.15.jar
-	rm lucene-core-3.5.0.jar && java-pkg_jar-from --into "${instdir}" lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
-	rm mysql-connector-java-5.1.23-bin.jar && java-pkg_jar-from --into "${instdir}" jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
-	rm postgresql-9.2-1002.jdbc4.jar && java-pkg_jar-from --into "${instdir}" jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
-	rm saxon9B.jar && java-pkg_jar-from --into "${instdir}" saxon-9 saxon.jar saxon9B.jar
-	rm servlet-2.2.jar && java-pkg_jar-from --into "${instdir}" tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
-	rm smack.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smack.jar
-	rm smackx.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smackx.jar
-	# rm svnjavahl.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl.jar || die
-	rm xerces-2.8.0.jar && java-pkg_jar-from --into "${instdir}" xerces-2 xercesImpl.jar xerces-2.8.0.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb
-	pushd "${instdir}" >/dev/null || die
-	rm activation.jar && java-pkg_jar-from --into "${instdir}" sun-jaf activation.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb/api
-	pushd "${instdir}" >/dev/null || die
-	rm jsr173_1.0_api.jar && java-pkg_jar-from --into "${instdir}" jsr173 jsr173.jar jsr173_1.0_api.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ide
-}

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 0803e48..b91931a 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -33,7 +33,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
 DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
@@ -51,7 +50,6 @@ DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a1
 EBUILD netbeans-java-8.0.2-r4.ebuild 13298 SHA256 d4172dfdec5afecb1cd099e18a21aa872c7822bff40b192b5f4ec4d35e6e0ef8 SHA512 48ae6f7141117fbf58123ded750d76f2e7311211a6be3b62bd491349817460da11f781ec5694da91584315547c32008f568fac3bfb406dbdb5ed7fd825ff694e WHIRLPOOL 73fb68aec003707c14b2b390c2de80f24e1e5413cf7e16cf7e661af47c908e2d559214580379e45e21d316767987ac906b5a119a61ae39f03c3d01dafad49b7c
 EBUILD netbeans-java-8.1-r1.ebuild 14775 SHA256 1bbcc19358e42931f2ebcffbc234ba4f903506bb255142f5dc8a6a3dfaac621a SHA512 9578fbd4732edfeca9d6abc6da147af8fe5bae2f740405b28bf82d403f7952a4f9302605dab07f4ad1e42b525d1562579d0b84de0b0a73c06113eaa8a617924e WHIRLPOOL 77e4d2a188b2aafb2506cc47abf98619edc783cd82c19d1c89c6278a4a3136c3f157e164354588fe6b6cc5889934380353b59e68cbe28f3e49d2c5989a7e4628
 EBUILD netbeans-java-8.1-r2.ebuild 14814 SHA256 1f49212c90fcaa9a6483f19bb60c963520f20aa08c2a509aa19cc7fda12e4564 SHA512 2d6b225f5d32f0ce1801124808b0cc2101f16a703540877c4818be06694742cfa262c3a2e7018761254f9244a7992eb7fe9bc15cdb20f6f4cb83958789c0ef42 WHIRLPOOL 8557163a46ea91a47efec3c272b8a8a0f2acbf9eaa8f6c280d0ddaac6dd8b2185f06716ab12ebf76fb87fe6c05ab1a14bfd281875ebef586f1304d2162e5f2dc
-EBUILD netbeans-java-9999_p20151229.ebuild 14930 SHA256 27f166d19b52e9ca7c9e8833b234a3d2e024c14f4e79f458db1ae8695895aad5 SHA512 da55f7945bde1ffdf5c933f5ff9830b389cb1c4c3d9fe9634bc64476fee963d977a2711e44db2256499710cbf37454080002367c8159be3fa712206e823a0682 WHIRLPOOL cc771102b6a515bae8681542eeefcef695d12af27e6fa86a6abf10021cbdccc07ab36e963bdd93fd5e5383b24cb6a0c6905f198b87332764fc4f938f27712b0e
 EBUILD netbeans-java-9999_p20160104.ebuild 14930 SHA256 ba68f8dbd62648ed6962e9179cef0f5b8dc9068acc1f1585ede34fb5909d4f15 SHA512 181ebca4afbee9c2dd2c372eebb3402f36338668e52e1a471bd137b65776d7c3d0af28095ffc9067fff54cb95daf1e61fe557de3b485e0b097eb83de9c7c7cbd WHIRLPOOL a8f3af2ea09682a8182638a3766505322445720bd3235127474468bd2b75d2440f477baa44d821cfa3f89faee8ace29fdbf34e4edc7ae7437aabe62c6ad06784
 EBUILD netbeans-java-9999_p20160108.ebuild 14930 SHA256 7a8618286dcb80ad6d6f36edd0e9bfdb4758ee8cbcf1a356628e21e75bce3cad SHA512 31d3e97201b3f355b9497d71b2265c49ef983c6125f378b738812eede8fc2d0539d1d939f719e3ee3d1965650ad4281940f98caa26a444a5c39e5d58e744a288 WHIRLPOOL 0cbf06054910d64eb7364f1374cc82f443a20854dcfed9cf8fea2b0e02772be2301e33560113c0c4b37290c956c85d6304725a1df54bcdd76ed73f017eca139d
 EBUILD netbeans-java-9999_p20160111.ebuild 14930 SHA256 dd0c03f1b8aa7fbba7f8387b75d15a3a04f0573ba598531e893b2b9d9dd19f2e SHA512 be73679b3db61100745704618871d7b85fbeb9b016454a1084ae4435ab81afbc920267337642b793b7be2008a3214194d452346523583ec8ba3b44cdc0b9eb16 WHIRLPOOL daf3be86711d2475f566dd836717284f7a8087f433ad4bd754f87458597299e3180d50b0ade0b7c208be761fbfaead2b54f54d275fe3f2706f48e7881b0316b8

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

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 5ca48c1..521f35c 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
 DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
@@ -23,7 +22,6 @@ DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9a
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 EBUILD netbeans-javacard-8.0.2.ebuild 4906 SHA256 944fee40d693c2c287e748f70ba565f3cd84bb7c19110f8be716134ec20694a7 SHA512 1f66cd2756effbfde7d43f9da7d8d93cb6252c58a02ee3d821f6faeaf63bf3c63e28f80c6eb44689e3aa954452a2f3893c65e75de84158dff1da0d94cafea14a WHIRLPOOL 88197e03008b8acb1ce62f72783bb096d9a3fc2a289b83367841a8adbee2bf822031f9bd6051831515ee44b1d5d2a109c5646f98ca723506f27c874301fb4189
 EBUILD netbeans-javacard-8.1.ebuild 4930 SHA256 5342d0d3f4207da3d36eb19f0fa78015f33b4a6e6435fcf43b7f568afabb9d02 SHA512 5275ae0fd617e26cd8580f6256a766bdd9cc0299f5a488be5a97744ec6abddf262e5fb1db358b9ac00203bbedfe7ac152828b174856d9cf6fa06e1e2128e219b WHIRLPOOL 427bfed5b61a421340acf7ec0cfb5e88a8b4a68cb546b9d0546b7c69ab0e29700d03e2bf58641bde63a2a43579b0521c028cf57dbf25af280fb0732565a30617
-EBUILD netbeans-javacard-9999_p20151229.ebuild 4971 SHA256 cd7446cd9564c50fb7b34a3c41fdc4a02c745d20b32e77f76804de7f678d9932 SHA512 eb381b9c038d298eb8c1f1ac0a9ca417fc6e03d64e3e9ec71c675b05468a4bcbc15407ad41566e3ec00eec27721659165353cd2ebda9315ab8fa5507cdc1b07a WHIRLPOOL f2176499facbab5125dad58816090dba17cb3ea07b6871b2da905517cce6f26a0d590d6524a2c10d9684ecc60c19e23d1c3b13d8298fe3f58d7f60da48a1064e
 EBUILD netbeans-javacard-9999_p20160104.ebuild 4971 SHA256 2d9b446422f5bbdae0bdfb9499f69d24199ff3f6b00d08b50cf85ffa6d92d5d3 SHA512 a5f8a1e4cd2426324c437b37c7119ccdf0826433490911b2f65124e9e37a5084c0021467057a338621f6c6dd0840e2ffc7fe425225ec10b6bc3cd2ad01be804f WHIRLPOOL 7d4c1f5ebf1b91996459f20d0b74b0a4fc18b96047cb967933435474a7c640b45bab067a18d8b86ec903e2dee7b28b59847339461a1d261f5edf677b63e42654
 EBUILD netbeans-javacard-9999_p20160108.ebuild 4971 SHA256 5799211de058e7e9aa1ea0949e6ff80bee1a79ca44af0fa4ba898cac1a5e30d8 SHA512 6a679c0a705c6ce077667f142f0f0c1a45df29630a956d5068e4b874552075ad1d2188c8fb4c99f41268e432988811eb47f3b7deb1c3da2280f04d7d636faa0a WHIRLPOOL 6ac05574f1fd269a1c39e4bc9f4d3c15132ccc69f903d76b8e1b127a8d05861ad6d802be6599794949ed823d97f7995e19d3eca429173c00d5cde8559a102d51
 EBUILD netbeans-javacard-9999_p20160111.ebuild 4971 SHA256 444dff9c2c13f95fb870418bdfd4635ee1d7ed382beca69bce93afd76072d065 SHA512 281dbfeac334ceb8ede44721a73311d0d2ad3f844ce6a725e7d601b3036e86456fc6ada2921c34e394a857ed3ddafa5434dd38aed2552802c2f850246bb902c2 WHIRLPOOL 544744d9bd6601d7c08cea384521c1e424c2f177bc3ac11a314a4c102f3ba3f552b31ba84136981b3b0555c139fa028241914909f4b3189f83af7ae73246d47f

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

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index e342597..07d16a1 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -4,7 +4,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
 DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
@@ -21,7 +20,6 @@ DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9a
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 EBUILD netbeans-javadoc-8.0.2.ebuild 5993 SHA256 baf9da38d87b86eb8ed10ef46017361f36ca8583dd90885c9d1667a51851bc52 SHA512 892bc25b30dc26e3ee7c8be9aaf8542c00a7fa1d1d8f883d82bebb816edfa93e1ee9abeac1b0c47ecc8b4169bcaded56c5c71f18151fdc22fe241fcee0fd4521 WHIRLPOOL 2012f28f3ba5074b4d262b20e9a1c8ddf590ce444339ec1a404c890867c1271e38f9f9e09717d0648fae061553f5c8da3d97a70c35c8e853fe4894fb6fd4ec96
 EBUILD netbeans-javadoc-8.1.ebuild 6247 SHA256 5f0ab01cbea85353ac471a46e341750785f4889732c9da111d77b87bbd1bcc2d SHA512 4a4636f4f58a9baba9d9f5bac4ee7d4f57c0e07d6790902d34974383660f2926c4c4b16a27bacc2a3a7a0a6d5b7699caae90bb2ac513ac8e0535e46d11ec345e WHIRLPOOL 9cbac0234b9f1a8122df116512d5154b7e85561fd9541e0a77dc5c2b5863cf3238400ac17d05499e950705309faa97caace6da00c912ea07d6a74b0076f683ed
-EBUILD netbeans-javadoc-9999_p20151229.ebuild 6293 SHA256 572525c079b0c8c8a5f547dbe77f22230b5eae8f46410f3e2c8c5b2d87721a69 SHA512 0b67494c2317aae103b194aecdac9f766063cda39f78007ed4edbd5d961bf8f5dd402b7293802acedfadbd7b926c66d28330e4ad077ecd242d216b2cf8da2526 WHIRLPOOL d4fb602fc6291779eab2259e33498559a2604ad68960c30d863964323e9b44c1533ab10a2c1e3f440fc37bc59819649bb53cd6e4b111987d4ef9f5de12bdcfc8
 EBUILD netbeans-javadoc-9999_p20160104.ebuild 6293 SHA256 2d75f2091fbab033f643f1aef2b33034e5a0003846a91bc676165144f8835a7a SHA512 b159873d3cd86818f353f43d7f12b764ca42d24abd965b44513d32b0c6176255eb4ce833a5ecac9e5f1fb68a4dabb10776f6e95dbd13eedfd4b3cf3b352005ff WHIRLPOOL 73a968ce3674f5c4027371543fd286724fb3fb96b25f1d85b7311ac3d978ea13407c2457c9931e814b443349db7e23e58f62946870e38d01a954d31f28dc34a6
 EBUILD netbeans-javadoc-9999_p20160108.ebuild 6293 SHA256 a312c7663133df8311244766d7cd28afb67ac3538647b5c7837bfb99c687e705 SHA512 c6e180bf67cf1f968f97bf083451401faa3d87c772ed4a82c07aec3c0ca612c28bf461adc5536b0a26ed876c441b79d1042bb28cc6c0a0e746edf7d821290c0a WHIRLPOOL bf9d0727e6b5dbe79b5530469cb40ce8eb38b62e50326cb6fb1b1346de7ef2db49600805c86a4c67864bf50fbdcb8e2b9ca5972a1ad8ee0d7bf70317250079bb
 EBUILD netbeans-javadoc-9999_p20160111.ebuild 6293 SHA256 92b134d3634dd196b679285a9b6a1d8643d03e3db03b077645447d5af604271b SHA512 57edac8b237c110581aa1f8740b224370599519100124319560914bc89b8a470ecd3016dc5397f1e48b3c316d19d9611020f2e956eb818fa19a4d4b6c0d9740a WHIRLPOOL a8c6a997461a4ead44384b741dd7f2218176d8c0958624c73d5b90f341614699444350106a2884e5d5c32c570975e5fa1a8f376408130d2d81a1f1a963f7bdb6

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

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 12f6dec..008654f 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -11,7 +11,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
 DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
@@ -28,7 +27,6 @@ DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9a
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 EBUILD netbeans-javafx-8.0.2.ebuild 4647 SHA256 15e5e0b1c4729852dd55e5bfb2dcb520ba7c959bd9927d315c0abcb3f94e4ecc SHA512 520c60264fee67b0ccfd50ced0cc8586d5653d5186fa75c6b7cd8b400aae834de446b7e6145ad38df7e68207391fb360ef4834140e096d48add568fed387ac98 WHIRLPOOL 416a56ceb2ba85e3923ada0c8ef485cdd6fa16b3423b8fd0de523fa54dd082cbaedee5da4f1a92b50e440195f9256376f50e99a850d70ccdcb8c0ff370007f7c
 EBUILD netbeans-javafx-8.1.ebuild 4671 SHA256 2a12bebaca0ddbb03b84c33de7f5933f76a8381db3c40013fc4014687ded6cd4 SHA512 ff410f96e808c414e3e9485461866239080098e46e843ee771a78a0afffddc1c776697dccb276daf7f87dadf915a212bfe9c2a07b3a8a9057cb3ea19b77163fb WHIRLPOOL 51729142255a16d4cd949d4bf5f3b681d36bc83f30dad39aad9d1dd56f7dcec0dae4377817350e7947d518129a74eec7f227c3cb1600ac168ea90d056b87d195
-EBUILD netbeans-javafx-9999_p20151229.ebuild 4717 SHA256 8469b0a41e25ad8cd23f44f47e9c2b6db741625466f8023f235703c5bea2c4ef SHA512 b8c78104924823e265da7775a9d5cf8d10a77cdd735a9c0e86a328fb3916be5bd42160a63350977c10b96e730cb0c50c8c30cd2f477c5768aea56fa21af616cc WHIRLPOOL c1a76a0a40bf1b49908df6f85690413d490d743d150c6f5e993629f17014657bf2f82a982aa33405f6e12f49ebe4e56fda798314a8c518945d6d6713e2718126
 EBUILD netbeans-javafx-9999_p20160104.ebuild 4717 SHA256 59a80e6d0bab595781c7a607913a4fdf0b9590d7d81dffa8396f84c3f13d9136 SHA512 b72ba3e52921421bf51edec7080a390df9232f62bce3b7ebfedb732599d4481bf34aecd610799768ba3449c35f8bb50e54bf47c0c78ec8585d424ca3a27a0cea WHIRLPOOL 8073288bea2a476883eb9ddf78fb1327b7b634f9245355b9d6e2490bbadd2a5328515925afa079cca9b307f3026082176027a1cfbb4a4dba70c148bc1b4daad1
 EBUILD netbeans-javafx-9999_p20160108.ebuild 4717 SHA256 e9b5ad69533d04f102b9d6f892e7f0173706f42aa130e075b4e4770f5131b11f SHA512 c7467a586e8cc74f08f36bb8b9a77beb96abe13a0841438cfc8bed174663ea5949ff6da202130c961b2c52e654c502812f79615455d93f3e5727e4cf93e60b7e WHIRLPOOL 24ebe2a5f4b1160a4157423fd277fc4f5222378c022422b5874f65d9346598ec2ee252105042b1e297830418f975b311a7f8efdbecac5f0c83e903c0d7bfe5d1
 EBUILD netbeans-javafx-9999_p20160111.ebuild 4717 SHA256 b324c0fbbba0034583640e08ea5ceb5d94904a93b025f3b01171ea3316ab475b SHA512 81afde2be0b009e2db65835fd72c79de4bf4c411be9600b127281d09eea457b40b6e9fd5492e87c9301da47606e30587319943b7fb1cfea7c93e3dc57c9728ee WHIRLPOOL 7a43413a66573bfe1c572d2781c44f9fcbb6a0fcf98df0ed302987db15763224c19820523899d16dcd290451dd116626366dadd6f197560904d965d70e9e3631

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

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 7fa50e5..11a20eb 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
 DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
@@ -20,7 +19,6 @@ DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9a
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 EBUILD netbeans-mobility-8.0.2.ebuild 4342 SHA256 e9b4ff8fe38904346bc21a82219696e97322bf9df4e9d4cad2259b6f08bbe7f9 SHA512 338711fe61c469cee80e499ddf8c3ad70a3a38e6658311afcd1d24edd1a99b87566fafcbd392bb958b589796e0913d2574b07570870c8d3382a91a324227082f WHIRLPOOL 855b2817c36bea67c8fb368a0740be18b71dbebb2b98a154552f002a56eaff34f54eee2698379d7200a6042c1de699df23e7717b5b6c532776852d8757b74cb0
 EBUILD netbeans-mobility-8.1.ebuild 4366 SHA256 fe10d103a284b8f82b67179ea52d51d57b43cfc4a4084b97e3f9650526621497 SHA512 36bdf0948b41bfe4f9c66fe093030d5f27b90f5a89be94dfbd176e3887b249d5aa3eb9b0924df142291f0d693f274eef840ed3a7f658106847327befd0374710 WHIRLPOOL f9dd44e6401367b2df73c5f1428bff53547ac012068297667666d0241c29310aed4413a368e5350a996af37ad026e875325467b1a165cba6953d99a5da3a0d76
-EBUILD netbeans-mobility-9999_p20151229.ebuild 4412 SHA256 8bc4de3868b8f53ccbb7ab4445fdf027712dea92b8e7ed4587bc159e6bb56097 SHA512 056ee42f1ab26d6e1d463caaa52cbf967fabbd19248a49f358d7e445b0b40f57e65a5f982350bbe9c199188f768c4437fd02fb3f5b917069b96e3c783ab93e7f WHIRLPOOL b1bd9b1ba3f62a8e22e66b592108217a763dedb96ab3cd6b2b078d7849ce411e6eb35500bc1b2181859c2c6f646098c7e6b34c59dbb6ff5405b3f74799ecc474
 EBUILD netbeans-mobility-9999_p20160104.ebuild 4412 SHA256 53139800c0b259b2bd7254d29547e225c9c31695e4b3c195e2d19fa4e65efed2 SHA512 4e0845b40fa279a700e3ca6e5f4ab221465c47c535d2405ad7432139f240a02a58c111753527c09a7de5364c3d6c7d7e83ef242d4711ef0e73109974fd689a51 WHIRLPOOL 3d6fc8ad2bb81055fb9e533265975590784091e8a3f8ff9f8f4d28f347a4c16e61c09bf70775dcdc05d13f0cd56afd391cc2336ff5cc7020eda32d7bd86a6fc6
 EBUILD netbeans-mobility-9999_p20160108.ebuild 4412 SHA256 0b1cd91916939bca6cfb06178757f831625fed434675393a0687069911f1d2f8 SHA512 88764fb80fe99833b24543b2f5580d34d4fe2aba444aab8b1f2384c880f71fc02389456e877461ca96b544a29b3416201d9664a81ee68d5e67e47fcb3c2f7b08 WHIRLPOOL 979ff013bbf69c720157df10c49bce1e453ad42f706b5ac78bb3ef06b5891dba345f906c002506ae46924c23038c807effd318c5acf20c2f2a459b539ab53ca1
 EBUILD netbeans-mobility-9999_p20160111.ebuild 4412 SHA256 a626a4a5232ee5235e851862491c1f0dcc5b84e33ae85ef842531948b8627d4a SHA512 7afb898984150c7491bb1df9f087b2701a689b161914084408ee1fff3ce48a96ad3663032e6db2053c5e0341004f7c34068127126dc893b12fe4dfc9b8d1d3e6 WHIRLPOOL cbb5aa89af025337f5e5cf967849dc10fa2cd81ec397bf8d89752d1a28bad618cb0a06fe44f7e58460724864a82f6da1c6072dba998168647583517aa0f5f73a

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20151229.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20151229.ebuild
deleted file mode 100644
index 3589afa..0000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20151229.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# 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-12-29_00-02-04/zip/netbeans-trunk-nightly-201512290002-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 b2a69e8..dec5a35 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
 DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
@@ -23,7 +22,6 @@ DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9a
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 EBUILD netbeans-nb-8.0.2.ebuild 4927 SHA256 7531e50c4d76608bf925efdba4f54f522de3a8ceeef4d48807fb4ee48bfabdf6 SHA512 925734f331cf228066c5c9e614f48b756af31cac8b559cfe756347b6a2cb0ce362c7c41489a25084f2ed3f2e415baefd148a54f39fc00269fb14179efe056cb9 WHIRLPOOL e3224c5f22bb8e4792a5f98bbe819e071ff18c99533ce05a3fc1c5898ddcca1e3ce34487ba78159bb4d60155acdf15ae4fe81189ff2d5b1bc77ffd9ee4e20aca
 EBUILD netbeans-nb-8.1.ebuild 4065 SHA256 c1bfd704ecaa1fd62b149114b7391b4633a90a8a1d87645b833731920aa6efbb SHA512 56bda99c3d05522d5becb032177e4b4411d862d18a069e2d4343ddc8b08d05ed6c3199588e28aece7e583ccc9f95517621780a246bdd65c7d3edf072a61ef1cb WHIRLPOOL b9a43e6b4ada929bcf2aaed0bffe9cdfe0b9dbbf001e8ee4f2ab3cf8a08e27d318ea435d0580c80fd23cf921d261ca9b54d54a2b2e7a53173f955bde03aa0a12
-EBUILD netbeans-nb-9999_p20151229.ebuild 4111 SHA256 307405ecf0b1996504856035f6d74cb8b4ccac7f433e343ebad0815b87c9901b SHA512 6a4e483e4007790a22bff6f31dfd4d11aed0f899b25c6527e197dd71d779ee2a9e7743d5deb41c9c35d8c11b0b495c086107f5ac5c9091edaf7bd9fdf1cef0dc WHIRLPOOL bb287d8a383384df7e65c8c4bee205598540a0711d725d0e71fa04da7b4afcff728c3f585c7f5c5416a9030e64117b0b76a46beb3ddfeea4a44ea4d2dfb23ac6
 EBUILD netbeans-nb-9999_p20160104.ebuild 4111 SHA256 37c19b6aa13fa95700d10483a58ddaba41482cfb04a7946eb4f6e698fa60a5c0 SHA512 2faff85920f5c09e2b52c7042e62585c4368cb9fa3877dd21ff0f23d3ddd91ef1323c1e669d56991c4048c7549485ad8c92842ebf5393c80ff3dbf00468a4de6 WHIRLPOOL 633e87b3dc1d067592ae1b7ee9f0bc8b6fe288457a505dc1d018007a791cd927966969afb936a340b58eabcdca04063c982a8b3e089dc05dfc33aebdbdbc27f4
 EBUILD netbeans-nb-9999_p20160108.ebuild 4111 SHA256 4f26d5e7847051f7bb02e0b8e8c67f483c4f405f683714c8f5613af748513a7e SHA512 75c8dea4e0df38d80f94a52117d54a06621d545681956287cfb23746f0384462bcbe5b272643014f18586cbb9001ee853679ca25e0f23d476ef78f700d091cf8 WHIRLPOOL 5e762a34b0eab5072d7d6ecfdefe94851e981a48b9764f6ac09a75eafeb9f5b60a5cc763a078c020e8551fd7e41ed300d889b337ddfdfde15c8a23741f6969ac
 EBUILD netbeans-nb-9999_p20160111.ebuild 4111 SHA256 bf3596d4b39073e985748910fcce8ee7a3f6ce63cac8e206a1fd33071a809263 SHA512 26afbc618f8d19f6db3a2ba633836ae58caa89e261903d8124f42a768c9c0c3e431149e5b1eda4002c9a24630d553ffd98449459428a73500d01523263f411a4 WHIRLPOOL 800f5b7bf794f5f7001e1eacb2e911b62343895c4c141504599f3f5e70ef0331a59279d75aa44f3c7430cf88db4a24a16f1e2ca63e5013d8b118551065726f1a

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

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index 94fde35..c89af5f 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -7,7 +7,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
 DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
@@ -24,7 +23,6 @@ DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9a
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 EBUILD netbeans-php-8.0.2.ebuild 4347 SHA256 585b2488d748f3d0f87c17c951870e167aac7bf10847428add786e4a8a446583 SHA512 1431305d4f340cb0a2c7c896c54d45f6f02ef82a4201f82053278b98511a5a4a68210317530e9cdf5cf1f495996d3a3f9c4b2c3c479aa407abd375072ab3182f WHIRLPOOL af8476f2ff2d119f2657e6be03cfea1160f86e41bd791f40609f1bc8a8aada46ba1081e4f2417b0fddde931fa4e43d20956c0fe1d4fdf3617b78d01afd23f9b4
 EBUILD netbeans-php-8.1.ebuild 4371 SHA256 a9e7565a8cbcc5dfca4d9449f43b959911c47ad8da59648e383ecce55c4b0064 SHA512 67d43532ea43abf007adce73e7da2345d9cc42229189ba90d254d7764e19e3fd3c86b990ea2fe08cf52e49422def481046fe6e0e447fdc1de1680ac59f51d9d3 WHIRLPOOL 433275570fd81db477180e58909ebd50b83cde03bd5df807cc9ee213e2f3a44f65f3ec4877851aa6322e7752969aa72313ee7b35b8ee07446e8c22be4321d536
-EBUILD netbeans-php-9999_p20151229.ebuild 4418 SHA256 b0288009fdc8ee4de26b7312434ece060f10567bde810d647baf43550d540d4f SHA512 72f3467694ddd7dc867c4c447404c5353c6b1168e52ac3b5216a16f5adf3789e364b7fbd5b4708e9e8d2e93ac2eaef1ffeb307bd58b5eeb669446bef7d5ff059 WHIRLPOOL e304add104734712933de3fcbaf494fcf358e28e467b0fa7f18883ed2fcea717d1ee36dba3a5c6ea7b0b90952a6419889ff6d0ba9c366a983fe50c3afd5f901c
 EBUILD netbeans-php-9999_p20160104.ebuild 4418 SHA256 08d408fbba6d43b353b2f53f9e16eeeeb3b449ec5da875bd1d88261f87405b7a SHA512 47aea35c7a21d931b57a75e97578a42dd4e8c34406ccff8b62c32be569618cfdaa78342202b7b0d34334b3abefd8276bd4d90d92bebf5697935dbfafe7f2ee90 WHIRLPOOL d61e370b17ab86c73d5a1087cb415cbbe925bef4ab27e5fa5ef7f3b4841a015f903d73d4796817ec2ed14856b30dc1f5db65caf3d58335707e5934cd61e10e53
 EBUILD netbeans-php-9999_p20160108.ebuild 4418 SHA256 c3ac87d1cfa4d64dd6c89bf2d38e36922c753588f343e241e9ada0a5b1509d24 SHA512 3fa73ee72855fa3d8dded8a9aa8be6ede38f31950112e7d59013074449fe042b01bc425834c7259afd922cd5d99ec2ed5260c57125c2f5ab752543fce72bb5ba WHIRLPOOL eac696a5e1404ce10a41d058816b2f656aa68997823ab563ba51da9fdd3712ed196de038bbe88c2a31f656061a05347f9163d6790608617d0fa8cf475d785beb
 EBUILD netbeans-php-9999_p20160111.ebuild 4418 SHA256 b422382d085f00464ebd8013437eb7737343a757cb4a04a858ff9f6bfcf1f00b SHA512 8718b38349556090538ec1b0714f2c346e1b9ef56263c6b47784a5702449ba3fa121e5a203d715fbda70553bc12ad2d4e0095474b21e5b1d15b975f041b5e1eb WHIRLPOOL 846fb26ef76c5b2a1b7617f64faad1693fc3360d832c9262ae055935c358c65757e4db643f2ac60ad0515f73e9f3ce2e9bb5a91c8441becb77810e9f05601755

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

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 3c2ff15..1b499d6 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -20,7 +20,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
 DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
@@ -37,7 +36,6 @@ DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9a
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 EBUILD netbeans-platform-8.0.2.ebuild 5406 SHA256 98e9861da45ead0d2d975a0527315df5282870b2d7e71a089724d91c18852e81 SHA512 cadbe66132d3ad81f6d149e20731b558c11c529e2ec15b1fe47ff97d99a3f4b4612fa5c98c435c4ff979eaefab6702721db009a03162202c96b4b411cf9f872a WHIRLPOOL 9552948e8bbad308f4379eaae69d8c214da9fbfab87d75226949b69ddca3e68c2d36c4d05738196073e5b959ab0b764064c9186d421198937122aa4bdc4988dc
 EBUILD netbeans-platform-8.1.ebuild 9320 SHA256 4a03fc6a399aaab949edb3df7c629da5bc7ce6288d44dbc848097352c2b4ae3a SHA512 7015cb042dd4e371cdcad49838eb2e4109d1ec505ac618f3a6f98d4dce328ab34be90a3cb0820896bd75337a180a1bd9c91c842a143fdffdf033696d5f496402 WHIRLPOOL 8c5311df396a374bf9d8c994b37c5c9fe6aa3c82a9e9e0824a5caefb0006fd9b44f4fdddd387ee12da48592929d5c4dd7e7fb2d866c9ddaf76acf5b3adbe310e
-EBUILD netbeans-platform-9999_p20151229.ebuild 9360 SHA256 6abd4f200c6d3edcc5c66df3ed68a6725565ff7aacfad514e45ac13b156f50ac SHA512 5f76c40f20e8fb8828e190548db2bdcf977f642dbef6bca11f7b12c5624e33f7cf8dced1db751613ed6c3dc5e93279a0eebd519b62f7c0230a4abb36537d88d1 WHIRLPOOL 2d2888db6bfb144051d7e943b154b783f8a5039886ce1861e8b7f3982420c940a32fb7731b5edf30a177e6214ae9fd134f39a633d90821e824186b09c809547b
 EBUILD netbeans-platform-9999_p20160104.ebuild 9360 SHA256 dbe0927dd378235a4e5d2c1a80e1dce1e18f2ed930f8a61886fd4fa715ec3a4d SHA512 2fa60726a78b3d387bbd3a201dc40c3c50a35a6da7e4f94a8e1e2fa22b94ef66b8b3883365c29e205c04a01c6cb3dfad235e22796d869bac335da5e757e939b2 WHIRLPOOL 6a7c552b0c82c1fd6854682f874e60beaeadacdcaf3fd22b3b1ae5009c3ef610de4bdb1433ae47d132eb15d74714f5a18ed7850ee119a7d221e6e2cffd8c2da0
 EBUILD netbeans-platform-9999_p20160108.ebuild 9360 SHA256 d2a8a154699e83687f87795375e5e1e9d4eeacb4e74027220ddc5f48c3c826e9 SHA512 c25d4073ac52080ad78bd6ec82732fea120d4d5ac8483e4302c0f7c766796b87efa0ef83c270d812656238b72ff187700f283c16795e392a4726f15dd29a01ea WHIRLPOOL 28c729eb7cb088df965df5c739042197d681de831e151399aec69bab7808e70cb531ae607423a34ec8773d18411a35c3c23390868b2fbe2632ea080da95731df
 EBUILD netbeans-platform-9999_p20160111.ebuild 9360 SHA256 ee44a5257c5b5c9fdfe3ebd7b38079b0f055b5db406f9208b71e583c45742290 SHA512 1abcb6b890fa0771189598b9c0350780150b372f6a9aa07632d6c58b8464c8892e4ff49cc942c94391f80f73bfd8b38cec7d1c1a87e4552d2a1704e1826a4f19 WHIRLPOOL 708d892213ab9821c7d8fc83bf508c192308df295699fea24a94bc4468d2375517ddb3c672b18dd02051d24784fe12a95449f4f6225d86a4ddf1489f8da71b99

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20151229.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20151229.ebuild
deleted file mode 100644
index 9bda2ec..0000000
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20151229.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# 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-12-29_00-02-04/zip/netbeans-trunk-nightly-201512290002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar
-	http://hg.netbeans.org/binaries/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar
-	http://hg.netbeans.org/binaries/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar
-	http://hg.netbeans.org/binaries/A3432F57D9B3B4AD62CB0B294EEC43D12FCF3F62-ko4j-1.2.3.jar
-	http://hg.netbeans.org/binaries/78DD1C0B4EDC348FF4DCD0616597BB809AAE248D-net.java.html-1.2.3.jar
-	http://hg.netbeans.org/binaries/7BA1E1C450BCD0AD9D0D2F6797A2EB50A4822E0E-net.java.html.boot-1.2.3.jar
-	http://hg.netbeans.org/binaries/068B9902E65F2292C9EA30E5423E41FB6B30D8AA-net.java.html.boot.fx-1.2.3.jar
-	http://hg.netbeans.org/binaries/8621531E83EC4850DA61AA2266FE41105C304F40-net.java.html.boot.script-1.2.3.jar
-	http://hg.netbeans.org/binaries/24824B1E8C2A2D3A5C471F5875BF61F27E8916DB-net.java.html.geo-1.2.3.jar
-	http://hg.netbeans.org/binaries/F41518385DA4B5682C864F19B82C3BA4AF65AE83-net.java.html.json-1.2.3.jar
-	http://hg.netbeans.org/binaries/989A81454D4FA962EB1C158FE794D2EB060AB9F6-net.java.html.sound-1.2.3.jar
-	http://hg.netbeans.org/binaries/E5DDC5E827D3D62E7BE9F7E32927CA01F2839971-org.eclipse.osgi_3.9.1.v20140110-1610.jar
-	http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip
-	http://hg.netbeans.org/binaries/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-# oracle-jdk-bin is needed for now because of javafx which is not packaged separately yet
-# [parseprojectxml] Distilling /var/tmp/portage/dev-java/netbeans-platform-9999_p20151108/work/nbbuild/build/public-package-jars/org-netbeans-libs-javafx.jar from [/var/tmp/portage/dev-java/netbeans-platform-9999_p20151108/work/nbbuild/netbeans/platform/modules/org-netbeans-libs-javafx.jar, /usr/lib64/icedtea8/jre/lib/ext/jfxrt.jar]
-# [parseprojectxml] Classpath entry /usr/lib64/icedtea8/jre/lib/ext/jfxrt.jar does not exist; skipping
-#  [nbmerge] Failed to build target: all-api.htmlui
-
-CDEPEND="dev-java/hamcrest-core:1.3
-	dev-java/javahelp:0
-	>=dev-java/jna-3.4:0
-	dev-java/junit:4[source]
-	>=dev-java/osgi-core-api-5:0
-	dev-java/osgi-compendium:0
-	dev-java/swing-layout:1[source]
-	dev-java/testng:0"
-DEPEND="dev-java/oracle-jdk-bin:1.8[javafx]
-	app-arch/unzip
-	${CDEPEND}"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.platform -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.8"
-JAVA_PKG_WANT_SOURCE="1.7"
-JAVA_PKG_WANT_TARGET="1.7"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r14-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar libs.asm/external/asm-all-5.0.1.jar || die
-	ln -s "${DISTDIR}"/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar libs.felix/external/felix-4.2.1.jar || die
-	ln -s "${DISTDIR}"/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar junitlib/external/junit-4.12-javadoc.jar || die
-	ln -s "${DISTDIR}"/A3432F57D9B3B4AD62CB0B294EEC43D12FCF3F62-ko4j-1.2.3.jar o.n.html.ko4j/external/ko4j-1.2.3.jar || die
-	ln -s "${DISTDIR}"/78DD1C0B4EDC348FF4DCD0616597BB809AAE248D-net.java.html-1.2.3.jar net.java.html/external/net.java.html-1.2.3.jar || die
-	ln -s "${DISTDIR}"/7BA1E1C450BCD0AD9D0D2F6797A2EB50A4822E0E-net.java.html.boot-1.2.3.jar net.java.html.boot/external/net.java.html.boot-1.2.3.jar || die
-	ln -s "${DISTDIR}"/068B9902E65F2292C9EA30E5423E41FB6B30D8AA-net.java.html.boot.fx-1.2.3.jar net.java.html.boot.fx/external/net.java.html.boot.fx-1.2.3.jar || die
-	ln -s "${DISTDIR}"/8621531E83EC4850DA61AA2266FE41105C304F40-net.java.html.boot.script-1.2.3.jar net.java.html.boot.script/external/net.java.html.boot.script-1.2.3.jar || die
-	ln -s "${DISTDIR}"/24824B1E8C2A2D3A5C471F5875BF61F27E8916DB-net.java.html.geo-1.2.3.jar net.java.html.geo/external/net.java.html.geo-1.2.3.jar || die
-	ln -s "${DISTDIR}"/F41518385DA4B5682C864F19B82C3BA4AF65AE83-net.java.html.json-1.2.3.jar net.java.html.json/external/net.java.html.json-1.2.3.jar || die
-	ln -s "${DISTDIR}"/989A81454D4FA962EB1C158FE794D2EB060AB9F6-net.java.html.sound-1.2.3.jar net.java.html.sound/external/net.java.html.sound-1.2.3.jar || die
-	ln -s "${DISTDIR}"/E5DDC5E827D3D62E7BE9F7E32927CA01F2839971-org.eclipse.osgi_3.9.1.v20140110-1610.jar netbinox/external/org.eclipse.osgi_3.9.1.v20140110-1610.jar || die
-	ln -s "${DISTDIR}"/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip o.jdesktop.layout/external/swing-layout-1.0.4-doc.zip || die
-	ln -s "${DISTDIR}"/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip libs.testng/external/testng-6.8.1-javadoc.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	# upstream jna jar contains bundled binary libraries so we disable that feature
-	epatch netbeans-9999-r14-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --into libs.junit4/external hamcrest-core-1.3 hamcrest-core.jar hamcrest-core-1.3.jar
-	java-pkg_jar-from --into libs.jna.platform/external jna platform.jar jna-platform-4.1.0.jar
-	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into libs.jna/external jna jna.jar jna-4.1.0.jar
-	java-pkg_jar-from --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
-	ln -s /usr/share/junit-4/sources/junit-src.zip junitlib/external/junit-4.12-sources.jar || die
-	java-pkg_jar-from --into libs.osgi/external osgi-core-api osgi-core-api.jar osgi.core-5.0.0.jar
-	java-pkg_jar-from --into libs.osgi/external osgi-compendium osgi-compendium.jar osgi.cmpn-4.2.jar
-	java-pkg_jar-from --into o.jdesktop.layout/external swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
-	ln -s /usr/share/swing-layout-1/sources/swing-layout-src.zip o.jdesktop.layout/external/swing-layout-1.0.4-src.zip || die
-	java-pkg_jar-from --into libs.testng/external testng testng.jar testng-6.8.1-dist.jar
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	unset DISPLAY
-	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
-}
-
-src_install() {
-	pushd nbbuild/netbeans/platform >/dev/null || die
-
-	java-pkg_dojar lib/*.jar
-	grep -E "/platform$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	insinto ${INSTALL_DIR}
-	doins -r *
-	rm "${D}"/${INSTALL_DIR}/docs/junit-4.12-sources.jar || die
-	dosym /usr/share/junit-4/sources/junit-src.zip ${INSTALL_DIR}/docs/junit-4.12-sources.jar
-	rm "${D}"/${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip || die
-	dosym /usr/share/swing-layout-1/sources/swing-layout-src.zip ${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip
-	find "${D}"/${INSTALL_DIR} -name "*.exe" -delete
-	find "${D}"/${INSTALL_DIR} -name "*.dll" -delete
-	rm -fr "${D}"/modules/lib || die
-
-	popd >/dev/null || die
-
-	fperms 775 ${INSTALL_DIR}/lib/nbexec
-	dosym ${INSTALL_DIR}/lib/nbexec /usr/bin/nbexec-${SLOT}
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext
-	pushd "${instdir}" >/dev/null || die
-	rm hamcrest-core-1.3.jar && java-pkg_jar-from --into "${instdir}" hamcrest-core-1.3 hamcrest-core.jar hamcrest-core-1.3.jar
-	rm jhall-2.0_05.jar && java-pkg_jar-from --into "${instdir}" javahelp jhall.jar jhall-2.0_05.jar
-	rm jna-4.1.0.jar && java-pkg_jar-from --into "${instdir}" jna jna.jar jna-4.1.0.jar
-	rm jna-platform-4.1.0.jar && java-pkg_jar-from --into "${instdir}" jna platform.jar jna-platform-4.1.0.jar
-	rm junit-4.12.jar && java-pkg_jar-from --into "${instdir}" junit-4 junit.jar junit-4.12.jar
-	rm osgi.cmpn-4.2.jar && java-pkg_jar-from --into "${instdir}" osgi-compendium osgi-compendium.jar osgi.cmpn-4.2.jar
-	rm osgi.core-5.0.0.jar && java-pkg_jar-from --into "${instdir}" osgi-core-api osgi-core-api.jar osgi.core-5.0.0.jar
-	rm swing-layout-1.0.4.jar && java-pkg_jar-from --into "${instdir}" swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
-	rm testng-6.8.1-dist.jar && java-pkg_jar-from --into "${instdir}" testng testng.jar testng-6.8.1-dist.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/platform
-}

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index c7ae956..f91e11c 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
 DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
@@ -20,7 +19,6 @@ DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9a
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 EBUILD netbeans-profiler-8.0.2.ebuild 3402 SHA256 8021dea620d1bc26214ff0ec285f8061c24693dd28a62a97a48ac3223707e920 SHA512 2660390337a973256b1aac3a02b14e16782c230fa2714ae695213b0cabc0eb60621c6a1ae234f9e57259a19de22a87447f9a89ab846bd59bcedd2be313c35072 WHIRLPOOL 5d1053ded03143b2de05b64cfbe59b515cb786d60bfa65566be795567bfaf5feb88a2f8e7161a05da512fafd523f871778d5ddeb3c6b89fc95885096e379f65d
 EBUILD netbeans-profiler-8.1.ebuild 3426 SHA256 81f8b3b135f021a2dbe7b5ccb53fc7fcf79908ab83ef14ca0e912732b7fb4b53 SHA512 210bc0c5214aa8f79f559cccf69f1ed885dd2d14dc55cd17bd89c8a7f04f1a76de5b414426337b2ba6e99576850f0753f13e41e0f424b3f0adc58001dffc217a WHIRLPOOL 293d12a03294532dc9ce10503b030282cb636f08af6300ea796885eb6a3fe36c9d37c2a07138d03e9c4d45b31352ce160901a96f659f26d50a0fe5caee3bf0fa
-EBUILD netbeans-profiler-9999_p20151229.ebuild 3472 SHA256 ebca38f2b4c1822b284a0a1d7592afb0a6f632f4e04fb7170aaa77c1beaf4635 SHA512 8e78b04568a2a635149ddc79fdc914f6bb4edff42556d126b356f90abfd1decc5c16e081b71b2524194756a5147f908f4a56ad6c914b3cd861af7396bc6e2bba WHIRLPOOL 59004107286634479d2ebffaa83e86edbc5c2d1b8c0f301f1609fa87eacc259fa3f76c4206e944fb4ae80c431d214c375dc165dc090143bdfb0c69d9b6ea9fc0
 EBUILD netbeans-profiler-9999_p20160104.ebuild 3472 SHA256 dd029b7ae4365dfef7c8779dbea31a273118bcfa1b2e3e96f55e3a9c78caba36 SHA512 e5e44865b0d67ac5b78ac6faf95441ec7cc7ce38923048c65e07fa91c38f8739bfce78be900e887b189690b9390ca099f68add9269f11dd4d1b4e96769f65e80 WHIRLPOOL 8211c224d29751e32ae94c22c66a32f5985ec8388743c43ff8100d5a0a5295f1448eaa500deab9f891843c8220c54ee1e773fae8899d33b4c90c91e6be056a44
 EBUILD netbeans-profiler-9999_p20160108.ebuild 3472 SHA256 dce9b6d9b9d65ecc15b7e08a391b5209676f4faede24dfa02dc025a3d4ab3c5f SHA512 db0877681b5c37791189542cc616d49203fb377a0050fb73127035ddecc55ee7f2d090e905c560268d011b8ddc12b2efa1046f5e05e3fab1278484161678e063 WHIRLPOOL 9b4c40ed7cd9ffb8ac8b3f7a4d5bbad77dd54243f87df6243fc2546dfc9e5114767bbd8eda8061283bf4534581365dc6ec86d2f99fad8656e2b87de1c9dec4d2
 EBUILD netbeans-profiler-9999_p20160111.ebuild 3472 SHA256 eb063ae4bb16a18103f598d470aa14c7fe5c27f47567194eb198fddaedcbe5b5 SHA512 17991fa2b67149c2892c8218aef01bdc1d5b1462d8715e959814a950f64d17176efe1c6a082af58d90d1e8e188d6ccff61156d52b3ac7c037dd4f5d2abab62fd WHIRLPOOL 2a11634a4227d5981a99821c99d1970abf67423dec0eba41cbda0c05a212d8bcfafd8f4bb6053c5f382c3492dd60f590cde0d7ff5cf2c0d039713766a2e8ba0e

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20151229.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20151229.ebuild
deleted file mode 100644
index 22b6ce7..0000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20151229.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# 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-12-29_00-02-04/zip/netbeans-trunk-nightly-201512290002-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 2b5ea72..dfcdf2f 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -18,7 +18,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
 DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
@@ -35,7 +34,6 @@ DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9a
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 EBUILD netbeans-webcommon-8.0.2.ebuild 4723 SHA256 e2ba39cb6f22c990acf9a492eac5707f130382d56f9bc1e3636e82cbe4d61938 SHA512 61955d38f829b3ed54bc5cb9a71da07f05676a2bf7219fa8073aeee0f0e2d0e73f7aa6ec1636be39fb071d3d2b9de7ceb813a247a61961874f4cc78697d4e568 WHIRLPOOL 1a272650fc2394716a790b79cb85a9322929c7cc96ea4776cc639fb869c5b536140dbdc632b1a8aa9cb1fc8e740050125c2ebe9390de7a8f4207e88e24924206
 EBUILD netbeans-webcommon-8.1.ebuild 4945 SHA256 55c57b638481134d659763154a7820467a9866707112cba0e60dbd9ba8cd2840 SHA512 a98987535f60b533bf0df701f83693a58584dfa9a10d5c8646186165d884fb7e8a3348ec77cbf25d1a8cc8cfd947bf54cdb30d251ae1a3fffb74947070d76579 WHIRLPOOL 36fe1b7b9b34a02fcda227aaeebed8a33562e6fe4a014c78e9a464d709bf5120322a35bd54a0ffa15c4dd4f3ae605cf6fc2d35c5652f7162ae646c61ad69210a
-EBUILD netbeans-webcommon-9999_p20151229.ebuild 5280 SHA256 10543ccc3733dad581b7fe62c979919cf8804770fcdd0e5b417a1a1bbf8de039 SHA512 6ae9b2f9835f3e8ee3db3416c45928ad559ce5929ced94b007244326ea1a88453a87c01fc1443aa14cc59b8b9ef3d66433cd6d5973cabb03ff2c3eec95f2063a WHIRLPOOL 268e5da422f0414d26f145b50b4ab71fd11bb6ebe2ff7c9a51bb0b9af311aba55e35dc9129d00425237f1548cf17e1b8a3d21ec133865864e0d1484f96da8eec
 EBUILD netbeans-webcommon-9999_p20160104.ebuild 5280 SHA256 8b6cba663a851e4f552223c9cddd9beecdcb2b2ddfa873c777368e4d303f1a7b SHA512 b41607612f133ce80472864b4350e1f1bbfb8057180038cae421e1214950a201dbd69e5757ba1ea2937df68fb400dfe70443a001095db0a9446abf0cd9a5370f WHIRLPOOL de759519558037f98e171c71e8deea939a8144c035d9e21e39590a9dd512631fa22511f068be80fb71cc02d7fe1b7dc4561a73cc3376503fc662bf0c7f12557d
 EBUILD netbeans-webcommon-9999_p20160108.ebuild 5280 SHA256 0dd5d66c0533ae34634cbf3f7bb170490ee66e53958e5f71c623a9d0aa6b9954 SHA512 4f3a7a89ef58828f561f195f0c59bcd38600d5ecbc2e1d6be0509b57963c566cf240cfb631dbeca36451faebb3c6502aafae89559b326ecc9aa08d035580f9a9 WHIRLPOOL 8ca9815d403868f9da5f2f1a17f75515d8bb547c982d1e5c2210de16cdeebfa2b4dfc3bb27e53b5ae7c26b414e832f724e0b34450288451b92549b6a09a6f33c
 EBUILD netbeans-webcommon-9999_p20160111.ebuild 5280 SHA256 7ac164f96f7a03759df519ac86a5300f5c4b1d9e942fd47f0ab395c53d1bb142 SHA512 604d168c22b7b15720c90aea05bd58f7ce6674973bc6ba6c236835854c30a5f9a510e020c046ff6a8a4b31c9458ed408914882bb01f027b1d1eec9f6f31fce84 WHIRLPOOL c4ca3602705c20bb494d5d2849bcce323cc3eba4e1774853695a34f72a31c813a78d66c5b0c2c9430e82a3d2aae733d8e2f8d19910a6124dc91c65b91bd76915

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

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 57577a9..1b7bc71 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
-DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
 DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
@@ -20,7 +19,6 @@ DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9a
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 EBUILD netbeans-websvccommon-8.0.2.ebuild 2651 SHA256 a195b307847c466dbb5f46eb04240358ce3c92cadeecb8fda1562304de46820f SHA512 933626bd2073f58e3508180c042e237b9e61ba6f3c992cf37ea43978ac2fc972d2dcc3ef0b5c390b3867296e197ed2605c43452c98e36acf0982e7338b6d1eb7 WHIRLPOOL c3db8f0b50116d0129f50778e1961166e76601d8c165e20e73d75c91b02c8a095067e0f13e18178d849dd29adcedaeee7d3e0e62f99be592d7ce159fd6af632e
 EBUILD netbeans-websvccommon-8.1.ebuild 2675 SHA256 c9ff3d598c5f76c2b69dd5488a80c63025acc3cd0cc99321a0e84a493502df36 SHA512 89daec44b860aa8011d9e5533230f89dad7bcc50a119664122d2718db3e53501d1319ae4b27eac1d71596671e9a7c21315a641346e6cbab22edb3c7232bf5ce3 WHIRLPOOL 521521094b396c98687e2054742e4c019023045f19b01a6cc3a5f826f4cabe9448254db8b834448f3b33368c76dd667942554e1bae459c55de2c571bb5cfb4f5
-EBUILD netbeans-websvccommon-9999_p20151229.ebuild 2721 SHA256 f1b6448004d210974d8ae5410d2302bf456ed4316a7b4077d71712eaca7af507 SHA512 8f8dadc568c9c91c8a5c2578b77e207938648ffe298752798067de5ef9f9ccdf3bb977bb4833a02dcfa27e2960359a4c233aaf2611aefac19f04c973f52fdf98 WHIRLPOOL c4531e92ace3df09845281bf102d92e44c01ec4b04a8861dfcfe5323835c95b91368f003481d16834d36c95f78f297f51e31d83bc2df6bf77af8331687614fd8
 EBUILD netbeans-websvccommon-9999_p20160104.ebuild 2721 SHA256 1859840a6fe758cc115b174961d79887638a3c360e0835718151f4a800a6dbee SHA512 80d0a30a980b99bf6536a605ffbdebf7b2c2625482110006864b37a4b2d99988d58eab8c320b7010e3284a342ea11f5808e7d6c3d097460afd74d6aa118830a3 WHIRLPOOL 01e2adf818de5ee27041ccd2392797de927ed145cf2e56084ee36da19c7fd181b194f24792e26f96f5ef0244a72ee9c1b809d89d595a0f98daf8024197c93d0d
 EBUILD netbeans-websvccommon-9999_p20160108.ebuild 2721 SHA256 f987affbdbcda640f214df4c9d6a7d0a37f444029574defed75cd0846ec16db8 SHA512 9a98d910cb152a0134734f568646cb19610686e6c500c7742afee243cb2de0d7c0f0d4a302048a0f186ee3672d692e679c53bbd2ddad337e349b3913dbfeccdc WHIRLPOOL 2408f28d35dbda995c4d2357874bc60906c57240a37ad1429ac27423ce88450ce0de02204c12d641de475037aae47a3b5ab5df66ac7b4b65fe4c46cb5422fac0
 EBUILD netbeans-websvccommon-9999_p20160111.ebuild 2721 SHA256 e9d1f3e2b0e84da15edd1cc9668be983d4d1fdf683cb1eef766eae94af3edb4d SHA512 3adf6ba01dcb9491b31f6c3bbcde535c543696b3c7c773d5037ce36941b6ee152640a766156c625da8b7dccd122186ef6e6f62731bf113ca487a383bc0eaf406 WHIRLPOOL 0e2668771a3a6344b259aec6d1b99b54bc44780dccb7d51c410c6262d4ff508f397c786c868dbf2ea994174c6fd4202680e79cf57dc2808a4f26dc4b80b6d610

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151229.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151229.ebuild
deleted file mode 100644
index d9c3033..0000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151229.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# 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-12-29_00-02-04/zip/netbeans-trunk-nightly-201512290002-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 18ff671..fd7e22b 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-9999-r14-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3
 DIST netbeans-l10n-8.0.1-20141110.tar.bz2 12065358 SHA256 542d325cbc6e0e617f6076e964e37803ec322b6d0ee4724a6d2127f2f480fb24 SHA512 28242dcbe7bcbc6a9abce15dfe6fd6140a275a417d96ff28228315bdc0ce8110ede899a1815e2fdf9115b48221d50cd3ff5b71a15d36316d04d81f66e9c0cac4 WHIRLPOOL 0318caea3463d3f7bb8876774b1cc9467dadd9bc36497a9304ed12900e2fabdc4dcdfec0b9eaee27bb36c39e9caff3743c5a42ad4c3a432205a716832688c4d6
 DIST netbeans-l10n-8.1-20151105.tar.bz2 11945028 SHA256 33e86aa7315021d28fdb64790233327d7599c98bcf3ab9d936b6fe924884325a SHA512 eb3163eaa8add417a0e8ac3ed4923a6e4992a80eaac00a01eed24e0e1ceb8a5cbd308659bcf0e5e1192ac8e84a79ea36744ad6b2589d60891b03b37102e9435d WHIRLPOOL f214a865bfd8c54341fb9d538da6db4d9b24906b0d94b3ee6cbf4a525e8842d28e852febb2f34c4c31f989d1b6baf750480bc2f04d94bcd7a8bdb8c9553ef590
 DIST netbeans-l10n-9999-20131010.tar.bz2 12440242 SHA256 64c48605820ec1f35e38c34b48cc16cd40c053d085d50819d4b4e9a80453dfa9 SHA512 7d4d61fa61710186fefd90721598ec635db7c6249ce6fc484fd5813636220f163b60230349c984c398c87e083d2d629c531fe5b4cea3752ebbcaa9823b701a02 WHIRLPOOL 10506e3a3004d6c0ab17b05507f72db2c25d2713c3233a7f5478da27d3b1261b5fb6d5f71cbf369858668ca2d1219dad1900c6c42d3f250adcc935e846e56b09
-DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
 DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
@@ -23,7 +22,6 @@ DIST netbeans-trunk-nightly-201601310002-src.zip 209587059 SHA256 fc95aebeac0d9a
 DIST netbeans-trunk-nightly-201602010002-src.zip 209594786 SHA256 4e28a43ae473a13a453642964f0b97d1efc92954eaa3129b16853d7a63b0557e SHA512 09ac178421febc4c5a7f7add33618a86cd2fe8432b92f6b840604c360936aa3e737aff28feb822186fde61b6a91f38a51843916b6749b385384f4588d1078afc WHIRLPOOL d613ef283670e772932dcd19b23486f40720c838754f90a360034f969c0c5f120cf548c950ac22db354868f1aca4c7aa273ff9b5f98cff426d759e7217611ec5
 EBUILD netbeans-8.0.2.ebuild 7167 SHA256 80e31382a0ceb680c2a055dc5c78c1dce8edf32c50bbae6a1c14a2c568492519 SHA512 0ab466ca247ec953896ef0ab3b01b43ffea3a9f37e9bcdacecfc0476226d45cef35e4ddf27f2b85628d9512ed304e6cc6cfe963a5e547217d08cad400eefc4b9 WHIRLPOOL d09668e669f4f8d7987ab02cf26104fc6e54ba29b8b497fe0013cc8816a2d7560c99e6e1b02db77ead872d5240b84c09e3fabbc3465587d1d1ca7d6fcae114c1
 EBUILD netbeans-8.1.ebuild 6891 SHA256 22a19f05bdcea85475c0451df867367b69363bfbc6280f78b087248d9f8e9513 SHA512 812b6cdae3e5feaf37db5ca8b5efa1b374d5492f11cfa1df2adbd3617986cdca6a79d2d4dffd024c8c48492fc8a21704190242f5741c5699b12070620cea2c87 WHIRLPOOL baf5f750574c01effa0d02c72194139fb2757be932054f4900ceb0534607064af10f2b5b38063ff2cca34e75ab5be23d00c7e5d90d1c724339666d20f1bb10d3
-EBUILD netbeans-9999_p20151229.ebuild 6938 SHA256 48434dc7c4f72cc32f2789541b85cb842a0024a58a3db7b01c011b551956c487 SHA512 48cee46971986b6bd7afeb22728ac5b750a95bd9d22063c3d87763aa562e3663e4a72bb9af568f5270036221481ed1a0e9660cddab6fa434aae2c8e7e8e8dca6 WHIRLPOOL c4da5b86f86667626f0bd37bb385c5c364f372fff3e408b68eb31b641179e2ccff35765ff5969a27602651acac51e97c9347e6d22f98afab548d3ed58a148175
 EBUILD netbeans-9999_p20160104.ebuild 6938 SHA256 1135be98d1f27e9b9878f3f8c3b1f45f376812992c33ef10f65f0816e8527b8b SHA512 f2c130e0a405cc12d8deac7c1fe15870f6e59228d06cfa54dc794d75b48465d97ab6b181c81bb8a1aad8634b97eacca5e1776ff767d3ec6fdfdfab2b4b299b7e WHIRLPOOL 64318e8fa604d8e307d2f5c7f01fc8a8b447d9e78af4e86ec0608b56c966c35a3654fda021a2695efe76c825ccf58fbcfc6495897c5a5e3e6a97f759e5ceab91
 EBUILD netbeans-9999_p20160108.ebuild 6938 SHA256 d88c1b351d2832fea3b58e9c5b7a40aed4dbb73cc0d68d4810792fa497b9e94f SHA512 cffb502d84ae2cd7ca0c35f09200484b95614f1bfcf65148faa7b7cffb7221ab517e61be9d075c1d791b90fabb3ff599f7fb7414ea50b25a8cfed0ff17145292 WHIRLPOOL 6053108db25b04b69cbc6fa42df8d99ac417fae17e011fe0ff75349099dc37e1feb73e2a0a31a36a1eeb41c936f5792eff906514c4f4ce6daf46d2dd546b49ae
 EBUILD netbeans-9999_p20160111.ebuild 6938 SHA256 be09bdb58187f8166ce4cd09484de01053547ed6f20fdbff36ae2832f1b058da SHA512 2f2b7d23e93243d2d0beaf572938ab44afe0367f753e326b8c639a6f1bcb7a245fae75a35e678a9f58531c565e1371ac24eb25d32dbe31b4db4ceea1017c2f79 WHIRLPOOL 86e02e132c7529cb435b245a88ac5fe38988c81b9169bb23ab5ae5b2dca1463b7d639f080710671595c2803a2d926053a208162d793dc62f41143b720ddcc720

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


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

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-mobility/, dev-java/netbeans-websvccommon/, ...
@ 2016-10-22 10:34 Miroslav Šulc
  0 siblings, 0 replies; 4+ messages in thread
From: Miroslav Šulc @ 2016-10-22 10:34 UTC (permalink / raw
  To: gentoo-commits

commit:     b9d2bb431178d448e51b936eef2d6577b5788ecd
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 22 07:57:15 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Oct 22 07:57:15 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=b9d2bb43

netbeans: removed obsolete ebuilds

Package-Manager: portage-2.3.2

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 356f63c..8c26bd1 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-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201610210002-src.zip 218421842 SHA256 c06c45aac35396
 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_p20160920.ebuild 3384 SHA256 de7d5a01a0af33c46c1b997b056a614afc01b609534976f391665a9ead4be8d7 SHA512 52ea6b6418eb9ed056064fae73bafe93b800697bc77438004ee1e6cff81a6d5cf295bd7643c91c15dc542cd5fd60c41c61a11e18a1be2013318477e177933a14 WHIRLPOOL 11f423becd2ae0d89d3b2262689e0ae5e14b76a52f6db55899835629c0612d9f6d55300386e69d54142bc50d7d7ff196e1a29bfbdb7d08ed066354f2cd891e9b
 EBUILD netbeans-apisupport-9999_p20160921.ebuild 3384 SHA256 9372fb191756ed900d0a6f59fd005eadf314485663e48da56cf2ba32ae950e24 SHA512 ad53d9b0575fbf875f978808d7f1ef88eddd9ba7998a610979aa7b15b12c93377e56d080bdae8c45c12ada854e711297a356cf741292a2a552e5a678ee561823 WHIRLPOOL 40fccc3b9fe9f1be2cc000994f11b56a4bee7246b0f16f11869960ed3fc89d2b8510bcc09d297a964cc2320f0dd800d5ef0680315b2577521b87fd707b4c0d39
 EBUILD netbeans-apisupport-9999_p20160922.ebuild 3384 SHA256 09616722b9367099d6abf15dfb83a81cfdf5119bc54fa6ee6bb56c0fc12d30cf SHA512 1b54b505064a656fae662ee1daa141f1022bf5a8a6f3fb6a5f593a66f75b40dd3c9eed6fe7d87bc14c8eae4d1da627489be68d01372b72bac532c101c4c4a512 WHIRLPOOL f8d6f03a79198ee465619b8c4b9eaa558314756cebea9feb719246826542046e47940c557a654e23c55c8d351febed1c8c0fe6abc2c002d42a4daeddb4b5ea42
 EBUILD netbeans-apisupport-9999_p20160923.ebuild 3384 SHA256 086ab65897edffd05f26c28dc4d3c01098b258b2219fa4b65e5e9ec58a4753b3 SHA512 05e8e2ba035eb743b801a61388328537a9f5a7a759889d085f4052329ef270dcdecc5a39ed071037edf6ce70cad1fd198de4741aefae32afcfd000ca0a9d24e4 WHIRLPOOL dae7c988ed1dc79e7022c10d34833d2a9f22812b6f22427f137644eabb04fe8abafaa67e9dc58477678a7146ad488d90a06e2418353bc8107a5a150f8c4e7a12

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160920.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160920.ebuild
deleted file mode 100644
index 436dc4c..0000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160920.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-20_00-02-33/zip/netbeans-trunk-nightly-201609200002-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 fd576e9..10e95cb 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -7,7 +7,6 @@ DIST 99529DC0E1426A102A98EF5494B6F6AA6E497F62-clank_0.3.6.zip 7930942 SHA256 ad9
 DIST BB83D4F8047D608858154CB041054F5CAE35B903-cnd-rfs-1.0.zip 177647 SHA256 c92c3d3311b8f75883f4f9280fe8d6932b154c67c9dd1bd65a49beb45e578cd1 SHA512 c42e4f0c1b7efb24a45dc375180bfc8b0e02e74e01233665d3e74bf83a182c2b0bbe8b572a8eeb993d77312f6d118777d0576adfca4ea8f4c2cfe08892155345 WHIRLPOOL 41b573c7ca4b926333f28a9329a2423955055ff716e7be03b7a6f4714e7261e57574b16a0e89b96ae744dc0a36f9a4a72f8d948b11a6b8052159d42cbd40876a
 DIST BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip 31891 SHA256 dd9105ad309b56d22ef08573ec48a5f21baa2c50f8606df9c7b6245abd9dbe72 SHA512 288229a85536a45fbae6ba5a4dc085fa2053264259f14833cd435f64191a4b2f4b93c3e9981589087ec293afbb0fc76e97d2b5312a196e3b3fed11a605ab650a WHIRLPOOL 69379d331a68e1c4eb15aa8b1ff5256c9b98d9fad4688f2d306841973b151fd22ddbca25c5388af39b487b8810a2e521ffefbbb9775cf02271626179c3810c04
 DIST C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip 92177 SHA256 71e6d46d9c7e624bc83dbfa4edde20bfdcb47ae76dc2b19dd553d23f22b454e7 SHA512 64b15aa898a45c1dce0d9c58ec4ef8c3dc1a32e1213543d98002cbf5419d67b3caf4357c8a252e36951197f3edd70e34a226c989e5479ce3b2d1405783d3d530 WHIRLPOOL 675db7f81ecadcecfe52f18cf8bd465867c1dac12f818717248da9a7d071d45adeb3c6af2e6ac1863bb5ccca36ae9383722d2361c28af52e51e5f2ac34736e89
-DIST D43D5D67A1D7DC1E62ABA7C01F90BEFFD8A74A65-clank_0.3.6.zip 11781480 SHA256 8b331d6efd19c29163d9d884a4de19f35a7133288c5993198011b7a993c79af7 SHA512 e5498fc96f0f2b3dcb8b6980520efc2ddedbe6fa61076b9d307e7721cf475d0b238592a599e5975fbe10b44e1e0db4af57b58d20e8257097891220f05155b17b WHIRLPOOL 885c0478851fe7072b0a7ca0b7e025d25c104a7c142ee8f16fb468f48537de13fe34a3e0c0507f45a865fd4e18c3ec8ee32a4c0f351bdfdd0c8a04150e1c4016
 DIST E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip 179656 SHA256 33d046408ce7a59158c550c672de03dba87485e0e83ca2e408b704e7a2a60591 SHA512 748979d810751d570087dc60bc02cb5969c6f713cba87d32004c505b9a92150d518c6dcf66caca61841ca8f28c16cf3cd2a5a40b370f5dec5c9482b57bd051d8 WHIRLPOOL 12cc51c73f8511b84d4860ed8c2545e96c72477755d6027a086537187ac3c16322305a0158480498968a4f71a72ff6513d91d9f7d37ab2c38c8293dceced0da6
 DIST F20EEEDF4FE6B93B180387576FB780EED9F79C66-clank_0.3.9.zip 11747046 SHA256 a65a323506d76a048f01604da1f446944eea52eba1c5558ffdb74e10410071a6 SHA512 73f5c986f132bc898fe67c528f5a356868c7d5a0dd7e9201252b3a20a4906f3e729ce5444b33197c28a94513cbc47664a8c80aeb5c114f9a58c7065b41d414f8 WHIRLPOOL f3bed3bb4e4707a2dfbbb79a78fc0ffeb7e31e1858c389d1b312c4551f68c5864286d100b08dc9651f02a3479a85826f4ddf315ca687cb249ad4366cda9660ae
 DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
@@ -18,7 +17,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-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
@@ -44,7 +42,6 @@ DIST netbeans-trunk-nightly-201610210002-src.zip 218421842 SHA256 c06c45aac35396
 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_p20160920.ebuild 4790 SHA256 16b13cee59598f079cad6409309a3b2d4388f51b16a834231531b465bebc0b68 SHA512 3ad16c8530ad8c55e716c2c72a10358e8b883bb8b1150be98cc5276cbae2906f0aec33d98c4215e7fe83918bad25265a70e53ca688e290c9675b0a0d26f795ed WHIRLPOOL 4a4336654e7c3a9d260fe29258645a20fdf35b431f82aaddb4f505ada2b17024990c099ad9789a77fb233856d9f2270cf1e0a8ed8418e65ff5f982f039e192dd
 EBUILD netbeans-cnd-9999_p20160921.ebuild 4790 SHA256 da3da80e958a041a4390cb41003586fce8990b229358084ebc81a1080469b5a3 SHA512 18ef8cc5c50d5ae457a853ddc0ee84f445acac4f3d1c63e7ad70df308d30d270c52879fb2937ad997b6fec30f475c9ecabedfeae121944fec411697a7799033e WHIRLPOOL f7e4e4ea1b0c9d4214a6a597d4decf33bd74053d6c6e8f0633faf93ab898dc1c8496b72f60302a2c02012d5336d63cd169122696cedd376b5dc7fcb7c82ca67f
 EBUILD netbeans-cnd-9999_p20160922.ebuild 4790 SHA256 9a60a0268cd04e850f372732660d2b462655ab999dca6db8824a74c40b84604e SHA512 b9e737b10ba9ebac717da8a929a231cdc165e55c906c96e52bb567ffbaad5fae1dc16ec38da879477c8c68cf4039fe8d7e112d3d7cab51a67eb79fc9c9ed3cf2 WHIRLPOOL 15a1392d789ec3a3e86b31d4a2e88f0442cacfb6712d50f9c5e0efd70f4dacb6e449c953f2934216bb10f63ea8204202dd3d6ebcbecae9136c3aaca16ce5f22b
 EBUILD netbeans-cnd-9999_p20160923.ebuild 4790 SHA256 dc84c629b391b322ad6ba51221f2fe80bfca7af010b020cd0bf9a4f860c53549 SHA512 797d7fa8d814f0cc62c9ce2cf9d484cda8da017533d6087c0e6a6b1d2c68aa25f82bb79ceddbb58bc258e6b8ed40fc2b3177878f013bce6b287506923c793746 WHIRLPOOL fc599a2f28c81b92ce8a9cd21f02692fb9106a18d7c86d8c27f49f5a4996c2e41f8c8c5cf153ca05839b26ee1419a9e92c92fe60d1e4917bfe34c8b24ae9c6c5

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160920.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160920.ebuild
deleted file mode 100644
index 9d7c1e0..0000000
--- a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160920.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-20_00-02-33/zip/netbeans-trunk-nightly-201609200002-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 23f53f1..212be70 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-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
@@ -35,7 +34,6 @@ DIST netbeans-trunk-nightly-201610210002-src.zip 218421842 SHA256 c06c45aac35396
 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_p20160920.ebuild 2968 SHA256 55d14cd8522cde2857e3cdb34e8e567e3dbdbf51af57dbaa2f15b96793ba73c6 SHA512 dd4a3191b5397d03b6c5f9a63119b281326f1b96640e4196916fa5407315341e17e071161de9c4b0211861f95dc995934666f942e03f073c9107e32195a77170 WHIRLPOOL 09b11a1edf82e3d3ffe6f68d8b5caeae887f0538989e3dbe70b5b6417c5053606d6daa9631b49fb3fab10b3b72188a74f086abff016d89f4f7b2491d2f23384f
 EBUILD netbeans-dlight-9999_p20160921.ebuild 2968 SHA256 8929fae200cc9536eba4a8e528c8a3f598a99bf052452203ad7759981eb72d9e SHA512 1eaef46875e0579a45a18bc27c7a88900f9f1109cad9d293168dd9932cec1eec42af6b2bfc6d91d53886fcbd5d8848eb74f79a0250590486ca44ddb5e3644676 WHIRLPOOL 31cea4def2343ecdbc8021189406ed409b38f4891be2abf573414507182787fc69120b307626339068ce8dec7dbe3b4b6801e6115859bf5b81c899eda2e43d69
 EBUILD netbeans-dlight-9999_p20160922.ebuild 2968 SHA256 88b1fbca1de4604bcdd6cebd13733a3c9b689a3f59f7b384eaef945858a440ea SHA512 de97d61cc3d63f12d3ab1f80501dd86b6162ecbea3915c19f65f168bb6c918be0a9257b805efd0f8c32f56f4096a7c5d17c8728d145d58a27bc023aa4e032b53 WHIRLPOOL 8f5f4c1c8b06fad77e0888dc65a3efd89d65fb4a156b0bf28a5da788b7e2dd5c04d2d32331ff30087703bc51d3145c4c02e2acda545e1c9a8cb6f0a942da72f3
 EBUILD netbeans-dlight-9999_p20160923.ebuild 2968 SHA256 d24924c3b1be7ea5c8d4e87fcfe7cea094ec5457030fd758a98376094fe95134 SHA512 0a2872d10dfb87f5a1f95129af873c80e5f6f7cd22733455a41f3f442405c5ce57762e11fecda0567ffd630842ea631410e1ca5b510aea931f32ad2cbc87cf43 WHIRLPOOL 843bee7d2939f695ebd26a21452cc8279f8ee60b2915e309f0a3daa1003ac3b0a1d5a9faac61586758dff77eb53eb9e911793a72e08150cb8d150d025bf2b9e1

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160920.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160920.ebuild
deleted file mode 100644
index 9351957..0000000
--- a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160920.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-20_00-02-33/zip/netbeans-trunk-nightly-201609200002-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 3ee75dc..de22e2c 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-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
@@ -64,7 +63,6 @@ DIST netbeans-trunk-nightly-201610210002-src.zip 218421842 SHA256 c06c45aac35396
 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_p20160920.ebuild 15825 SHA256 71f2de62de7be7787224eabf2cf43aa127383b6547e074c194afce0020d82928 SHA512 63d6d4da000ed067856aea100e269fc8f1b32c7c33707022bc8571a7a38e8aeef65a53d131a0b4ae895b8126f2fca6c97fdb24486dfbf97057d66348fa3622bc WHIRLPOOL 0a1d11a8bc1731f22bdc92815505cd8f90221d611b0ac10272a7d551bac74632dc8c9bd645270108b74bc6be6f7e46a5778d34233cbdf7f9c12977a0c5c9778b
 EBUILD netbeans-enterprise-9999_p20160921.ebuild 15825 SHA256 d5d36a26517c98a7fd7ba2ae9df90ee1f49458c3ddea6056df8db2a06bd3922d SHA512 cb7311d13c5d836a65b2e3fcacbffda94cb8bb93fb632c5e94216c0cd0fd1eedd31c45fc32d8b1adda6c323ad3619c86c5e80123950d5b23e13ca3ae2a49dd32 WHIRLPOOL 7c4a17aa92a70461a4de7acce285805a3b862753ab64275e8da87fbe7c477ddbbe39da190dbcfc22c4fe49732fae0cb7d495587bd66ab77692d29de0d75b3b41
 EBUILD netbeans-enterprise-9999_p20160922.ebuild 15825 SHA256 9bc3f731dfe2bb62eb7e039c9f93810256099fb3bfc484c1ce82e4cbaf171d67 SHA512 36d48fefd0f288465361d05fb6b2ec69a99740998c67750a80b03e8373369804519acae7c79a0bca68e8576486f0e1305a583300472719ecc424221c4b39cb2a WHIRLPOOL 29ce318476918afbf1144fd112fd94d16588a019e0c2e2c12400a12c39a00552f6a01c398d66619f015095efa47891fd9e4f75a5906b4693e8bd4ac207f7cf32
 EBUILD netbeans-enterprise-9999_p20160923.ebuild 15825 SHA256 36c67989b9521d97e45b99b05cd188f21e9ab67cd248d0fdedd4dd38cf2b46d1 SHA512 5cb824ecffc96e57616d9dafba02347f69f85b9e84828c8d45d408484d4c7c9f27f9b4e942b75c8d552c78114daf4346659e62381ee1878e10970f569d4d6949 WHIRLPOOL e6057c3d43ec8bfa1e39f45aa89d947ab8cd2368e07dc89861543ed8872c785d2e5d58a553d3adc720fce79aac1b15633717360bfbbd8a329fe3f52970ee27f9

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160920.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160920.ebuild
deleted file mode 100644
index 2e40c16..0000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160920.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-20_00-02-33/zip/netbeans-trunk-nightly-201609200002-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 f1afe5f..950bba6 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-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201610210002-src.zip 218421842 SHA256 c06c45aac35396
 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_p20160920.ebuild 2913 SHA256 3e3f526858d5221b6e4968dbc8445bf9cdaa55a13b514d0c59ade13b1b4f330d SHA512 d468c8b08ad55e18f6597fc5e56d853ff943174797691bf3c0be643c010c4994c9fe46c021b3357a577947af56c29dbdf05cdab486c842ec2614055f3052e425 WHIRLPOOL efc07b013856546d68ebda24da7575eee796479c579c8f9a46c216a434ddf1536d25fc3505d01c5f49d10d9b1730403e144f15a51e25ee714af575c5d681539b
 EBUILD netbeans-ergonomics-9999_p20160921.ebuild 2913 SHA256 242eef7be7445480b75d30b51172fdf7e79aaa76080194c0c73e5d3b34be68cc SHA512 1f8590eae56bb744f2370199a057d8b6e139f6cf2de5c39bd8351e0e0a905f53c0c6df1c7c1143e0ebcf183c3df333f86637b225528612c0da01f1dee308e170 WHIRLPOOL edf684e0046a5159f18eaa45e22b15f0cff5a91ad2231b17021f50604d6c6adbb1976694d4356054f89cb1483b41e0a5271e01155acec6bc90ea414a3a3cd40a
 EBUILD netbeans-ergonomics-9999_p20160922.ebuild 2913 SHA256 a71c94636e2d6a18d7a0349eba93a88443c7ea94b44eff33df16530c63ac7db2 SHA512 f1805dd048cb67cecf69b64aa4802ecee815755605810990808824df684aa0457e40151111fdd944ca79c84faac837858c7e03193e78fcf5a758386bf0808224 WHIRLPOOL 98725c779ca894afd72f7c2cb8fa5efb4df76e1f508891ea863a5477cc79168e5d9c67a9e7ad2261d8fee688cf9827877b986b815333af31e8e9f69381e131da
 EBUILD netbeans-ergonomics-9999_p20160923.ebuild 2913 SHA256 ae69b6f6b52c939444ae4803b0da11cb64e30be2c3f6b9be886f1795eca6f200 SHA512 6a66091c9bde3eb15cc90981871f6d986cd83d44ad781e1f3d7f9fc421c10438d5c82cea80bc3627c7e55536a8ed548e7c1445f2a783543fa848a1eaad40dfbc WHIRLPOOL b8bd1cfb7f712b38115d5f8ef7cad33b2be6b8c6c145429e6bc2ff6d761fd4e453e2b13a16ecbecffa3877783797c462780611d6b602f32a0d6086b15fee014e

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160920.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160920.ebuild
deleted file mode 100644
index 1265696..0000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160920.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-20_00-02-33/zip/netbeans-trunk-nightly-201609200002-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 1a7cde3..2f8d9c6 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-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
@@ -38,7 +37,6 @@ DIST netbeans-trunk-nightly-201610210002-src.zip 218421842 SHA256 c06c45aac35396
 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_p20160920.ebuild 3377 SHA256 7999e7ccc6b393d509e6025379fef3fa783c6af7ff1401e43831f6b3a236c6f7 SHA512 a6b90952d9ee1607294445f44de8b319c7988199824072ac8dc64c6523f9c6e0ede60a93249f3fc999cccdd6222373d1d35d792998bb35d4b5afef5f8ede7eac WHIRLPOOL f65010b1c27d5ac2ac33714bc7aa353013a2016e06e6d3fff11406d707ee8f77673bdf255392a2b23eab2f529a55be912dc83569528993ed412aac96dbce8ded
 EBUILD netbeans-extide-9999_p20160921.ebuild 3377 SHA256 72a863c9877d8f8f8041ea8d33b2a8b824fc66b907d076d8164d9dfb6589e65f SHA512 0c2afbe9e8b1a8295f80356a239f75a27e6c2efd2c4b9ba39e740726177f8ec41b9bc3152564ee4df4a71ec0f32a52f5884ffcd3b586c9ee1ab8def859b39da7 WHIRLPOOL 0670ab486ce5e24a429567b4b1638ee77a05a91813cdef973dbc298798ae30f9bf761b66d9de88d1d6716c4e4fe79ec9ff90a062c0e7d30d71df2d96bb3d7c14
 EBUILD netbeans-extide-9999_p20160922.ebuild 3377 SHA256 534d4faf272ca3cc66c0e2baddf479093968192a7b94ef02d7350ee3a30faca5 SHA512 58e913bc89a9103f2778da9b61a42456b62ca3ef665161b2036445812e21ed757ebf44d171223ba92d7192148682fef1c0e96e4b0679524abff439af45187492 WHIRLPOOL c576e9077fdad79947a4b80cf39e13e3c17a5d187c1f2c1e367a8c67fa78c36633a1f339a7cd390ea591c034080beaa94ba4425946fc622379bf73d6c3f0054d
 EBUILD netbeans-extide-9999_p20160923.ebuild 3377 SHA256 c13f4ea026ff0dfc45be0a40becf2973a9452f5737bee3b4bfea28dcd115f2bf SHA512 18da0a84a68fa38a459651e2be521bdef7e748251f3a21dfbaa71f2ca62f7a24b1a078065d88e6d2150c188acfe9ac42c59146194c292856758f6958265f35ec WHIRLPOOL 3e0bf748d1dd38ff029c1b904f889e39b9946c32aae6fd8250f18db6b4ffb1dfd7d61ada7135ac756edfe354522e3538c5ad2865f1886e88f6d50042ead23700

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160920.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160920.ebuild
deleted file mode 100644
index d41f0d2..0000000
--- a/dev-java/netbeans-extide/netbeans-extide-9999_p20160920.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-20_00-02-33/zip/netbeans-trunk-nightly-201609200002-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 2f40572..92f31ae 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-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201610210002-src.zip 218421842 SHA256 c06c45aac35396
 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_p20160920.ebuild 3416 SHA256 523fffd499a2acf8232a6243451b1397e3b3672b2e69cea8753c86c1b1972d95 SHA512 d787a617b0f7039ffe1a1402963f9f124f0b35680d776178b7248fbd20f95440f38ae3930e32c6e04e719278e50a1dc9ca376e28f813dc6de9bd0aaf126b69c2 WHIRLPOOL fd07967c5943bdc15e33e8ba8eaccf69c2bae89016313952df59201ed57420b79964571a7a50f7012fe9285af7f44d25cb42d592b68c877b34bd8121311a0671
 EBUILD netbeans-groovy-9999_p20160921.ebuild 3416 SHA256 a3258e5c6204ea4ebb735fcc49ee909a66dc25a6b1de4d8772cbbede5d546326 SHA512 782abb3a84a62f2eb50f0b7cbfcf9b53dbb574f910d923a210c1051d782331e7086d4ae65791b5fd2ef3b4160bbb43fd7e6a5552c3e1fb60d9f84aaaece9372e WHIRLPOOL a9486e05cea0ee82bafa18a2626a604a017f0401226eb79ba8b14a56215073ae2543a05e7972632b1844c9f4a266df23723b0497d006098b0a9057298507a833
 EBUILD netbeans-groovy-9999_p20160922.ebuild 3416 SHA256 4ad0fbdb8fd52a87874ce0481229fe9e4b46946ce8d4723e8684d6e2c2b19298 SHA512 5bb756b8b4fa1a969180dd812dfa08ad0bbf99430632fc13d3258a7007c8b3b7967fa6f33865567313a1de35a79ce697b769cb2e24fcd3ac2a8a29a1a3c48934 WHIRLPOOL 7c014d0c226a61d53ea4704edadab0dd7493820840c7f9873fc4779228718e3322a811b7a004fc3d6a75f9a2e50ed71a9c1872010cac1524b1352a609a0f569b
 EBUILD netbeans-groovy-9999_p20160923.ebuild 3416 SHA256 7c430ad28d5813a54a135cc26b3df74dee836834ea0702ea3607dafba48a9346 SHA512 e4350dbd75b58d4c9dbf20978d40e1a0b012a5e8bd4a4d190a47736456bcbc10736112d8126669214fdcc94b437fb664a5d4ee1cf6bd594ca14f37e7542efe27 WHIRLPOOL ee7fed3756c860af9ac483c4fc9f5d4c0787418deb0770a5f3592ffb6a8b959d5edd9a172ed856ceccd9b3e7fca24f37ad4f764e7cdf4b612d1f2592ba8c7958

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160920.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160920.ebuild
deleted file mode 100644
index a4acff3..0000000
--- a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160920.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-20_00-02-33/zip/netbeans-trunk-nightly-201609200002-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 af30891..8a37863 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-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
@@ -37,7 +36,6 @@ DIST netbeans-trunk-nightly-201610210002-src.zip 218421842 SHA256 c06c45aac35396
 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_p20160920.ebuild 4126 SHA256 644bb12dea929e3c68a6b636840512d987087c2ddae067a833cd45b199ea4bf2 SHA512 99e40ff3f204448e0d49a86c63a76693267a6d5ea423df6dfa137fc48d7ce6130d52f97a96a86604c7c8a5e87e3663e9cc444ba70acbb7e2047009cfd88e590a WHIRLPOOL 1ced7ee5f25c861b45c232848eb42fd6d8cd0b28401aa49cd108efda0c73ddc7e4838a8f4c1f7c7a0c1dcba9de425ff76e0073099110e2878dd6b06efc27ee4b
 EBUILD netbeans-harness-9999_p20160921.ebuild 4126 SHA256 e6e857b6983fff8405ceadd509444b81f24f7e08d0135fad61ef7c65d08c82f1 SHA512 bfc0d12653efb4571f53c5181827e600942c24a36b41c0999bf146f47adfd46bdd50cdeca8036458755b339a0a2381ee11a636fb2dc972389ded7c5f55efc741 WHIRLPOOL 32461b02fe0d5acfa92556f1b51813ad18029c0a4859dc5d01b795d3a0505f715db86f467a9e72ebef61f97a51a42c8977b3d15c8daa292b69b488130067d558
 EBUILD netbeans-harness-9999_p20160922.ebuild 4126 SHA256 fca1856381e1a7494d7c9cb309b7c7253cd2ead2bdebadc4d13442ae409ea0f4 SHA512 9591cef614662591dca590f5b7c1134f60e694fe440129586c2dc9acbe6a1e90e8d9d52dae9c8773bce66d8b8fc477d770c7f6822deb6d211fc7b1703340d32d WHIRLPOOL 60c0abf60e09df66cc0506ac372f178c369f7274d09eebb4e153e7446fc8d536f6e1706fbe68fef22d788c5a971dd8f48afbb606357de84ee7a86020d6c1352b
 EBUILD netbeans-harness-9999_p20160923.ebuild 4126 SHA256 8345db8f7f5eff1aca757370b5808fd8646ebcadbccbf60719a2ae5e1afde62c SHA512 075c4c6a23c7c312932e96c872ed009f384e59920b257738f3a16d11aed6c46a8fec1582209347281d40f7a3018f9e72e53e1167b1f02282fa40cda5c9bb3a4a WHIRLPOOL 6fa4637fff9fb42ae53079126d77f9baf8dd4063e4aa0f757aeae125f3b5c2f042e2398220bc14c0dd2cd7c3866de1725fd4ad340add3f7c6c2b40e0b3d481f8

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160920.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160920.ebuild
deleted file mode 100644
index e6b7f5d..0000000
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20160920.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-20_00-02-33/zip/netbeans-trunk-nightly-201609200002-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 4ac77e8..80dc368 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-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
@@ -171,7 +170,6 @@ DIST netbeans-trunk-nightly-201610210002-src.zip 218421842 SHA256 c06c45aac35396
 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_p20160920.ebuild 29849 SHA256 b77baa64e73048f604ebaa909079eeb5ec6984a3e89f708a1721953c705c7c14 SHA512 695c020d32b4f7b123c9dff580ecac1b5d6173d8a836330d09a4321d8b372b35e78bdb54410983114863a94711c5ed334c6dc16de5c78e653535bb9edf0e4938 WHIRLPOOL 5bdbb56ad3d9c86d8b719d46251c93846d0b96bec7899936bb3273077565bfe49d8187c9b8a61d8423276c730912514fd2dfbad0ecd9e663f079a6333c83bd27
 EBUILD netbeans-ide-9999_p20160921.ebuild 29849 SHA256 a8b62cd0a7a0fb29d46dc96b2e85b2a09dbe54a36d587032f3de389dca18cbf2 SHA512 c2b351954fb43715efb9996c77ba2150137330ffdafba6a1d0ad71e7bff260186d9cbfc41b7892e1a012e08a94a8d55047ad4d8ee71b1f020752b5c003afa009 WHIRLPOOL a06b6062153d8a63becaa310ec4f9713b7b6b672ee55dd12cb8080e3e49bc403d28ff1f820ce22a3a67adb1ff3215918407f114d2f495d3af71cb713b57c1c9c
 EBUILD netbeans-ide-9999_p20160922.ebuild 29849 SHA256 8917983cdcf8818f1d1e95470eff1fb2580e38e73d7e9e5902d4d9c069ea3db8 SHA512 6e16058d75d8c398406bf95eb1394a12fe6b06e4105af26aa92764c45f23c43098d617de303db0a7906dd6cf3c1773c7bc663fdf141332c97bc9592182116dd4 WHIRLPOOL 234ab0bc091a84ee6cfc27ab2826b7df9a64f13a346fce9cbf467463c91e2366abd7b420a4af30098235509604e451f5f5987b034fed14df9807c30e319ff0b1
 EBUILD netbeans-ide-9999_p20160923.ebuild 29849 SHA256 16e0491d916a1b5c263de2a39115b24321a8f354ff092096932c275cf278c0ef SHA512 686f1ec0f67b73a40d4656abf80fafa9ef7653cf19e2cf6b9d9bd3fc7d77f263b9a9c940d927cb36b6dffafa78f0cbc66af576f0d02a1e6db13dcc34162edd2b WHIRLPOOL 2ec2e5197333a2f552cd12c24ebb3c68030ca58434620824ef63a31405cadce83f014145598e7be86764d0ab2372df730167e886e39587dfa73d4d36d343356a

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160920.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160920.ebuild
deleted file mode 100644
index 6903126..0000000
--- a/dev-java/netbeans-ide/netbeans-ide-9999_p20160920.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-20_00-02-33/zip/netbeans-trunk-nightly-201609200002-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 571fa8f..fc0fb5b 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-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
@@ -67,7 +66,6 @@ DIST netbeans-trunk-nightly-201610210002-src.zip 218421842 SHA256 c06c45aac35396
 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_p20160920.ebuild 15656 SHA256 eb5eeba801ce75f3e4c8b65a8930b64a8c8fedfb2bb4115dd5ee34cf8a9d055f SHA512 07f7890f532d744b55b10ddd06eb5df0fb1b373d8fe11ca31c805e5d3cd232523a7412e86fc960407c01292e554880af5576d56aefbec681bc8bd18516f3a398 WHIRLPOOL e216f0e2ec2b6aa1cbfb46a3c1e01f4f92e53182be1411efadc3a5e27d2857c232d0cc929bce1a086611e34e04fb209b20de394a3ea018d51f686e02a2723a54
 EBUILD netbeans-java-9999_p20160921.ebuild 15656 SHA256 142511e71996d902af4597cd0020dfc79788c52bc4c67306098d79fce4bab8a1 SHA512 ccf7f1ba490d06e3bd82338e0fd2a92ec5cb702796e58fc0ae28839bebd1030afe2332e72fa043e321bb379144cd432e9e9bc2f8892be935a3a0337c62012ab9 WHIRLPOOL b06b67a24bcc7e97cd61cfa51d998678917ea8e69914e0c56adbb1b98cabf6ecfa95c73e8bc673a1513d3e90a212207409005534fde27fd45e57fa34c84f6044
 EBUILD netbeans-java-9999_p20160922.ebuild 15656 SHA256 47fcde1b320798b90abf6f888ca8e724e7ea0fff7f1ac8f55da90869cf450c07 SHA512 e8020e54a8c044b7e007314b46e965f3d881f5b4bcf557d2681739777e8529845d24127a448077d93b19c2c854a640650716232990552491e4f9b94543d22467 WHIRLPOOL 7d5bcf931aeba8c6b17796726b00f9c3963b9ce5b488be7b0bce0f0f320a1bbb48c078cdc1b3f96a5b1a242caa03e68bd0bde71262ca8e22ee05174e9b09d22e
 EBUILD netbeans-java-9999_p20160923.ebuild 15656 SHA256 34daae61c9ee4b64c5c7562abdcaa7ba1494a9741c03b338f4be8523f319266c SHA512 1ab5bf8f30f46c1582bee57060d9e95ba154d06c194f5dfa1695631269e97230d23c04f6743e918f0dbb0b7de344211aa9dd3ba34989b886a06b546ee65ef7f1 WHIRLPOOL d59ad85376486d4dbe22400506f4fb6a8bff16feed936e736ad5b0c99b23de6dbf6fa00634e44b8549e2f05f164900de19266553e1e6bd37073f7658d8cb9cea

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160920.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160920.ebuild
deleted file mode 100644
index 1d2f00e..0000000
--- a/dev-java/netbeans-java/netbeans-java-9999_p20160920.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-20_00-02-33/zip/netbeans-trunk-nightly-201609200002-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 363bd97..28c497e 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-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
@@ -35,7 +34,6 @@ DIST netbeans-trunk-nightly-201610210002-src.zip 218421842 SHA256 c06c45aac35396
 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_p20160920.ebuild 4971 SHA256 f942b0a7bd02a0aea4e897b90fece8cbadaf0a96f9cd798aca9baa36dbe8a125 SHA512 1ed4a96dd17f5eeb5c7cd5c9a1cb65de911742a258f48a62d4ec4483a9f366e58484fdd6303a6fd97685fe0964bfbf0e565d4d24de263913a31466a9cbc65850 WHIRLPOOL b8dcca77e0eac26c38ff4b7b2fa742df2d91bdac2fa81e6d81adea7d944c15ece6967439e2ef4185b160a3892a7dfe8dc5a9f45f7dd3fa4e3bdc02c917b41249
 EBUILD netbeans-javacard-9999_p20160921.ebuild 4971 SHA256 21865902b7308019b2845fe76bb1b343913a0906d78f088b4385d3d554e075b2 SHA512 f4a9435803090501c346e2db625ef681ecd118c062927c81acc7a4f1e68b68a034fc2654ff490cdbb2e850100ce27bc447910a851e0a4fdd05e57f72ea35e886 WHIRLPOOL 9a88567d837160283db513c38588e3283c393c41358406afeb0aab4c7c88276ffad8a606115213a122b41afff7bfc8a13282c737d7c3c60e8aba27d2b81d08ab
 EBUILD netbeans-javacard-9999_p20160922.ebuild 4971 SHA256 4036468b046ac27f060a8b41e6aa686f061121a9a1fb525e6835d62682c3b6d1 SHA512 156ff632dc843a0cc81b0f3421c293bf0d27a50487f9fbfb15ee330869b09cdf162daec0b5fa2999e256ce4e3897cd320ea3dfd7003441d1a69a7b5daea315ef WHIRLPOOL bdd286b4e5a123926b53e5762047fe68a254508b559dc4085da61c2cbdeaeceea3ff2336c059a5103d56c782884b141775a43f247dcaa0b9bf142219009e9bea
 EBUILD netbeans-javacard-9999_p20160923.ebuild 4971 SHA256 b0426e6fa96ca0836b7993a87e43827af60202e84e9186de3f61980ce17c2166 SHA512 52910ddd3d8e8c15217cc418b2d4c8a07548628cc5c0277b52fecb8e9ca865d1e1b908d73f830264d684b64fc5065e93bcd9e03646fc8327910782e41b7acc29 WHIRLPOOL 18866a267a69c31aa45f750ca94f0d1eacadd46c1e2b07d67a59feabc51e073c4b3514747392b7461bb19b9c1ff10d41341bf55e66e5cc5a2975ee2edc8a3ef0

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160920.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160920.ebuild
deleted file mode 100644
index 0548c3d..0000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160920.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-20_00-02-33/zip/netbeans-trunk-nightly-201609200002-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 fdc4519..af747bf 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-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
@@ -35,7 +34,6 @@ DIST netbeans-trunk-nightly-201610210002-src.zip 218421842 SHA256 c06c45aac35396
 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_p20160920.ebuild 6293 SHA256 8e8a74e20716e35510182e53940b4097ded4257aa66f751175b0cce0bf4d2766 SHA512 e3dfb14914e0d4d5ccf5de51d04e5409dd997b5d5b9871eac23de200e8aa18520ffd40dc6b7d3c50062848aa756e97bf8fc9033a564390a031adf5100a19df2a WHIRLPOOL 23e795989fe821f5ec934f3ffafced8fe40ac19388d76e887ff7b83db2d05976ad64eb36cbcdbb507b9ffe6b49a0d4d7fa7e170a62ac81bcf8e8c5f50ddcddbf
 EBUILD netbeans-javadoc-9999_p20160921.ebuild 6293 SHA256 61d3c823f386ab5efa25a3213e2878d02a34ab2bf017a00355757f25c28ecb9d SHA512 45d02b81d4f303d4a0042a81a34ac4fde1ec9e898dc6a19d6d9bb2f1efbe22559a4913cf6eb34f22ae65c34a87ca985d8da208fa6097f939df13a138b886a074 WHIRLPOOL 610af3784a880a23a9e7d89c37f90aaeb590109ab3f4cace4ad7a194222e82beb8c10d59f9b2cf952a2756e8083ad59b6bd10acd1d402f5b04f5bb908dfca41b
 EBUILD netbeans-javadoc-9999_p20160922.ebuild 6293 SHA256 6fcf03a46bed23279cf1507b407e003bf1e1229e9864de276bd5052c2afd1f13 SHA512 e3ae3c7e394d2e3e3ac37f86e6fd8abf325eba9de51354ef98879d05f133194857c1629e06a176b8c531b01628ee4845b67a452e69372a2d4ea466226b172a57 WHIRLPOOL 7e2fe33e3100bd3b2a3528ddee7ffcf9767ece1c20f9aa25ed720e20589fb4c3999877f1d592ed69af81f4464be917b4f456f2fca63fe5df6ef4a9d05398043d
 EBUILD netbeans-javadoc-9999_p20160923.ebuild 6293 SHA256 8435fbd07c136f9d45d4c93ed7233ae3d7de8f73b9f688b21349f34c2d16eaad SHA512 5d1838c5c432850663b07dac0b233b130b35e39d8644bde04521c9ac7efb6f0b793e07430442e181fe780b81b796360b77eedac6413d3ff23498f16fdc0d26b7 WHIRLPOOL ba3fa57f5c884615727740103d02c4e8902d48a85980eea5860eda459200fe5d76d585ab01e286bf9c9128a9442895bfa602eab2119c27e6fc290b3c7f44c995

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160920.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160920.ebuild
deleted file mode 100644
index cee9c7e..0000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160920.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-20_00-02-33/zip/netbeans-trunk-nightly-201609200002-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 38cb246..8940551 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-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
@@ -41,7 +40,6 @@ DIST netbeans-trunk-nightly-201610210002-src.zip 218421842 SHA256 c06c45aac35396
 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_p20160920.ebuild 4717 SHA256 dc9fa4554706242615ca9f44f012f17997545b2088dd276a309a22ae5f5f5e26 SHA512 f282a6ded78b8d1def6d5cc00de383dea78fac0dea4eb49d3f47afc987903495928845306299ad9dc7f11443f5c74e0305470804b7e045a00a194e5019cd0b64 WHIRLPOOL 77d6096e1f0561e7b2cc0a38be5eab3054e0d73cdad298629c80f99529d5572ebaf81559db526b1794c2d13ac29c6266253ee5ceea25bb2c9d7966a4bf2e88c3
 EBUILD netbeans-javafx-9999_p20160921.ebuild 4717 SHA256 76680ecce25bbad915149b2979e7273d5d34d9e0205a2b4d64d3493e0d7ba7bb SHA512 37725e1749c144ad89916a3bee858df8ef1a162f232c40852b5af932d19f2589f6e8128bcd04860b1b17dc356e86a5decde75b64e0c64a66eaf7b20108f73343 WHIRLPOOL a97aa91d857683baadb676428f53c987d344accabe056fe6c625f12aefe60176af038d1438766f21890fa8c094d110196340e2b5156a740dc370d15591dd572c
 EBUILD netbeans-javafx-9999_p20160922.ebuild 4717 SHA256 654c5ea152120db6c9967e538d21531fef2db633c6a2b59458407694557de992 SHA512 49c8f2c996c9fcd0787f1e85dfa971d32e35bc259818dfd8b7da583f88d8951204affd8e15457d2271865712290f3bf01333049385db980a01dcdeca4a9d768b WHIRLPOOL aad3b34d197d6c479d8160517476964f8351e07205ec7e107fa44962663b786cd05d4ecaddff0c8816c860360366a0c16e27976b5f44240502ccfa96457a5c7c
 EBUILD netbeans-javafx-9999_p20160923.ebuild 4717 SHA256 d96535609c046ce32ecfd37f734bbbd51684cb4f5f5c169bc222ff332c0fa24a SHA512 3bc08040180a70797e8dbb93e481f290ba0989221c8f9a0564104c788b97cb4cc20e251df7690b8347b4d12062b6e888023e211761fe94ab8d106edc73058ff1 WHIRLPOOL 83ac51ce9bc9b3b955440f23d58cb4d534879887927e14440f14177fff88d8f19983d81cb1d4540375b7154d85ab0e06f3933a865919b5d239ef67cb377cce73

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160920.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160920.ebuild
deleted file mode 100644
index 66ed296..0000000
--- a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160920.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-20_00-02-33/zip/netbeans-trunk-nightly-201609200002-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 97cf983..3043235 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-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201610210002-src.zip 218421842 SHA256 c06c45aac35396
 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_p20160920.ebuild 4412 SHA256 3020a5b9fe9ddfee9f58adc756b8c327fe580238c022342e8b5cc2829a03b068 SHA512 b87b67d64da0348cf36a89bca5d518c6af7ee2e1a5d45b7d5ad02bdf094d6c85f3294f8f36c1987a443bc4cdb44b79942ba009bd48b96234531929420bddbcad WHIRLPOOL 9a6f04e89311a9df34b07ebc78f3bf273ed6bd393e842cfbb726f791dfe528dc806d7a2f8e6a60ac51737cdf45e927da503649bff4c6d4dbee87cefde939cb45
 EBUILD netbeans-mobility-9999_p20160921.ebuild 4412 SHA256 90fbf38757830eac8f0bb29030e4302feff0d6c1937c0ae19135313ccd5ce692 SHA512 e5b69a0dbfc86f6970f0ae2e0d41c2d0108cbf7e8513e692dd11fd188b3ab4cea8cf57f0d54270bc4c988f007f6b099cebf5a68b0513f5a2cd08125847876d4b WHIRLPOOL c43a0acf87379ffe4ffbfda0cb97476518f692799ef0a1bc0a4bc7acbcddf15744949bdc6dbc7ad42d32eaacb3a01220b8894c4105cfb8568fb08c427d7c6491
 EBUILD netbeans-mobility-9999_p20160922.ebuild 4412 SHA256 d6bb5a34a3742abba1641d16db1564456e86fdc1f30e3f6a7438bba1f0212475 SHA512 2febe56aab2bda727d518107564cd63bebe5b168eb7ae0f1b38104ec4ce57dad069cb28ad79d64c2adcef66bdb51586e0065f3aaf644f544b65cb29633d54838 WHIRLPOOL fa200f54f108b114c29fb460046373f5bfe9efc3f09c47e6e4a6632c0b6b03498567baa5e8cda13c8f249fff5551f8c289cfd5c80103019ed87d1145a05a3675
 EBUILD netbeans-mobility-9999_p20160923.ebuild 4412 SHA256 ac5f7635522c1a2ef038c2da0c1dcb22a17ec77d3cd0a558219980a8de02c075 SHA512 b7786eb252b59edf1d003aee8a0cd19db338402413a7f08a2f0c389ea63ccdd4ecaed0d646897e64564f014fb5a410df535872272484e6a5051f0ca826741cdb WHIRLPOOL 6d56447c181386049dca27e1055b69f31045ba9edb73d05a7b37080a7545796a9a9b82fbc6764737203ba5c3e473c3e1f3b496ec84a17025efc57daaef23fe24

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160920.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160920.ebuild
deleted file mode 100644
index 8d26c37..0000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160920.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-20_00-02-33/zip/netbeans-trunk-nightly-201609200002-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 331471d..129334b 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-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
@@ -35,7 +34,6 @@ DIST netbeans-trunk-nightly-201610210002-src.zip 218421842 SHA256 c06c45aac35396
 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_p20160920.ebuild 4111 SHA256 60dd1c81f381320e4ded3b4847bd1b27003ac60c6f94878b6cc64ad75df63608 SHA512 13da90d8791ee2d776edf5d1fe6025cca2cd13d0c6dec4107956bd05287d8c975a4ff51144c2c03ce4512fad17d140e4b0b2e77332d12e2a7623bb2f4a66b34d WHIRLPOOL 4d70778420193e47852797dddc67a3a3e21ff7ad0d8b6c87696a320528b08e6c90e5b39f070b3d7394b01448dd0fec28a59bdf7833025d69e72354aae1d62898
 EBUILD netbeans-nb-9999_p20160921.ebuild 4111 SHA256 561d42c61ddd8a944c49494594f16db3adcc75675fec213b1e3a0b0bbf178fed SHA512 e1ed23b200a6efdebb52e63418e51d1c17908beb4154831bc20a7945740a2e518d048d2ec639197ea3a12e20332f9efbaa500f15e4be48d2798456a8bf9d9e78 WHIRLPOOL c00aa9756cb4180c485ce81fd2718ee5fc877b9c4ffeef3f3d36fe5c8896dccf2461d19e5da07f010bc21e8f4134d7609c5c72925c28460d697f79a3170a8c04
 EBUILD netbeans-nb-9999_p20160922.ebuild 4111 SHA256 99f929e187c809bfdfb930a67cf32463eff7ee1f88d7d0264f751414d7368941 SHA512 17e167a50e9f9678bb3b89a6e252324dd3bc110747ed94e1d6167815aa40fe8f8c5cd39e40f226e89fe82420acc814d0d6049684cfef522b38fcdd49e23a3196 WHIRLPOOL 336ce82df999df3af21935ce281a0a4e354c988fefc834fd45a6457d841717d20797b3de1420e8c6336ddc27f04d535a12c0f77f27b4f38eaf6b28757486eede
 EBUILD netbeans-nb-9999_p20160923.ebuild 4111 SHA256 dc991bdc29dc3d8831ed431ef4d91fcab2176fc3b0eae78eb2342eb22c1afa9a SHA512 c445317f935b801fe5d901a17c4fff8440d6b74a729bec2bd96872722c40264adfc475bc1a8037f63d7518f9c8ef2e1655211ac84a82ae72f15745d3dceb747c WHIRLPOOL 42c81e4d225323697f59eedfcb45299db09bce3ade77a762dc391a59b22f56566f7ae0f0810eff4f8b76ae985e9be9fc3f27f6c8da2051f4b1e9d9bc87935da7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160920.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160920.ebuild
deleted file mode 100644
index 21e68cd..0000000
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20160920.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-20_00-02-33/zip/netbeans-trunk-nightly-201609200002-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 07f9482..f730b9f 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-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
@@ -37,7 +36,6 @@ DIST netbeans-trunk-nightly-201610210002-src.zip 218421842 SHA256 c06c45aac35396
 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_p20160920.ebuild 4418 SHA256 158832e6eb864b252f9b66723a49ec67146aa6a9cff6d87ac1ca319ebd2e9003 SHA512 ac9631c0c4ea2be2e8cc87fb9f09a1c87108cef9528e596c4a867d797814c32cfd0a11f0bed794aa5312a98d8be9d1fc84ecc08fe122441ace995b6a69bb2952 WHIRLPOOL 293473594db3debe4580d2fa3e54ea8791202ce72228bb545d7e29db68f867c9e259ae8ee16172709ed6daa160499eb37bd628a9543f3e3380abfb1d15a49ce4
 EBUILD netbeans-php-9999_p20160921.ebuild 4418 SHA256 12bd9e2e016096645258eecf0b540eae005058d3d860dd86db4c4a3dcdc872bf SHA512 02a7dfccc3a64ee0976230b55afa1dd9969d411646b843f569d593a6b3848ac77549359a269a7e8011c67d586839afbab58f3787974b5a58533ac3009dbfc8af WHIRLPOOL 4baca7f1020f388c471a2a074f3729534a531d47aee038d981b69500e0ef7b0f0048c2643d2796c811492ea58be13b4833e2cebb9ce9e20eb4a357d4d758b110
 EBUILD netbeans-php-9999_p20160922.ebuild 4418 SHA256 9b76fbee63f82bbf5e12809df5fc7e91fab65a409d8ecf759ccf1d1e73f818d9 SHA512 694d17097304d7df2981fc192d8a3f1831b9a694306ebba012100d6951173f2654a21dfb7167393543468d57991ccaf104f8943bc6ebab8f8b59f36904e1f0b4 WHIRLPOOL 910cdb5b7e5b9935165a1f7fa201bc2ef2cdf2727e506e52b6573e8fec3d98ad39a896981bfd73c6670afa5cc7701911116d18160f0f48546d669bc31e18c1a7
 EBUILD netbeans-php-9999_p20160923.ebuild 4418 SHA256 cf10d7940b3736dee724cb1232917e8c2f960f3937a0c99563db8797c22de5db SHA512 e144f88eb96b499267139291af9a4b50e37d9a80214b862fc55b54bb45b1406dfbcdd4d85034f7a0265e4fd0b4e1cc3fae6e26322bcf16413a50752a4526e170 WHIRLPOOL 55b067fe3e1daca16bf9b55c24d91ead1a5caad7501c9fb6689f64914a5b097765b5d8efc7c3f9e1049c6fe87671d68633f62d977e4527b87eeeffe71716c1f6

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160920.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160920.ebuild
deleted file mode 100644
index 4a65a5d..0000000
--- a/dev-java/netbeans-php/netbeans-php-9999_p20160920.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-20_00-02-33/zip/netbeans-trunk-nightly-201609200002-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 228f0ed..409ac1f 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-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
@@ -58,7 +57,6 @@ DIST netbeans-trunk-nightly-201610210002-src.zip 218421842 SHA256 c06c45aac35396
 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_p20160920.ebuild 9520 SHA256 3920316f3bdba192111215e9fd7f95bd18f78d71a2fb90c0153328db8432bd9d SHA512 920861657aa16dae7e4247b1d61ad307b142d4c06c10f03f6362c103f25de5d10d842f1909479e33606560dba8558e7cabf20f0abbc1d6cc55fd9466bf7ec0c8 WHIRLPOOL b054ea3e99895981cbd2ee79535752f766ea112dec6d9daf5fdf7d97e705828a911698737f6292d8e1fe22c514e1bbf0ad675ac5506a399bdb320b8f1959585e
 EBUILD netbeans-platform-9999_p20160921.ebuild 9520 SHA256 6605bc3d321144d739c758b3f289cb0e0f09cd4bfdc15e18ff997499877d8b6c SHA512 88e79dcb8ec6f12ebb1ea326c0b340f349c9cc64eb3d46e6047b7c5165795f309da23741e9c96cd2fbea3ef77a8e14543a479c4e5a2f40079f252c331ffb245c WHIRLPOOL ca3ec959327aafa2418fc94ac5580717ccfafbbd96e694acdcac60ef429ac4fb9c106c0918bed786f0861757363bd92cd1cfda6e8e77fcde38ef8c77cc345f29
 EBUILD netbeans-platform-9999_p20160922.ebuild 9520 SHA256 be0d6e34acafb06fa50a32386907e85756c47a710f1ffa1c38518321cc0bc01d SHA512 e6a9861cabd381f9edb9cea48a01396248ce301d5b41c4f28ac7808fa2577eb68ac1b9b23540c45871d2d25feb8cb511c3983252480a8e1c4af127ba09286674 WHIRLPOOL 11f21c81a2c4d3232e48f0de32c115fe301dafa0658e99f7584a79fd51cd0712cbf8357f5ae7cc22338eba81339a54c5b31a3638b529ec82d3f938e4cbac0699
 EBUILD netbeans-platform-9999_p20160923.ebuild 9520 SHA256 ecf5afa681013f771772fc4707e0723ed93a3685567dd3135c506c127f826f47 SHA512 5e369337eda2ae02757dc5244117cde6809398dd0ef3bc167b74e7a6b11b37870f7d2b7c4bd80ba1bd673b3032492f847d1a888c5d471637bda3780de31c225c WHIRLPOOL 6ddb823d587da4fd78653935ae0a1cbb104026a7ce224631c87f0319fa265644ee79a52e40d009d7767818eea17cbecb7f6c679b6d6073da952f2e87e3719926

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160920.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160920.ebuild
deleted file mode 100644
index d42620a..0000000
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20160920.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-20_00-02-33/zip/netbeans-trunk-nightly-201609200002-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 7a07065..f8da8e5 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-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201610210002-src.zip 218421842 SHA256 c06c45aac35396
 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_p20160920.ebuild 3472 SHA256 1d2c754743334e7c82cf76045c3544ec639e2f0db4fea9acb52b9d4d981990fe SHA512 5f44819d0eb17fc1c64bb1f92177bc8feae4a6c2eca80261d3b81641bbcaf805d742606e29d13c346e584862bdded19b09a32575deee6b9af54056f7673d5fc2 WHIRLPOOL 8b09a95ee22796c099a3349da1f493129b2d56df6b9f4725262a961c458c9ba63dc33ad849a63617f37d550a07dee0c3e7b77b373abcc8c964db5225154ac2a2
 EBUILD netbeans-profiler-9999_p20160921.ebuild 3472 SHA256 bde0aefc575ff44cb2519f43bfdbb4f2dc69c675fd467cc6bc8ce93261ef56b7 SHA512 008920fc391f9ee5e70b21a95c14e1fb4be78eba476e1b32c39d9f63701a6a275521db997f49429d45b0b2958e3972d5285253af2c2e18ed3f9839d6065dc262 WHIRLPOOL e6f816d67923da46bef9da77fcbc0455d71f6d6b1bfd5060b824a06429ff36fab1720d40702d1eea315b3c34604490574669ab1873a4e676f3e173fe8b411de9
 EBUILD netbeans-profiler-9999_p20160922.ebuild 3472 SHA256 6cce91b426d46bd0d31d5eac3a099a8fc14dff8ebfce1d0859771e4bb75feada SHA512 9f63e050219813f09a7837f38918dc3c2b9fbd4f178afef7cc71e957996677bdb60c6afa0a8b48c0bd56438f268abfaf5e57e80db5cea32ba3216777614e32a5 WHIRLPOOL 5da3f46caaa380cd232225b93fffee13325c655feed579ebed0dfb636fbfcf58dadfc8ee34327303a9e6270616655d88f93302feb4e2da60e30b4d29eab43577
 EBUILD netbeans-profiler-9999_p20160923.ebuild 3472 SHA256 1af09909286a1d7374ff45ba29acf16cb6c98a7f7c2ab83d3b4fe2b962ee62e0 SHA512 87bdca97b9de975e61cad98b70fee591607fae30a7658f3e5234e720ec8c1266f585444adbf9ff0ef72e277815964f5f2c55fd4b5b46848a28b6730ee40e14c7 WHIRLPOOL cfbf422c548bda79880831979be15554344448d74878366112969210063932a9e622d265b574893dfa6b55371cd24593500f68e11f4e7563813059eb2f56654c

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160920.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160920.ebuild
deleted file mode 100644
index b8553c2..0000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160920.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-20_00-02-33/zip/netbeans-trunk-nightly-201609200002-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 f87d926..72de413 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-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
@@ -51,7 +50,6 @@ DIST netbeans-trunk-nightly-201610210002-src.zip 218421842 SHA256 c06c45aac35396
 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_p20160920.ebuild 6242 SHA256 2d6623d7c15892c091adb90b7013b627794b6e509391168a1b2cd50183d30049 SHA512 50ee074d0bbe0cc161b730516252dd993b01c3fa781c2b12e6d04c4b6e1b5a56814b99026894807c779a48e0a1c2019e8aeceb86d9ad1d38f44fceadc08cbd0f WHIRLPOOL 0f14c23b86ddf85e74993c07409736e783bf9355bb4774adb7e7ae072b25adf4df46db69c8bc448a17749bb47794fc09b8f4807c998e7711b8dca5de9340cc30
 EBUILD netbeans-webcommon-9999_p20160921.ebuild 6242 SHA256 0815d845808d3cd44f3ea2202e1ad2ad8dee295b1f2123aa6a95dff43687143f SHA512 291968838fc281e380eaede34d83d4eb058299ab6c0a3bbacba422091bf342dfa3ca3d84e8e08cb57db05700340653b92d64d20b037534b8a2a13066bbc5c53c WHIRLPOOL 1f15a6bb34d01c0c371a5bd736ba26105cd42a38e7130e3b16ad56cc9c4a712b777d209d09efd70b556fd479a137c818ebf35999f4c30b9dc7de1eccf9e897ed
 EBUILD netbeans-webcommon-9999_p20160922.ebuild 6242 SHA256 174b69168a6521f7bed7fdd3b3ae230cda80181702b5f5e97bdad987f3c35cd7 SHA512 f6681373874cb29bb55aba015bdf7fced80b42eae763b6b09fff6d7a58c4c194738d2fda7972dfa7977e00a9fb26a5f0809382744d68d75e091589593e16c3dc WHIRLPOOL e741de5c8bec5e6303c22894fb330251d91928427bfc9ee74fc10f180f4df4849f60a1b4925fd722828633858f857f8b257e2b138236b0cd7a20e303a7e86fc1
 EBUILD netbeans-webcommon-9999_p20160923.ebuild 6242 SHA256 2daf97814023159c8962cb4242526865c00dd3ced60050d46a874063031f4058 SHA512 341f6b769376bab304eeb60254b1d31855a615ed147dc9ed3f9752404ddfa5129903f41ce775ac365e6a0346a0718dc0afaf7be984568d34ac09c5381466c273 WHIRLPOOL fc74c52e49e2fb8d7c391e5618dc179498f243b694a82851bc6f04a0bd152a6770b86a419af5bafd3ef6d4fd0a71052f9afa7934ac01a392c794868d5a5154d7

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160920.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160920.ebuild
deleted file mode 100644
index 6f235c4..0000000
--- a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160920.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-20_00-02-33/zip/netbeans-trunk-nightly-201609200002-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 62c1bae..4425b56 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-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201610210002-src.zip 218421842 SHA256 c06c45aac35396
 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_p20160920.ebuild 2721 SHA256 e5ae98c4f2c8d36da6d8921971a44b508599ae60c8eed0b510f76fd4b57923c4 SHA512 a4f2ac41778fc3e8051908368999c489ef004d57194e37ead79a51a84e1fcd97567eac5215f40f8c092e75234d763af8b3820511e3fc88f775927ef3ce06e4fc WHIRLPOOL 34b923a7914c303c46fb787826ae10dcef1888db342d2c5c2591e28c85f665d295995bcddca09acd89ba3548da81e5dfb36c128d879471ea2df8365139386039
 EBUILD netbeans-websvccommon-9999_p20160921.ebuild 2721 SHA256 d6944a0e2c6617607193f5ddcda829c1ba6cd224ef775294fbf66299fd0fb614 SHA512 d49a533db74c1d2fecbcab357d58bdb6f1bd949d275be21bc0f3f22cddb35e6f9577c6fc7ac2a4ff4db9206a660074b52a2a10d81d9044c8da6ca8538ff0bb7f WHIRLPOOL 07482a937e0858ae5d779746fa2d4905b3b9d75c0ac3013ef0642b684590f24b4fe4ffb70cb1798fc4d0d16a3a08ebdeeb423d8797cf5b139e9a1cf9d57464d1
 EBUILD netbeans-websvccommon-9999_p20160922.ebuild 2721 SHA256 5b0ba48b0a4a9ed47c94eb5baa1192cb279c62603fedb3043be5d0d7edc79724 SHA512 9d04740d9cf0eb1c6fa08077e40667017f00769eece4c121e5fc620ecde22f22fea185c76270e5c001e12f8a3a8a525de185a37cc2b0fa791180c82f59a563c0 WHIRLPOOL 5f642a21c364b3aeaad9977ce698be4a40e7ee5c63877b273df5e15f92ffee41af3c5d7cd46ca995e9b2df3fad457549ddcd7d3ef74e175ee86391ba1e497b66
 EBUILD netbeans-websvccommon-9999_p20160923.ebuild 2721 SHA256 9aa15b94dc4a03eede4d6c37fb92ea1945412eaab45d48ec9187b2087690f939 SHA512 b1ad8c4235e829273dee53fc4871947aa9853b4b17fc9c91e2e5fdeb31f6005a9159263ee3d2b710ca465b729e7cc0dcdefe505f23175590b63e6adb099fa750 WHIRLPOOL b467f3d062109c70962490cc3b19080a1b393c9c02cfcb49402a74985d74bfab8503ec9414a7cfceac7584fdf0a767601a1da1ac78a7ed29d45993de44ac20e7

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160920.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160920.ebuild
deleted file mode 100644
index 85f83ff..0000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160920.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-20_00-02-33/zip/netbeans-trunk-nightly-201609200002-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 e054970..b53788b 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-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
 DIST netbeans-trunk-nightly-201609230002-src.zip 218005040 SHA256 b91fc402d53a7f9def4e0d67c4e1714c386e7687d3b8762eb36caaa31c2e3a80 SHA512 221687b4d93239470f737a15800678ca718da8191d99c31742b1c90954bde3ed470f4bc8076e3b2a05ed165ecd1b118d55a626f2ceb330aa0037870a88292534 WHIRLPOOL 9b12a1563bbb5ae3eff05d477f38306a679f36be7ad0466a1bfb43d48df4a9f9b634f0096159030cc14de5b12969def4f5ee6a82f15e3217f388bc9b09e7a990
@@ -37,7 +36,6 @@ DIST netbeans-trunk-nightly-201610210002-src.zip 218421842 SHA256 c06c45aac35396
 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_p20160920.ebuild 6939 SHA256 56c017c40bedb1f60809d6c5e5357cf129aac1ab641232f353686ae0cbcfd365 SHA512 c5e783d4dd76b4440a8fcad2525ef9d27ac231a3a268752a2f6e618027cc32ddf0d11f332f643e161cfedd2c486b505274975d2fc18919af2eab710f699a0b74 WHIRLPOOL 9e3ac1d498f3f63fa9caab53eac68d58220d16f5a14810598599ce941e3bce1f69777c665ca9b34f0ec6af8171f9858d8032f932854456cf9f6ac2f4f80df477
 EBUILD netbeans-9999_p20160921.ebuild 6939 SHA256 ad1bf1c8a99452d8ec1e6e872a8a91b4cccc97a56ea6c4dd7c38a30b9815a7f4 SHA512 aea5283c6f064ea27a951214af716d3ef0ea4feb96ed2e529e740fd928d8f283a3233bdc7639de609018b214c5e1b9eed0b95e3091b493e3fd2e2317faa33a67 WHIRLPOOL 6082ab9fdd09c73340355c63add6d289c7f90e7ad7109a3253e2dc948b1ec5cd4a352d2682c15e752340945012d6f9c7df234eaa5f2bf49e84ef8000062c8b8c
 EBUILD netbeans-9999_p20160922.ebuild 6939 SHA256 ad2069cbb9ad4658cb4ef8fee5fa97a3d28a6eb3bad2609478c1c5465a0aa487 SHA512 541897fc7bb4c1c60701244492efaec3457be8734025bf2d72b45f1b89abb297c7ea5ac250e2080fcf48a0b97adaa95e29151a773e8dd40abcc00ec23064fb90 WHIRLPOOL 1f3212fea8f99255ec7eb30b3655a4f7cbb5274db925b7f795e57eebab137dc1d158030fe7ee1f305ed9cdcf5e6b10e51d15e6abaf1a129d565c48af289b3a2a
 EBUILD netbeans-9999_p20160923.ebuild 6939 SHA256 cf51769ce98e2975c55bdb0b88ffdff00aa51dfff31517b50485fd466c8b8b22 SHA512 cbb7c6cad642b72a6b149d3b5df317d0221beccee3e7d98903bde5aeb533d1bc63f2d79fe203758fb78fdc52281c77860e63b2cd7f094a98416ef139ee9dc71d WHIRLPOOL ee1d0d88e2160ed33f9f32200caf3553e4c97f8c258aede1eb943553a8d5ad4aebfe0edb51f6db3b9915ff364c522a3f8d604a8a7c97e3de5a87bec699cac66f

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


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

end of thread, other threads:[~2016-10-22 10:35 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-04  8:14 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-mobility/, dev-java/netbeans-websvccommon/, Miroslav Šulc
  -- strict thread matches above, loose matches on Subject: below --
2016-10-22 10:34 Miroslav Šulc
2016-02-02 12:08 Miroslav Šulc
2015-01-23  9:11 Miroslav Šulc

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