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

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

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-websvccommon/, dev-java/netbeans-php/, ...
@ 2014-11-28 10:38 Miroslav Šulc
  0 siblings, 0 replies; 5+ messages in thread
From: Miroslav Šulc @ 2014-11-28 10:38 UTC (permalink / raw
  To: gentoo-commits

commit:     38c5588366c87abd289aa27491a415a878b1d2a5
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 28 10:38:00 2014 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Nov 28 10:38:00 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/fordfrog.git;a=commit;h=38c55883

netbeans: bumped to the latest sources

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

diff --git a/dev-java/netbeans-apisupport/ChangeLog b/dev-java/netbeans-apisupport/ChangeLog
index 833922d..8573af6 100644
--- a/dev-java/netbeans-apisupport/ChangeLog
+++ b/dev-java/netbeans-apisupport/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-apisupport-9999_p20141128 (28 Nov 2014)
+
+  28 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-apisupport-9999_p20141128.ebuild:
+  bumped to the latest sources
+
 *netbeans-apisupport-9999_p20141127 (27 Nov 2014)
 
   27 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 2f13ca2..7364a1f 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -46,6 +46,7 @@ DIST netbeans-trunk-nightly-201411240001-src.zip 199372060 SHA256 1088d63eb70366
 DIST netbeans-trunk-nightly-201411250001-src.zip 199373828 SHA256 a73eb4832b16f3b121228ef66f9f356756c0dfa8c31b2f74f69180904b262997 SHA512 296310be127d636a577dda2e89f68783fd85279dfd0f34faf3bd67173cd75fd769a85795e9dfa76a8d0918016041789f91cda883b903e3c82497e5f8bd0a91cf WHIRLPOOL 212327df9fa4e920680cefad9b97e3d660bdc79a411de9a76817669b180449576898e37c56ec91700e9fee1aeaed86d4576434b7db39222f2760e196d9bf8a43
 DIST netbeans-trunk-nightly-201411260001-src.zip 199396686 SHA256 82c5453d0702c37f6a059773c06890b25786f6a06cd2c6c2206d2bcc7480eb5c SHA512 365ef290c511e44223de913f861fb841f25cd018cdd1d31d8c4c99fd6b674ad37c63ad9d01fccf865ade9fadb918a8a895a6593596538be472cd9229c54475e2 WHIRLPOOL fa5ae283203d4ff3c7fa684eaa581229f2fa6c80c168028e501991bc2d6766aba85dc6d757e362f150110faaab372ea2e1eb7c9ed25091851c637269380de175
 DIST netbeans-trunk-nightly-201411270001-src.zip 199424732 SHA256 1986cf723ea94e5219c59e0171fdd1b302b6fe5d381ac7ac3fd0c3468ed71448 SHA512 c4d76a6a5e79c1298fae3276185a2a43fa024ee32f6cf2d5e25fc26da763491ca37cfc8829a142b9b4af879fbf9607f03721d40c7cacc5a8ed13aba913c2c92c WHIRLPOOL 82a5aa2e73dee3b67204f9c2624f53bed2275d11b03b222c2d2d36e5fd34a729e06e1ade5a0d4bfe8346059f00f7c1241beb3682a501031cb43b8dd4e222349e
+DIST netbeans-trunk-nightly-201411280001-src.zip 199431402 SHA256 ec7a6b5e5ddbdd042b5336dced4a05d0679c59368984601ed7229da9faf99903 SHA512 d4d9b15c56453249e56050cff1c9e9ee4f72eb2dee910ade236a3ff70b919fb1a8836a77517c1c651c72d9993432080727a247c69a5d971ba5ba04795c7d60a3 WHIRLPOOL d5a774df345a1726598c650292f3f915efb7852e35674f3ddeba3c1be167e1490f1e7f0bbbfa29655fb7824ac4279325e13c82433988d45a84d85a503d0ac04b
 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
@@ -87,5 +88,6 @@ EBUILD netbeans-apisupport-9999_p20141124.ebuild 3390 SHA256 2a9f1d2b3c9a9e4eedc
 EBUILD netbeans-apisupport-9999_p20141125.ebuild 3390 SHA256 272147b6efecafc05a6c66a676516b4486e5a51e325069bbc8b79714f8be2cce SHA512 ba31b771caaffba7785601dec2f00c14904d3966f1b43e55b424f7e61bc056ed4950d727108b0ed7d550d4225c3b06ee76757ca52b08c744da1f8a903889b284 WHIRLPOOL 3a0046a09f950c4d87d75fd2a0097afb95becc3706ee786dcc7f957c0aac4f9b7e0ff54c0d5f2c4bb9909f361766d752439c27033ebce7ca4f0bc70bd30d46e0
 EBUILD netbeans-apisupport-9999_p20141126.ebuild 3390 SHA256 b475bd8603ffe43f3c0ea6fb10deb93e14faf130dbce50153fc41da821ff75e7 SHA512 deec06aaaaee013355ea6044ffe34177067df5644890cd41e47f08144188427f137b329662eeb79ff63e217073809f48c2c0febf4fe0056cde85b813ce96baae WHIRLPOOL 4e13dbe6976b61a371937131671e5cd014061508c933bf4aac8d381be51c94a1510bb9d6fedcfbe6ce0c714ab6fd1e77c06affc068493d823d8c10b754a8752c
 EBUILD netbeans-apisupport-9999_p20141127.ebuild 3390 SHA256 cca8a227e6990c70145e29d017e808ea13a5aa4120f7bf683c504e12ae657f30 SHA512 a1ff860e219f1e55be2349bc4c23d550bc31ccb8085b314f1f708b761a8f18e95d7a44198af34995da108a88ed1969b0c7d5436980425f3d5a4823d5e2d9755c WHIRLPOOL a34a630b351710e80b059ab5be03c3bf16e341b02b89216788438fe8593e8fb0bb40bc422b1750e46a96a13f0f9d7c865278a0b33d9eb69f9db07dd6e6239092
-MISC ChangeLog 143610 SHA256 c758a2775bd72caccdcfcc4a8de64071b2b5cc365467c38ef369fb304b065b5a SHA512 28d39a63c30876cc8ce4617aeb57fb0e1d9b10470accabbdeb04382a831651a4c85a247d85e6dccaff0b8345b55d06197e929a8270ba3c672e71f5ab7fab8cfe WHIRLPOOL 240063727099d0cbe88125076cfe8f2e657e48208d3713417696e2b67c564acbaab045bbc0421088470d4ba9802bf168aa750fde6ce9619f6a1701e9655e84a5
+EBUILD netbeans-apisupport-9999_p20141128.ebuild 3390 SHA256 acf9ea783d8ae34bfcd7c2f3b4479b686ed564978deb97470a820ec60ef619d2 SHA512 e1a4455cb79d75ab0a521770807425c5524ae6dc019fd9631fc3d7a2a838746c4159f2113fe29e047a727457d65148378463628ed4d0f2da764bdc9b086bf223 WHIRLPOOL 27af10be1c0ca918f4eaaba959c3178f0a8fd677ba63c4f300fcca55f5b0b034c3e0aa5a5a2bcebec4349ea4fad21fb57c24343b8977e61847787d277715fd5b
+MISC ChangeLog 143791 SHA256 28fb16140f9f70738919bd53cd4fc3c92b6edd6eb3cf405aab22195a926abd3c SHA512 d6ed773c2e2b8149071ab949064acc65ff09f08cd5433d8bdaefde4d69c7440efe3462b3ab2350d6252d2aff58c473599977b4866c8f2e5e47947c123bfb1aa1 WHIRLPOOL da7361a4ac5be7b5d3cc83af4295b8bf19698326d8b9097381badeed056031c1d544fb99995601e838a3311031ffbf2e5f60d5a366473df54e9ebf54846f19dc
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20141128.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20141128.ebuild
new file mode 100644
index 0000000..d4208e9
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20141128.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2014 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/2014-11-28_00-01-49/zip/netbeans-trunk-nightly-201411280001-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 280c173..bd5d481 100644
--- a/dev-java/netbeans-cnd/ChangeLog
+++ b/dev-java/netbeans-cnd/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-cnd-9999_p20141128 (28 Nov 2014)
+
+  28 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-cnd-9999_p20141128.ebuild:
+  bumped to the latest sources
+
 *netbeans-cnd-9999_p20141127 (27 Nov 2014)
 
   27 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index c4af7b4..10ffa3b 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -59,6 +59,7 @@ DIST netbeans-trunk-nightly-201411240001-src.zip 199372060 SHA256 1088d63eb70366
 DIST netbeans-trunk-nightly-201411250001-src.zip 199373828 SHA256 a73eb4832b16f3b121228ef66f9f356756c0dfa8c31b2f74f69180904b262997 SHA512 296310be127d636a577dda2e89f68783fd85279dfd0f34faf3bd67173cd75fd769a85795e9dfa76a8d0918016041789f91cda883b903e3c82497e5f8bd0a91cf WHIRLPOOL 212327df9fa4e920680cefad9b97e3d660bdc79a411de9a76817669b180449576898e37c56ec91700e9fee1aeaed86d4576434b7db39222f2760e196d9bf8a43
 DIST netbeans-trunk-nightly-201411260001-src.zip 199396686 SHA256 82c5453d0702c37f6a059773c06890b25786f6a06cd2c6c2206d2bcc7480eb5c SHA512 365ef290c511e44223de913f861fb841f25cd018cdd1d31d8c4c99fd6b674ad37c63ad9d01fccf865ade9fadb918a8a895a6593596538be472cd9229c54475e2 WHIRLPOOL fa5ae283203d4ff3c7fa684eaa581229f2fa6c80c168028e501991bc2d6766aba85dc6d757e362f150110faaab372ea2e1eb7c9ed25091851c637269380de175
 DIST netbeans-trunk-nightly-201411270001-src.zip 199424732 SHA256 1986cf723ea94e5219c59e0171fdd1b302b6fe5d381ac7ac3fd0c3468ed71448 SHA512 c4d76a6a5e79c1298fae3276185a2a43fa024ee32f6cf2d5e25fc26da763491ca37cfc8829a142b9b4af879fbf9607f03721d40c7cacc5a8ed13aba913c2c92c WHIRLPOOL 82a5aa2e73dee3b67204f9c2624f53bed2275d11b03b222c2d2d36e5fd34a729e06e1ade5a0d4bfe8346059f00f7c1241beb3682a501031cb43b8dd4e222349e
+DIST netbeans-trunk-nightly-201411280001-src.zip 199431402 SHA256 ec7a6b5e5ddbdd042b5336dced4a05d0679c59368984601ed7229da9faf99903 SHA512 d4d9b15c56453249e56050cff1c9e9ee4f72eb2dee910ade236a3ff70b919fb1a8836a77517c1c651c72d9993432080727a247c69a5d971ba5ba04795c7d60a3 WHIRLPOOL d5a774df345a1726598c650292f3f915efb7852e35674f3ddeba3c1be167e1490f1e7f0bbbfa29655fb7824ac4279325e13c82433988d45a84d85a503d0ac04b
 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 +101,6 @@ EBUILD netbeans-cnd-9999_p20141124.ebuild 4586 SHA256 e7dafbea7fc25514a5e28ea956
 EBUILD netbeans-cnd-9999_p20141125.ebuild 4586 SHA256 81109a0e84f9e9cc678cb6acc2ae01239977ff08022067377e09458c46b150cc SHA512 4159bd6ad12f1fc36487957d6812d5e9db077d7fdc6e4db942459ce72c5627f0be9eb8e8d5bdc29320febbcad70621257d5e7141336c648f6b59bd5d692c36d0 WHIRLPOOL fbd389381f0714bea0668cf7847feca6b1d5289dda31581800ce3291fc13099493ef50ad0a1f559b023202050bc59576f69051f88890f4aff4e77db7c10f2faf
 EBUILD netbeans-cnd-9999_p20141126.ebuild 4586 SHA256 90c2e44b3bb8deeb95244228c5381e114d1cafe9ad773dde0813d899d8e44bf7 SHA512 834edd0e792b044c2561a4d8379faf5dcb7f7db7b1953634242ab37141288dda3ef9d9e7a30b664e74911a64af104fb6628257bd5a98a8fc3712351f01c382e7 WHIRLPOOL eeb0992a1a3c0d8e94ec0abd67822f6a3b5d40e1bfa260286a5ac31f3a0a0f83fe0e7768d67d398df3ae38763a00879618166b6117d4cfe3eb65440124965af9
 EBUILD netbeans-cnd-9999_p20141127.ebuild 4586 SHA256 0e1f49768f1cd01a02b8a76861f8348b183873cae1e0ee3ade407ad4670d3f5e SHA512 a2c04fd3ebe15bf9cb69f24b373a1e2c8f31ee3a900223c08d2415737a7c2732ef163759a3b2a191a12627629a7b96703c7aaed51ebab2d135ff1224867fdc90 WHIRLPOOL 10d05fc45c282a949400bc217315a0f4afc5eb7e4c4e2f96c052e4e06634ff589fcf59f3d408f8631ad49a6051fe4f4c5711d91ffded89c90c082b6dc6a5d77d
-MISC ChangeLog 131310 SHA256 071dc727604b1e59f4e6d42ba3f5a6244907a22cead5b7822f1f257de7fd9e60 SHA512 fe151c169ba9cef62b4c6e2f30e0c40fabe81ce3170a88ee4f00a1d493a267b910b55f31f5fbe8e7774c54293cc976a82fc570ad1a67a96e91138aee715d4542 WHIRLPOOL f09532b5b62c91c861aea040201b43ca19ae2b8418789521af4269c1d8a013759bd8c9947e059db8a52d02ee8491be55e103890258a7fab3093be84b60a3f148
+EBUILD netbeans-cnd-9999_p20141128.ebuild 4586 SHA256 b469d38b0820abe62ec0bd22278f76017ca58f2196243606a569ec68487ce6c3 SHA512 8c6c2cb298c9ecac33af0a378f3d5a459a3f27a7b7896fdee73bf5f30e07cabafc4a38039cf4daf1845de6bca86cd86760d7596f57373a3c006306a4b6afc5f6 WHIRLPOOL 6ee6aef8183be115348e3b74e9ec12af8c697e89bb7eb8309217583531a337df440c5cab73232187b3f98a615c1994919b6aaa2aa9e1ce4951ac49af9f809b7b
+MISC ChangeLog 131477 SHA256 f1ffccc27df74acc427de69c4a7a7772caed76e62a4bdaa750eb90b0168d7c33 SHA512 f78f846160c1bf13bcfbe2ac6aa6ae0318f93e6d29e4b344a9c20dcd6745f960639eaea131f16607a7d4960ab3517d58a80671bd688c574dbdc487c703ba890c WHIRLPOOL 5fbbddd85febd0735017660e56a14b6e081e4983f36a20427e79ab0e1f6acc8de47451e156f1a11feea9fc2ddb3ad04e7aae4d5a6fa2c4ddffc961e99251b8f0
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20141128.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20141128.ebuild
new file mode 100644
index 0000000..9be889e
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20141128.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2014 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/2014-11-28_00-01-49/zip/netbeans-trunk-nightly-201411280001-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 1b53083..f52fb5b 100644
--- a/dev-java/netbeans-dlight/ChangeLog
+++ b/dev-java/netbeans-dlight/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-dlight-9999_p20141128 (28 Nov 2014)
+
+  28 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-dlight-9999_p20141128.ebuild:
+  bumped to the latest sources
+
 *netbeans-dlight-9999_p20141127 (27 Nov 2014)
 
   27 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 0d9c810..1de1961 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -51,6 +51,7 @@ DIST netbeans-trunk-nightly-201411240001-src.zip 199372060 SHA256 1088d63eb70366
 DIST netbeans-trunk-nightly-201411250001-src.zip 199373828 SHA256 a73eb4832b16f3b121228ef66f9f356756c0dfa8c31b2f74f69180904b262997 SHA512 296310be127d636a577dda2e89f68783fd85279dfd0f34faf3bd67173cd75fd769a85795e9dfa76a8d0918016041789f91cda883b903e3c82497e5f8bd0a91cf WHIRLPOOL 212327df9fa4e920680cefad9b97e3d660bdc79a411de9a76817669b180449576898e37c56ec91700e9fee1aeaed86d4576434b7db39222f2760e196d9bf8a43
 DIST netbeans-trunk-nightly-201411260001-src.zip 199396686 SHA256 82c5453d0702c37f6a059773c06890b25786f6a06cd2c6c2206d2bcc7480eb5c SHA512 365ef290c511e44223de913f861fb841f25cd018cdd1d31d8c4c99fd6b674ad37c63ad9d01fccf865ade9fadb918a8a895a6593596538be472cd9229c54475e2 WHIRLPOOL fa5ae283203d4ff3c7fa684eaa581229f2fa6c80c168028e501991bc2d6766aba85dc6d757e362f150110faaab372ea2e1eb7c9ed25091851c637269380de175
 DIST netbeans-trunk-nightly-201411270001-src.zip 199424732 SHA256 1986cf723ea94e5219c59e0171fdd1b302b6fe5d381ac7ac3fd0c3468ed71448 SHA512 c4d76a6a5e79c1298fae3276185a2a43fa024ee32f6cf2d5e25fc26da763491ca37cfc8829a142b9b4af879fbf9607f03721d40c7cacc5a8ed13aba913c2c92c WHIRLPOOL 82a5aa2e73dee3b67204f9c2624f53bed2275d11b03b222c2d2d36e5fd34a729e06e1ade5a0d4bfe8346059f00f7c1241beb3682a501031cb43b8dd4e222349e
+DIST netbeans-trunk-nightly-201411280001-src.zip 199431402 SHA256 ec7a6b5e5ddbdd042b5336dced4a05d0679c59368984601ed7229da9faf99903 SHA512 d4d9b15c56453249e56050cff1c9e9ee4f72eb2dee910ade236a3ff70b919fb1a8836a77517c1c651c72d9993432080727a247c69a5d971ba5ba04795c7d60a3 WHIRLPOOL d5a774df345a1726598c650292f3f915efb7852e35674f3ddeba3c1be167e1490f1e7f0bbbfa29655fb7824ac4279325e13c82433988d45a84d85a503d0ac04b
 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
@@ -92,5 +93,6 @@ EBUILD netbeans-dlight-9999_p20141124.ebuild 2995 SHA256 5336efafed8cd4618f63991
 EBUILD netbeans-dlight-9999_p20141125.ebuild 2995 SHA256 6bbba07b32962887701d98656b796f9867351d4dc9b47fc4f504ddf5d7f9d2fe SHA512 ba2774d4189c8a9fe4e552eddff9c2d45b15312b16d7271d57973cde5fdadb9b96395a200a2cd8853af1973597ec845e93db835eb3b995f523dbe0a758f2de35 WHIRLPOOL 08d4ee526e3c8fa863bdcaeb4001493c12ddc4ccfa348245a8f44be58c2cb77418c094f84cdd14e7bece37b9411d2a5dd64ff319d131b4bda5920e7bc23f1ee1
 EBUILD netbeans-dlight-9999_p20141126.ebuild 2995 SHA256 aa4deb06201f3d1cae5163b27fe72c2ac2aafe76bdd11f58117bcc424583cf27 SHA512 670c3fc8209f196b939298c62d94b6831cca6edbc8849fa1f683fbcbadd6966df38784ecfa290bce23a371ec50fabaf8f2fd6fb39ab7848dd436e2817d77e6e0 WHIRLPOOL 6c19674a0fe1c06f495d709af3b83b59a1954ece20dacfb133a1bff7b8ea399535f2d5dfd330b6da1c8f27ac7b24f566ffddf5e5bfd023c5a01cbc1ba8aa2525
 EBUILD netbeans-dlight-9999_p20141127.ebuild 2995 SHA256 8517ab0ee73d363324bd83c4c42da8626fc4fe381f5269e7eaef9fb0efa4f36c SHA512 907a74820cd9b828264215290f40a534903623002eb775f433dd94aa6d701b1db5817e8f7ecefbe29bc4e2397f9380e60aac24cc06f09041bd13b2c61f721099 WHIRLPOOL 3338b623a22627b09ba02df029da6c89aac4e893e15c5922a4de5cb961fb2f33f15f0c4bc0e6c260eaa4d8cf56e7215f182ccbaf99a0fde2a91c11522f49275b
-MISC ChangeLog 136833 SHA256 c3e722f245e84e7717f4d0872def103dc7c7d767a7e2e0f27a660412bb38763b SHA512 39816989cf27523f649d729d5e97a5818af47f6ee2b53532505a61bb3c67bb8ba1ca9d27a74a85ddf25a493da53021c556ef1f2c7e051b844522c77779013be2 WHIRLPOOL 0524b7f62827f063324f30452df5802c19a5a579d929eac1349839d65b28992c2dc15cd78251eeec91d3f39a779273d4bfe971769687198686742c56283f3757
+EBUILD netbeans-dlight-9999_p20141128.ebuild 2995 SHA256 65e26343a2e41d4485a6a40e04f39ad34fb254cba53c34bdf81cca8705d2dffd SHA512 059f0ec9bfae3974648fb729c821a675051d5383168f541c7e735c6151c3db33b7f0577c5c2ddcd9dfda8b982886da3184d4f5a4369acb0ed26870a461c252f6 WHIRLPOOL d5068da0c0a9b5c91b676cd47a17af471130659a2f879278ba70a02453add32113c6f5ccdc1b99554cded282f2853292c2df6d5d9728782af2140d45c58c9f44
+MISC ChangeLog 137006 SHA256 f3ef66bcce4772e8ec5f2385674f5bb86096c0ca61aa5089409fa446a81f9a33 SHA512 f88d8c137bd465cf98c336d9d530177b459bc3141a643032ae3b6ae48cf7832563e64fdb6071a7fc07d36ee4a1b737730e066c752f053101db2b9ca31ef09738 WHIRLPOOL 7df8fbab4056f3ed505af2d5dcad88f26d32b8063bc8231a0ddc0d0118484da9c1e8bfa1952f7829b4c56f3bf54598dd5da4110ceec59091f14f5cb20838cfaa
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20141128.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20141128.ebuild
new file mode 100644
index 0000000..fdd5ab0
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20141128.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2014 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/2014-11-28_00-01-49/zip/netbeans-trunk-nightly-201411280001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/457A4C66AE33D1D5887BB1F359EEA41A10EBB2AB-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}"/457A4C66AE33D1D5887BB1F359EEA41A10EBB2AB-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 728a6f9..43b09d5 100644
--- a/dev-java/netbeans-enterprise/ChangeLog
+++ b/dev-java/netbeans-enterprise/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-enterprise-9999_p20141128 (28 Nov 2014)
+
+  28 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-enterprise-9999_p20141128.ebuild:
+  bumped to the latest sources
+
 *netbeans-enterprise-9999_p20141127 (27 Nov 2014)
 
   27 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 2bce526..ae8871d 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -135,6 +135,7 @@ DIST netbeans-trunk-nightly-201411240001-src.zip 199372060 SHA256 1088d63eb70366
 DIST netbeans-trunk-nightly-201411250001-src.zip 199373828 SHA256 a73eb4832b16f3b121228ef66f9f356756c0dfa8c31b2f74f69180904b262997 SHA512 296310be127d636a577dda2e89f68783fd85279dfd0f34faf3bd67173cd75fd769a85795e9dfa76a8d0918016041789f91cda883b903e3c82497e5f8bd0a91cf WHIRLPOOL 212327df9fa4e920680cefad9b97e3d660bdc79a411de9a76817669b180449576898e37c56ec91700e9fee1aeaed86d4576434b7db39222f2760e196d9bf8a43
 DIST netbeans-trunk-nightly-201411260001-src.zip 199396686 SHA256 82c5453d0702c37f6a059773c06890b25786f6a06cd2c6c2206d2bcc7480eb5c SHA512 365ef290c511e44223de913f861fb841f25cd018cdd1d31d8c4c99fd6b674ad37c63ad9d01fccf865ade9fadb918a8a895a6593596538be472cd9229c54475e2 WHIRLPOOL fa5ae283203d4ff3c7fa684eaa581229f2fa6c80c168028e501991bc2d6766aba85dc6d757e362f150110faaab372ea2e1eb7c9ed25091851c637269380de175
 DIST netbeans-trunk-nightly-201411270001-src.zip 199424732 SHA256 1986cf723ea94e5219c59e0171fdd1b302b6fe5d381ac7ac3fd0c3468ed71448 SHA512 c4d76a6a5e79c1298fae3276185a2a43fa024ee32f6cf2d5e25fc26da763491ca37cfc8829a142b9b4af879fbf9607f03721d40c7cacc5a8ed13aba913c2c92c WHIRLPOOL 82a5aa2e73dee3b67204f9c2624f53bed2275d11b03b222c2d2d36e5fd34a729e06e1ade5a0d4bfe8346059f00f7c1241beb3682a501031cb43b8dd4e222349e
+DIST netbeans-trunk-nightly-201411280001-src.zip 199431402 SHA256 ec7a6b5e5ddbdd042b5336dced4a05d0679c59368984601ed7229da9faf99903 SHA512 d4d9b15c56453249e56050cff1c9e9ee4f72eb2dee910ade236a3ff70b919fb1a8836a77517c1c651c72d9993432080727a247c69a5d971ba5ba04795c7d60a3 WHIRLPOOL d5a774df345a1726598c650292f3f915efb7852e35674f3ddeba3c1be167e1490f1e7f0bbbfa29655fb7824ac4279325e13c82433988d45a84d85a503d0ac04b
 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
@@ -176,5 +177,6 @@ EBUILD netbeans-enterprise-9999_p20141124.ebuild 15147 SHA256 2b78a0bf8abce2b744
 EBUILD netbeans-enterprise-9999_p20141125.ebuild 15147 SHA256 534aa56f5e7ffb11e10e82a6d3853c71887c32e516857f74ce863065f6105aad SHA512 db0f38ebacc0911fd451d973c2be7d95fd7bb758b48c454991717c0d7a08617d251521c70be3484ce6f2bc186e70716a0378db951d673d203cc422f18609a672 WHIRLPOOL 08cfc4bfd8c5dd22fc4ce5972f5f327737d4f1b7538529ce86aaf9a7ac10d7bfad863a013b6e00cb8c7e6f8f1de80aa55da00b35954a686e45d8adc69b5f7a3d
 EBUILD netbeans-enterprise-9999_p20141126.ebuild 15147 SHA256 c58aa906a59d15e8f87abd4ed122f6b86172946bf9caae33182f0d3a7bd92f48 SHA512 49e329ed60b220ced0697d479647bc0a983b03fe24aee35056e0086aefe3232a1db3fb15c396f705b914bf22d2dc624005859eae18f3a5cb005e80a4b285de4e WHIRLPOOL 95080da5d7f92703f228ffe97a0022c685f830d7eed4a2471095d25a13630a3050d4a931f49cc0b981d1b930335c2366e37861a96a2ed2d527d5afb3d860b020
 EBUILD netbeans-enterprise-9999_p20141127.ebuild 15147 SHA256 e9ab0f4f53535506b19c11d9c9123499e9103f3337f2b151a6e7f6d9cdba9eff SHA512 4dae636fa38129ef513d565b4f0116879b1be651f16ec35b807779abd2b74d796f9a0991555ceeb63350a2d3978aa87eb208af329f1fd5f27095276706be98ef WHIRLPOOL 636c17c45dd7a64ef14351afd90878e0cf595b1de63ad8487eaf094bbf985260cc30c57999a49ad24eb3841264961814ed64ffc8bf49be427e1d13fc2911541b
-MISC ChangeLog 144135 SHA256 1b48b93be1b8bfdd53d848aca6c163013d0b8879221ee4df8ccbbfc374326ef6 SHA512 e905cf3e6723d2797e4cde045fedf7cbd429668470004692d3f05e8970f0416f152dbbbb6e3cc7980e77c6c802b9e1198648e70c8232177307683d3c931f6b89 WHIRLPOOL ddef09b785d1a75b7884108be642a6b66f8c47a04ca6e62f7cfa085fdcbbb99c8ab92adf52d22fdb1f6e4dff415bc9ea6a890e8cc5076b84ce7c1a6fd39e39b1
+EBUILD netbeans-enterprise-9999_p20141128.ebuild 15147 SHA256 9b25f4ec46ca6ae11092240e109499ef5a6b88602e5fa7511867d3dfc4ee7421 SHA512 026055e8e2a7503e1d9e936f3c3368ddcb29d195ae4a9a8335e2254fde6baeabacc93c4ec2c74de4196ff99d45f558df2ed895f69d21dd4f7cb2e6f04233bfac WHIRLPOOL fc846e47acd863fbb47ce6c4db014737dd9194df9e0747cbda76a06380138ef2e7c3b78ad48e92c8e52dd113db65b98d71d73435fedcaf7824958568ce75956d
+MISC ChangeLog 144316 SHA256 7d6ef7ffa694298d286e57d496adc284966a3859431f9db20ee259b93b5a5820 SHA512 4243a81866ccf092bfc90c261fde440a45f6accd8652b779aecd424c60e288e9ebc859c2a522320b807a244360fa87da96354546689c99b154e1645d54cdbd56 WHIRLPOOL bc230c14472afc3407e47e316d02b91f8df0ea5ba47b9e9d4f3680d863f9176ef36e34718ebaf8d7a163afb5a3aac39b010d67d7601344eb12e31de7c9f6d9ca
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20141128.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20141128.ebuild
new file mode 100644
index 0000000..6a2fdac
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20141128.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2014 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/2014-11-28_00-01-49/zip/netbeans-trunk-nightly-201411280001-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 ef13063..1b41d56 100644
--- a/dev-java/netbeans-ergonomics/ChangeLog
+++ b/dev-java/netbeans-ergonomics/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-ergonomics-9999_p20141128 (28 Nov 2014)
+
+  28 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ergonomics-9999_p20141128.ebuild:
+  bumped to the latest sources
+
 *netbeans-ergonomics-9999_p20141127 (27 Nov 2014)
 
   27 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 7c6e643..3741f52 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -46,6 +46,7 @@ DIST netbeans-trunk-nightly-201411240001-src.zip 199372060 SHA256 1088d63eb70366
 DIST netbeans-trunk-nightly-201411250001-src.zip 199373828 SHA256 a73eb4832b16f3b121228ef66f9f356756c0dfa8c31b2f74f69180904b262997 SHA512 296310be127d636a577dda2e89f68783fd85279dfd0f34faf3bd67173cd75fd769a85795e9dfa76a8d0918016041789f91cda883b903e3c82497e5f8bd0a91cf WHIRLPOOL 212327df9fa4e920680cefad9b97e3d660bdc79a411de9a76817669b180449576898e37c56ec91700e9fee1aeaed86d4576434b7db39222f2760e196d9bf8a43
 DIST netbeans-trunk-nightly-201411260001-src.zip 199396686 SHA256 82c5453d0702c37f6a059773c06890b25786f6a06cd2c6c2206d2bcc7480eb5c SHA512 365ef290c511e44223de913f861fb841f25cd018cdd1d31d8c4c99fd6b674ad37c63ad9d01fccf865ade9fadb918a8a895a6593596538be472cd9229c54475e2 WHIRLPOOL fa5ae283203d4ff3c7fa684eaa581229f2fa6c80c168028e501991bc2d6766aba85dc6d757e362f150110faaab372ea2e1eb7c9ed25091851c637269380de175
 DIST netbeans-trunk-nightly-201411270001-src.zip 199424732 SHA256 1986cf723ea94e5219c59e0171fdd1b302b6fe5d381ac7ac3fd0c3468ed71448 SHA512 c4d76a6a5e79c1298fae3276185a2a43fa024ee32f6cf2d5e25fc26da763491ca37cfc8829a142b9b4af879fbf9607f03721d40c7cacc5a8ed13aba913c2c92c WHIRLPOOL 82a5aa2e73dee3b67204f9c2624f53bed2275d11b03b222c2d2d36e5fd34a729e06e1ade5a0d4bfe8346059f00f7c1241beb3682a501031cb43b8dd4e222349e
+DIST netbeans-trunk-nightly-201411280001-src.zip 199431402 SHA256 ec7a6b5e5ddbdd042b5336dced4a05d0679c59368984601ed7229da9faf99903 SHA512 d4d9b15c56453249e56050cff1c9e9ee4f72eb2dee910ade236a3ff70b919fb1a8836a77517c1c651c72d9993432080727a247c69a5d971ba5ba04795c7d60a3 WHIRLPOOL d5a774df345a1726598c650292f3f915efb7852e35674f3ddeba3c1be167e1490f1e7f0bbbfa29655fb7824ac4279325e13c82433988d45a84d85a503d0ac04b
 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
@@ -87,5 +88,6 @@ EBUILD netbeans-ergonomics-9999_p20141124.ebuild 2919 SHA256 4d121ee477bd6b5d761
 EBUILD netbeans-ergonomics-9999_p20141125.ebuild 2919 SHA256 cefcf56a8032bcd12e2921ad406b5d3b0acd9ad76361a7eeceb8973074e3185e SHA512 134e51090d6aaa2b08d3c3ca53ab4e542743e7ec5f867f3ef25e76f83f12ceef57c09554b5857853105f00e038c9099a8943bd34c680c458a3a454bc03ebdeca WHIRLPOOL 114f2bdc461bf90e0ad3244805675cf4836891216c5bfbe2b94ec7b89bf6bcac1b2c5464fa6ccad13d0e6c5d791bcbaecdd358fed3d5a788f62c5498c7f2da9a
 EBUILD netbeans-ergonomics-9999_p20141126.ebuild 2919 SHA256 fff01599583647d8c56a34b17270895654930cc2f5a837d677617db146baeb88 SHA512 a43df7c26845b3a20b93b20ecee9104fc5f917edbd01bff7f4fd605753fd37876d54e340e08f8d31c338ff91031c613867e7b11c57f7f024f628e2b95418f756 WHIRLPOOL ea8c94eb7f8db75c2648902bb39a4e6eba6c34f3df77f7470985e937f77ab415f400433e05573e7e7afe2d96fce301716737624c809be4fc8efe4bbca7ade892
 EBUILD netbeans-ergonomics-9999_p20141127.ebuild 2919 SHA256 60d84441673c574d0197312b5fc0cfa15add14ec427c459cee846b122cbd72f4 SHA512 3fe67a0c82c93adcd4cccd63e46f0fc472d7d3bcf4fe4036ea6f0dd77806f9a099149045738ac761e00c4ec91e4cb2de0081f0031077b3470a162407b0ba3c21 WHIRLPOOL 3be01e7b9cd58e67fc026dc0c185d78c983db2ffc7e106dd9cc1add0cce408ae0bcf091453a6ab9ce3a207960ccee06316944c3d245703e5b6aada11aa7ebb6e
-MISC ChangeLog 143610 SHA256 8481cf4ea662c6f839a27f2c01f2b18d33bb208293d50f4b6b2e3dd7e2ba627f SHA512 6a3fb7cc3c849f1178c43ac0eb9afef1fae7b189294051e036cd6b2dde1df8f0171c9f293d4125847b1fad198070ed29007ff39de84788b3c920b27d9f23cdd9 WHIRLPOOL a8bcda74aa9ea6db8e50fb50655de3b9cdd92148dc39181ef231b22106368a88f670c323e38864396b634b4cc512f7eaac99be089ad1a50ba16a1ec4ef300868
+EBUILD netbeans-ergonomics-9999_p20141128.ebuild 2919 SHA256 167e25def5217beba8529f28d2ec378ca5a8d7e20b73b347332bec7e82388da6 SHA512 65c173d400beb99a9f7dc4cf0398c824d11a97650ce5b908075a8d3d179a08c89ccad62ff82fea478b174db9dde87c658f7e440c3b777f1c5c435cdb2d429fde WHIRLPOOL 017e8b3ba6c343065027917c847557b447efabdaabfc6eb6a59746af0e58c550f9ea1b9ef813105e1edbf59b610685bebf218f4e5da249464af21150d4308339
+MISC ChangeLog 143791 SHA256 438ea7d82c3599abe564b8c74d647f1bc8ac66c32cd0d07525b20c83d49f1dd3 SHA512 ba9243496d65a29f79c8eb40f413d6b67edba05524b14b45b75ad3b45d9d24af47dc3be056e6118f0112f590570611ffcb3f0c82ce87d0404248aea469d8a4cc WHIRLPOOL ab4d44ec6efcd4a35834c3b67e4f980be2ad1243df4e51aa28fb301e55e4a563c5bb4226f0c174dd21f4ec613907b57dd1beaeb16a2ba4f1c4bd094ef066e6ec
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20141128.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20141128.ebuild
new file mode 100644
index 0000000..1b28665
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20141128.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2014 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/2014-11-28_00-01-49/zip/netbeans-trunk-nightly-201411280001-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 6f91d02..0243503 100644
--- a/dev-java/netbeans-extide/ChangeLog
+++ b/dev-java/netbeans-extide/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-extide-9999_p20141128 (28 Nov 2014)
+
+  28 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-extide-9999_p20141128.ebuild:
+  bumped to the latest sources
+
 *netbeans-extide-9999_p20141127 (27 Nov 2014)
 
   27 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index 1f676a5..41f83c8 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -44,6 +44,7 @@ DIST netbeans-trunk-nightly-201411240001-src.zip 199372060 SHA256 1088d63eb70366
 DIST netbeans-trunk-nightly-201411250001-src.zip 199373828 SHA256 a73eb4832b16f3b121228ef66f9f356756c0dfa8c31b2f74f69180904b262997 SHA512 296310be127d636a577dda2e89f68783fd85279dfd0f34faf3bd67173cd75fd769a85795e9dfa76a8d0918016041789f91cda883b903e3c82497e5f8bd0a91cf WHIRLPOOL 212327df9fa4e920680cefad9b97e3d660bdc79a411de9a76817669b180449576898e37c56ec91700e9fee1aeaed86d4576434b7db39222f2760e196d9bf8a43
 DIST netbeans-trunk-nightly-201411260001-src.zip 199396686 SHA256 82c5453d0702c37f6a059773c06890b25786f6a06cd2c6c2206d2bcc7480eb5c SHA512 365ef290c511e44223de913f861fb841f25cd018cdd1d31d8c4c99fd6b674ad37c63ad9d01fccf865ade9fadb918a8a895a6593596538be472cd9229c54475e2 WHIRLPOOL fa5ae283203d4ff3c7fa684eaa581229f2fa6c80c168028e501991bc2d6766aba85dc6d757e362f150110faaab372ea2e1eb7c9ed25091851c637269380de175
 DIST netbeans-trunk-nightly-201411270001-src.zip 199424732 SHA256 1986cf723ea94e5219c59e0171fdd1b302b6fe5d381ac7ac3fd0c3468ed71448 SHA512 c4d76a6a5e79c1298fae3276185a2a43fa024ee32f6cf2d5e25fc26da763491ca37cfc8829a142b9b4af879fbf9607f03721d40c7cacc5a8ed13aba913c2c92c WHIRLPOOL 82a5aa2e73dee3b67204f9c2624f53bed2275d11b03b222c2d2d36e5fd34a729e06e1ade5a0d4bfe8346059f00f7c1241beb3682a501031cb43b8dd4e222349e
+DIST netbeans-trunk-nightly-201411280001-src.zip 199431402 SHA256 ec7a6b5e5ddbdd042b5336dced4a05d0679c59368984601ed7229da9faf99903 SHA512 d4d9b15c56453249e56050cff1c9e9ee4f72eb2dee910ade236a3ff70b919fb1a8836a77517c1c651c72d9993432080727a247c69a5d971ba5ba04795c7d60a3 WHIRLPOOL d5a774df345a1726598c650292f3f915efb7852e35674f3ddeba3c1be167e1490f1e7f0bbbfa29655fb7824ac4279325e13c82433988d45a84d85a503d0ac04b
 EBUILD netbeans-extide-7.4.ebuild 3311 SHA256 8585e0b9eac3b9bb35d5b5e0152936f84708a824d76831930a3dfd3d196556b0 SHA512 19eceec7a634923b4712eb277a1ff9900a2eb4d9ac0a2c699175333c263f0c02baaf24eb30bd7919444f5c9df751186689b2d4359ca1c88dca02884d7c18c3cd WHIRLPOOL e64509f198c4d09851f98d5bd2ddd5b469b0a7c0f3122f391c17833e5d6d77b7a6c2fd9e942e34f2df42047504ad40593f97af9b2898450e769c7b012355c316
 EBUILD netbeans-extide-8.0.ebuild 3305 SHA256 b2d57e2e2d92760ead3d383fe4dd5b4fb9fc2807a9b58c6f40b44fc24072b8bb SHA512 6e7f12758188a564ef6b5cf8b0ffdf79e30d1021172d10f215d04e727bc4001e4385fd0961a26a6bb42638089e0919b1d4628a13ba11a3deac94d4693c7210d5 WHIRLPOOL adac8461de43669b7bb98ea8920c0a2944837211a37503b957221149d4b91c4bd92b6db160191990b838c474495c65f62c8a4bb9fdbcaa371b4648a335b1afa9
 EBUILD netbeans-extide-9999_p20141001.ebuild 3383 SHA256 28f0df3cf47d0c1a73e413fc7bd1d8768a1d9c26d5cc5a32f57fdcf9f7784ff9 SHA512 889799daeb6b82a9565861ad26ed3b79ed10014cf8d47720e64647101796a17956341ee6c539acbf8b50215145dc0cb705cfc7464400e07c6a736f765a1a7429 WHIRLPOOL 10936cf6eeca831be05e4163056c0297f5bd919a2c09c43d8331f5cd3741603db4013594f56ea551c8a2980b5210c61403ff485acb7afff961f0309984aa830f
@@ -81,5 +82,6 @@ EBUILD netbeans-extide-9999_p20141124.ebuild 3383 SHA256 be6d3751e5b15258e1501a8
 EBUILD netbeans-extide-9999_p20141125.ebuild 3383 SHA256 288350a933ad4d49f1c9effe1a719cadbcda3e4d25aa63dbbc959bb612619aae SHA512 b1e4ebf9b4b645758bfd305f0b4a5119dfa536da43e3fb71ff79416e3bf4e62ba79790eea3476166476fa00718e06861556ccb358c056d8250ded9278804a362 WHIRLPOOL ef82f4d50176aed483d1ba07be110a58c53985b9d7441c023021526bd4241dc8eb54bfcd8b931d5bd8d974a57eadb3b98d5f4d59797d8901f1a3a63dba8913ff
 EBUILD netbeans-extide-9999_p20141126.ebuild 3383 SHA256 51705cbf69d5352903298477582f80a1930f5afe9b5fdf0e3020cc2f544c6aa0 SHA512 0655d10f2c12faba1734f0786fb828b387654a3cca0941e2bc0b9265b4a000686ade92cb39b33827a2985c3ca11a25c074e6c161df306a773328ec4a53b64431 WHIRLPOOL 14454f1c105072c6be0631df7a739fe617765d156b28b06d116db6ff3f8b50c61d589364e8cad60ce44a7e7a231c993065fef52be99ee9bffeb8a810ae35f259
 EBUILD netbeans-extide-9999_p20141127.ebuild 3383 SHA256 93c49839ca0621f8217c15528df56b2ceef69d09b955609c22c60be00b18d89d SHA512 f45cfb60a8909e48ae9b3a1bf079f7e48eac129f726676def39bbdca4e7888672c4cf5a449a109f13fe532bea0cde33db0209170232dd45ca78c8cdb271b3f6a WHIRLPOOL bbcc9d58f80205d507be022328cd72918e47d09e44d96e1b25ecb0312c8578d9d881c941f4149be5f67c3db99fee8c6a8aa6bce9f4579324a5f5c16cb74c6a03
-MISC ChangeLog 68845 SHA256 82d3034ab6e2637466ffe8c6e8f94a18a4c403572cedcb11b2bdb9a2ebac3fdd SHA512 be22de6762b576050850d869200008739f99d8d78e354b95fe20f1a373293505bc5c7a33091e690e6305b6beb9df357c0b8a41202aeafec560ed8aceccebf5c1 WHIRLPOOL ca0e6eb89e56e4e9d4bcec5daaba003650610e41e69fd37d37209b27fae78d0b5d98679779163c97ecd3e60e9c4d9e874c7fcaec9fbde2e1244121677a5e26fa
+EBUILD netbeans-extide-9999_p20141128.ebuild 3383 SHA256 d8995e3f90c94ca2914c7511e687744424291d09e9e961e26cb67b4d3d4ba32b SHA512 61dfd99b9e90e1ea02fde82311cfc3356f0447ab905a0cf7b613f452127732cf340323100c8338cbd35cc5bc6938b16328e094135bf374c0e2ff883945d1713f WHIRLPOOL 48fec03d2aeb093633363a36fcb8691ac1db4c756382be1c5356643e82a901cf2b5a896e1092386d5c93862cc8125f3937114f7597fb122ad35cdcb12b9dfea7
+MISC ChangeLog 69018 SHA256 d0d951f197d5e3079686f6a5fbdf379bcb439fd2cb7f54e988a55c50c5c0510b SHA512 54c159369b7429281e19dfbcc75adfdb4e32741459564eaec16e2224b635116d6a70df010265d5ecfba8fdb24eeddf5f89d788e0c9b11eddd7d6ac4894bedf48 WHIRLPOOL 2b68498f832eb7529720fe9e7b63d179c9912c75a7e5b1c2e587890786f51f2cb4414e445d5871dddfa2bb9d3386f5ede28c8d718b9acdb39b1e80d081c783a9
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20141128.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20141128.ebuild
new file mode 100644
index 0000000..130d63d
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20141128.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2014 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/2014-11-28_00-01-49/zip/netbeans-trunk-nightly-201411280001-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 8640a6a..128f5df 100644
--- a/dev-java/netbeans-groovy/ChangeLog
+++ b/dev-java/netbeans-groovy/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-groovy-9999_p20141128 (28 Nov 2014)
+
+  28 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-groovy-9999_p20141128.ebuild:
+  bumped to the latest sources
+
 *netbeans-groovy-9999_p20141127 (27 Nov 2014)
 
   27 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index a094dd4..e916e7a 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -50,6 +50,7 @@ DIST netbeans-trunk-nightly-201411240001-src.zip 199372060 SHA256 1088d63eb70366
 DIST netbeans-trunk-nightly-201411250001-src.zip 199373828 SHA256 a73eb4832b16f3b121228ef66f9f356756c0dfa8c31b2f74f69180904b262997 SHA512 296310be127d636a577dda2e89f68783fd85279dfd0f34faf3bd67173cd75fd769a85795e9dfa76a8d0918016041789f91cda883b903e3c82497e5f8bd0a91cf WHIRLPOOL 212327df9fa4e920680cefad9b97e3d660bdc79a411de9a76817669b180449576898e37c56ec91700e9fee1aeaed86d4576434b7db39222f2760e196d9bf8a43
 DIST netbeans-trunk-nightly-201411260001-src.zip 199396686 SHA256 82c5453d0702c37f6a059773c06890b25786f6a06cd2c6c2206d2bcc7480eb5c SHA512 365ef290c511e44223de913f861fb841f25cd018cdd1d31d8c4c99fd6b674ad37c63ad9d01fccf865ade9fadb918a8a895a6593596538be472cd9229c54475e2 WHIRLPOOL fa5ae283203d4ff3c7fa684eaa581229f2fa6c80c168028e501991bc2d6766aba85dc6d757e362f150110faaab372ea2e1eb7c9ed25091851c637269380de175
 DIST netbeans-trunk-nightly-201411270001-src.zip 199424732 SHA256 1986cf723ea94e5219c59e0171fdd1b302b6fe5d381ac7ac3fd0c3468ed71448 SHA512 c4d76a6a5e79c1298fae3276185a2a43fa024ee32f6cf2d5e25fc26da763491ca37cfc8829a142b9b4af879fbf9607f03721d40c7cacc5a8ed13aba913c2c92c WHIRLPOOL 82a5aa2e73dee3b67204f9c2624f53bed2275d11b03b222c2d2d36e5fd34a729e06e1ade5a0d4bfe8346059f00f7c1241beb3682a501031cb43b8dd4e222349e
+DIST netbeans-trunk-nightly-201411280001-src.zip 199431402 SHA256 ec7a6b5e5ddbdd042b5336dced4a05d0679c59368984601ed7229da9faf99903 SHA512 d4d9b15c56453249e56050cff1c9e9ee4f72eb2dee910ade236a3ff70b919fb1a8836a77517c1c651c72d9993432080727a247c69a5d971ba5ba04795c7d60a3 WHIRLPOOL d5a774df345a1726598c650292f3f915efb7852e35674f3ddeba3c1be167e1490f1e7f0bbbfa29655fb7824ac4279325e13c82433988d45a84d85a503d0ac04b
 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
@@ -91,5 +92,6 @@ EBUILD netbeans-groovy-9999_p20141124.ebuild 3422 SHA256 7c2ece679e3946a53e051ce
 EBUILD netbeans-groovy-9999_p20141125.ebuild 3422 SHA256 0d761b060d3e24fa4589544fdf3d56eeda179c18126678969c9cb93d964fffb3 SHA512 0d55978b84a2a3c8315c7eaf5705b1c80109d14333eb81c742111e279e9034a1cb5744b73a1d4a512229b0964c236505a1f0b47dd6fddc5b3a8f2f6c62fdc325 WHIRLPOOL e4fb80c2893b7f3ea3c6b1841ff9fdb9d9ffc0da97f0abf8de0c9b2faef3313a16060af2c21b0d82ef2b4ba115281d14aa3d7a9e439bb73005a277c23b1aa9b9
 EBUILD netbeans-groovy-9999_p20141126.ebuild 3422 SHA256 e5e8fb2cff6223fc16359f5b3dde1f5f0c5ef250abd901062e3f16de152e9f4a SHA512 20a16b8dcee8ec3f16f0bbc66b51d211a3d254c90082aa88b0628439f54d8713a51b8b65fa4db40d69e6673e2d3f1eff771ba665a1cf8f79961c5c44b53a7cff WHIRLPOOL a3ecf7ab3067bb3f0cb99bf9c0ed00ec80c79984f09d95fa38d294e0d5347250d7fc0ba3d70fdd6cf309cd724574ea3a3ee3f69e2958ebbdc90eb479b9051e2c
 EBUILD netbeans-groovy-9999_p20141127.ebuild 3422 SHA256 7c5c60fb2f98d130d29cce897d1892d70fc94b886b7214465baa38ca2b210059 SHA512 6c67daff6ad897a99267149e414dd174991e78fd7ac4d0314da1ecf330f2bd7d65727f863e9becd816c42de717c0a928abc90c65e8993abb68ad24cb33283c84 WHIRLPOOL 199bdb45f8edeff8c1824311d0368225ba9d740cad4b8ce3740c8eb2217570a728e9446864b2f0730cab0ab9324a4b90c64214460d6de090c1f7a8bca4bf04d6
-MISC ChangeLog 136825 SHA256 b253ac5b70082ca5cb0468476e3e5365b2c248629a8164470aaf79f7d167a50e SHA512 f1ac8b8ddf23c342cfa14d452bcf048122e7e0e468020ef5c413cc6a9bcc0332f43756c93f1ac75eddf7965ca473f0aae0feaeb1ae21ee98f7220b650b05f6c1 WHIRLPOOL 7eded36c3b2c83b0d9af2636a5b59237761134a7f3f5cd4c3b312ba1077c52f24fd786b060e3cfa1e0a2ceaf54b2c97a58b1495ec769745f7a872ebc9dac0f4c
+EBUILD netbeans-groovy-9999_p20141128.ebuild 3422 SHA256 905c214aca677f61cde20e3ec1bebedf1e2df2113d2d05847ea2416974854ae4 SHA512 cf31e1e27380c82f6bbd8c4704a254847e7ceb6a623c27cbb294e606c735b90fb031e4571f799879776041891dc66415175f66426245d9c6596f89340dcb0523 WHIRLPOOL d9917110d790ffc3b5dd768b531a201a9186864fc6e4667ccd3d94314ce25d85512d94c00053ccfa439d4ca2f3d53df3b9f0ca2a5d0e03dac03b3d5ca9010694
+MISC ChangeLog 136998 SHA256 67374b55e70b79bed598371eec0a521ef22f458613604a4e8a5a32a7d8879ae0 SHA512 7a257163e4f2f6c40d389af37d76b8f2d224f51115ca27f01649fba8e221153c6b0a65b0e5b8b1efcc4915f8e15b632cb0abc979b9ed35ae913c8ff5ac8d829c WHIRLPOOL 04d13cb79829e1fd4456c5f784483898a9c3a130501645de1d00ec3755d5873f4c7e9981696e1ce894b6d6108a1bc0794d9fe90b5251143787c92385235a0d57
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20141128.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20141128.ebuild
new file mode 100644
index 0000000..3f90619
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20141128.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2014 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/2014-11-28_00-01-49/zip/netbeans-trunk-nightly-201411280001-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 7b8a0a6..d9bde10 100644
--- a/dev-java/netbeans-harness/ChangeLog
+++ b/dev-java/netbeans-harness/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-harness-9999_p20141128 (28 Nov 2014)
+
+  28 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-harness-9999_p20141128.ebuild:
+  bumped to the latest sources
+
 *netbeans-harness-9999_p20141127 (27 Nov 2014)
 
   27 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 158f019..25cc820 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -52,6 +52,7 @@ DIST netbeans-trunk-nightly-201411240001-src.zip 199372060 SHA256 1088d63eb70366
 DIST netbeans-trunk-nightly-201411250001-src.zip 199373828 SHA256 a73eb4832b16f3b121228ef66f9f356756c0dfa8c31b2f74f69180904b262997 SHA512 296310be127d636a577dda2e89f68783fd85279dfd0f34faf3bd67173cd75fd769a85795e9dfa76a8d0918016041789f91cda883b903e3c82497e5f8bd0a91cf WHIRLPOOL 212327df9fa4e920680cefad9b97e3d660bdc79a411de9a76817669b180449576898e37c56ec91700e9fee1aeaed86d4576434b7db39222f2760e196d9bf8a43
 DIST netbeans-trunk-nightly-201411260001-src.zip 199396686 SHA256 82c5453d0702c37f6a059773c06890b25786f6a06cd2c6c2206d2bcc7480eb5c SHA512 365ef290c511e44223de913f861fb841f25cd018cdd1d31d8c4c99fd6b674ad37c63ad9d01fccf865ade9fadb918a8a895a6593596538be472cd9229c54475e2 WHIRLPOOL fa5ae283203d4ff3c7fa684eaa581229f2fa6c80c168028e501991bc2d6766aba85dc6d757e362f150110faaab372ea2e1eb7c9ed25091851c637269380de175
 DIST netbeans-trunk-nightly-201411270001-src.zip 199424732 SHA256 1986cf723ea94e5219c59e0171fdd1b302b6fe5d381ac7ac3fd0c3468ed71448 SHA512 c4d76a6a5e79c1298fae3276185a2a43fa024ee32f6cf2d5e25fc26da763491ca37cfc8829a142b9b4af879fbf9607f03721d40c7cacc5a8ed13aba913c2c92c WHIRLPOOL 82a5aa2e73dee3b67204f9c2624f53bed2275d11b03b222c2d2d36e5fd34a729e06e1ade5a0d4bfe8346059f00f7c1241beb3682a501031cb43b8dd4e222349e
+DIST netbeans-trunk-nightly-201411280001-src.zip 199431402 SHA256 ec7a6b5e5ddbdd042b5336dced4a05d0679c59368984601ed7229da9faf99903 SHA512 d4d9b15c56453249e56050cff1c9e9ee4f72eb2dee910ade236a3ff70b919fb1a8836a77517c1c651c72d9993432080727a247c69a5d971ba5ba04795c7d60a3 WHIRLPOOL d5a774df345a1726598c650292f3f915efb7852e35674f3ddeba3c1be167e1490f1e7f0bbbfa29655fb7824ac4279325e13c82433988d45a84d85a503d0ac04b
 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
@@ -93,5 +94,6 @@ EBUILD netbeans-harness-9999_p20141124.ebuild 4131 SHA256 a634d9e05046c8d498e2ac
 EBUILD netbeans-harness-9999_p20141125.ebuild 4131 SHA256 f8afff0a2bb8a471e5bbe248d8a9556fd501cec92e895477ca1a9a7830d17c5b SHA512 8aff4540f68499310e76a3cd070af998f1a7d9a16b48ac948ac0ff4fa393d3db1cbd56a2f1b505091e37cb9606df47950c4bd5b3d80f4f9294b1f18d42ab8670 WHIRLPOOL c08e90365fc545c7fbe61d80dbefd70badb09722591ff284e1f6e3f27a7753977b12bf1031e9b4c6d20caa527e6739ed4c1fc982f71ba31fd7671c5b95d4ef1b
 EBUILD netbeans-harness-9999_p20141126.ebuild 4131 SHA256 c1420b1bc62f753907ac5071081c5e8810f0d21d898d57dc7240bfaedbaa6241 SHA512 ea866266fbe4b9a0bf271fc418014ade2075845a4e7f257836b540e722a2864aa49525d610efe60b2cf17c8197e3fcf61dea17f4720aa3f55e48f7bb7a1b574d WHIRLPOOL 48661f73180f4873e0628cf3a2d35c5533a960f0aab80e8452da3ab14df47b9495a995d802a1af6beab628e1d33b678ea28df6efb358ff159b3c68baf409ff13
 EBUILD netbeans-harness-9999_p20141127.ebuild 4131 SHA256 52d079e513fb8d608fb95045bf3e98dc64cf87d9743e468207ee06109d4c1342 SHA512 39f26ac796b461cc691e52394c694ec67aee998c92126a817af0def4262ae283b70fd2a7a205049b6a862e3f766cb902e36be1320c6ae0de4e95280fe45afee6 WHIRLPOOL 59a7dc317cbdcfea93c095d1fd3c3636d0ce74fade9ba7fbd40f7bde4036b5374541c4cc9fe79dda3c718addf5548c0eb264e14d02c0f64c924d9a64408ff57c
-MISC ChangeLog 138550 SHA256 d5543260dc493566375250ad20ad05e613436f0b0c4deb6205f0cb48d01f8497 SHA512 ef9c97cf07ba3e33751dd0d03dac4b973656a9a9f4dfa364b1c946e63a7c7ad637d076ca318783d3744b40937991ae76c25fbef213660882eca9dae3beed821b WHIRLPOOL fc3ca74c2d6dcb5efc580d7688fae0f5ef2e077e71212da026411aa8dc9b2828b09b5a12739fd9150108bcdc93b2706c00f9fcf42ea3a4ea91ff9ad6c60b8685
+EBUILD netbeans-harness-9999_p20141128.ebuild 4131 SHA256 11932a88e2b1d1caa473bf1d2ceac58c7c0e26c5a793963978497fbba6137de9 SHA512 ede6616781688157fe14792865cba90523bbc62429f6d41dd6acf143d6d413d039d24eedbd0e44ca9242e419c4bf4c1c1fba9c01f357f708751ea79eb11360d6 WHIRLPOOL 67ff4e0caacde2e2cd1d0eeffc364d58347e58a47a759d0c1062a25c81cbb578bf8b9731150fc0e09cd153469aba7be0767e5ba73f728eb9572500f8d757d176
+MISC ChangeLog 138725 SHA256 fce4e8701142179b686648280e2381527cf053588a5751cc6a2e6fb71ad0e8d8 SHA512 cbd798ef56fb11c9473fb2a75301bf7df00b4ed2b4a9b770a1e0dd712c167812f107deaa2f8168149f823b1806eac4d3fe2d60e7540e116a7daad75aa3eb09f1 WHIRLPOOL 7d4da9300091e08a575a37e8bf6408a91cbf2eb4f32535a6234d92d3c3afc0bce555b9013923105a5a636c3e72738830b308bd5affb569127e386696bd1a71f0
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20141128.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20141128.ebuild
new file mode 100644
index 0000000..cec081f
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20141128.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2014 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/2014-11-28_00-01-49/zip/netbeans-trunk-nightly-201411280001-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 8aebffd..f830aca 100644
--- a/dev-java/netbeans-ide/ChangeLog
+++ b/dev-java/netbeans-ide/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-ide-9999_p20141128 (28 Nov 2014)
+
+  28 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ide-9999_p20141128.ebuild:
+  bumped to the latest sources
+
 *netbeans-ide-9999_p20141127 (27 Nov 2014)
 
   27 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 00f5607..a3bfd95 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -227,6 +227,7 @@ DIST netbeans-trunk-nightly-201411240001-src.zip 199372060 SHA256 1088d63eb70366
 DIST netbeans-trunk-nightly-201411250001-src.zip 199373828 SHA256 a73eb4832b16f3b121228ef66f9f356756c0dfa8c31b2f74f69180904b262997 SHA512 296310be127d636a577dda2e89f68783fd85279dfd0f34faf3bd67173cd75fd769a85795e9dfa76a8d0918016041789f91cda883b903e3c82497e5f8bd0a91cf WHIRLPOOL 212327df9fa4e920680cefad9b97e3d660bdc79a411de9a76817669b180449576898e37c56ec91700e9fee1aeaed86d4576434b7db39222f2760e196d9bf8a43
 DIST netbeans-trunk-nightly-201411260001-src.zip 199396686 SHA256 82c5453d0702c37f6a059773c06890b25786f6a06cd2c6c2206d2bcc7480eb5c SHA512 365ef290c511e44223de913f861fb841f25cd018cdd1d31d8c4c99fd6b674ad37c63ad9d01fccf865ade9fadb918a8a895a6593596538be472cd9229c54475e2 WHIRLPOOL fa5ae283203d4ff3c7fa684eaa581229f2fa6c80c168028e501991bc2d6766aba85dc6d757e362f150110faaab372ea2e1eb7c9ed25091851c637269380de175
 DIST netbeans-trunk-nightly-201411270001-src.zip 199424732 SHA256 1986cf723ea94e5219c59e0171fdd1b302b6fe5d381ac7ac3fd0c3468ed71448 SHA512 c4d76a6a5e79c1298fae3276185a2a43fa024ee32f6cf2d5e25fc26da763491ca37cfc8829a142b9b4af879fbf9607f03721d40c7cacc5a8ed13aba913c2c92c WHIRLPOOL 82a5aa2e73dee3b67204f9c2624f53bed2275d11b03b222c2d2d36e5fd34a729e06e1ade5a0d4bfe8346059f00f7c1241beb3682a501031cb43b8dd4e222349e
+DIST netbeans-trunk-nightly-201411280001-src.zip 199431402 SHA256 ec7a6b5e5ddbdd042b5336dced4a05d0679c59368984601ed7229da9faf99903 SHA512 d4d9b15c56453249e56050cff1c9e9ee4f72eb2dee910ade236a3ff70b919fb1a8836a77517c1c651c72d9993432080727a247c69a5d971ba5ba04795c7d60a3 WHIRLPOOL d5a774df345a1726598c650292f3f915efb7852e35674f3ddeba3c1be167e1490f1e7f0bbbfa29655fb7824ac4279325e13c82433988d45a84d85a503d0ac04b
 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
@@ -270,5 +271,6 @@ EBUILD netbeans-ide-9999_p20141124.ebuild 29641 SHA256 64b0b45dddbfe4888df007008
 EBUILD netbeans-ide-9999_p20141125.ebuild 29641 SHA256 5f72bab3c2a44dd0697112364641fff01ebef326ccfd70b2c0298c562e404f36 SHA512 b45c4b08425b8d6ccb1ed50b57934fb60039b868ab94ec455a474d415e1779ac4432a9d3d2f9baeb73813e1907b16f31b3df5582408c07d26d353ebe8954ef79 WHIRLPOOL 3eda48300c94fd79b020b0e34b7b3b4c1ca31bca9ff321f6f0bc2e3a3fe90445ea7cbdf05686a1dedc3e66d27fc73bf30214e46a3f0ddd778b3bddf8a683f41b
 EBUILD netbeans-ide-9999_p20141126.ebuild 29641 SHA256 b636c6563c2e3b58768eed76943ce4835a4639fbb4f9d1b34658546067b1ca72 SHA512 ca6d0a66f41ebf6dac52e0a2d3c378d16a0c9eee12454d0e73da72e89f891a27d311156b6415725a582da753471368234b744e6cfa3640109a3efa1453ad2c85 WHIRLPOOL ac14fbdda97e5546ef0a190e48f92b447e4206e47979f0fd088a84cc20bf8c1c0273416b06cc4444c4c24c3c7b3596fd1e3905a9af88d8cf02b568d86fbcc71d
 EBUILD netbeans-ide-9999_p20141127.ebuild 29641 SHA256 b31eeb50dabe8073e0b57d188d13f4e05929fb42dd5a8f145213a35540c75122 SHA512 67d3d6f89ca403dbf394457206130f064bdadb542d79c66b02b413b0a94378105af76cd24a8e3cd7d41c85401171f7fd4aba95da09e1fece9e5ee660374064f3 WHIRLPOOL d0c843464ba6ed5209e1a1b669c276c9617d1ad1e53218226e90ef32db542311295d237bbade4adbea41f803d885a5e0796d8392efd133bcfc431b435c86b4ad
-MISC ChangeLog 132224 SHA256 3be546e811af0f723d20f6c4ddf55f4e3abd15335cb2d4ede8281e7c00268c72 SHA512 7ff3a653ccb325e75e86fefc17ef8f6d6fecb53821e580f3e2d841dce67e79e09c9367f161a0c9dd9940741efffc9e6c3e7a9eef11415f25c8133b56943025fb WHIRLPOOL f8e2efe4244e56495677390d410ab988a3babbc88545f9bdb931b33c73f14ec01ce4be6b0dfe03398bc9bb1621b19d41ef7f3bfc83ce3bcfcdcd53d131447a73
+EBUILD netbeans-ide-9999_p20141128.ebuild 29641 SHA256 f5704c25c8f57a5bd2b2daa152b67e90e79e8eb8365861fa4cc60055950ea2b0 SHA512 a27d63f5a46212365573697864268ab4e8166dae943287f62950266bf7ee07a910373e37a4adac6cadc110966844c06092538bf934dca9c1b34ece4ab2387781 WHIRLPOOL 04707f69120cb586395d3109c276451ea0adf98b8edd28e03f5a833c231e44c085b9b11d9553e6e208a03bd056b726f21521486a41d869b7fd06cd7ff1194750
+MISC ChangeLog 132391 SHA256 5a7f79e452b3a5f76a1a273186f81c5dd4826a1cdc455c209607dff097f2b372 SHA512 10dc07d58a80c7e5f1462a3830f987449456430de2c564524c5e142b2dcf5fb5ac980c45c42af67fd928056ae358c6f94e6dd26b7fbcd8c8a5a940f5bb786c96 WHIRLPOOL 49490ec4b7f74abe05d73d87f0ce0dcf7dd7faa94c2e44240d2886f920846733f3379092189838a4da088149422d824c3343f4d7a5a006a7da70721d9f15de16
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20141128.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20141128.ebuild
new file mode 100644
index 0000000..21a71f8
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20141128.ebuild
@@ -0,0 +1,373 @@
+# Copyright 1999-2014 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/2014-11-28_00-01-49/zip/netbeans-trunk-nightly-201411280001-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/7FE73A21F4A078ABAAFACE4D2B03B5EB3D306F63-org.eclipse.jgit-3.4.1.201406201815-r.jar
+	http://hg.netbeans.org/binaries/49F1EFEBC8CECA5D514209BE18A048EB5707C0A7-org.eclipse.jgit.java7-3.4.1.201406201815-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}"/7FE73A21F4A078ABAAFACE4D2B03B5EB3D306F63-org.eclipse.jgit-3.4.1.201406201815-r.jar o.eclipse.jgit/external/org.eclipse.jgit-3.4.1.201406201815-r.jar || die
+	ln -s "${DISTDIR}"/49F1EFEBC8CECA5D514209BE18A048EB5707C0A7-org.eclipse.jgit.java7-3.4.1.201406201815-r.jar o.eclipse.jgit.java7/external/org.eclipse.jgit.java7-3.4.1.201406201815-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 c8e8a44..2d1aedd 100644
--- a/dev-java/netbeans-java/ChangeLog
+++ b/dev-java/netbeans-java/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-java-9999_p20141128 (28 Nov 2014)
+
+  28 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-java-9999_p20141128.ebuild:
+  bumped to the latest sources
+
 *netbeans-java-9999_p20141127 (27 Nov 2014)
 
   27 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index c426d7d..4bfab86 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -122,6 +122,7 @@ DIST netbeans-trunk-nightly-201411240001-src.zip 199372060 SHA256 1088d63eb70366
 DIST netbeans-trunk-nightly-201411250001-src.zip 199373828 SHA256 a73eb4832b16f3b121228ef66f9f356756c0dfa8c31b2f74f69180904b262997 SHA512 296310be127d636a577dda2e89f68783fd85279dfd0f34faf3bd67173cd75fd769a85795e9dfa76a8d0918016041789f91cda883b903e3c82497e5f8bd0a91cf WHIRLPOOL 212327df9fa4e920680cefad9b97e3d660bdc79a411de9a76817669b180449576898e37c56ec91700e9fee1aeaed86d4576434b7db39222f2760e196d9bf8a43
 DIST netbeans-trunk-nightly-201411260001-src.zip 199396686 SHA256 82c5453d0702c37f6a059773c06890b25786f6a06cd2c6c2206d2bcc7480eb5c SHA512 365ef290c511e44223de913f861fb841f25cd018cdd1d31d8c4c99fd6b674ad37c63ad9d01fccf865ade9fadb918a8a895a6593596538be472cd9229c54475e2 WHIRLPOOL fa5ae283203d4ff3c7fa684eaa581229f2fa6c80c168028e501991bc2d6766aba85dc6d757e362f150110faaab372ea2e1eb7c9ed25091851c637269380de175
 DIST netbeans-trunk-nightly-201411270001-src.zip 199424732 SHA256 1986cf723ea94e5219c59e0171fdd1b302b6fe5d381ac7ac3fd0c3468ed71448 SHA512 c4d76a6a5e79c1298fae3276185a2a43fa024ee32f6cf2d5e25fc26da763491ca37cfc8829a142b9b4af879fbf9607f03721d40c7cacc5a8ed13aba913c2c92c WHIRLPOOL 82a5aa2e73dee3b67204f9c2624f53bed2275d11b03b222c2d2d36e5fd34a729e06e1ade5a0d4bfe8346059f00f7c1241beb3682a501031cb43b8dd4e222349e
+DIST netbeans-trunk-nightly-201411280001-src.zip 199431402 SHA256 ec7a6b5e5ddbdd042b5336dced4a05d0679c59368984601ed7229da9faf99903 SHA512 d4d9b15c56453249e56050cff1c9e9ee4f72eb2dee910ade236a3ff70b919fb1a8836a77517c1c651c72d9993432080727a247c69a5d971ba5ba04795c7d60a3 WHIRLPOOL d5a774df345a1726598c650292f3f915efb7852e35674f3ddeba3c1be167e1490f1e7f0bbbfa29655fb7824ac4279325e13c82433988d45a84d85a503d0ac04b
 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
@@ -163,5 +164,6 @@ EBUILD netbeans-java-9999_p20141124.ebuild 13405 SHA256 eecf2614ec9eb2984307c5e0
 EBUILD netbeans-java-9999_p20141125.ebuild 13405 SHA256 b0ee5169d08b2f5e13385aa42f55134870f329ea4c1ec31cc13b8e23387cdc45 SHA512 f716231ef1cfa96253f5c2136c4591748b4df531227b76171b6c49f8706882ecbb910bd8b4c953066ef2f22dc66dc5f189a670f59c4234f1ff1e850107108bde WHIRLPOOL c262671ad65172606b5c872a337869a006a0fa5dc30cf8ffbc70d4709240091813d144323c1bd741d964acbc941a46bcee57abf30b46676cd8d03b7af8eacd42
 EBUILD netbeans-java-9999_p20141126.ebuild 13405 SHA256 589683ab5cffe08b082b6fd0b4f3212c955b96405b30a63aff0fb68a580cdee6 SHA512 6705925a29a09b2595490a24b70a42db4b42b55b8b3ba52f4dc047de155ca5baf1bce6505c3dfd238d4ad01269d0333ad01a5993842eb0b4bd400305bc00aa5d WHIRLPOOL 12fafcd07fa4d3b437bc3520680be75218fee383b8ede7aa69dff3fd1c917eed7fb5b696a4012e64a287a3dd0e6b9336c22dfaf7465a4260f434bdadabf4cca1
 EBUILD netbeans-java-9999_p20141127.ebuild 13405 SHA256 75e69099be750a9c181992d2a2bea15c62e9c8687f9536a4486f6d00bccb8361 SHA512 ecb5a59cfbc95f6be0388b3c1147e4f9c5d9132682ec416016765c7a4c91b44c1c39713eafa03094f21cedf6eb84bff77d5c625cb73a648946d80f640eda88ec WHIRLPOOL 589c573f6edca4a169e4a77c03d399f4be22d1ab0595c2e23e72783c605cd48333e3ef4eb9f6ab476d8d4e96bfd0ab243938880f2d16887acfed978454386472
-MISC ChangeLog 134721 SHA256 d70a36dcd6bdd7b4e301359eadd63acad522f5b63eb5ab1cc6ccdab78c6df68d SHA512 a2882d5e77a9f3b691791ba1e0c75dbea438b77f27c4bd8e66cfc72220202324fbf48fe6bbd4c515dbc11eed59e2654d318eaa11f9bc649108d910f5545c7a0f WHIRLPOOL 41230bd31116251b353c4bdd2c349590a707220a1ed08cff5eed1f1419df787adbdb63bac2ef198fea03db652d905c63035577debedd57f5bce42be41dc71257
+EBUILD netbeans-java-9999_p20141128.ebuild 13405 SHA256 0ba407f9685e8d6a057fe9a2b7e82c51aa1b9a0c8b87c74d559947edebdc4316 SHA512 ff881a1eb41b3de979b50e0d5ce282d1f13b7e51572b1f43e6cac05694f255783512852542b7a06d0e9eaac35c1747d86b9225cf7540b5aca249c8627a3e3453 WHIRLPOOL 4abdb995c1b35c13172ffd8de23ccde3bddd81adde65106a7cedece86e57dcabdfd460a1f72a1302fb7a921fa8536dfa1fc36794e8c2ca829c6d4ee5f050b02f
+MISC ChangeLog 134890 SHA256 7ee07de9c1a1aaeaf085e5c80005dda3d09d3ed130aa6f5334290572f1112be7 SHA512 cca8c6adfb20700d57e92219ec3d251b8fca0c71188b004f91778ed24b86b38bcc79c7ed74031e49bff1879e6444ef8b799be3ec8a7ca216c801927d848b122e WHIRLPOOL d351e8c3153c7a7276ac0a68e8052cce3b74f77e2f3fffcf39b1b960a7a82ccbf2c50e2964312caee57cd071cb407b65a7a206230ed6df971da62429b88b756f
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20141128.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20141128.ebuild
new file mode 100644
index 0000000..1a7593d
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20141128.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2014 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/2014-11-28_00-01-49/zip/netbeans-trunk-nightly-201411280001-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/2B9EAB164D8748F9793F6A0D29B6463E97B284DA-indexer-core-5.1.1.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/7B5CF580E4F9760727BBD7964E5B7664B243AA75-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}"/2B9EAB164D8748F9793F6A0D29B6463E97B284DA-indexer-core-5.1.1.jar maven.indexer/external/indexer-core-5.1.1.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}"/7B5CF580E4F9760727BBD7964E5B7664B243AA75-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 29ba011..d3bd481 100644
--- a/dev-java/netbeans-javacard/ChangeLog
+++ b/dev-java/netbeans-javacard/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javacard-9999_p20141128 (28 Nov 2014)
+
+  28 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javacard-9999_p20141128.ebuild:
+  bumped to the latest sources
+
 *netbeans-javacard-9999_p20141127 (27 Nov 2014)
 
   27 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index b6ac047..e6d9135 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -49,6 +49,7 @@ DIST netbeans-trunk-nightly-201411240001-src.zip 199372060 SHA256 1088d63eb70366
 DIST netbeans-trunk-nightly-201411250001-src.zip 199373828 SHA256 a73eb4832b16f3b121228ef66f9f356756c0dfa8c31b2f74f69180904b262997 SHA512 296310be127d636a577dda2e89f68783fd85279dfd0f34faf3bd67173cd75fd769a85795e9dfa76a8d0918016041789f91cda883b903e3c82497e5f8bd0a91cf WHIRLPOOL 212327df9fa4e920680cefad9b97e3d660bdc79a411de9a76817669b180449576898e37c56ec91700e9fee1aeaed86d4576434b7db39222f2760e196d9bf8a43
 DIST netbeans-trunk-nightly-201411260001-src.zip 199396686 SHA256 82c5453d0702c37f6a059773c06890b25786f6a06cd2c6c2206d2bcc7480eb5c SHA512 365ef290c511e44223de913f861fb841f25cd018cdd1d31d8c4c99fd6b674ad37c63ad9d01fccf865ade9fadb918a8a895a6593596538be472cd9229c54475e2 WHIRLPOOL fa5ae283203d4ff3c7fa684eaa581229f2fa6c80c168028e501991bc2d6766aba85dc6d757e362f150110faaab372ea2e1eb7c9ed25091851c637269380de175
 DIST netbeans-trunk-nightly-201411270001-src.zip 199424732 SHA256 1986cf723ea94e5219c59e0171fdd1b302b6fe5d381ac7ac3fd0c3468ed71448 SHA512 c4d76a6a5e79c1298fae3276185a2a43fa024ee32f6cf2d5e25fc26da763491ca37cfc8829a142b9b4af879fbf9607f03721d40c7cacc5a8ed13aba913c2c92c WHIRLPOOL 82a5aa2e73dee3b67204f9c2624f53bed2275d11b03b222c2d2d36e5fd34a729e06e1ade5a0d4bfe8346059f00f7c1241beb3682a501031cb43b8dd4e222349e
+DIST netbeans-trunk-nightly-201411280001-src.zip 199431402 SHA256 ec7a6b5e5ddbdd042b5336dced4a05d0679c59368984601ed7229da9faf99903 SHA512 d4d9b15c56453249e56050cff1c9e9ee4f72eb2dee910ade236a3ff70b919fb1a8836a77517c1c651c72d9993432080727a247c69a5d971ba5ba04795c7d60a3 WHIRLPOOL d5a774df345a1726598c650292f3f915efb7852e35674f3ddeba3c1be167e1490f1e7f0bbbfa29655fb7824ac4279325e13c82433988d45a84d85a503d0ac04b
 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
@@ -90,5 +91,6 @@ EBUILD netbeans-javacard-9999_p20141124.ebuild 4982 SHA256 0555d5810dfa993c3f7fc
 EBUILD netbeans-javacard-9999_p20141125.ebuild 4982 SHA256 db4c42a41d24177335054f1d129fef6732f866ba200abccca227d0ccf407f201 SHA512 1e93c37769012c63879dc72d67b8d058c9a68ab54bdc5454c86ec9a888df5b741fc9ebea4c76720bf2f12f03513c86d18efd6c826282f028265fd887655b77a9 WHIRLPOOL c194d5531a2bd0c8020fbf68fa3a0201fa9c5ed9a0c4a3b0d933cf8631970869fd12c46cd58f4f23ec9b047a32ff6eaa6cdece3b505a0f76184b71c58cf660c9
 EBUILD netbeans-javacard-9999_p20141126.ebuild 4982 SHA256 87e9ed34a1bfb2af920ab47d6c3af0d33b14e16fe29bcf0eb267c2bff9885c18 SHA512 31ff46ab700d6f2c04d656c991bcc347c3573febe4adc26dafffaa33f5f1e86589d030a388319eaf1916aa8ee234a0db944051834688c1d28e145bfd257d5c2c WHIRLPOOL a6d30d1716a322cce276a6863e9807642b318c7c6f8bdf7f57e508376d9e72c75acf8aa0a1c8ed1f9736b4cf57c309d3c8cff7de4a3f0dbe53438a4b94f3c7da
 EBUILD netbeans-javacard-9999_p20141127.ebuild 4982 SHA256 5f685b3596a7ba17a8b8ed10723f54747f0327bcc80606adf9ad4ba41730e659 SHA512 62199b068cf3329aa1cb01a661c79738305b356d916dc80fa04aee33d9af8d697f3f9599b547b51bd83c35cfab58700b409d1a7aa03c8621769b555a3fc45e5c WHIRLPOOL b4a24b347440cd0fe013c1c37b5886e82c2cdd80c9577d9689546f2d1f1a501f4130091d00fa9f2c96d5eec4d357c4fa72cc61ac6c0647d48c85bfe29c0d7553
-MISC ChangeLog 140275 SHA256 a3e51469b746f5291d7c79e5fefb5e7f9d6de3dfdcdb28f1d0b13ba0430ffea3 SHA512 fa81a4db7916cf321efdf5dbca2896b7ab928a35d968660df1e0fb7fec8bdb9e2f47d7909090c6a880b1a69a429b388838222540f0a1589ef08d6f7f7c5564a3 WHIRLPOOL d8f4d926ad37db16caad7a33173a21b0431bfb9c0515a9ff05af7da6aee01fad6efde0559efb8875e73a4787e591e967d29821950703e9bb18689e1235d23842
+EBUILD netbeans-javacard-9999_p20141128.ebuild 4982 SHA256 dc53d11909c20d39d063c8b933f3b7a14754a72a6f4c7d92c22ba9f18a86f68f SHA512 3860109ad3c3c7a78ffd1187fca0e297df67ba9aca42930eb21ea35e91ed36e001dd0b86ea5be39e28af24976dbc5657f29e791049722c4717b5681ceb8bdd19 WHIRLPOOL 5974a56ddc6324d1eab21680205d9ff6b245940d6bf71e5c30747f64cd6a28901d22ad4c72837228eb312197a273b35db79acba99a810e64afca00f632fafbc4
+MISC ChangeLog 140452 SHA256 4d4275bebce9630f507fd5da3c7a74e6acc50c703fc57a6299de1fa61db35ed1 SHA512 566ef99b173e39d3fde44bf37a31f073d1e2f4a6611930c4f1460e33484578af3dc94256c3cfb0a4b9f1dfaf2085bf6c629f3084b341a67778ffde84a558f3b4 WHIRLPOOL 8a1e382db54a4c779e4b96fc7bdd12b727c2b44e482ae49cbd6c32422768fb608ead03d8f000558c2d85a65fd3fe717d02802addb45cb7ea599bc8ccc16b4fd8
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20141128.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20141128.ebuild
new file mode 100644
index 0000000..646add8
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20141128.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2014 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/2014-11-28_00-01-49/zip/netbeans-trunk-nightly-201411280001-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 897f4fc..5cfba32 100644
--- a/dev-java/netbeans-javadoc/ChangeLog
+++ b/dev-java/netbeans-javadoc/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javadoc-9999_p20141128 (28 Nov 2014)
+
+  28 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javadoc-9999_p20141128.ebuild:
+  bumped to the latest sources
+
 *netbeans-javadoc-9999_p20141127 (27 Nov 2014)
 
   27 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index 921a2a5..df27ada 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -52,6 +52,7 @@ DIST netbeans-trunk-nightly-201411240001-src.zip 199372060 SHA256 1088d63eb70366
 DIST netbeans-trunk-nightly-201411250001-src.zip 199373828 SHA256 a73eb4832b16f3b121228ef66f9f356756c0dfa8c31b2f74f69180904b262997 SHA512 296310be127d636a577dda2e89f68783fd85279dfd0f34faf3bd67173cd75fd769a85795e9dfa76a8d0918016041789f91cda883b903e3c82497e5f8bd0a91cf WHIRLPOOL 212327df9fa4e920680cefad9b97e3d660bdc79a411de9a76817669b180449576898e37c56ec91700e9fee1aeaed86d4576434b7db39222f2760e196d9bf8a43
 DIST netbeans-trunk-nightly-201411260001-src.zip 199396686 SHA256 82c5453d0702c37f6a059773c06890b25786f6a06cd2c6c2206d2bcc7480eb5c SHA512 365ef290c511e44223de913f861fb841f25cd018cdd1d31d8c4c99fd6b674ad37c63ad9d01fccf865ade9fadb918a8a895a6593596538be472cd9229c54475e2 WHIRLPOOL fa5ae283203d4ff3c7fa684eaa581229f2fa6c80c168028e501991bc2d6766aba85dc6d757e362f150110faaab372ea2e1eb7c9ed25091851c637269380de175
 DIST netbeans-trunk-nightly-201411270001-src.zip 199424732 SHA256 1986cf723ea94e5219c59e0171fdd1b302b6fe5d381ac7ac3fd0c3468ed71448 SHA512 c4d76a6a5e79c1298fae3276185a2a43fa024ee32f6cf2d5e25fc26da763491ca37cfc8829a142b9b4af879fbf9607f03721d40c7cacc5a8ed13aba913c2c92c WHIRLPOOL 82a5aa2e73dee3b67204f9c2624f53bed2275d11b03b222c2d2d36e5fd34a729e06e1ade5a0d4bfe8346059f00f7c1241beb3682a501031cb43b8dd4e222349e
+DIST netbeans-trunk-nightly-201411280001-src.zip 199431402 SHA256 ec7a6b5e5ddbdd042b5336dced4a05d0679c59368984601ed7229da9faf99903 SHA512 d4d9b15c56453249e56050cff1c9e9ee4f72eb2dee910ade236a3ff70b919fb1a8836a77517c1c651c72d9993432080727a247c69a5d971ba5ba04795c7d60a3 WHIRLPOOL d5a774df345a1726598c650292f3f915efb7852e35674f3ddeba3c1be167e1490f1e7f0bbbfa29655fb7824ac4279325e13c82433988d45a84d85a503d0ac04b
 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
@@ -93,5 +94,6 @@ EBUILD netbeans-javadoc-9999_p20141124.ebuild 6234 SHA256 e70dc777e4eb302b7514be
 EBUILD netbeans-javadoc-9999_p20141125.ebuild 6234 SHA256 a5e733239acdb0005a4997a40a0d6639305d4f9b1e9a2ddb60c8b50533cb6655 SHA512 2a77f316c641815f80e119ff7c2973085bf3798ec0ae59d876e441de2df8970ad682e3f0e4292c7b1ddf8d832868f5b19359910d0375139c38e97f85eaa1e740 WHIRLPOOL 8c570100c18bd1361a6c120514e0a4ad8ab81ecbcbb41afb2d6ac2ed2a0cfbcbd74ee616249cc4ca072c824aeb58f631d11c0f6bb28a1a871ac8fd9329500844
 EBUILD netbeans-javadoc-9999_p20141126.ebuild 6234 SHA256 2f7ddba53e2fadd7ecd57e3054e3285814c470836412a3d1e77e843e808ec55a SHA512 74800fa7f165b11e763038c7944b5c5835ca63a6feeb020c700edaf343675382478be019c30851de30737dff3991c3fd1f77551f7a6239fb99d54725eb144116 WHIRLPOOL 3c2aae907c063aa9cb13190f5a40ed782ed7938607a94b55984c7384f67f94327e705191a2a26475aef68fbe50faa2bef72b050ede25831aa6af1a62f408f271
 EBUILD netbeans-javadoc-9999_p20141127.ebuild 6234 SHA256 8762db0a27273ad4690f285f08024a76e94c962fbc89d1ecd5a747c99173ec2a SHA512 5f72e63ea631cd5791227299bb87ff67cab654a1b65de142403e13bc66b1e468ca80008ed03134b8e9501264ab5cd81192c8ba1030a996f0da8a0fca0ef5a668 WHIRLPOOL 3b9ecb5f4f0f52103a75a90b67ff8a6be8c68cbb59681e6099b5aa646ce438ca5bd0dee5b9798f463e06398a1a49ce7f736567d91ae6772d68efac4a2d462d65
-MISC ChangeLog 138376 SHA256 9fe38d7a835719b23b1622a7574e5600b86000096400e3d29dbd8d82971a5fc4 SHA512 39f28eeb4f041d28cef56b4baece845a2570d021df50a225206add0c633fd3ff2ee35675ce582a73cea62e706d6cbb5a4514e86df8e25c58687749f97583ddb1 WHIRLPOOL 42d9e626f3d6c90fbaa2d261b54a0881c080398058d8dfa11af8920ddd2162aadee0617848efd4a23e8d7c9d36f22fdcf0cb6a5dc8d751e86cdb6916be44048a
+EBUILD netbeans-javadoc-9999_p20141128.ebuild 6234 SHA256 85fd84a5c481b6bdad315a97a425e2653cc534980c82ca028c66d24a8426bd1f SHA512 e42a5619b25686559f1dd8b32f45f396039399b9c0a18dc483f039ca2fe6666b3f2091ebf0a26ca7c65f9b9668f8916d24d2d1875ca61d1893a3473f73edd6de WHIRLPOOL 58ab8a2d56fc6cf7c038ffa2ed8ba74f3b3139361280ca4f3a404a3c01ddeda3567a724387ff149a4bd7505e0f94ffacbcb096d0fa5fc7e9ccc5cc52f2362091
+MISC ChangeLog 138551 SHA256 409749c5b4df8af18d23e157eaf7486da50c8b89cf505c3b0410d95555ffba35 SHA512 574439b51f5ba960988d28a7e77536e9578ada6efac43a1af7619212a72c92c18c4cc5133e87ce848a15dcd0b2100c7c920f7ca25040b1da4e419b13fa2253e6 WHIRLPOOL bb6a1cf6a6a90923f86c782b98013bc355466032a6b0e358214ed0894d49b5a8302180376ae4e54a0a08ee45235fa389dea82c66a5bba6880c42bb29a95e2f67
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20141128.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20141128.ebuild
new file mode 100644
index 0000000..36e0106
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20141128.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2014 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/2014-11-28_00-01-49/zip/netbeans-trunk-nightly-201411280001-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 4f942e1..28a5018 100644
--- a/dev-java/netbeans-javafx/ChangeLog
+++ b/dev-java/netbeans-javafx/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javafx-9999_p20141128 (28 Nov 2014)
+
+  28 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javafx-9999_p20141128.ebuild:
+  bumped to the latest sources
+
 *netbeans-javafx-9999_p20141127 (27 Nov 2014)
 
   27 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 94e896d..c281ee3 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -51,6 +51,7 @@ DIST netbeans-trunk-nightly-201411240001-src.zip 199372060 SHA256 1088d63eb70366
 DIST netbeans-trunk-nightly-201411250001-src.zip 199373828 SHA256 a73eb4832b16f3b121228ef66f9f356756c0dfa8c31b2f74f69180904b262997 SHA512 296310be127d636a577dda2e89f68783fd85279dfd0f34faf3bd67173cd75fd769a85795e9dfa76a8d0918016041789f91cda883b903e3c82497e5f8bd0a91cf WHIRLPOOL 212327df9fa4e920680cefad9b97e3d660bdc79a411de9a76817669b180449576898e37c56ec91700e9fee1aeaed86d4576434b7db39222f2760e196d9bf8a43
 DIST netbeans-trunk-nightly-201411260001-src.zip 199396686 SHA256 82c5453d0702c37f6a059773c06890b25786f6a06cd2c6c2206d2bcc7480eb5c SHA512 365ef290c511e44223de913f861fb841f25cd018cdd1d31d8c4c99fd6b674ad37c63ad9d01fccf865ade9fadb918a8a895a6593596538be472cd9229c54475e2 WHIRLPOOL fa5ae283203d4ff3c7fa684eaa581229f2fa6c80c168028e501991bc2d6766aba85dc6d757e362f150110faaab372ea2e1eb7c9ed25091851c637269380de175
 DIST netbeans-trunk-nightly-201411270001-src.zip 199424732 SHA256 1986cf723ea94e5219c59e0171fdd1b302b6fe5d381ac7ac3fd0c3468ed71448 SHA512 c4d76a6a5e79c1298fae3276185a2a43fa024ee32f6cf2d5e25fc26da763491ca37cfc8829a142b9b4af879fbf9607f03721d40c7cacc5a8ed13aba913c2c92c WHIRLPOOL 82a5aa2e73dee3b67204f9c2624f53bed2275d11b03b222c2d2d36e5fd34a729e06e1ade5a0d4bfe8346059f00f7c1241beb3682a501031cb43b8dd4e222349e
+DIST netbeans-trunk-nightly-201411280001-src.zip 199431402 SHA256 ec7a6b5e5ddbdd042b5336dced4a05d0679c59368984601ed7229da9faf99903 SHA512 d4d9b15c56453249e56050cff1c9e9ee4f72eb2dee910ade236a3ff70b919fb1a8836a77517c1c651c72d9993432080727a247c69a5d971ba5ba04795c7d60a3 WHIRLPOOL d5a774df345a1726598c650292f3f915efb7852e35674f3ddeba3c1be167e1490f1e7f0bbbfa29655fb7824ac4279325e13c82433988d45a84d85a503d0ac04b
 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
@@ -91,5 +92,6 @@ EBUILD netbeans-javafx-9999_p20141124.ebuild 4723 SHA256 17e70e04c6413f1407aa3c0
 EBUILD netbeans-javafx-9999_p20141125.ebuild 4723 SHA256 6182e8a3697a00a27676c6af3347b2dce78000dcb1af98fd2a47021ee6c4e1a4 SHA512 837b4cbb4a3479127a8260b59912fd1691997a478eed32e909d541174c5413ca89ef590e84890c0f3c0e964565b5d641e25cbbc9560ab19eef6331a6b8677dfd WHIRLPOOL c8e1c9069b0c884b4b62398c151785f2efbc898b23f4640c14b6e43bab3b9f3d716297a319e2e79a8bfbe57d322dbf06e1845108e2bcceeca1cf1210115131d7
 EBUILD netbeans-javafx-9999_p20141126.ebuild 4723 SHA256 4075d822357ce07e8c85f2feec241ce255c52ec9cb59159c7069c5591dec9417 SHA512 8fbafce520fb05b6fe0d20863672081a1018c2565b4989fa23ed40dadc65b907210a87dcf32194f54c4c89164e034b45d0a8d7062747531f5e3b346d888f8312 WHIRLPOOL 13964df72d752dcce82ddcf2735decffbd2b18979200862861a7eaaff36741dca2b9fc27bd3dfb2cf93abd654632cba3744af17eefa7aa603f22d0a5a1ba1628
 EBUILD netbeans-javafx-9999_p20141127.ebuild 4723 SHA256 c7c7b135cb2942b5c19e0c04fbb7c4cf289e09094684a7739253c25524e2eb3b SHA512 424e4cdf7df919530fab63602007bc0f50072bd9effc16e4e6ba8352b4ddb1b364e1d6be9f4170ce5b147be12ca62abb0924da38a8f47a04844f063b62d76495 WHIRLPOOL 9464791dd897b8b6b14f1382607a31f7a93539c5146f32e036795fe23ec1b9dcabbb93951d8ebfda8c7a5390975d431c527277dd9015f68968479503e7f89cc0
-MISC ChangeLog 123344 SHA256 fa07c831c661c9f5589377580fdc8efd188422639cdf0999724247f89d65adcd SHA512 74085c33dbcb002c1d0aa08ba135927aa0088ee78300d3ca20599f93cb222212bc89d110e807f222a2a7614e61e3da79f43105496a990936937a5af94f7a609e WHIRLPOOL c16349ae806b665c6228bd8375f3627da88ecec2a631d342b750d815e684b4b46d1b1e0f9b83531bb8dc5625461c834923f97701f5f5ebad39cd7af1b5f9b135
+EBUILD netbeans-javafx-9999_p20141128.ebuild 4723 SHA256 fab375d87a9a57dcb83dacea336e84f3504b185fcce79dfb155df9443b916a7b SHA512 e23307b6da9df1c43043f2103bf78abc42418147129ff6765ebf18682041f8469c07e2c670a1e5c74643e35f00617449920c449b720d7af2ac838ec007fd523e WHIRLPOOL 3c942afd346c3a7b879516d2e2e73f94f59ccfa1b01ce182c9b28da918b476108eec3074b1f0f2adc9209d5805e6706ce21db56cab59d575440a530c2d4f6686
+MISC ChangeLog 123517 SHA256 166300ce40a1509227d4ce14c3314bf6d2036ef55b08fc07e150517e27fcf20f SHA512 9b026baf047b6e232a62bb628467f5be79e96a023d7cbbf43aaf6c9ee5f03c41bda3e0b7be3d57d243523bc32efe7b5c28fa8ed48363a53c1a283ea4c26e0d80 WHIRLPOOL d5e3d5e504f7dd752626f46b65b7bc6edd0efcb6ffe9128d78a95aa45bd94e3ed29f3e5da5af8349d384c2cc864b361548c6903f9a5d69f5d27724fe29492496
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20141128.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20141128.ebuild
new file mode 100644
index 0000000..0acd7a2
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20141128.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2014 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/2014-11-28_00-01-49/zip/netbeans-trunk-nightly-201411280001-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 2e23f03..94f150f 100644
--- a/dev-java/netbeans-mobility/ChangeLog
+++ b/dev-java/netbeans-mobility/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-mobility-9999_p20141128 (28 Nov 2014)
+
+  28 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-mobility-9999_p20141128.ebuild:
+  bumped to the latest sources
+
 *netbeans-mobility-9999_p20141127 (27 Nov 2014)
 
   27 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 0c088a8..823d3a6 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -55,6 +55,7 @@ DIST netbeans-trunk-nightly-201411240001-src.zip 199372060 SHA256 1088d63eb70366
 DIST netbeans-trunk-nightly-201411250001-src.zip 199373828 SHA256 a73eb4832b16f3b121228ef66f9f356756c0dfa8c31b2f74f69180904b262997 SHA512 296310be127d636a577dda2e89f68783fd85279dfd0f34faf3bd67173cd75fd769a85795e9dfa76a8d0918016041789f91cda883b903e3c82497e5f8bd0a91cf WHIRLPOOL 212327df9fa4e920680cefad9b97e3d660bdc79a411de9a76817669b180449576898e37c56ec91700e9fee1aeaed86d4576434b7db39222f2760e196d9bf8a43
 DIST netbeans-trunk-nightly-201411260001-src.zip 199396686 SHA256 82c5453d0702c37f6a059773c06890b25786f6a06cd2c6c2206d2bcc7480eb5c SHA512 365ef290c511e44223de913f861fb841f25cd018cdd1d31d8c4c99fd6b674ad37c63ad9d01fccf865ade9fadb918a8a895a6593596538be472cd9229c54475e2 WHIRLPOOL fa5ae283203d4ff3c7fa684eaa581229f2fa6c80c168028e501991bc2d6766aba85dc6d757e362f150110faaab372ea2e1eb7c9ed25091851c637269380de175
 DIST netbeans-trunk-nightly-201411270001-src.zip 199424732 SHA256 1986cf723ea94e5219c59e0171fdd1b302b6fe5d381ac7ac3fd0c3468ed71448 SHA512 c4d76a6a5e79c1298fae3276185a2a43fa024ee32f6cf2d5e25fc26da763491ca37cfc8829a142b9b4af879fbf9607f03721d40c7cacc5a8ed13aba913c2c92c WHIRLPOOL 82a5aa2e73dee3b67204f9c2624f53bed2275d11b03b222c2d2d36e5fd34a729e06e1ade5a0d4bfe8346059f00f7c1241beb3682a501031cb43b8dd4e222349e
+DIST netbeans-trunk-nightly-201411280001-src.zip 199431402 SHA256 ec7a6b5e5ddbdd042b5336dced4a05d0679c59368984601ed7229da9faf99903 SHA512 d4d9b15c56453249e56050cff1c9e9ee4f72eb2dee910ade236a3ff70b919fb1a8836a77517c1c651c72d9993432080727a247c69a5d971ba5ba04795c7d60a3 WHIRLPOOL d5a774df345a1726598c650292f3f915efb7852e35674f3ddeba3c1be167e1490f1e7f0bbbfa29655fb7824ac4279325e13c82433988d45a84d85a503d0ac04b
 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
@@ -96,5 +97,6 @@ EBUILD netbeans-mobility-9999_p20141124.ebuild 4418 SHA256 f9d07cb9cf63c0a938a05
 EBUILD netbeans-mobility-9999_p20141125.ebuild 4418 SHA256 a30ccdc2ae10ac81e14427987057f43db8f4821d5274727d0df1032b358b1f26 SHA512 faa00cdebcb4b390800d41ed7e4d8e5f7a8d8b4006694509fc81c43065282061d2ae244527ddae8bcc191d227d21f6c491ed91470a4382ebd0992269133cfa6d WHIRLPOOL 5249199491cfd661b4ae291ea8f4380e40e9a9bbb63c9937fa95ba8d924fc490bda1a88699215f62079df64d184b1b4de8254ab398a34c792bfa249c0cc22377
 EBUILD netbeans-mobility-9999_p20141126.ebuild 4418 SHA256 248c0f6682faaa2873849970d7acc5ba850cd52b7cb248d3ab5a407c94f8e499 SHA512 2a332528770b962fed8eb7d14a299c1a9816447458596766dc6a921cd6cc832a9146000d413745da8748566496504c9f2e773f9ab146162cd850e689b82b5ac5 WHIRLPOOL 947c3419c3fb434bc62db7e19086c6cc7dc04c8a14aa04a69630bc5dfe565f6efc9c38676275ca4d44f4df649ab12f552ef696ab9e2491952f36c002af8761b5
 EBUILD netbeans-mobility-9999_p20141127.ebuild 4418 SHA256 2d13871a53c559f383a40af94f8d1ba010ba730eff38e223a5f25da3361e7bd0 SHA512 c7011a65d1cd8b6e8d8c0344eb4b6a641e68958bc4d66f4ed17de3457ed63d033045e334479378584b278d29292e1070da26966f480c9601faf382a9dd2fbf80 WHIRLPOOL 3a0c14e827ae0085e1cca239b6b950d19c1221c7f43d6883ec646298b1fdb2c32d8297b0be1f4a6b46cfd412cb740a72c73dd0f58073207651564dd3f96702a3
-MISC ChangeLog 140416 SHA256 7f59bc337596f6e9e45652b7cda74fe8b9c5754561e0e4aef7f6b3c27d68a2af SHA512 3f9a742352d08375c5497f8c5c82c9a3372ca34b8ff02032a1194a5c1b07da4566f2071a910cbf36669821302a1a95cf783a4f31f472dab21e3fcff98fc8fd27 WHIRLPOOL 7899351eea824a6952d83fca83d428f5d255e0c4237837771e9d054091eda200219da56fa3ab2a851df0fc59042497b94ed4fe0aac583df2a28c3cde412eea6d
+EBUILD netbeans-mobility-9999_p20141128.ebuild 4418 SHA256 1e2610b2552d3e4f9345369695f560efb267a49264806b595a8d82e278baa3d5 SHA512 2e9233e7a6cce0d2e0c95cfba167ff57ba648dc2d10c1493835fa014656120c5697f16839109c3c4bd0bf88b030145c9639dc76b45abf8e98e392a0909640b2f WHIRLPOOL 35978e3be76fdd85779c6471175b4df1a33964e4c431b825035e6354a27ce2427f4cb08230bee9e4b077e140508a8bbeb340abb387bebd5c1b8622a9c1679201
+MISC ChangeLog 140593 SHA256 6cb504a07e26b94557a228b655ee9c6ee3ffba6f58f7dd82fdbac180151f9b4b SHA512 0b1bc46ff29ce5ba938f9e75d53d1e13eb6c49267062a09dcb7b37f00c38a440717ac92e0440566375764edc4ce61ebbe4e536e9477f92eedd6466b331c54da2 WHIRLPOOL 4d0b4048a9e42f6e5a13ea6ac8de96abd0e1f090fd4ea9c7fd490f10a371942b0607b015976c13df63badca93376847efdc61461933273604c517561aa017f54
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20141128.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20141128.ebuild
new file mode 100644
index 0000000..43529a2
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20141128.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2014 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/2014-11-28_00-01-49/zip/netbeans-trunk-nightly-201411280001-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 bedf3fe..f39da9e 100644
--- a/dev-java/netbeans-nb/ChangeLog
+++ b/dev-java/netbeans-nb/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-nb-9999_p20141128 (28 Nov 2014)
+
+  28 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-nb-9999_p20141128.ebuild:
+  bumped to the latest sources
+
 *netbeans-nb-9999_p20141127 (27 Nov 2014)
 
   27 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 265d9a0..ba4034e 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -54,6 +54,7 @@ DIST netbeans-trunk-nightly-201411240001-src.zip 199372060 SHA256 1088d63eb70366
 DIST netbeans-trunk-nightly-201411250001-src.zip 199373828 SHA256 a73eb4832b16f3b121228ef66f9f356756c0dfa8c31b2f74f69180904b262997 SHA512 296310be127d636a577dda2e89f68783fd85279dfd0f34faf3bd67173cd75fd769a85795e9dfa76a8d0918016041789f91cda883b903e3c82497e5f8bd0a91cf WHIRLPOOL 212327df9fa4e920680cefad9b97e3d660bdc79a411de9a76817669b180449576898e37c56ec91700e9fee1aeaed86d4576434b7db39222f2760e196d9bf8a43
 DIST netbeans-trunk-nightly-201411260001-src.zip 199396686 SHA256 82c5453d0702c37f6a059773c06890b25786f6a06cd2c6c2206d2bcc7480eb5c SHA512 365ef290c511e44223de913f861fb841f25cd018cdd1d31d8c4c99fd6b674ad37c63ad9d01fccf865ade9fadb918a8a895a6593596538be472cd9229c54475e2 WHIRLPOOL fa5ae283203d4ff3c7fa684eaa581229f2fa6c80c168028e501991bc2d6766aba85dc6d757e362f150110faaab372ea2e1eb7c9ed25091851c637269380de175
 DIST netbeans-trunk-nightly-201411270001-src.zip 199424732 SHA256 1986cf723ea94e5219c59e0171fdd1b302b6fe5d381ac7ac3fd0c3468ed71448 SHA512 c4d76a6a5e79c1298fae3276185a2a43fa024ee32f6cf2d5e25fc26da763491ca37cfc8829a142b9b4af879fbf9607f03721d40c7cacc5a8ed13aba913c2c92c WHIRLPOOL 82a5aa2e73dee3b67204f9c2624f53bed2275d11b03b222c2d2d36e5fd34a729e06e1ade5a0d4bfe8346059f00f7c1241beb3682a501031cb43b8dd4e222349e
+DIST netbeans-trunk-nightly-201411280001-src.zip 199431402 SHA256 ec7a6b5e5ddbdd042b5336dced4a05d0679c59368984601ed7229da9faf99903 SHA512 d4d9b15c56453249e56050cff1c9e9ee4f72eb2dee910ade236a3ff70b919fb1a8836a77517c1c651c72d9993432080727a247c69a5d971ba5ba04795c7d60a3 WHIRLPOOL d5a774df345a1726598c650292f3f915efb7852e35674f3ddeba3c1be167e1490f1e7f0bbbfa29655fb7824ac4279325e13c82433988d45a84d85a503d0ac04b
 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
@@ -95,5 +96,6 @@ EBUILD netbeans-nb-9999_p20141124.ebuild 5013 SHA256 187774a4cbdfa9f7ffebf003500
 EBUILD netbeans-nb-9999_p20141125.ebuild 5013 SHA256 d89d528cb7c29f674938bb736f994a80c7680d896e8da30c7a3a9c4e5242a5ab SHA512 71c2937496716a9a5bfe186fb35b0876e0d226ebe28894c0f7cc86a72b4b3ec7d348fdc177fedf99b24c601cf4fca2b66b68aadbf051526e3d543a2baad94e17 WHIRLPOOL b2d7d5705b81d23401b7c41550e64eb0f666b3e776c476f5963b1c6e76be28de72b2b0be686bb27bdd5d6e2fd8e6b5dee35216094998a7c6d509660a8cb48b88
 EBUILD netbeans-nb-9999_p20141126.ebuild 5013 SHA256 b262b31454a2c14cff62fbb8d8e40a2dc40f94cabe82aa3bc33ed5d40cc048e8 SHA512 a0b218444b463e085b020911b9f9a2f317fb06ea0eb09de2d0cd1bc10fb6e3135ac9c88ae7f71257e101638a46e47c21ca3ee24e18d0a05c3b452cd78468faae WHIRLPOOL dbef1977edcbff149973cc7942948e26b9ad72787a1ab20b2fd1920101ba314c2d0c108bc456a06d700c8dc67419a741a93597deb4a59309e45ea5fc150e35e0
 EBUILD netbeans-nb-9999_p20141127.ebuild 5013 SHA256 7749dda9bfb69dab9b6c824a7cc58599f94dd483db8455208e04f537e55ee98f SHA512 dce007ac87cb2557e9090010b158f7acdd2fcfd08d8241c97da6c8a8e4e9e9f8c5f9ec5cddc761980acaaa95017ad1bd6f7851df0faa9d3840c91f4573d730d1 WHIRLPOOL b7c935aa7f9a575b65f6e3ed4f5226ab8588a1796a213d22fe4ea35d502bdce375134523da5063cb65d43599d54254c0b097ec76001fd56bc44523509fa03813
-MISC ChangeLog 130363 SHA256 11897a0b931b18a8ba8736728c7b5947312aad36c116b0bd09a29bd145d3db58 SHA512 002120e1ca00e9ec1c74e1abbacfa2909f9910ec0536fb174646a16909a631c1ff086c2876be16992c975ba3dde9add5d8ee927d83328324811e53e9b1cc6fdb WHIRLPOOL 255e9558aa126e18090bb3aed37f5281976c237f5631be4b84f1cce0beb6c3e6696a71c0cdc6213a53b6856d3b5a7e4cf2f193a9b0c7af79c0453fa7db3d97f2
+EBUILD netbeans-nb-9999_p20141128.ebuild 5013 SHA256 11e4ab5d035d93830985bb73536d90f172c0575c4e83aed11b06b731a7f6df09 SHA512 4c44d2ae9ad33ce168ecdc02b88525d534029951827ec540a06c4a0f2a8d8de700806e55bc90ea67dd8f501aa68128283b52e8fd9d3feb86898ba753c80488d6 WHIRLPOOL 73ae1910f3f0f9e551df4c2888631b4d572bdd65dcffd5e91719726b0183fe0c0627b2395dcc4dc2e57295614c78f98eb84c542e41d6caffc942167f50d39cf6
+MISC ChangeLog 130528 SHA256 c8b0938780c06ea3d728fc244b58f4b9f9d6310bbb44c9517f4ca6f150f8985c SHA512 e62ddd048c30483b5d7476e370912e61e9564919ae6a6c8afa0aca5e3afcbc4b680df9adc2552a8a4da19982535812a23a9a8e2ac8ba1452ac4ba3b6195c4226 WHIRLPOOL 1dc7b2c0bcde9684d42d623d7b95e614cb1ae9ea300da2e6637e33a1c97f5b864e57c018c01755d2d72107b9d457a4567139490cbb2662adf0c7f820f3f3e11c
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20141128.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20141128.ebuild
new file mode 100644
index 0000000..0673eb6
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20141128.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2014 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/2014-11-28_00-01-49/zip/netbeans-trunk-nightly-201411280001-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 390ed36..a810c16 100644
--- a/dev-java/netbeans-php/ChangeLog
+++ b/dev-java/netbeans-php/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-php-9999_p20141128 (28 Nov 2014)
+
+  28 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-php-9999_p20141128.ebuild:
+  bumped to the latest sources
+
 *netbeans-php-9999_p20141127 (27 Nov 2014)
 
   27 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index 17a03e1..169a038 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -57,6 +57,7 @@ DIST netbeans-trunk-nightly-201411240001-src.zip 199372060 SHA256 1088d63eb70366
 DIST netbeans-trunk-nightly-201411250001-src.zip 199373828 SHA256 a73eb4832b16f3b121228ef66f9f356756c0dfa8c31b2f74f69180904b262997 SHA512 296310be127d636a577dda2e89f68783fd85279dfd0f34faf3bd67173cd75fd769a85795e9dfa76a8d0918016041789f91cda883b903e3c82497e5f8bd0a91cf WHIRLPOOL 212327df9fa4e920680cefad9b97e3d660bdc79a411de9a76817669b180449576898e37c56ec91700e9fee1aeaed86d4576434b7db39222f2760e196d9bf8a43
 DIST netbeans-trunk-nightly-201411260001-src.zip 199396686 SHA256 82c5453d0702c37f6a059773c06890b25786f6a06cd2c6c2206d2bcc7480eb5c SHA512 365ef290c511e44223de913f861fb841f25cd018cdd1d31d8c4c99fd6b674ad37c63ad9d01fccf865ade9fadb918a8a895a6593596538be472cd9229c54475e2 WHIRLPOOL fa5ae283203d4ff3c7fa684eaa581229f2fa6c80c168028e501991bc2d6766aba85dc6d757e362f150110faaab372ea2e1eb7c9ed25091851c637269380de175
 DIST netbeans-trunk-nightly-201411270001-src.zip 199424732 SHA256 1986cf723ea94e5219c59e0171fdd1b302b6fe5d381ac7ac3fd0c3468ed71448 SHA512 c4d76a6a5e79c1298fae3276185a2a43fa024ee32f6cf2d5e25fc26da763491ca37cfc8829a142b9b4af879fbf9607f03721d40c7cacc5a8ed13aba913c2c92c WHIRLPOOL 82a5aa2e73dee3b67204f9c2624f53bed2275d11b03b222c2d2d36e5fd34a729e06e1ade5a0d4bfe8346059f00f7c1241beb3682a501031cb43b8dd4e222349e
+DIST netbeans-trunk-nightly-201411280001-src.zip 199431402 SHA256 ec7a6b5e5ddbdd042b5336dced4a05d0679c59368984601ed7229da9faf99903 SHA512 d4d9b15c56453249e56050cff1c9e9ee4f72eb2dee910ade236a3ff70b919fb1a8836a77517c1c651c72d9993432080727a247c69a5d971ba5ba04795c7d60a3 WHIRLPOOL d5a774df345a1726598c650292f3f915efb7852e35674f3ddeba3c1be167e1490f1e7f0bbbfa29655fb7824ac4279325e13c82433988d45a84d85a503d0ac04b
 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
@@ -98,5 +99,6 @@ EBUILD netbeans-php-9999_p20141124.ebuild 4423 SHA256 a86c8cbb89d2797410db322d7c
 EBUILD netbeans-php-9999_p20141125.ebuild 4423 SHA256 8fd65fcf8df2627e9440af3993121b7a419446810c414e431404507a316a7e4a SHA512 2c474d0e54fe0ba1ac34323e2d7280cdf890077cdbf5a09142134f1a0ec2f3d341adbd902ead4f9d75035e15cf938ec5a8b862d6bab66c060f788ef1f2957b1a WHIRLPOOL 327ac5d05fba75902da4a985d8081dc2796a506e64ec9d0cd1b5c31a640792ad4b035fb01b2428b5068d9d614419f2b75db3f20a610cea1f9f286507dd1ca284
 EBUILD netbeans-php-9999_p20141126.ebuild 4423 SHA256 adb6abe265090668a8bb37a369b7feead303a207fbb978ad9a02fe13bba5dc5c SHA512 ac1ab33b06471a35651fcd800db4c06ad4162efdd7639c398a87fefe75ac59335f1b38ccd4b8e4d16e1be058b11828313124a423b6d2624df045a8de19618c3b WHIRLPOOL 75bb18a964c0a49be93194a0104aacd777391a1f8e4f069d3ee26fd9dfe66f664e9f11cbdc375f43c3c5202694f32deba3e0a2345fe7c47fde646f7437017051
 EBUILD netbeans-php-9999_p20141127.ebuild 4423 SHA256 87d5ccd51afe8fa21d5ff46e87e13d33ede3af9a307e4fad937fdc9e1389c074 SHA512 2aa5e1a618a6dd5a842c3cdc96d567beca039fa1f78c310cfe18973e593c786ba0cf218d1ee07ac046a65926a50ae8d2abca0d07b8afc516cce2eb07305c1b58 WHIRLPOOL 589e003d2a265d06cfd3d67a2962ddbdc08cb35c27df0fc2d98326081b28fa8b9cb6d4fe86fddd8931cd9312a24973d8f19b25f4b84569e0cd1492d1bf7ec1d0
-MISC ChangeLog 131053 SHA256 4a3512f65f3da8e4c27601d593c13f856099bd77484eed5f2696ea4bd9cda620 SHA512 be02ee3acea5be372d88bd5f2ee50bae0ddcb2ad02d0dec6526d2876a3e719cdebe909989fe28e3522ddc39988fdc7691692d227cd254aa4861cf57bf4abce94 WHIRLPOOL 1aedb981b58e8051e888c22a4eeb88b01506fed2f8c0aebf939783017b2c36f8f5c3f765fb40a264813b7b116452ccc9d4d49324a44600484ed21b54a8bcf6dc
+EBUILD netbeans-php-9999_p20141128.ebuild 4423 SHA256 83ea579883eb511f8178558b26cc7f4d0589a60d08db55236c71b5fb23ba566e SHA512 2036c71325e86bc05755a971dcc7c1c2f736eb31b5ae241e9a8f36b867269ff7494ce06fab406d236c20a91b51f260d84aa94cfce5e28b4c106e6bd0799b12ef WHIRLPOOL a4ad6e31cdfbb921be3f1e40204ade56f73251760f9e9ae9bfa3632acb0f3ee0d46b5559b7c31bed382801a852b43fa1973874aa4c8e0be522bf0d15c47fbd2a
+MISC ChangeLog 131220 SHA256 540e6e8b41c7652c862f24dd16324b421c36766805a864963b2925781c9738fa SHA512 f7fce84a12e9a2e6a20debcc39bedfa74a450295884d9c05708463bc91568a91ee79bbbd1b0cc532dad09bb240ed8f6e07e76da8cb9a3c7e480e17edac1a971f WHIRLPOOL 14e4433249620eb39479857fed080c65b3304f6e4193f64c1a2c0298b0654c24fead71bddf50c9d38dc2d092d48ddd05f6560b9d524aaac36692e76441ec335a
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20141128.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20141128.ebuild
new file mode 100644
index 0000000..b2d151d
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20141128.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2014 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/2014-11-28_00-01-49/zip/netbeans-trunk-nightly-201411280001-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 2970214..4d238ba 100644
--- a/dev-java/netbeans-platform/ChangeLog
+++ b/dev-java/netbeans-platform/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-platform-9999_p20141128 (28 Nov 2014)
+
+  28 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-platform-9999_p20141128.ebuild:
+  bumped to the latest sources
+
 *netbeans-platform-9999_p20141127 (27 Nov 2014)
 
   27 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index dac99ba..2809f59 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -72,6 +72,7 @@ DIST netbeans-trunk-nightly-201411240001-src.zip 199372060 SHA256 1088d63eb70366
 DIST netbeans-trunk-nightly-201411250001-src.zip 199373828 SHA256 a73eb4832b16f3b121228ef66f9f356756c0dfa8c31b2f74f69180904b262997 SHA512 296310be127d636a577dda2e89f68783fd85279dfd0f34faf3bd67173cd75fd769a85795e9dfa76a8d0918016041789f91cda883b903e3c82497e5f8bd0a91cf WHIRLPOOL 212327df9fa4e920680cefad9b97e3d660bdc79a411de9a76817669b180449576898e37c56ec91700e9fee1aeaed86d4576434b7db39222f2760e196d9bf8a43
 DIST netbeans-trunk-nightly-201411260001-src.zip 199396686 SHA256 82c5453d0702c37f6a059773c06890b25786f6a06cd2c6c2206d2bcc7480eb5c SHA512 365ef290c511e44223de913f861fb841f25cd018cdd1d31d8c4c99fd6b674ad37c63ad9d01fccf865ade9fadb918a8a895a6593596538be472cd9229c54475e2 WHIRLPOOL fa5ae283203d4ff3c7fa684eaa581229f2fa6c80c168028e501991bc2d6766aba85dc6d757e362f150110faaab372ea2e1eb7c9ed25091851c637269380de175
 DIST netbeans-trunk-nightly-201411270001-src.zip 199424732 SHA256 1986cf723ea94e5219c59e0171fdd1b302b6fe5d381ac7ac3fd0c3468ed71448 SHA512 c4d76a6a5e79c1298fae3276185a2a43fa024ee32f6cf2d5e25fc26da763491ca37cfc8829a142b9b4af879fbf9607f03721d40c7cacc5a8ed13aba913c2c92c WHIRLPOOL 82a5aa2e73dee3b67204f9c2624f53bed2275d11b03b222c2d2d36e5fd34a729e06e1ade5a0d4bfe8346059f00f7c1241beb3682a501031cb43b8dd4e222349e
+DIST netbeans-trunk-nightly-201411280001-src.zip 199431402 SHA256 ec7a6b5e5ddbdd042b5336dced4a05d0679c59368984601ed7229da9faf99903 SHA512 d4d9b15c56453249e56050cff1c9e9ee4f72eb2dee910ade236a3ff70b919fb1a8836a77517c1c651c72d9993432080727a247c69a5d971ba5ba04795c7d60a3 WHIRLPOOL d5a774df345a1726598c650292f3f915efb7852e35674f3ddeba3c1be167e1490f1e7f0bbbfa29655fb7824ac4279325e13c82433988d45a84d85a503d0ac04b
 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
@@ -113,5 +114,6 @@ EBUILD netbeans-platform-9999_p20141124.ebuild 8508 SHA256 53658b726af732555e0cf
 EBUILD netbeans-platform-9999_p20141125.ebuild 8508 SHA256 817177dabe7b9b7986d41cca4a351eea7aad44d180f3c530b578dda7c8f443bd SHA512 322e9f6e5ddf6dade7b4017d176cddb239ce1ffaf49d32b633c9129a20fcc8dcb1385794ef159aa17af84574215d9e35ac3e401e7028461a008575389584da0b WHIRLPOOL 20cb87776abd07bbdc6c16b8a7ba9f8a7440a676d9ff273a764e60523c7c8aec8aacef2aef6931a39a58d281e0bcd034d31bbcab4e7759bf2e0fdaf50251ece7
 EBUILD netbeans-platform-9999_p20141126.ebuild 8508 SHA256 0acbf5ef4ed709a2cda29f050aea0e519a909a59fea7bf582c888e0eb0251701 SHA512 9d762b3926b6df63e61a04eab2f6b91f1a9fe6dbb0686680352a68cf50ea530691997bc0828a01502733e602aa89e629fe4d6b653843f4533ee580c115a2860e WHIRLPOOL 140c763b24034dac37f3e91993a70543ce5680b76c7bcc206202b52574c8060e380cbbd479bc9af2292307db7ebe4367c1e9a96a5fde621197349ad8ea643e75
 EBUILD netbeans-platform-9999_p20141127.ebuild 8508 SHA256 cd561b1b4ad323b60929dded85652c41ecdf938357a2b84a6d5b40de508f2ccc SHA512 fa067c60e423c70cfe977876227b95b61c512db880a1a7c07663e8ee0d593fc99142c66c0d172a5e44bea93b90590f03af21f10a8f157c0fbb5ac02af2d6115c WHIRLPOOL f232f154159acb609fe47cbeb7fb08406abf369fe8fbcfdb1cd3bc67b5612e58086c9818178be6a880e8aca02de1d348dee10431e00ad8bd6c82dbab3c19ef77
-MISC ChangeLog 141012 SHA256 3afe4d909d4a4a93960beccad143db973e90338c9f28ed3f19fe083c59303567 SHA512 24d96d362e54062300c194c6793215bd7d6a66d248d8cf740fc72c19d9c06044b2bc08bbf175ff1d22ab99efea1832c3fa6c0bae5fde248e3d5069574279ff5b WHIRLPOOL 24c1e21dd98ea69f5a7203907bd74bd617f280f3995018f98c378391fe06e806888e01ee5cb96245bd4d51e0f5a26ba0fbbbf81de03c3410c44269a168cb85b2
+EBUILD netbeans-platform-9999_p20141128.ebuild 8508 SHA256 cebc414c052d99f6a276ab2965bb25394cb877a1f7fe5f7b6576e12ec661eb25 SHA512 be19eba6639b68ffc34f421e87e96cdf517e30f4c9c08b653bae92d460fdde451f0ebe179bbeb6ace31216b89b53575c86079415bdef80a24f6324db1c01bca4 WHIRLPOOL 6fcf8324515f8929ef4480d8399f39026b66f562e4c323ad3de8472c523839c0313ac848f2a7547461457fa4ca3a1d3eee6ac6cbc2a8444e3a5d1ae106578edd
+MISC ChangeLog 141189 SHA256 3b1b9e99fd82e8cd2f07cf3cd236dff188e6011d92d2c1151b5412898661d808 SHA512 663bcbdd2920a8ec5643d032d0eac71ab97d24dd5b505a8e317024d0411f81e188bdc3fe38da16c3013a199217f333e37377b8b3ff595c9c807731d5f42252d4 WHIRLPOOL a82d79679db2a785d765d507f981733e3440e9bc6bf6c100ea8109116ff53046a1db621f444734f6b3cdbf92d4520a24a6affb17e85305cc6de25c15ddfa3020
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20141128.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20141128.ebuild
new file mode 100644
index 0000000..fe79c75
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20141128.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2014 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/2014-11-28_00-01-49/zip/netbeans-trunk-nightly-201411280001-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/8B5627E4907808B25628C64F2876B2E64ECDF750-ko4j.jar
+	http://hg.netbeans.org/binaries/4C8F273EB7D02845F42CFBE3DE4EB2BA22AF6357-net-java-html.jar
+	http://hg.netbeans.org/binaries/72B71E13ADC08732D8274083908D47ED9CC37B55-net-java-html-boot.jar
+	http://hg.netbeans.org/binaries/29388BB216B2463DB0B7AD403392C0F7EA7A4260-net-java-html-boot-fx.jar
+	http://hg.netbeans.org/binaries/37B1B513D8E7A2689A92188DABE950E0D63176D3-net-java-html-boot-script.jar
+	http://hg.netbeans.org/binaries/51ADBD6B0FE548E15BD10AFC345CAD48589E960E-net-java-html-geo.jar
+	http://hg.netbeans.org/binaries/D9E741F404CE0751B97A343A665666A441008E4F-net-java-html-json.jar
+	http://hg.netbeans.org/binaries/A89F8D030A3BFCA10880C3274E86D683FCB92062-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/AD568238EE36A820BD6C6806807E8A14EA34684D-org-ow2-asm.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}"/8B5627E4907808B25628C64F2876B2E64ECDF750-ko4j.jar o.n.html.ko4j/external/ko4j.jar || die
+	ln -s "${DISTDIR}"/4C8F273EB7D02845F42CFBE3DE4EB2BA22AF6357-net-java-html.jar net.java.html/external/net-java-html.jar || die
+	ln -s "${DISTDIR}"/72B71E13ADC08732D8274083908D47ED9CC37B55-net-java-html-boot.jar net.java.html.boot/external/net-java-html-boot.jar || die
+	ln -s "${DISTDIR}"/29388BB216B2463DB0B7AD403392C0F7EA7A4260-net-java-html-boot-fx.jar net.java.html.boot.fx/external/net-java-html-boot-fx.jar || die
+	ln -s "${DISTDIR}"/37B1B513D8E7A2689A92188DABE950E0D63176D3-net-java-html-boot-script.jar net.java.html.boot.script/external/net-java-html-boot-script.jar || die
+	ln -s "${DISTDIR}"/51ADBD6B0FE548E15BD10AFC345CAD48589E960E-net-java-html-geo.jar net.java.html.geo/external/net-java-html-geo.jar || die
+	ln -s "${DISTDIR}"/D9E741F404CE0751B97A343A665666A441008E4F-net-java-html-json.jar net.java.html.json/external/net-java-html-json.jar || die
+	ln -s "${DISTDIR}"/A89F8D030A3BFCA10880C3274E86D683FCB92062-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}"/AD568238EE36A820BD6C6806807E8A14EA34684D-org-ow2-asm.jar o.objectweb.asm/external/org-ow2-asm.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 14c75f5..eeef40e 100644
--- a/dev-java/netbeans-profiler/ChangeLog
+++ b/dev-java/netbeans-profiler/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-profiler-9999_p20141128 (28 Nov 2014)
+
+  28 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-profiler-9999_p20141128.ebuild:
+  bumped to the latest sources
+
 *netbeans-profiler-9999_p20141127 (27 Nov 2014)
 
   27 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index e7bc88e..d9c2e7b 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -46,6 +46,7 @@ DIST netbeans-trunk-nightly-201411240001-src.zip 199372060 SHA256 1088d63eb70366
 DIST netbeans-trunk-nightly-201411250001-src.zip 199373828 SHA256 a73eb4832b16f3b121228ef66f9f356756c0dfa8c31b2f74f69180904b262997 SHA512 296310be127d636a577dda2e89f68783fd85279dfd0f34faf3bd67173cd75fd769a85795e9dfa76a8d0918016041789f91cda883b903e3c82497e5f8bd0a91cf WHIRLPOOL 212327df9fa4e920680cefad9b97e3d660bdc79a411de9a76817669b180449576898e37c56ec91700e9fee1aeaed86d4576434b7db39222f2760e196d9bf8a43
 DIST netbeans-trunk-nightly-201411260001-src.zip 199396686 SHA256 82c5453d0702c37f6a059773c06890b25786f6a06cd2c6c2206d2bcc7480eb5c SHA512 365ef290c511e44223de913f861fb841f25cd018cdd1d31d8c4c99fd6b674ad37c63ad9d01fccf865ade9fadb918a8a895a6593596538be472cd9229c54475e2 WHIRLPOOL fa5ae283203d4ff3c7fa684eaa581229f2fa6c80c168028e501991bc2d6766aba85dc6d757e362f150110faaab372ea2e1eb7c9ed25091851c637269380de175
 DIST netbeans-trunk-nightly-201411270001-src.zip 199424732 SHA256 1986cf723ea94e5219c59e0171fdd1b302b6fe5d381ac7ac3fd0c3468ed71448 SHA512 c4d76a6a5e79c1298fae3276185a2a43fa024ee32f6cf2d5e25fc26da763491ca37cfc8829a142b9b4af879fbf9607f03721d40c7cacc5a8ed13aba913c2c92c WHIRLPOOL 82a5aa2e73dee3b67204f9c2624f53bed2275d11b03b222c2d2d36e5fd34a729e06e1ade5a0d4bfe8346059f00f7c1241beb3682a501031cb43b8dd4e222349e
+DIST netbeans-trunk-nightly-201411280001-src.zip 199431402 SHA256 ec7a6b5e5ddbdd042b5336dced4a05d0679c59368984601ed7229da9faf99903 SHA512 d4d9b15c56453249e56050cff1c9e9ee4f72eb2dee910ade236a3ff70b919fb1a8836a77517c1c651c72d9993432080727a247c69a5d971ba5ba04795c7d60a3 WHIRLPOOL d5a774df345a1726598c650292f3f915efb7852e35674f3ddeba3c1be167e1490f1e7f0bbbfa29655fb7824ac4279325e13c82433988d45a84d85a503d0ac04b
 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
@@ -87,5 +88,6 @@ EBUILD netbeans-profiler-9999_p20141124.ebuild 3478 SHA256 f7542738161062221e7b5
 EBUILD netbeans-profiler-9999_p20141125.ebuild 3478 SHA256 732b2e6aa9f5c807c02499f912b472a1c4ab53a3db34697efa6ecf480e4c05c4 SHA512 c3726648f5a7e816a75885f7d55e65d6b72915c4d0327ba6adb6f07aaf2f24ed6ad0eb7b4e82944a1a6d667e23921664e525cdea02d5ee55076a265cd2974bee WHIRLPOOL 92b12885e190dbd2e2d04be248f1cf70a9754323b5ccd8d2c57ec8ae1552f6cb85bd9a96eadfd664c3882774a38caea419edd30599f4e0a7ad8a41d27682e548
 EBUILD netbeans-profiler-9999_p20141126.ebuild 3478 SHA256 295e1fc9d59841e9ca900cd458f5bdf203f279a1cdfeedd911dfb97a15617a70 SHA512 2b516681049c172489a894faa27acedb4a707ba4e2aba3ddcbc22b2301d1dcd45d97a56ac04efe456906e0521ec5b7d08e0c6cb198d9395bdedb8ea3e70397e4 WHIRLPOOL 89330cc035c09b1535afa86f3f4bc19138acd988acb556902ac8712aa9e19872fd012c8b7d5ddb92a3cb45aa9e9f1145c7ac34e41eabd17987833d0976eae896
 EBUILD netbeans-profiler-9999_p20141127.ebuild 3478 SHA256 4099e364bbd889f7ba3f227a192041aaa4dc61d9edf7f759e57d50480587ca4a SHA512 7497b63d53db95dfc7f5815cd7943268263755c8c6acf2fb0e22d21b859b27924c69d2e03b1b43d75815d1ad1f6c1f5685c997213b16b42ccd03ea0394aeafec WHIRLPOOL efb9abb537ecfed60834cca13ef2f4d44e53d8208090b67328f7b62640bd30557e12fdc4c51382e6a8c6d49bbe8bc999f4b7c3ca39782b0676071c1600eea276
-MISC ChangeLog 140473 SHA256 92ab22ad9aba67bf10cf539f779fe71981ccd976c8c508c116d207694df2df10 SHA512 2d3161a211dc72b0830262cff0b71e39062a86cf900917c4194acd4ceaad4a4b64fea081aa7a3499c2d2ddc1f22af6f306ae3b8da4a9572774b5fc43c0760a3d WHIRLPOOL 87c35d6fbe0f110e2ddc532b1998d9b53156a9073c14c14bb456c2fbf5ce442bf9088681ec58afed86583becf708f9bc5c3f8447774ed58a3f335834a029d152
+EBUILD netbeans-profiler-9999_p20141128.ebuild 3478 SHA256 60a3f46013fb9d232ed34643abf85e43b385a16f9af1174174105cc71a11e83a SHA512 7f15cfae5e27e8e8fe4a6faa420ee0e59241aa1dd2b756b6d973155a96f53eab0003e36614842baabea5886c7d473aff3ad689feebd863ba3f3e2b95937104be WHIRLPOOL af3709da3eb206eb675552bd920f9e53c16bf5905e0d7e92ffa7ea60d91f680051a2c43119e5873c9fbfc7564fdcc256b3ca5465dba0cfe7c5ab5aa13c733330
+MISC ChangeLog 140650 SHA256 aeb06c61750feec721c7a5f6c2e894b520a121ce320517b12c03a6089b3b8362 SHA512 54cbe558d1ca77f2f1e45c91ddedfdbff34b7fb13922172ef26047313484a9afc195bb0141803996688205a1e4ce56040515da14bf177243fc05befc25405a97 WHIRLPOOL 6bca9e62ea435faac35166e12e70f404ccab184d7d9ec596ffe4b24dd4f3443f3efe4d903667593a34ffc1f47683f46e621b714b878c6e58100ef65d7f21f315
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20141128.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20141128.ebuild
new file mode 100644
index 0000000..499499a
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20141128.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2014 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/2014-11-28_00-01-49/zip/netbeans-trunk-nightly-201411280001-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 727d3d3..3518658 100644
--- a/dev-java/netbeans-webcommon/ChangeLog
+++ b/dev-java/netbeans-webcommon/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-webcommon-9999_p20141128 (28 Nov 2014)
+
+  28 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-webcommon-9999_p20141128.ebuild:
+  bumped to the latest sources
+
 *netbeans-webcommon-9999_p20141127 (27 Nov 2014)
 
   27 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index 54ae08e..f8b2a9a 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -51,6 +51,7 @@ DIST netbeans-trunk-nightly-201411240001-src.zip 199372060 SHA256 1088d63eb70366
 DIST netbeans-trunk-nightly-201411250001-src.zip 199373828 SHA256 a73eb4832b16f3b121228ef66f9f356756c0dfa8c31b2f74f69180904b262997 SHA512 296310be127d636a577dda2e89f68783fd85279dfd0f34faf3bd67173cd75fd769a85795e9dfa76a8d0918016041789f91cda883b903e3c82497e5f8bd0a91cf WHIRLPOOL 212327df9fa4e920680cefad9b97e3d660bdc79a411de9a76817669b180449576898e37c56ec91700e9fee1aeaed86d4576434b7db39222f2760e196d9bf8a43
 DIST netbeans-trunk-nightly-201411260001-src.zip 199396686 SHA256 82c5453d0702c37f6a059773c06890b25786f6a06cd2c6c2206d2bcc7480eb5c SHA512 365ef290c511e44223de913f861fb841f25cd018cdd1d31d8c4c99fd6b674ad37c63ad9d01fccf865ade9fadb918a8a895a6593596538be472cd9229c54475e2 WHIRLPOOL fa5ae283203d4ff3c7fa684eaa581229f2fa6c80c168028e501991bc2d6766aba85dc6d757e362f150110faaab372ea2e1eb7c9ed25091851c637269380de175
 DIST netbeans-trunk-nightly-201411270001-src.zip 199424732 SHA256 1986cf723ea94e5219c59e0171fdd1b302b6fe5d381ac7ac3fd0c3468ed71448 SHA512 c4d76a6a5e79c1298fae3276185a2a43fa024ee32f6cf2d5e25fc26da763491ca37cfc8829a142b9b4af879fbf9607f03721d40c7cacc5a8ed13aba913c2c92c WHIRLPOOL 82a5aa2e73dee3b67204f9c2624f53bed2275d11b03b222c2d2d36e5fd34a729e06e1ade5a0d4bfe8346059f00f7c1241beb3682a501031cb43b8dd4e222349e
+DIST netbeans-trunk-nightly-201411280001-src.zip 199431402 SHA256 ec7a6b5e5ddbdd042b5336dced4a05d0679c59368984601ed7229da9faf99903 SHA512 d4d9b15c56453249e56050cff1c9e9ee4f72eb2dee910ade236a3ff70b919fb1a8836a77517c1c651c72d9993432080727a247c69a5d971ba5ba04795c7d60a3 WHIRLPOOL d5a774df345a1726598c650292f3f915efb7852e35674f3ddeba3c1be167e1490f1e7f0bbbfa29655fb7824ac4279325e13c82433988d45a84d85a503d0ac04b
 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
@@ -90,5 +91,6 @@ EBUILD netbeans-webcommon-9999_p20141124.ebuild 4997 SHA256 5243a7101b8d12d06ef6
 EBUILD netbeans-webcommon-9999_p20141125.ebuild 4997 SHA256 b74cb3c0252c6b8125def8c102640c0ae975438dd2202cc3abae6c89ec0c0ae3 SHA512 baab7fde169e09566fae8ecba7db74c1ccea8fa0c03544d43485d46ae76bc6b52dcd5b513c599cd51d2c2d3cc312b5aaa0a30b208d8de1d7360fd3074da1fe78 WHIRLPOOL d1dfcb50df37cc720d1afee4f6015b14d539013a2635cb66276a70bb8cd97a84c904a6152ff10f36ef5f11dd524961e150f1ad817c544c93e493ea862c1283c8
 EBUILD netbeans-webcommon-9999_p20141126.ebuild 4997 SHA256 b77a2e41dfd9ab153b88931547cb232e71cb3faeadaa7d49b2f42d80bb0a5568 SHA512 28de4a1cf778412bf6813a31ca15929a0f5518fe9fe881dfd27422a5ab8a96cb0407d47f1267d570f734db2135487a8b8e6f22688271eb2f3a991f9d58b145d8 WHIRLPOOL 3eeff815ccd6ece2b24e276d7dd8cab8b25f7b18b32f1e75782ebe8cd94d47961da02715b84998aa3ab52813ab3c99405e90a2b1167305f348074f953d3caa28
 EBUILD netbeans-webcommon-9999_p20141127.ebuild 4997 SHA256 7911aaf19c07738b6a042c0c4f76651a52ce8ac072756253d67109f08f29a994 SHA512 cee9861c323d2532304e26b1027bf02633e9d30ca90e31ccbbaa78e673eebcca357e280ce58dd9189efb467338b5c880ada3655d9da8f01ab47827b4a2fb2548 WHIRLPOOL b5bc821f6c3af78551eddfbf0c2dd76f7f49b18e65abd133ab8abaad3e3e1bd6fd9384eed94fd6b37e44ef3b4b5a2b566bff70e05c0229b7e51a9b2dab66b0ff
-MISC ChangeLog 113185 SHA256 514466de814e1639a9fc5c1a845aab72a82a2ee7ac260dd847c7bcd7938f91a8 SHA512 09bc3bc26d20d42801c9f0f33efcafbd34c718d147007770eb81eb4d084baae7e949cfa7d739719b321baf3b93708aa38bb9dc4d4727ff8378c5878a434012cb WHIRLPOOL a2a76091bf1ad6659c685bda6fe3ddcaff110e17225c806f0259e5d3dcaf8af6b67a57bf7828fc21f05797dc123a114ba97a2a44f73fd91ac6ed81c9d38d3127
+EBUILD netbeans-webcommon-9999_p20141128.ebuild 4997 SHA256 77689352177ea72c772651706e637cd62c6961baf5f94416289dfd25b682abd2 SHA512 dde8f5203378d0e0389745de77064751ea2fb68e0bc6ca24fa7976ab8b51285181ca14c9d784f26cbf5197c172f9f8a94753905bbd01b13a5069fe88d98488d3 WHIRLPOOL d762ac55f59435c3f8d53c8f9e85ef4377381b758c0f078b0f233e60a1a8856a3573a2c5e297b137b16d26ef8d6347e81a5d8fc4ae6af7bd0472d3a3cfba4770
+MISC ChangeLog 113364 SHA256 fe9cbe08e12e7080f68bd20a1c114d43a0702703a592dbe2069a6c93a37bd8e1 SHA512 60caeb5c5268d33e05539be7d94c8e00f1b95109870e2e829a2afad235d5228ad32f1a5c8f0f8b9b7f49416e2f89bcdb72e931ca04ef4fd6d6a0ff33ce1ed865 WHIRLPOOL 2d225098c993c510153f4af525f8055558a8fbecc424c8004e20440abdfc0e7330715d8c6acfa40ca87e3a2dcd01642dd577ecf4b0b7b24b56666b298b4680d8
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20141128.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20141128.ebuild
new file mode 100644
index 0000000..a5f8653
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20141128.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2014 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/2014-11-28_00-01-49/zip/netbeans-trunk-nightly-201411280001-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 e5b8618..0830676 100644
--- a/dev-java/netbeans-websvccommon/ChangeLog
+++ b/dev-java/netbeans-websvccommon/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-websvccommon-9999_p20141128 (28 Nov 2014)
+
+  28 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-websvccommon-9999_p20141128.ebuild:
+  bumped to the latest sources
+
 *netbeans-websvccommon-9999_p20141127 (27 Nov 2014)
 
   27 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 1cc883b..0451249 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -46,6 +46,7 @@ DIST netbeans-trunk-nightly-201411240001-src.zip 199372060 SHA256 1088d63eb70366
 DIST netbeans-trunk-nightly-201411250001-src.zip 199373828 SHA256 a73eb4832b16f3b121228ef66f9f356756c0dfa8c31b2f74f69180904b262997 SHA512 296310be127d636a577dda2e89f68783fd85279dfd0f34faf3bd67173cd75fd769a85795e9dfa76a8d0918016041789f91cda883b903e3c82497e5f8bd0a91cf WHIRLPOOL 212327df9fa4e920680cefad9b97e3d660bdc79a411de9a76817669b180449576898e37c56ec91700e9fee1aeaed86d4576434b7db39222f2760e196d9bf8a43
 DIST netbeans-trunk-nightly-201411260001-src.zip 199396686 SHA256 82c5453d0702c37f6a059773c06890b25786f6a06cd2c6c2206d2bcc7480eb5c SHA512 365ef290c511e44223de913f861fb841f25cd018cdd1d31d8c4c99fd6b674ad37c63ad9d01fccf865ade9fadb918a8a895a6593596538be472cd9229c54475e2 WHIRLPOOL fa5ae283203d4ff3c7fa684eaa581229f2fa6c80c168028e501991bc2d6766aba85dc6d757e362f150110faaab372ea2e1eb7c9ed25091851c637269380de175
 DIST netbeans-trunk-nightly-201411270001-src.zip 199424732 SHA256 1986cf723ea94e5219c59e0171fdd1b302b6fe5d381ac7ac3fd0c3468ed71448 SHA512 c4d76a6a5e79c1298fae3276185a2a43fa024ee32f6cf2d5e25fc26da763491ca37cfc8829a142b9b4af879fbf9607f03721d40c7cacc5a8ed13aba913c2c92c WHIRLPOOL 82a5aa2e73dee3b67204f9c2624f53bed2275d11b03b222c2d2d36e5fd34a729e06e1ade5a0d4bfe8346059f00f7c1241beb3682a501031cb43b8dd4e222349e
+DIST netbeans-trunk-nightly-201411280001-src.zip 199431402 SHA256 ec7a6b5e5ddbdd042b5336dced4a05d0679c59368984601ed7229da9faf99903 SHA512 d4d9b15c56453249e56050cff1c9e9ee4f72eb2dee910ade236a3ff70b919fb1a8836a77517c1c651c72d9993432080727a247c69a5d971ba5ba04795c7d60a3 WHIRLPOOL d5a774df345a1726598c650292f3f915efb7852e35674f3ddeba3c1be167e1490f1e7f0bbbfa29655fb7824ac4279325e13c82433988d45a84d85a503d0ac04b
 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
@@ -87,5 +88,6 @@ EBUILD netbeans-websvccommon-9999_p20141124.ebuild 2727 SHA256 2ba37f674907e52ae
 EBUILD netbeans-websvccommon-9999_p20141125.ebuild 2727 SHA256 3daab530159f4a21ce1074728cf750006dedd3969f55ce5e3d08e34b35a8870e SHA512 92b21842a45cdd1669ad7290566a686eaeb2186c076af59c5b44a44023463a132d2c19292076b8f876d2ea6b603e7b3aa92dd0a130af0c3c6c73127a3bc799ec WHIRLPOOL edee2b331acffef6bdfa1a453b5f81980bc18cb642f895c209bfc49805fca074d6025a3c0bf77c7a6067472732856eeb713acc2cd65c2d10841414fe36517075
 EBUILD netbeans-websvccommon-9999_p20141126.ebuild 2727 SHA256 a9faafb7c4952e9d886d2a458f5b64bf348e18a909b13713333ed41cce1a0169 SHA512 e4333c25512d81758dde639120d0af4899abdf7ac6937d3099334868eae5d6f8b5e322c77dd82092212ba668b8ab68ee1774f3488f734bd71a2532180c9f064a WHIRLPOOL 86e92fa5cd0be3e3f6149fb2ede1ca250dc08dde0940eb798d96ace6cea2cec9879c954ff827431db2030241c5cdc840cbc37da8f06e1bca02f6ba5549706131
 EBUILD netbeans-websvccommon-9999_p20141127.ebuild 2727 SHA256 1680598a46b1d11986365181b6c456c48a211aaf8c0446770d5712e1dee234c8 SHA512 7ddf8ba4e1cbf10d2fed73c593c57f6eaf484a966164e99bcd2cadb09fa3598651445633ebbc5caea5ca0c2939d4343ff19b49ce279e8b52a3bc967f2a1c5f3e WHIRLPOOL b6a74773307a8a55c857caf2f8695b30993223c50346f80c61c08592ca64f4d47be758afd41f39220d8454695f8b717bc33c29fa8e455e411567c2706cb61e9c
-MISC ChangeLog 147062 SHA256 5179503dffb0f605051e6a2f371fe2be8dbf760b9e826fceea00a8448612f9c0 SHA512 04c3f54f2385eb0fc6ecd34242c9b8581cba2758f7a5ecf1703d191ffe9ebce261a86a7eaa8392d38f0a975df90d2b0eda3fab95346a79f393ffeadb64bfa090 WHIRLPOOL 429a074ec827170ed72b59492352bbe817f73b6d4629caa9fdc902f83c7afa043b7f460d9d6419ece6a86c57c5dcc9f0d20f14d04473d6919133f4e5e5af731c
+EBUILD netbeans-websvccommon-9999_p20141128.ebuild 2727 SHA256 782f8188ccd90a961b312597be731a4ac1c2a171cfdb0d03f6394d02eba85ebf SHA512 2007653e84ba340401817aef8f74d27d659866c963b8a417c3ef880fb332a18388cf7b875fccf4a826f0f258ac224778919a4fb138253365ba6f70c60adfb5f6 WHIRLPOOL 76ba0e82b6d0ce036351167a53bfb17e08d525f43db1d26bea8a4c8fa86fba026e73cad72cb96dfb89ca512cd0326f8119211c8b33600d4bcc3da9c75997ed4b
+MISC ChangeLog 147247 SHA256 bce201f4c735c878aacf61d20f261b46763a8d3d7ff7aacd119207e8f09e1ddf SHA512 02524d6b598c5f2307a02f1440c665f25061a0752a0e7b2e4a9faab21d4ee38c922adc175aacf74d7d3d8a03ac118a10a8280d21d3299f5baf894f3a2b9e62e6 WHIRLPOOL 2190670122a25911380ca56830a71f777b76db90e41a47d76917f9582a9b9617849159bc59ff158d13f48e6eeff03b11e4fa82114a513ac2690eda535152007a
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20141128.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20141128.ebuild
new file mode 100644
index 0000000..abdf798
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20141128.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2014 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/2014-11-28_00-01-49/zip/netbeans-trunk-nightly-201411280001-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 9d4ac11..07ec3f5 100644
--- a/dev-util/netbeans/ChangeLog
+++ b/dev-util/netbeans/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-9999_p20141128 (28 Nov 2014)
+
+  28 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-9999_p20141128.ebuild:
+  bumped to the latest sources
+
 *netbeans-9999_p20141127 (27 Nov 2014)
 
   27 Nov 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 535698b..defcfb5 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -53,6 +53,7 @@ DIST netbeans-trunk-nightly-201411240001-src.zip 199372060 SHA256 1088d63eb70366
 DIST netbeans-trunk-nightly-201411250001-src.zip 199373828 SHA256 a73eb4832b16f3b121228ef66f9f356756c0dfa8c31b2f74f69180904b262997 SHA512 296310be127d636a577dda2e89f68783fd85279dfd0f34faf3bd67173cd75fd769a85795e9dfa76a8d0918016041789f91cda883b903e3c82497e5f8bd0a91cf WHIRLPOOL 212327df9fa4e920680cefad9b97e3d660bdc79a411de9a76817669b180449576898e37c56ec91700e9fee1aeaed86d4576434b7db39222f2760e196d9bf8a43
 DIST netbeans-trunk-nightly-201411260001-src.zip 199396686 SHA256 82c5453d0702c37f6a059773c06890b25786f6a06cd2c6c2206d2bcc7480eb5c SHA512 365ef290c511e44223de913f861fb841f25cd018cdd1d31d8c4c99fd6b674ad37c63ad9d01fccf865ade9fadb918a8a895a6593596538be472cd9229c54475e2 WHIRLPOOL fa5ae283203d4ff3c7fa684eaa581229f2fa6c80c168028e501991bc2d6766aba85dc6d757e362f150110faaab372ea2e1eb7c9ed25091851c637269380de175
 DIST netbeans-trunk-nightly-201411270001-src.zip 199424732 SHA256 1986cf723ea94e5219c59e0171fdd1b302b6fe5d381ac7ac3fd0c3468ed71448 SHA512 c4d76a6a5e79c1298fae3276185a2a43fa024ee32f6cf2d5e25fc26da763491ca37cfc8829a142b9b4af879fbf9607f03721d40c7cacc5a8ed13aba913c2c92c WHIRLPOOL 82a5aa2e73dee3b67204f9c2624f53bed2275d11b03b222c2d2d36e5fd34a729e06e1ade5a0d4bfe8346059f00f7c1241beb3682a501031cb43b8dd4e222349e
+DIST netbeans-trunk-nightly-201411280001-src.zip 199431402 SHA256 ec7a6b5e5ddbdd042b5336dced4a05d0679c59368984601ed7229da9faf99903 SHA512 d4d9b15c56453249e56050cff1c9e9ee4f72eb2dee910ade236a3ff70b919fb1a8836a77517c1c651c72d9993432080727a247c69a5d971ba5ba04795c7d60a3 WHIRLPOOL d5a774df345a1726598c650292f3f915efb7852e35674f3ddeba3c1be167e1490f1e7f0bbbfa29655fb7824ac4279325e13c82433988d45a84d85a503d0ac04b
 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
@@ -94,5 +95,6 @@ EBUILD netbeans-9999_p20141124.ebuild 7216 SHA256 0264d5488ca2b232f9ccebac3bf849
 EBUILD netbeans-9999_p20141125.ebuild 7216 SHA256 186f3d8496adf9e6999084d566b40f9821c1069b431062b93dd09539b8ac72a7 SHA512 49139fd922caa61493b9bdcbdb730aadc2b9dbdadceb2147b7fd615070a661c62e667acc38652147e5bf55af2bb6c9d9c1a782358f8c9a77f526d388b6bed03f WHIRLPOOL fd6e6edfa47db9ea6c40e94af2f0fb1a267ac8d8b9905294729e81a9ac6150d4430ca16df895935728c91684c3bca5f473edd12d552edfbbf29d320e924c5770
 EBUILD netbeans-9999_p20141126.ebuild 7216 SHA256 253aceb48e02da65ef56465aa974bd6813516a3a86e783d047917bf1886de68a SHA512 5d9b26dc183f8b94c2cc44e9e4cad442bdf290160f0e94b0af74ee3cab571061af70f4b5f1e40cdab9fa94df19fdcf5bb3db1a8c32a445ee55f848d6edd32c26 WHIRLPOOL 4e7a910ec810abe0da48469ed0cc66e2a03b83a8d703e7fbb368053e40715a6a73492e6f9ef2de1310e6d990f873734ae7536887d56e4eb1a0badef724a64109
 EBUILD netbeans-9999_p20141127.ebuild 7216 SHA256 97aa720743a0610952ce1b106099f9aea6d9a157871d9ef38fac3974a07d7624 SHA512 61a6aac128bc3c5a0c0cd80a71bab663d429969fa394adaeef2afc14dc64e6ce6e2c1cc4e36896211d7506d8bb5060e4109f7cc641c64af0d4a3b66443d2f74f WHIRLPOOL 4f5ef3fa2240127d295d3042ef1571de17cd9b1b54cd400ec2c32f5389dfea404fa18018f2a797e80b42721d5157383a84d6ee3ab319fede963c2b373f3e77b1
-MISC ChangeLog 125538 SHA256 395810c34683df95b924642f9244c45cfd7b979b2ab64460585c864b0214a00e SHA512 6edf89f58c897ffa05054fdd79e6db5b1b6e2b4c52aa0bfb9f0bb71e7eac149978b65849a4a035e885d8cb9cd9367fc1463f0fc18898b3889b9cf2c76b12fa6e WHIRLPOOL b4e854badc64dc37f94bdc3a705517dfa5a44a800e01e8cfb5287da78bdec59a06084bb6c8cb6e88e14d1cbdc0ed60ea08e872cba7aa5e28f032f673f53aeb34
+EBUILD netbeans-9999_p20141128.ebuild 7216 SHA256 79dd60abec0d35d0406932c87901b8f458bad9978de459528d280943703b7aca SHA512 028d9e42bc098c2cb999e8473d200290e9119e9099e942ae9f603ae0c490ca7cd3a24c773a4f11015baf95cdf757c51cc1f31dc016dbace35bf851ad0b5aa06b WHIRLPOOL 78e80b170043c24f6a9110b004102726b34562664143dbf39813862f108192bf07c2d8a08e68072f7f37a4f27b7ec101fdaba46f73e5f696eadb39af1791b9e0
+MISC ChangeLog 125697 SHA256 99baee5ca994bbc588797ed2297fa5c1dcd786964e563ab1d9151e36c35cd737 SHA512 92440b9e79fcdc51e8b40857dc58cbf98e607912c06a64ddf313fe6ee4014031361d621b1a5425e7ad426c6ccda001db8258f44f31181452318faee3c0c750b5 WHIRLPOOL 4c4da932c84f81e90cdba3801598fcf9932074844f3fa9f7a4ebcaa6bac384e2ad65bf2afcadc3f8612c2cfafc75fe111cd1b2247281c4fcc6c1a21ac9d3e6b6
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

diff --git a/dev-util/netbeans/netbeans-9999_p20141128.ebuild b/dev-util/netbeans/netbeans-9999_p20141128.ebuild
new file mode 100644
index 0000000..d4a8c2d
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20141128.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2014 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/2014-11-28_00-01-49/zip/netbeans-trunk-nightly-201411280001-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] 5+ messages in thread

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-websvccommon/, dev-java/netbeans-php/, ...
@ 2015-03-24 10:17 Miroslav Šulc
  0 siblings, 0 replies; 5+ messages in thread
From: Miroslav Šulc @ 2015-03-24 10:17 UTC (permalink / raw
  To: gentoo-commits

commit:     b98b1f8d1f68f727cc5395391197ff65a5000eb4
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 24 10:17:03 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Mar 24 10:17:03 2015 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=b98b1f8d

netbeans: bumped to the latest sources

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

diff --git a/dev-java/netbeans-apisupport/ChangeLog b/dev-java/netbeans-apisupport/ChangeLog
index 07646bf..5feacc1 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_p20150324 (24 Mar 2015)
+
+  24 Mar 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-apisupport-9999_p20150324.ebuild:
+  bumped to the latest sources
+
 *netbeans-apisupport-9999_p20150323 (23 Mar 2015)
 
   23 Mar 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 2d0ed66..9ab7db3 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -43,6 +43,7 @@ DIST netbeans-trunk-nightly-201503140001-src.zip 206563358 SHA256 45e73ee894e29a
 DIST netbeans-trunk-nightly-201503150001-src.zip 206575066 SHA256 0582e1b5b709088e393fe88d0dcce4fe0b79bc7fd56ae952933270e4a976e64a SHA512 8c101f394dedf528978ae2e75ba0c767b754e395a792c1ddb590e839066a221347ac1a34674b6036895caec4b5471998856132327cd5bb727bcfcf1ab8a8e065 WHIRLPOOL 1a7b48bad020198e0d0c5eaef09511f2f9282ec67504d9dd4f96b81c0f2c52a4bbfc4aba2599179f73281bc9faf4d33661c672ae567cf46deaff7a15f4fb6ba9
 DIST netbeans-trunk-nightly-201503160001-src.zip 206576233 SHA256 2b90db4378f6999df5ace1efd4a1c819e3ae95ce424480fc0229e45be5fc6054 SHA512 a3258264d72c8fc95c92f99faa4b8d86e440b10907f81c3a08c397926e0606723b875f925cbf0072f63eeb023093be022510015d20d588826d9f4de360201667 WHIRLPOOL 3bb0b967b55613424cadb381340062d180d199b4b83f780785d2b0f84143c88518fec2fbad55fcc00fa0518fe36f17a81ceff8c9874f84b0cb30f2d7478458d8
 DIST netbeans-trunk-nightly-201503230001-src.zip 206651850 SHA256 bda0494e885ce4cbee7281730eab0083988c08c89fc6ea1edfc05a1ed38cfed2 SHA512 96fd079c1649a36fb108a8b4f6128142e5f8666fdb03ea3cd015b387bcaff46c5216974bbf9dfbe74aef79799a4dec8357fdaff6bcf0ef05158ea99ebfe265bb WHIRLPOOL aa2087cfe8d7caa0608eccc6d1ac2d3328afa13fe35166894bef62f74b3c239c5370fe32dc3f6a00ca08325ffed47976fd36775acafcff8df7e060848f0593aa
+DIST netbeans-trunk-nightly-201503240001-src.zip 206669022 SHA256 1c106c09dc8e4634331659e872020751589e794f73d0f89175c59e3fef119ba6 SHA512 a854c4f98402d12466c722bf9427c77956bcfc6869338d58217534daa3bf0ca1d7f6d8d791018af37e7df37f7ca07e4d8b92e65147b11bec92e725c0fb1a5603 WHIRLPOOL 601d8469b5bcfb0814765d42c6a41842912e2e9f742a0ee98b986cdd99c2f2c6e62aa585dacd3ea34e743b77cef2f45f595f0964b373d83bafcf2861376bd5dd
 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
@@ -80,5 +81,6 @@ EBUILD netbeans-apisupport-9999_p20150314.ebuild 3390 SHA256 4acd935206483b44ad8
 EBUILD netbeans-apisupport-9999_p20150315.ebuild 3390 SHA256 cb8e553253ecde55df6a59be2c7f15fe88622f8c770c439622a4a23276ba3888 SHA512 89143857a63cf7b104efd58257fd519ab1db85ebd4cd75e4ccb83d8819b041d3ff706bf8f3175a273a4dfcec45dce097ed50ea0fd638ffa18e2be280a6fbc01c WHIRLPOOL 51c05cbc00b7cde6b614281d742b5f194cb8417318d846e61f6f830b1c90a97623f4f43c092b5f7a0f62031e1d3deaa63d31009d3534701c076d42b2bf15a06b
 EBUILD netbeans-apisupport-9999_p20150316.ebuild 3390 SHA256 21897be75ce3cba6f17d1d2b5ea922a24efdf6743494730ca7fb4d0acd670ab0 SHA512 35c2ff1bb9316e8fbafc9ce5ad48f3cfb32171c4bbe20b0ec20894e0d1a14574509bfebb3c88c45075297c6894b966d0dace12892c07f57fb25828676e1687e1 WHIRLPOOL 329289cc13fcff53fab9e8cccff55b35e2ccfce2a1cbcbf8168f7b10370dd9fdf4b55f112bb2437e45c849cf32cf79618d4ffb704e8384cf4b53aaeeb5f19806
 EBUILD netbeans-apisupport-9999_p20150323.ebuild 3390 SHA256 200a1c8b73d68025cc8af3e5bcbceab19cd80dbe8a71058170bb3faa497e19c8 SHA512 8c24e947a8d92ac6a72cc015db69a4452d44dd2b704ca97c61115ca0cec957df083d1aebde12845715f596998181ce9cb7d4e32abb33a2474debf5e4626f44dd WHIRLPOOL d5b76b3e07e0438a849bcee41be8dca9836c3a6634893b24c8903b1bd893c3ac99a63a18b10f0b0b67bc6495c213cc3b049907f5e158e8c44c2208972206f497
-MISC ChangeLog 164436 SHA256 75b19c374d6f4cc98de588c32aac6f369cd6aa3f6085b6c243d90bb8349b6927 SHA512 1246af7645008f2139b0e3669bbc85a227a07335985e8c945f900e0c341e2bfe946ed60c3c0fe0ab8935f9aa63e47cb74e68bb3742d611bff783c1aa038791da WHIRLPOOL f452513009987c81a1dec8e7c99614fee02c788ec5c371b0edf812b1dde4c5d69b6d2ebb44c0f58e7209a44995a1228e36352dbe5cc0c169e8160edc1b176a55
+EBUILD netbeans-apisupport-9999_p20150324.ebuild 3390 SHA256 b3a3739875be853e6d1b10b757c26a378f7d94fa33ea68570c4cdbb477838c6b SHA512 2620037ff8de33df19ccae0104891bc92d180008e5570a19dcfcb8fbafad5688e74ad63c8c2a4fbc6ceb7cabff7332a744a2e793928079a6794eb3a41ae73759 WHIRLPOOL 3cc37b5b8dcdb71c0ca94ebc3f2c5037810f296996e151608b390a93b58a7a83597f3dbfcac5fce23b5d5143090c1c027c1e14f9f553561154b14726bdc86a5e
+MISC ChangeLog 164617 SHA256 6e4de5af601e7146ddebeb8839b6fa276fd480841ead6e73ec462edf54f24056 SHA512 bbbf01289953558cd5025fe3a71b4b18e8a57aef936c5152a8a4043df698ac5d27bb4f000cf5ebe75d43f3937de9cd594bb2f1623ff16dc77d6cfb06735c871a WHIRLPOOL d50501584e0fc16cd2c004cd5e199bfae05000dfd572d3d58d69bb58802c677ac4a9cfdd6a2076714801fbbf7ff910fb55325b42b582daa0ba3c9599a0796235
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150324.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150324.ebuild
new file mode 100644
index 0000000..bdfaf59
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150324.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-03-24_00-01-28/zip/netbeans-trunk-nightly-201503240001-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 70ed60d..29cad00 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_p20150324 (24 Mar 2015)
+
+  24 Mar 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-cnd-9999_p20150324.ebuild:
+  bumped to the latest sources
+
 *netbeans-cnd-9999_p20150323 (23 Mar 2015)
 
   23 Mar 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index 676cd9f..4d9cff1 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -57,6 +57,7 @@ DIST netbeans-trunk-nightly-201503140001-src.zip 206563358 SHA256 45e73ee894e29a
 DIST netbeans-trunk-nightly-201503150001-src.zip 206575066 SHA256 0582e1b5b709088e393fe88d0dcce4fe0b79bc7fd56ae952933270e4a976e64a SHA512 8c101f394dedf528978ae2e75ba0c767b754e395a792c1ddb590e839066a221347ac1a34674b6036895caec4b5471998856132327cd5bb727bcfcf1ab8a8e065 WHIRLPOOL 1a7b48bad020198e0d0c5eaef09511f2f9282ec67504d9dd4f96b81c0f2c52a4bbfc4aba2599179f73281bc9faf4d33661c672ae567cf46deaff7a15f4fb6ba9
 DIST netbeans-trunk-nightly-201503160001-src.zip 206576233 SHA256 2b90db4378f6999df5ace1efd4a1c819e3ae95ce424480fc0229e45be5fc6054 SHA512 a3258264d72c8fc95c92f99faa4b8d86e440b10907f81c3a08c397926e0606723b875f925cbf0072f63eeb023093be022510015d20d588826d9f4de360201667 WHIRLPOOL 3bb0b967b55613424cadb381340062d180d199b4b83f780785d2b0f84143c88518fec2fbad55fcc00fa0518fe36f17a81ceff8c9874f84b0cb30f2d7478458d8
 DIST netbeans-trunk-nightly-201503230001-src.zip 206651850 SHA256 bda0494e885ce4cbee7281730eab0083988c08c89fc6ea1edfc05a1ed38cfed2 SHA512 96fd079c1649a36fb108a8b4f6128142e5f8666fdb03ea3cd015b387bcaff46c5216974bbf9dfbe74aef79799a4dec8357fdaff6bcf0ef05158ea99ebfe265bb WHIRLPOOL aa2087cfe8d7caa0608eccc6d1ac2d3328afa13fe35166894bef62f74b3c239c5370fe32dc3f6a00ca08325ffed47976fd36775acafcff8df7e060848f0593aa
+DIST netbeans-trunk-nightly-201503240001-src.zip 206669022 SHA256 1c106c09dc8e4634331659e872020751589e794f73d0f89175c59e3fef119ba6 SHA512 a854c4f98402d12466c722bf9427c77956bcfc6869338d58217534daa3bf0ca1d7f6d8d791018af37e7df37f7ca07e4d8b92e65147b11bec92e725c0fb1a5603 WHIRLPOOL 601d8469b5bcfb0814765d42c6a41842912e2e9f742a0ee98b986cdd99c2f2c6e62aa585dacd3ea34e743b77cef2f45f595f0964b373d83bafcf2861376bd5dd
 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
@@ -94,5 +95,6 @@ EBUILD netbeans-cnd-9999_p20150314.ebuild 4586 SHA256 901f1ecce6847668e9bc18bb8d
 EBUILD netbeans-cnd-9999_p20150315.ebuild 4586 SHA256 f946ffafac092d95c2c7fb255b73bdb0f4134a73c49e54e94c8c56e3158acce4 SHA512 81ac61c2f6d4427d1e926a5d5cc678460b50a15f6d67083957c7f31f71a3e111000cabb39f33c61c36cc0a0f8bfbc9e85d2a0b3326bcee1998e0af1142c3429a WHIRLPOOL 1fe74728ee0947d266674ef37d82660daccc7096fb9f62198bf9c919c654c649a50fc9b7cf332ee8b09d17f8cb4a4fb895b6077b601d08f1ee1f6e0bf902dc7e
 EBUILD netbeans-cnd-9999_p20150316.ebuild 4586 SHA256 aa7389260802f2231f965c6e61c77535f6d448e1602695efa6830fe077a89786 SHA512 17f8982add12bcd4e56fe3722849091689fe73d6e6a7c0adbce0dbbb1426e404cfb76d1c2a79b9c7dcd4f85a1d40d7abf3a372d6749586f22ca9da7f1de783c4 WHIRLPOOL efad75c2b23d7da379833fc7e7d00166f3ec1645ecffb6b9849436abc86d1395ee4763328323f5c85c4a8c10e3e41dd8be2a141f463283635eb6be03515cd50b
 EBUILD netbeans-cnd-9999_p20150323.ebuild 4586 SHA256 1784b9d126012a6b763e9f566e6c0d75d2a849369256b7b1cd77c1e873969b4d SHA512 50aa0673e3c4e84b16990277ca8b0968c3658234d2c7bc5fe630230748ccf177d788a60d89f238088d5034b1818b14e5d80fff771da6ab605c344019e6f6a4b1 WHIRLPOOL 106c35916a4fd0df2b49aa90b3c600b4c2e8d3ee562550eb0f42c2e41d9336fba4cd0f5bd0cac4c721c4d1b33913e1649dccec9e8763d599860abd3273abb6e3
-MISC ChangeLog 150159 SHA256 9c411a8720554ecc44305a1217eace283379844b976e627dcae4085a178c2289 SHA512 d11d9eb9b72feb7397be6e0fb4b767e843a78fb35eddd283d3d353ff0003803004f5c24c327b12f5ea9f79aafdfaeb441c4437f811e8586ed28173f64db13861 WHIRLPOOL a38b41683a5109963c810d06420f102bffdf39c129ee312df772c7a3747c01bc688e14dd8df4e33988f749f180e9e8805dadf37bba732fd1c4ff01f833b9d665
+EBUILD netbeans-cnd-9999_p20150324.ebuild 4586 SHA256 289460b3c41c475841d55a180fb2f0a1169e24c17cfc9a103aafa69716df40c4 SHA512 2e2ebb9b0b5f7cc605fc01d5298d06a2cef856ace7a71abfcadf9d3e58289f46dee359d2675772ef56d00fb3b2150c01212c2a2ebf14ad1b1fddb7dba6997a0a WHIRLPOOL 68ff94edad6d10b31f2a90fc7dac969b0a3b57d73856e33116048f795bcd322ae1707ecfc26222619fcf6971d7c6e5ad16daf095ca0d2357e5bc0fa8f8d2bef5
+MISC ChangeLog 150326 SHA256 09ab04322082b327e2ba816a6984818f0898c3481f2021ad7a98a0e2b96f1a79 SHA512 00c844a4c60da32822f3cb6ba690be91394fa41fd9390792e1b970af44736372efa13ef458204b14395331c09843231f9ff0236045b79063176c5e638f4f239c WHIRLPOOL cd0b2e0625b774fd38ab3a2d8177d79a23905b99bd32d8a68f133e34f2a6b560362e74654276f28900674ede72a4739041dad895079555a00e0b3c5524074fb3
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150324.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150324.ebuild
new file mode 100644
index 0000000..ff476e8
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150324.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-03-24_00-01-28/zip/netbeans-trunk-nightly-201503240001-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/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-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}"/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-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 12bd1eb..9370eac 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_p20150324 (24 Mar 2015)
+
+  24 Mar 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-dlight-9999_p20150324.ebuild:
+  bumped to the latest sources
+
 *netbeans-dlight-9999_p20150323 (23 Mar 2015)
 
   23 Mar 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 640175e..b22f799 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -54,6 +54,7 @@ DIST netbeans-trunk-nightly-201503140001-src.zip 206563358 SHA256 45e73ee894e29a
 DIST netbeans-trunk-nightly-201503150001-src.zip 206575066 SHA256 0582e1b5b709088e393fe88d0dcce4fe0b79bc7fd56ae952933270e4a976e64a SHA512 8c101f394dedf528978ae2e75ba0c767b754e395a792c1ddb590e839066a221347ac1a34674b6036895caec4b5471998856132327cd5bb727bcfcf1ab8a8e065 WHIRLPOOL 1a7b48bad020198e0d0c5eaef09511f2f9282ec67504d9dd4f96b81c0f2c52a4bbfc4aba2599179f73281bc9faf4d33661c672ae567cf46deaff7a15f4fb6ba9
 DIST netbeans-trunk-nightly-201503160001-src.zip 206576233 SHA256 2b90db4378f6999df5ace1efd4a1c819e3ae95ce424480fc0229e45be5fc6054 SHA512 a3258264d72c8fc95c92f99faa4b8d86e440b10907f81c3a08c397926e0606723b875f925cbf0072f63eeb023093be022510015d20d588826d9f4de360201667 WHIRLPOOL 3bb0b967b55613424cadb381340062d180d199b4b83f780785d2b0f84143c88518fec2fbad55fcc00fa0518fe36f17a81ceff8c9874f84b0cb30f2d7478458d8
 DIST netbeans-trunk-nightly-201503230001-src.zip 206651850 SHA256 bda0494e885ce4cbee7281730eab0083988c08c89fc6ea1edfc05a1ed38cfed2 SHA512 96fd079c1649a36fb108a8b4f6128142e5f8666fdb03ea3cd015b387bcaff46c5216974bbf9dfbe74aef79799a4dec8357fdaff6bcf0ef05158ea99ebfe265bb WHIRLPOOL aa2087cfe8d7caa0608eccc6d1ac2d3328afa13fe35166894bef62f74b3c239c5370fe32dc3f6a00ca08325ffed47976fd36775acafcff8df7e060848f0593aa
+DIST netbeans-trunk-nightly-201503240001-src.zip 206669022 SHA256 1c106c09dc8e4634331659e872020751589e794f73d0f89175c59e3fef119ba6 SHA512 a854c4f98402d12466c722bf9427c77956bcfc6869338d58217534daa3bf0ca1d7f6d8d791018af37e7df37f7ca07e4d8b92e65147b11bec92e725c0fb1a5603 WHIRLPOOL 601d8469b5bcfb0814765d42c6a41842912e2e9f742a0ee98b986cdd99c2f2c6e62aa585dacd3ea34e743b77cef2f45f595f0964b373d83bafcf2861376bd5dd
 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
@@ -91,5 +92,6 @@ EBUILD netbeans-dlight-9999_p20150314.ebuild 2995 SHA256 303595bc0d40cbf12aa2ae3
 EBUILD netbeans-dlight-9999_p20150315.ebuild 2995 SHA256 6532b15d4de7879bbce2c1619c79f2f0d73f1a9fdb151f4c429b3530e620fbb6 SHA512 1c4990c61b1c85e7d627264994c18546d7daf86d2f3d5c09ad647224c87455789e9687c2c9535eba5569d5229d7ef09372a8f15f58fac8f1ccb6f207b715b8ad WHIRLPOOL e84e2fc68e42e1b3bd1b9cdb7e1d95595ab88e4b96e35a913ad0485b6a8d18dbcc456ed97698698bc6db2fb03ea6b5ea1c53df96f389bc84f70c39942329dd7d
 EBUILD netbeans-dlight-9999_p20150316.ebuild 2995 SHA256 c9272dd7d207e961ffa3864d60e7f2d72c252e4e0e824641440d75fd2292865b SHA512 de741a742dc396aba3945be737ee8d13b1d4a893d315fe0b80fd6818536c3c225aee0eb8675991aa8dc9e3da9d5988c4012e487cfe83b08a44216a7efaba434b WHIRLPOOL 040da49188364024d2fb0de9d3120e1c1ea6143bd36a8b145b182c15bfe2091e0c0843653d93d3f58bc676b15c6c31e95025ae8d308e23975286562c0391397a
 EBUILD netbeans-dlight-9999_p20150323.ebuild 2995 SHA256 41d804a785a0b38875300185808eda988457608bfe2b833c5efec14695e42a82 SHA512 2c40ea0346d054f048e292947e0094d4da1ba823756ed996bbd7f41082e7d010ba64b4d1c8b36a506f3f5581682b2a2518f48e8296233dee5336f8f7bf4fbd5c WHIRLPOOL ad559da890aa2315297b77730e42df33cdf7841fb0e50b0cc1eb67ec4264d9e4ad31896e3f454124d470220c994001ad03d4a3d12c6bb3b0dfe28a08f046e454
-MISC ChangeLog 156685 SHA256 f740f5437d23eec14c85b6e6c7f960a9b8a6f15c6a5223e5eb8637dc5266df47 SHA512 d469ffa7cdaf0df60a5d92a81e48082c90d32360a865c3dc297389199cb14aedbf865db2ab0aa3eb8520c9a4329680b4134b33be397563f0195ac51c98208b0b WHIRLPOOL 1919e25323d87dda0e56dffe88b6714660c0b200c174f9674ba8e35fa430c86dc83dcb28bc28ac6e79feabf9935cbf327690668dc7f7bb8f6e33c75d2f1e0056
+EBUILD netbeans-dlight-9999_p20150324.ebuild 2995 SHA256 c6afc71f6cbd62edd954a7fc1ff7798e35a6780ffee814407b8fd17389d7f787 SHA512 0c461fb462798344fcfc22b22606e06acb0462c6320422bb984f544f4943e3246a2c05935a3122f25813b15b5bf2a4f04299d1cebbfa0cdd0d2002ace305013d WHIRLPOOL 6b7ba4a4fc92fd1a9faa359cb58a90fd3d2e1c3756f6caba871c6360b141c82c877fff90e4f580541cbfb96b7f2c7c2adacbabc3be47fad5b5704c4ca34a3589
+MISC ChangeLog 156858 SHA256 b84d0b02609f6d2f3299923a3a7a9464894d2394e149a251b6e2dbf20088e0d6 SHA512 526f82abf22485df9a7361d2adb52dd7b7a6ea14e1493949ef11f30db39413143cde4fc785ea03330e83c5a400def1f1654d10abe801ef0864adb4b14ca87097 WHIRLPOOL 93959ce1a158918fa74ad569d7dbe5f2507a521fee8566b017d4d47ad26b2699162623151c782fd814e6fe591b746aae28d397aa2997658a951e8bdb492098ac
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150324.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150324.ebuild
new file mode 100644
index 0000000..3d44721
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150324.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-03-24_00-01-28/zip/netbeans-trunk-nightly-201503240001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/9395F923725681A9FC9154EF919B69564185B310-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}"/9395F923725681A9FC9154EF919B69564185B310-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 22f6b1b..59a8b85 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_p20150324 (24 Mar 2015)
+
+  24 Mar 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-enterprise-9999_p20150324.ebuild:
+  bumped to the latest sources
+
 *netbeans-enterprise-9999_p20150323 (23 Mar 2015)
 
   23 Mar 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 2db0fa2..b667051 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -132,6 +132,7 @@ DIST netbeans-trunk-nightly-201503140001-src.zip 206563358 SHA256 45e73ee894e29a
 DIST netbeans-trunk-nightly-201503150001-src.zip 206575066 SHA256 0582e1b5b709088e393fe88d0dcce4fe0b79bc7fd56ae952933270e4a976e64a SHA512 8c101f394dedf528978ae2e75ba0c767b754e395a792c1ddb590e839066a221347ac1a34674b6036895caec4b5471998856132327cd5bb727bcfcf1ab8a8e065 WHIRLPOOL 1a7b48bad020198e0d0c5eaef09511f2f9282ec67504d9dd4f96b81c0f2c52a4bbfc4aba2599179f73281bc9faf4d33661c672ae567cf46deaff7a15f4fb6ba9
 DIST netbeans-trunk-nightly-201503160001-src.zip 206576233 SHA256 2b90db4378f6999df5ace1efd4a1c819e3ae95ce424480fc0229e45be5fc6054 SHA512 a3258264d72c8fc95c92f99faa4b8d86e440b10907f81c3a08c397926e0606723b875f925cbf0072f63eeb023093be022510015d20d588826d9f4de360201667 WHIRLPOOL 3bb0b967b55613424cadb381340062d180d199b4b83f780785d2b0f84143c88518fec2fbad55fcc00fa0518fe36f17a81ceff8c9874f84b0cb30f2d7478458d8
 DIST netbeans-trunk-nightly-201503230001-src.zip 206651850 SHA256 bda0494e885ce4cbee7281730eab0083988c08c89fc6ea1edfc05a1ed38cfed2 SHA512 96fd079c1649a36fb108a8b4f6128142e5f8666fdb03ea3cd015b387bcaff46c5216974bbf9dfbe74aef79799a4dec8357fdaff6bcf0ef05158ea99ebfe265bb WHIRLPOOL aa2087cfe8d7caa0608eccc6d1ac2d3328afa13fe35166894bef62f74b3c239c5370fe32dc3f6a00ca08325ffed47976fd36775acafcff8df7e060848f0593aa
+DIST netbeans-trunk-nightly-201503240001-src.zip 206669022 SHA256 1c106c09dc8e4634331659e872020751589e794f73d0f89175c59e3fef119ba6 SHA512 a854c4f98402d12466c722bf9427c77956bcfc6869338d58217534daa3bf0ca1d7f6d8d791018af37e7df37f7ca07e4d8b92e65147b11bec92e725c0fb1a5603 WHIRLPOOL 601d8469b5bcfb0814765d42c6a41842912e2e9f742a0ee98b986cdd99c2f2c6e62aa585dacd3ea34e743b77cef2f45f595f0964b373d83bafcf2861376bd5dd
 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
@@ -169,5 +170,6 @@ EBUILD netbeans-enterprise-9999_p20150314.ebuild 14851 SHA256 3ee3e8994f607910aa
 EBUILD netbeans-enterprise-9999_p20150315.ebuild 14851 SHA256 405adb9d8294f1ef077898241c647cc13b7f5e40d29541a92c6735d79d29fec9 SHA512 7f1da88e9cf9007fcfacc2e6311abd21d3b948f071c67ffa1ba121ccd4d7e885975095c6412670f7c8c650cb5fffe5fe7f8e8d84891de9e17124c8e1721e06b0 WHIRLPOOL f3ff2a2938a38d6514a1deeb5aa4122bbd305dd3bc821ae899366e0d9336d4511280a85ec15d8f488a2a52e67ee39e58723576508b0cf33877a018ea20d6b909
 EBUILD netbeans-enterprise-9999_p20150316.ebuild 14851 SHA256 14750a78a5405496886d33938f76cbc14bc5fd5a7434eb8882a33301cfb10478 SHA512 833093794f8fdf8aed5f16c2198cd74337b2623ff4c74803c52a6e8b402cb3f542a741ecd4d384d053a17b6684ef8f3406e8f3e687338fc4b03f18f77eff197d WHIRLPOOL 9e763876743063a562f140676c0dd8a37bee9bdd5a680ae88a67ecd3b80d9a000b40cf90e3b941a16a4823dd98839123baf45e90797fd0cbaff5b6dc422e466d
 EBUILD netbeans-enterprise-9999_p20150323.ebuild 14851 SHA256 2aeef2cac9af8a6faa2c183aa5eb1032123a36e8323f2b7df091155a8a2a3ff2 SHA512 6e700fb64ed49bc724ec4190a32aa0be5478b975019620be05f70c7ae6e97da80c3a8d845e86e90a88daa6cbf910bfb833990c65af0baa9fa9bebcee9f876111 WHIRLPOOL e4bdd070ff57b6427797fad0120dd97665a80cfe2130924801a1e873bcbd566a0a7cdf209ade47ae7561e8e8bbf89fa36ba39ebc66c0843e048510a371ac8dab
-MISC ChangeLog 164961 SHA256 56efec196f6d2410b3d7fda6e65e3d3ab0ee73fe695c1594cc7d653621df1f39 SHA512 dd3065766c187efee469c0003b967012c9675ce412bc5e28fb9c0d19cc34165f181bfcdab0c9a1b95b763506e69b4cf455b5a372275c354a3368038efe9642e1 WHIRLPOOL c6efef0431aa4527af337cecd807d96015f8599dfc25f9c5dd1ea8edec951fe8feb7ddbf59c2e6ab203201fd6a2ba0c89c58d676d2cc5fb55818d817b74617a4
+EBUILD netbeans-enterprise-9999_p20150324.ebuild 14851 SHA256 c221ecfc00c376b4c1c2cc02226aa6f9323ac3df5605a07441627ff43b50e5ea SHA512 2517f4760985558d47f9fab12b929e65bf0b1a8676c207d4df9125598e906df4e21f283fe3c26ba53055e928ef2e1bb80f04a6a691bdf785cfca2a063848c5a1 WHIRLPOOL cbdbceaed895c79a6c174c8312c2a4493f7a8ba0fa124226a9ce9cef6ad5bea1bde4f45c51c2b9bbe9fa885e213c6ca26a260904d235a410fad9ab23cebd51f1
+MISC ChangeLog 165142 SHA256 da4e69836808e342ec8f25d679687a0179c82dc7c7972446a3a4ffb5ffb7e1d9 SHA512 5ab4b383bbf97ad081f04cf375e306b94103a7faaba502fc1d9fd2ad8576a4de6369471ee9e1a0f96c9000a3215c7888805b9f0ad617f5ea6c7327ba5d31a43a WHIRLPOOL 91d342a790e657ead2d90fd3190204c4bd61834cc0e671e6aaf991151226889031171964591b9894762679dc6b5783bcbc7e03a545caad976970d4b78af8c782
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150324.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150324.ebuild
new file mode 100644
index 0000000..e94c51b
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150324.ebuild
@@ -0,0 +1,247 @@
+# 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-03-24_00-01-28/zip/netbeans-trunk-nightly-201503240001-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/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}"/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 9e2115f..844277e 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_p20150324 (24 Mar 2015)
+
+  24 Mar 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ergonomics-9999_p20150324.ebuild:
+  bumped to the latest sources
+
 *netbeans-ergonomics-9999_p20150323 (23 Mar 2015)
 
   23 Mar 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index f2e90df..340570c 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -43,6 +43,7 @@ DIST netbeans-trunk-nightly-201503140001-src.zip 206563358 SHA256 45e73ee894e29a
 DIST netbeans-trunk-nightly-201503150001-src.zip 206575066 SHA256 0582e1b5b709088e393fe88d0dcce4fe0b79bc7fd56ae952933270e4a976e64a SHA512 8c101f394dedf528978ae2e75ba0c767b754e395a792c1ddb590e839066a221347ac1a34674b6036895caec4b5471998856132327cd5bb727bcfcf1ab8a8e065 WHIRLPOOL 1a7b48bad020198e0d0c5eaef09511f2f9282ec67504d9dd4f96b81c0f2c52a4bbfc4aba2599179f73281bc9faf4d33661c672ae567cf46deaff7a15f4fb6ba9
 DIST netbeans-trunk-nightly-201503160001-src.zip 206576233 SHA256 2b90db4378f6999df5ace1efd4a1c819e3ae95ce424480fc0229e45be5fc6054 SHA512 a3258264d72c8fc95c92f99faa4b8d86e440b10907f81c3a08c397926e0606723b875f925cbf0072f63eeb023093be022510015d20d588826d9f4de360201667 WHIRLPOOL 3bb0b967b55613424cadb381340062d180d199b4b83f780785d2b0f84143c88518fec2fbad55fcc00fa0518fe36f17a81ceff8c9874f84b0cb30f2d7478458d8
 DIST netbeans-trunk-nightly-201503230001-src.zip 206651850 SHA256 bda0494e885ce4cbee7281730eab0083988c08c89fc6ea1edfc05a1ed38cfed2 SHA512 96fd079c1649a36fb108a8b4f6128142e5f8666fdb03ea3cd015b387bcaff46c5216974bbf9dfbe74aef79799a4dec8357fdaff6bcf0ef05158ea99ebfe265bb WHIRLPOOL aa2087cfe8d7caa0608eccc6d1ac2d3328afa13fe35166894bef62f74b3c239c5370fe32dc3f6a00ca08325ffed47976fd36775acafcff8df7e060848f0593aa
+DIST netbeans-trunk-nightly-201503240001-src.zip 206669022 SHA256 1c106c09dc8e4634331659e872020751589e794f73d0f89175c59e3fef119ba6 SHA512 a854c4f98402d12466c722bf9427c77956bcfc6869338d58217534daa3bf0ca1d7f6d8d791018af37e7df37f7ca07e4d8b92e65147b11bec92e725c0fb1a5603 WHIRLPOOL 601d8469b5bcfb0814765d42c6a41842912e2e9f742a0ee98b986cdd99c2f2c6e62aa585dacd3ea34e743b77cef2f45f595f0964b373d83bafcf2861376bd5dd
 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
@@ -80,5 +81,6 @@ EBUILD netbeans-ergonomics-9999_p20150314.ebuild 2919 SHA256 b43ac3ea050d52ddfab
 EBUILD netbeans-ergonomics-9999_p20150315.ebuild 2919 SHA256 aeeb4865daed6e3435e9e70dbf8dc03ceeb4b6d39c9750f006e7522929a00998 SHA512 4547415b6b3c3c003cb8636c15c890b48e04f92d3f36a66648b22efc8ea28a342c267fb0d5b9e16222d5b56f05473fe654fa72edcc9d2e4a0b29012a784b8bda WHIRLPOOL 716c8cdb4b7001a119bee822b9fddfc8f62b1dbf06dabd5ce448cfc616d250a96cfcc492d9faeb0e20ee11c2877f55ba82dbffcb5b12db36efb03c6c101d5cf0
 EBUILD netbeans-ergonomics-9999_p20150316.ebuild 2919 SHA256 dfc44257b447270a266db0d4a7000cd893c91a717bd92477cc290473243ca4c8 SHA512 04ffde0decf44c33cff82e190756387cf8c50b1b6cce392472214170374f7b0ab81d051bf0b0b050ff8b00426eb4b423f9c4e6d0c264581f1ffff922faf2cd2a WHIRLPOOL a4fbd5a421711290da45371a131092e18aed7a755ce1d5b881c86371b89e1e6d1e987ea35f4d234e34a3399ab7a862959ca1ca7955da2eca130a30225c639024
 EBUILD netbeans-ergonomics-9999_p20150323.ebuild 2919 SHA256 e633f18aace7b520db13ab2f7df2f3576667e25694e6617cef0ee493236f4246 SHA512 ceb6a1298da5e10a5773d8133b101fb4a665ed20c13f0579fd35289ea5b764fb8bb4798e77f71a8ab8f874ef155030f19d2d0d9023c29b3320f4c9217d16e402 WHIRLPOOL 7a751b20c20bb24a33aeed7880e0e5d2038f0d9773626fe2a1695643fcc1394020d5cda82c51daf299c6ee3f9cea6ad41d5c396352639dd0d525522885e45ff2
-MISC ChangeLog 164436 SHA256 c14d35db5d235ce77d4bca97ffa71acc6a6d70926697a3e63763ac131f7e280e SHA512 9a2b7d481888cea8db2f051e68951e5b14102cf15f03feb7d2edd6fec2530085925c51cf3db9a3d2eea207057b1550462594e5df42b1512edd032e5ab19ecd7f WHIRLPOOL 307db2e1970a30171948895d3ce4ab88d8af661e02c7e06820b16c72e24e8f2152d6f42d383638daed8100149beff9931d69b4446e7510af52a422d24334ff6b
+EBUILD netbeans-ergonomics-9999_p20150324.ebuild 2919 SHA256 c597c867e88639603c4ec2678c724216d9a8275023b3ce38c0b768fe415b761b SHA512 f13d43805a8ce0341482ceb157a091e3e9e349092d67f80dcd3cb274766d31a889547590ed5536365a833561dd6161eb16567752c36c8c482f0ef7a29a5754ad WHIRLPOOL f26d11ff1ca6f8c04ee8ce8edaf9803f2a1d2d30e3e6aafe09add6bbe43faf521e50c50b724378102ffe004c6da753264ca2564ae252387d01fe685010f6cc86
+MISC ChangeLog 164617 SHA256 fe823e831ff18c670afa6f02c895b54a871a643ce53781f05bda087f46708122 SHA512 f4e270d7c79ebba38ee4331406bb358483aa0dbfcbcb526213aaed8f583d8e541d4582ed26ccb608482d98bb062503c72d3ecb295fd4b3720c11f946248e0d0f WHIRLPOOL c7c1ac450cbbad5d63bac660af27dd96c35e7c7fac4601c1bba091ecd1625fe2a1941d45d3f2e808a8096078638447f6ee414d27701971376cbfc07eb6b0d392
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150324.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150324.ebuild
new file mode 100644
index 0000000..79721a3
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150324.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-03-24_00-01-28/zip/netbeans-trunk-nightly-201503240001-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 d6531ee..f03029e 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_p20150324 (24 Mar 2015)
+
+  24 Mar 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-extide-9999_p20150324.ebuild:
+  bumped to the latest sources
+
 *netbeans-extide-9999_p20150323 (23 Mar 2015)
 
   23 Mar 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index b0da225..5b45fee 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -41,6 +41,7 @@ DIST netbeans-trunk-nightly-201503140001-src.zip 206563358 SHA256 45e73ee894e29a
 DIST netbeans-trunk-nightly-201503150001-src.zip 206575066 SHA256 0582e1b5b709088e393fe88d0dcce4fe0b79bc7fd56ae952933270e4a976e64a SHA512 8c101f394dedf528978ae2e75ba0c767b754e395a792c1ddb590e839066a221347ac1a34674b6036895caec4b5471998856132327cd5bb727bcfcf1ab8a8e065 WHIRLPOOL 1a7b48bad020198e0d0c5eaef09511f2f9282ec67504d9dd4f96b81c0f2c52a4bbfc4aba2599179f73281bc9faf4d33661c672ae567cf46deaff7a15f4fb6ba9
 DIST netbeans-trunk-nightly-201503160001-src.zip 206576233 SHA256 2b90db4378f6999df5ace1efd4a1c819e3ae95ce424480fc0229e45be5fc6054 SHA512 a3258264d72c8fc95c92f99faa4b8d86e440b10907f81c3a08c397926e0606723b875f925cbf0072f63eeb023093be022510015d20d588826d9f4de360201667 WHIRLPOOL 3bb0b967b55613424cadb381340062d180d199b4b83f780785d2b0f84143c88518fec2fbad55fcc00fa0518fe36f17a81ceff8c9874f84b0cb30f2d7478458d8
 DIST netbeans-trunk-nightly-201503230001-src.zip 206651850 SHA256 bda0494e885ce4cbee7281730eab0083988c08c89fc6ea1edfc05a1ed38cfed2 SHA512 96fd079c1649a36fb108a8b4f6128142e5f8666fdb03ea3cd015b387bcaff46c5216974bbf9dfbe74aef79799a4dec8357fdaff6bcf0ef05158ea99ebfe265bb WHIRLPOOL aa2087cfe8d7caa0608eccc6d1ac2d3328afa13fe35166894bef62f74b3c239c5370fe32dc3f6a00ca08325ffed47976fd36775acafcff8df7e060848f0593aa
+DIST netbeans-trunk-nightly-201503240001-src.zip 206669022 SHA256 1c106c09dc8e4634331659e872020751589e794f73d0f89175c59e3fef119ba6 SHA512 a854c4f98402d12466c722bf9427c77956bcfc6869338d58217534daa3bf0ca1d7f6d8d791018af37e7df37f7ca07e4d8b92e65147b11bec92e725c0fb1a5603 WHIRLPOOL 601d8469b5bcfb0814765d42c6a41842912e2e9f742a0ee98b986cdd99c2f2c6e62aa585dacd3ea34e743b77cef2f45f595f0964b373d83bafcf2861376bd5dd
 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
@@ -74,5 +75,6 @@ EBUILD netbeans-extide-9999_p20150314.ebuild 3383 SHA256 3f3168bd08eb724d3d31f6d
 EBUILD netbeans-extide-9999_p20150315.ebuild 3383 SHA256 92d91dcb59bade0a46ec95da9c824e184c2350fc34c7f28b1ac3d60f6ee829dd SHA512 781d1adbf667029f5a5ad94d53530c800598f4376058ec43e1e19a342794ea5a68998de7356e25e1a8cbcf123557572d1c740b56f09d1075ace8aff7f770929f WHIRLPOOL 1c5e0885346e428555869800bef85a58ce957745d43f59831d6b00a427f113197931d703b4c3ea959b8b03ff4a044d57c76a512ce5be40394d7dd55f1961ab82
 EBUILD netbeans-extide-9999_p20150316.ebuild 3383 SHA256 22006208501d34dc1a3f5db0a2345212e06479713ccd0c8a9da967e5b035c3fe SHA512 86e8cb62d657d0260865dc2e2d80f9c4db7f545194a7a7b5e1e4288cceaf5581b654fe3d1235d7ac6fd8003d1abb8d6fa27446ed66db095e742aeaaaad9a4b99 WHIRLPOOL 287886fc7b2f5c82d14ede06fd993c4fc69fd82bbaac795d2915bb44ea8f33a5fbf0823b650cf1abb0d596990756440f451072e27625b1df29194d585d969624
 EBUILD netbeans-extide-9999_p20150323.ebuild 3383 SHA256 c7dbcb90c768024cc5884f61c87b463098044e917171acdc60f22574187bd31f SHA512 4f73a2ef2d5bd6563a15166a52d0913ecfa2fa837dc93f8bc30adc2704c03c620ec79fc729ae58878b5849f751f3a1fa397010e4559e425a282f1f1843937a85 WHIRLPOOL 6cd94d6e5c839732d3a65c9a3918197aaabe235bca07754b629bad1ccc3f33bfd3c8ba66304bd77a7be92ca49534d2d2d19aad75eb832d6928504862126139d9
-MISC ChangeLog 88595 SHA256 1894a3f667e0ebfcdd67194873840e9e7e943eb77966257b11bae9fd4a574247 SHA512 4ace1b40a75a1b308d4d06b7bc3325d616c6dc8caa6cb9036a8923577d243269c64dde8c25ac760250c8ea50e63a9d5925a66208034e19589c563cb90b3d658b WHIRLPOOL 5b61ff29be5d1e63b447e63bc34f7ef73a38030fecfa7dd382838d4fc599094fadd88c00b3ec0c73968b5d504cf0b521d9b38b17ac1ca10ec8c216b88fb41eb4
+EBUILD netbeans-extide-9999_p20150324.ebuild 3383 SHA256 4a7573cd513c0e6863583d254e6414bfbd226852cd9d799ab545c84bbd43f101 SHA512 2ddb93115406934746176fdc6ec8e3b4e6e122ac1345d9a752ea88845898fa5dd9276be8ccba22726d2896ad973e0043221fc45dfad98baa8d235389d82a651d WHIRLPOOL 2ee96402b8b14f8eb82fc715ce7ef386ae337b03eccafcf1c579622005a575c975cd761ef9939ff362a77c64e5e01641cc2070084bd40b6e0c7d0ecf40157a45
+MISC ChangeLog 88768 SHA256 d1b2c1715d304f90e9f03395305555cc8278407192fb141474a71e4a1f674924 SHA512 ce76c89ebe223653929f784e5bac1074697c3c89bc793ba1de43bef7660508316ab98016f0820cd781aa134b5307e7c2076a8021128ef2bc0d5894ca67225652 WHIRLPOOL 76d0c70769dab194d5b58780214af317114fb04823d53d662c0e4dfa22a6dfd6f42f7986b53b6612851c54f0f904c0267a9555eced84af5fc0810fe808761721
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20150324.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20150324.ebuild
new file mode 100644
index 0000000..23f85a1
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20150324.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-03-24_00-01-28/zip/netbeans-trunk-nightly-201503240001-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 2bef11a..812ab45 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_p20150324 (24 Mar 2015)
+
+  24 Mar 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-groovy-9999_p20150324.ebuild:
+  bumped to the latest sources
+
 *netbeans-groovy-9999_p20150323 (23 Mar 2015)
 
   23 Mar 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index f487d28..cbeacde 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -47,6 +47,7 @@ DIST netbeans-trunk-nightly-201503140001-src.zip 206563358 SHA256 45e73ee894e29a
 DIST netbeans-trunk-nightly-201503150001-src.zip 206575066 SHA256 0582e1b5b709088e393fe88d0dcce4fe0b79bc7fd56ae952933270e4a976e64a SHA512 8c101f394dedf528978ae2e75ba0c767b754e395a792c1ddb590e839066a221347ac1a34674b6036895caec4b5471998856132327cd5bb727bcfcf1ab8a8e065 WHIRLPOOL 1a7b48bad020198e0d0c5eaef09511f2f9282ec67504d9dd4f96b81c0f2c52a4bbfc4aba2599179f73281bc9faf4d33661c672ae567cf46deaff7a15f4fb6ba9
 DIST netbeans-trunk-nightly-201503160001-src.zip 206576233 SHA256 2b90db4378f6999df5ace1efd4a1c819e3ae95ce424480fc0229e45be5fc6054 SHA512 a3258264d72c8fc95c92f99faa4b8d86e440b10907f81c3a08c397926e0606723b875f925cbf0072f63eeb023093be022510015d20d588826d9f4de360201667 WHIRLPOOL 3bb0b967b55613424cadb381340062d180d199b4b83f780785d2b0f84143c88518fec2fbad55fcc00fa0518fe36f17a81ceff8c9874f84b0cb30f2d7478458d8
 DIST netbeans-trunk-nightly-201503230001-src.zip 206651850 SHA256 bda0494e885ce4cbee7281730eab0083988c08c89fc6ea1edfc05a1ed38cfed2 SHA512 96fd079c1649a36fb108a8b4f6128142e5f8666fdb03ea3cd015b387bcaff46c5216974bbf9dfbe74aef79799a4dec8357fdaff6bcf0ef05158ea99ebfe265bb WHIRLPOOL aa2087cfe8d7caa0608eccc6d1ac2d3328afa13fe35166894bef62f74b3c239c5370fe32dc3f6a00ca08325ffed47976fd36775acafcff8df7e060848f0593aa
+DIST netbeans-trunk-nightly-201503240001-src.zip 206669022 SHA256 1c106c09dc8e4634331659e872020751589e794f73d0f89175c59e3fef119ba6 SHA512 a854c4f98402d12466c722bf9427c77956bcfc6869338d58217534daa3bf0ca1d7f6d8d791018af37e7df37f7ca07e4d8b92e65147b11bec92e725c0fb1a5603 WHIRLPOOL 601d8469b5bcfb0814765d42c6a41842912e2e9f742a0ee98b986cdd99c2f2c6e62aa585dacd3ea34e743b77cef2f45f595f0964b373d83bafcf2861376bd5dd
 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
@@ -84,5 +85,6 @@ EBUILD netbeans-groovy-9999_p20150314.ebuild 3422 SHA256 54cfd54257209e6f66cbe3d
 EBUILD netbeans-groovy-9999_p20150315.ebuild 3422 SHA256 6ce112ac31125ed9262c46ee97622a129c360e5083060ca3c66bd7ab12f2d5c3 SHA512 c9906b7b0b5dd2e32ceb45f834cb76b0569edb144aefc041a186800c69e1b3344460f9bd52652505e5e61ed645df6b1af554a77cdf6ab2fe24f9e6dccd89b754 WHIRLPOOL dc49ed97492db45cb22c77d45744422cc4901c5176cdc807859fc04ecf0b0a958daf3bff4fd1a31b062cd90a6872f0de70194c311b63de65622b47565f271ca6
 EBUILD netbeans-groovy-9999_p20150316.ebuild 3422 SHA256 03cba3e2716356519afeb7fefa700664be67ceafb6a27921f0ba96daffae9fad SHA512 15a57a540f947e84b15790c3510ff0fb631a110c672c91835de9124009979bec85526885a55504dae12704a5b290ed0631aa999559b4511793a238ca5aecf0ff WHIRLPOOL e784df926c3fc72fc15b6235a66298f4da2e2cc3009ad23fce7914fd9836cd0638d5ae63be090b42812091c676f835857993708592717985f4a51b2620bb242e
 EBUILD netbeans-groovy-9999_p20150323.ebuild 3422 SHA256 6ce7d3507efd392cb52cbaea74b27c8752060ae4d9bd4fdd8760c11674b6fdf7 SHA512 14179e48346d861fa77902d22fd96fdcc60a88040a1407421a54c9cf03fddc3ae548fcfee9faa253cff2a022e972912a6448b78be1aa88b990ec7b018d5fd236 WHIRLPOOL 8f136ae47d1169ae43072e22e09286defdfcaded14cab5de610b8a7ae72baff3e1cf285d0be69cce063037516792a72657e39b3b7f3c9bb531c04ee9806db67f
-MISC ChangeLog 156575 SHA256 192c044a43e8ba1c243a202593fa5601b95d7a14fb7f64a319c5772febbd598e SHA512 1f43697d6846a667d94b52d810d9e547fbf9c9d5953484418fed2b776b42efc4ff07cfae932060929d59d644512c09238920a21dcab6e44ee5ee5a0f07d1ee2b WHIRLPOOL f1cdb0dbdf5e9aca9179ea0a66451cdcaa5d6407aaad226194854ac2ef734eb3e0079f5c21c16dce1a45887bb50ae49bc77186d6db92aae799dea867624f5e49
+EBUILD netbeans-groovy-9999_p20150324.ebuild 3422 SHA256 76c99165b567e72490e321f39225c4fa4e2d8286b04d90cd5bcb0e73d6a16c20 SHA512 e1e430126e6dd12a377cec991667ded70294ed11a16f217c29e6d2470692b5ea2b1667f96ac3c9de5633a371bf1b7727ec57cb7b8bfb167c93568b931332bca2 WHIRLPOOL cb9b41e20e3dcec933e9fd10ff6d28148a1469bcc1e655de79a83074e32bc9ddf0364f61cba50ed1f36ed74ea0b41b51b8a979a3f673195e6099dadbf3ee9308
+MISC ChangeLog 156748 SHA256 ab30e668932c3553b730c03b63a7fc8e8aafe9f170f2b469ff12909c70cdfb32 SHA512 7e2fdf72d53585d2024ce242a2a16612235d4cba0e6b5c0e88404f3931563bd33a3bd801503e34ff3ad6b7cf8b3cec159f800b85b7379e0a18c9c8a2970786eb WHIRLPOOL 2b379e1e5f9acbace2bee0b5de0d37b90073300f1212f1de8ed726672793ff80b1b370ff012ab9105cfbbb7c28a713c716c3611a89e60964d590e7ec8657fe0d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150324.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150324.ebuild
new file mode 100644
index 0000000..dea3afc
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150324.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-03-24_00-01-28/zip/netbeans-trunk-nightly-201503240001-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 ac7dc1b..e0fc22a 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_p20150324 (24 Mar 2015)
+
+  24 Mar 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-harness-9999_p20150324.ebuild:
+  bumped to the latest sources
+
 *netbeans-harness-9999_p20150323 (23 Mar 2015)
 
   23 Mar 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index f60ee6e..9578bee 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -49,6 +49,7 @@ DIST netbeans-trunk-nightly-201503140001-src.zip 206563358 SHA256 45e73ee894e29a
 DIST netbeans-trunk-nightly-201503150001-src.zip 206575066 SHA256 0582e1b5b709088e393fe88d0dcce4fe0b79bc7fd56ae952933270e4a976e64a SHA512 8c101f394dedf528978ae2e75ba0c767b754e395a792c1ddb590e839066a221347ac1a34674b6036895caec4b5471998856132327cd5bb727bcfcf1ab8a8e065 WHIRLPOOL 1a7b48bad020198e0d0c5eaef09511f2f9282ec67504d9dd4f96b81c0f2c52a4bbfc4aba2599179f73281bc9faf4d33661c672ae567cf46deaff7a15f4fb6ba9
 DIST netbeans-trunk-nightly-201503160001-src.zip 206576233 SHA256 2b90db4378f6999df5ace1efd4a1c819e3ae95ce424480fc0229e45be5fc6054 SHA512 a3258264d72c8fc95c92f99faa4b8d86e440b10907f81c3a08c397926e0606723b875f925cbf0072f63eeb023093be022510015d20d588826d9f4de360201667 WHIRLPOOL 3bb0b967b55613424cadb381340062d180d199b4b83f780785d2b0f84143c88518fec2fbad55fcc00fa0518fe36f17a81ceff8c9874f84b0cb30f2d7478458d8
 DIST netbeans-trunk-nightly-201503230001-src.zip 206651850 SHA256 bda0494e885ce4cbee7281730eab0083988c08c89fc6ea1edfc05a1ed38cfed2 SHA512 96fd079c1649a36fb108a8b4f6128142e5f8666fdb03ea3cd015b387bcaff46c5216974bbf9dfbe74aef79799a4dec8357fdaff6bcf0ef05158ea99ebfe265bb WHIRLPOOL aa2087cfe8d7caa0608eccc6d1ac2d3328afa13fe35166894bef62f74b3c239c5370fe32dc3f6a00ca08325ffed47976fd36775acafcff8df7e060848f0593aa
+DIST netbeans-trunk-nightly-201503240001-src.zip 206669022 SHA256 1c106c09dc8e4634331659e872020751589e794f73d0f89175c59e3fef119ba6 SHA512 a854c4f98402d12466c722bf9427c77956bcfc6869338d58217534daa3bf0ca1d7f6d8d791018af37e7df37f7ca07e4d8b92e65147b11bec92e725c0fb1a5603 WHIRLPOOL 601d8469b5bcfb0814765d42c6a41842912e2e9f742a0ee98b986cdd99c2f2c6e62aa585dacd3ea34e743b77cef2f45f595f0964b373d83bafcf2861376bd5dd
 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
@@ -86,5 +87,6 @@ EBUILD netbeans-harness-9999_p20150314.ebuild 4131 SHA256 1a4e8c3131a355140bc2e1
 EBUILD netbeans-harness-9999_p20150315.ebuild 4131 SHA256 7b349130eeccc20df1b8a35a76605819cb1f41c6e8804536b5c5def3eeb1011d SHA512 484972729dab63e4a285ddfc137cfadffcc14a7c1622557abfc19262192bf9fa43c631980db57d6c62391bbf47fd8176fc91257b28efc9e75a71c2d476fc422a WHIRLPOOL 502a363d5d1aa44578605cba5068158ad0730c353047d926a7c194ba0861b46bae6c4a5a88c9c8e775a36cb0087f1ff16ea09ae84952ec4d15862fb85ea793ef
 EBUILD netbeans-harness-9999_p20150316.ebuild 4131 SHA256 a526fc3b83b9bff2e73b48666ca0c3123824c3feadae389796713869006b6fd0 SHA512 d37f2966f3091b0decc6dac2d3ba6fd614b98b4ee362acbeb359082aa126503f8aec3f91b48edb1c745ed4f1bf06b3b01f0ff5059bb06453ee18619d0f8e4179 WHIRLPOOL 71239b693e03a2cfefffb204859e7e5c78b1d5bc4a97767cc2952e5354b0169b804055dd4fdd79ee23f616a338837acbbd4d07fd3cbed447a2057e1240d4d5e4
 EBUILD netbeans-harness-9999_p20150323.ebuild 4131 SHA256 aabe796d563c6b9440a652c18f6ad9c8cd9f1fb11aea0bfa715775837e76b50c SHA512 c41778efb519276084966edef4cd8dcf2e4afd2ff67c12010b09551feff6d909a36c5365f93cd883be34bddd48368a2878f07f1c7265f167c5d524ead8b694d3 WHIRLPOOL 8a07052e97d6540fc6e60e3a0f2e39b413e6620d4540bd7854925c648037dca4b9974d85c5ec0c065eaff02682fbc17e20a9581649e1377cb9cebbf57339b633
-MISC ChangeLog 158569 SHA256 6af9c4fff4c49eee80ec336d714bcd845e91800348d4da86195e1a3b2d170898 SHA512 28322400b48c8e0561f163ca343dfae01931786505fc9b003fb7e041a73026b1148e65677df2aa9439d1c6779b928bfda6bc17606b8b75cf037a8ed8b2e3fbc4 WHIRLPOOL c1c59135179b0a562c2158939e724a5168de85e31ebfbe840f7334192f825a73a3da898cb45e6a822bcdc0d55191a675650f9e593f9950471b413a76d2eaf392
+EBUILD netbeans-harness-9999_p20150324.ebuild 4131 SHA256 43e7e86cbcdbd4c608f96dc081e0b1c35b0e9d2e45e023879c565abdf6b241d4 SHA512 07c46ed24e81219bcbf7a399ef2c56b8055f64de49e23f62f7810f2bd92834592bae2d37a5175ede5b8a66f47b034a2022e5d5f83f402f2600d38d732d2f84ea WHIRLPOOL 56c866d5f80e81118bcb6dd703c8dda5dd1d7d02a22bb5562d8d27a11a0b957800bebd065c89857d6cc02bab461e63b407748fa1b5c301131ee7d1a6f9931ac9
+MISC ChangeLog 158744 SHA256 e00171521e66471c9330e8ca00cb0202b34b73cf673ff7f6504ecfc3d5f3030f SHA512 6315e149028b18e9815f1768c18c0fc52d95064b5ebc271d0035bf86a9697dcd40300c2674ac567fc30e8872ce3d1e636a9518f7c637a3312dfaae2539894701 WHIRLPOOL 1b8f61dcacec14d4fcf68da3aa1ddccd1981e0b894d722469149d841eecf76f05815cda34b8aab781200e75d44dee8fdd216774f4c109d52a1c5fe9eeb9030fb
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20150324.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20150324.ebuild
new file mode 100644
index 0000000..b50a4ab
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20150324.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-03-24_00-01-28/zip/netbeans-trunk-nightly-201503240001-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 d9999b3..64ec4a6 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_p20150324 (24 Mar 2015)
+
+  24 Mar 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ide-9999_p20150324.ebuild:
+  bumped to the latest sources
+
 *netbeans-ide-9999_p20150323 (23 Mar 2015)
 
   23 Mar 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 2f37f29..0931f5a 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -254,6 +254,7 @@ DIST netbeans-trunk-nightly-201503140001-src.zip 206563358 SHA256 45e73ee894e29a
 DIST netbeans-trunk-nightly-201503150001-src.zip 206575066 SHA256 0582e1b5b709088e393fe88d0dcce4fe0b79bc7fd56ae952933270e4a976e64a SHA512 8c101f394dedf528978ae2e75ba0c767b754e395a792c1ddb590e839066a221347ac1a34674b6036895caec4b5471998856132327cd5bb727bcfcf1ab8a8e065 WHIRLPOOL 1a7b48bad020198e0d0c5eaef09511f2f9282ec67504d9dd4f96b81c0f2c52a4bbfc4aba2599179f73281bc9faf4d33661c672ae567cf46deaff7a15f4fb6ba9
 DIST netbeans-trunk-nightly-201503160001-src.zip 206576233 SHA256 2b90db4378f6999df5ace1efd4a1c819e3ae95ce424480fc0229e45be5fc6054 SHA512 a3258264d72c8fc95c92f99faa4b8d86e440b10907f81c3a08c397926e0606723b875f925cbf0072f63eeb023093be022510015d20d588826d9f4de360201667 WHIRLPOOL 3bb0b967b55613424cadb381340062d180d199b4b83f780785d2b0f84143c88518fec2fbad55fcc00fa0518fe36f17a81ceff8c9874f84b0cb30f2d7478458d8
 DIST netbeans-trunk-nightly-201503230001-src.zip 206651850 SHA256 bda0494e885ce4cbee7281730eab0083988c08c89fc6ea1edfc05a1ed38cfed2 SHA512 96fd079c1649a36fb108a8b4f6128142e5f8666fdb03ea3cd015b387bcaff46c5216974bbf9dfbe74aef79799a4dec8357fdaff6bcf0ef05158ea99ebfe265bb WHIRLPOOL aa2087cfe8d7caa0608eccc6d1ac2d3328afa13fe35166894bef62f74b3c239c5370fe32dc3f6a00ca08325ffed47976fd36775acafcff8df7e060848f0593aa
+DIST netbeans-trunk-nightly-201503240001-src.zip 206669022 SHA256 1c106c09dc8e4634331659e872020751589e794f73d0f89175c59e3fef119ba6 SHA512 a854c4f98402d12466c722bf9427c77956bcfc6869338d58217534daa3bf0ca1d7f6d8d791018af37e7df37f7ca07e4d8b92e65147b11bec92e725c0fb1a5603 WHIRLPOOL 601d8469b5bcfb0814765d42c6a41842912e2e9f742a0ee98b986cdd99c2f2c6e62aa585dacd3ea34e743b77cef2f45f595f0964b373d83bafcf2861376bd5dd
 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
@@ -293,5 +294,6 @@ EBUILD netbeans-ide-9999_p20150314.ebuild 30101 SHA256 56e324ce3783e6f97ba235ef7
 EBUILD netbeans-ide-9999_p20150315.ebuild 30101 SHA256 9efc03192a8301d6d967b46f2f70834f58de6a069b8ead19d19db6d09ee30376 SHA512 3dc7f963cc43f291f14fa04b73e87df3112d693932579f31a2b2959fa856b48c43e1cbd572498afc275809c1371d3c6cb5e6a9ea356676d526a19b91b26fcf73 WHIRLPOOL 90add30de539366995e559c50b76d843160aff5791a441dfd931981cb072bc7335bf93aa040a55b544c3d9c010b89b73958f337f32df5646a6399f9807edbcae
 EBUILD netbeans-ide-9999_p20150316.ebuild 30101 SHA256 3353e5b923bfbe68ba5fe4304fedd755410b6efb65664da57927e090e50e2811 SHA512 13c7858eb2efbe40539c9623fe77908bc062c5d0bdc60111f5e72c732c7c4356b9138deb550702e763568de124764676ed041c0b0ee619b06b74d789d8305eb3 WHIRLPOOL bf244259ca78d6a6ca76684225f549cb8510352b4e4825a2a879f0e441c9b2361f4e0d4c139bfa6838110c1835b98ecb2e15fffe904dd083fc87a3a91a0bac5c
 EBUILD netbeans-ide-9999_p20150323.ebuild 30068 SHA256 f26bfedf18ae2dac5074eacfe5b6bda485194d93977a5ae11f062b79f833a2c9 SHA512 4bd3de9f16fcb48f6b1d869efc9a30646068b2c7d6bd3d3fdc06973bbb286e0244d2c391edbc290bafa017cc31e37ebe1b9fac0c4016807e165d0f13a14b84ea WHIRLPOOL 818d65e5872de2666d1b2bb0ab603586137e39600e8ae20ec26fd5ba55f0484b2d70bd400b79981c54e50d1e5a0e179f3c17996b6c05a3f835a22eb948bb86e9
-MISC ChangeLog 151073 SHA256 90630f13d85d62350e583bbc5a9341a4b351aa7b054fc10a609f438c99a43b90 SHA512 a2adc720034248491ff072a5c968bdd9e1739bab892488737471ae8ab237d4abfa2cb4d5b5d088608bd27686c48dd9ee2816e8cd8e2ced69922dcf1fdbe20a24 WHIRLPOOL 6922735e9c1e086864acfdf7ccac0444d2c76369bf62edf481fc7bcc3029a9a025020e35b93e996dbfe3d2758c399c9f365a34170303a02d64cc2105c5a392fd
+EBUILD netbeans-ide-9999_p20150324.ebuild 30068 SHA256 1d58855aa88cb09eebf566971d02a46dc0472cfbd1713c482194e287977be398 SHA512 aeefda3fc0092980453e20e4a70f88e3a430c82ca592e18f028ccabebf7b18a3502046d7b50c2e82dfd71b34b83ec7a69dd21730f7ebb51e762dbee22d9b437e WHIRLPOOL 00440b60dba55132554abbde7440c55a60a74566b23f759c907e01dc360fc683c057c64a89bb95110b6c77a69a75ce8d972a6c772ee939011d9365304fd2726a
+MISC ChangeLog 151240 SHA256 eb4615f3a4ecbf7ec91283dc4783429f9a1b571c067601c515b8a2942cd098c7 SHA512 72c1f1677b8a7d87a425e80b5fc90264afed0e39eaafe9608206092360611949a0919b9882745454f384a00e9f35ee7f6515dafdccc930f98e9eaa838cf726e5 WHIRLPOOL b4e68d1c1425ad83e879fe66a4ad2b439953d7dc4e5435a21882a812dc5a297828803e391a52af30eddd5e7d5d986c71df5744ba0138f7ea2012166ffa364a19
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20150324.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20150324.ebuild
new file mode 100644
index 0000000..233892b
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20150324.ebuild
@@ -0,0 +1,371 @@
+# 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-03-24_00-01-28/zip/netbeans-trunk-nightly-201503240001-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/D19F70E8CC5D326509B1BF8C1A8FC87BD258E990-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/7B737C0556FD692D8F072EF375FDD4FCA717DF9B-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/934DCAB9534B8FE12FD9C90759B26B6B0D442837-org.tmatesoft.svnkit_1.8.7.r10376_v20141223_2131.jar
+	http://hg.netbeans.org/binaries/688C11A84F86005448120D4F8E6347DF38117A56-processtreekiller-1.0.3.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}"/D19F70E8CC5D326509B1BF8C1A8FC87BD258E990-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}"/7B737C0556FD692D8F072EF375FDD4FCA717DF9B-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}"/934DCAB9534B8FE12FD9C90759B26B6B0D442837-org.tmatesoft.svnkit_1.8.7.r10376_v20141223_2131.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.7.r10376_v20141223_2131.jar || die
+	ln -s "${DISTDIR}"/688C11A84F86005448120D4F8E6347DF38117A56-processtreekiller-1.0.3.jar extexecution.process/external/processtreekiller-1.0.3.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.51.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.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/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 5754dcd..407c733 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_p20150324 (24 Mar 2015)
+
+  24 Mar 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-java-9999_p20150324.ebuild:
+  bumped to the latest sources
+
 *netbeans-java-9999_p20150323 (23 Mar 2015)
 
   23 Mar 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index d6b931c..42449ee 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -126,6 +126,7 @@ DIST netbeans-trunk-nightly-201503140001-src.zip 206563358 SHA256 45e73ee894e29a
 DIST netbeans-trunk-nightly-201503150001-src.zip 206575066 SHA256 0582e1b5b709088e393fe88d0dcce4fe0b79bc7fd56ae952933270e4a976e64a SHA512 8c101f394dedf528978ae2e75ba0c767b754e395a792c1ddb590e839066a221347ac1a34674b6036895caec4b5471998856132327cd5bb727bcfcf1ab8a8e065 WHIRLPOOL 1a7b48bad020198e0d0c5eaef09511f2f9282ec67504d9dd4f96b81c0f2c52a4bbfc4aba2599179f73281bc9faf4d33661c672ae567cf46deaff7a15f4fb6ba9
 DIST netbeans-trunk-nightly-201503160001-src.zip 206576233 SHA256 2b90db4378f6999df5ace1efd4a1c819e3ae95ce424480fc0229e45be5fc6054 SHA512 a3258264d72c8fc95c92f99faa4b8d86e440b10907f81c3a08c397926e0606723b875f925cbf0072f63eeb023093be022510015d20d588826d9f4de360201667 WHIRLPOOL 3bb0b967b55613424cadb381340062d180d199b4b83f780785d2b0f84143c88518fec2fbad55fcc00fa0518fe36f17a81ceff8c9874f84b0cb30f2d7478458d8
 DIST netbeans-trunk-nightly-201503230001-src.zip 206651850 SHA256 bda0494e885ce4cbee7281730eab0083988c08c89fc6ea1edfc05a1ed38cfed2 SHA512 96fd079c1649a36fb108a8b4f6128142e5f8666fdb03ea3cd015b387bcaff46c5216974bbf9dfbe74aef79799a4dec8357fdaff6bcf0ef05158ea99ebfe265bb WHIRLPOOL aa2087cfe8d7caa0608eccc6d1ac2d3328afa13fe35166894bef62f74b3c239c5370fe32dc3f6a00ca08325ffed47976fd36775acafcff8df7e060848f0593aa
+DIST netbeans-trunk-nightly-201503240001-src.zip 206669022 SHA256 1c106c09dc8e4634331659e872020751589e794f73d0f89175c59e3fef119ba6 SHA512 a854c4f98402d12466c722bf9427c77956bcfc6869338d58217534daa3bf0ca1d7f6d8d791018af37e7df37f7ca07e4d8b92e65147b11bec92e725c0fb1a5603 WHIRLPOOL 601d8469b5bcfb0814765d42c6a41842912e2e9f742a0ee98b986cdd99c2f2c6e62aa585dacd3ea34e743b77cef2f45f595f0964b373d83bafcf2861376bd5dd
 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
@@ -164,5 +165,6 @@ EBUILD netbeans-java-9999_p20150314.ebuild 13432 SHA256 55f4bcccb51c4fbdb08549b4
 EBUILD netbeans-java-9999_p20150315.ebuild 13432 SHA256 8b12d5a5434973dfadd02499a1eba45f96c73e5e9a9d4aa00bb832f9cfba9418 SHA512 05d0a6da3ebb51d2c52ce2d4f3a6975146ccec01e229333d1a218c9aad09ad918b62c82dfe002dbebfeaf31e9531dcdf0919845342ed9ba865affe8b87032f59 WHIRLPOOL 0032d3d616763d3a7146490e0772b983d2ae5af53e21d1e6bc4df080c7548fc3ffbd7a1fbc3f99b2bd635164c1d2b94df3bee9862f08e4da77107d42e782c0c7
 EBUILD netbeans-java-9999_p20150316.ebuild 13432 SHA256 e81bf2defa33206e77ff6c1e7a5e2d34fcc750028bcccd2a46679e7e5685c5fd SHA512 b484c0943ebebb03cb8aa5fa5f7bff3a44e9b50ed3ffe5c25e991152da2601becebfac95cb03ac99416e40321d2db1c699aab6075b444d8372d7143fe18a5996 WHIRLPOOL 7fa74b0d1747d4899392c137d710859bd3a5ab45454744179d4da8e3f0a725f8455f1123dbfe1ceb95e87b58f97889b57228352852a7d191f4a522b1d7316319
 EBUILD netbeans-java-9999_p20150323.ebuild 13432 SHA256 9be8b1681c62e73a1e318258f0b3f141026da7ece1573603ea4e77942a601105 SHA512 dc84716a968d06eb8bc5cc02af0a7f03a8b2e1f11dc0f59a5d72328bdc4eff3016963813e1ed8a4706cce503cda0d4ff63faab9886c1746fbf5d82a3cc438641 WHIRLPOOL d9838e89cdee9e2451f416efbd1a336a2e6ff8973118fe0110d924fc67b1d0670786f4259d2459d80418f100abbb4ade319033e5655e966b239350a9f73d3179
-MISC ChangeLog 153911 SHA256 5d672955771dd72277ab7c9e220ad514a6853baeaabc776510c3eaf46a92a28c SHA512 ccfdc0de8735a17768327eb229df88c81cbd18ad3be10f3eecbb0f7b2708ddaadf888c49aae54856fb4dc91ce2c8ca259819da8d4993bb4ae7ffc21c84552c20 WHIRLPOOL 1f1b0b74ec60f23bfa3d988f9f5389fdd52edc91249a583a99a9f23e1ad86f0e8894b775b73709093727c1170829a33f66818c3eac87532dfbdd6aff7bb9bc0e
+EBUILD netbeans-java-9999_p20150324.ebuild 13432 SHA256 7e59f571d3f871633e736dd88252e0ea3282a81573d8fb98a6fe4b35b481203b SHA512 cd9e5157d7b603e338bd080e86c56b7273b658b83836cc9e5ff668da0ca058a7a52ecdfa5b35509d68c5ab4b42903b06a062168920e86216ca36bd620c824505 WHIRLPOOL d740f946c4168ae40f484b6ed00762cda91c224f4516a7ffd4dd3b0fa3ac3f30553735c8007d1d35265d25c53724401e4497082830f85fd5bcf9ec1b65f01696
+MISC ChangeLog 154080 SHA256 ec62bd68d4ea9b7d0819c83b3ed482758d521a82fc3f36f33bf285f750016c9c SHA512 20aff92dca051eaa14f900129399ebc610ed3bb9cc5a840697d17d72772a99f7a64f9cab03f124ead0fd16d22b0939a13a450bc5a5c431ecbc50489de1c39306 WHIRLPOOL c3b617406a3ce1fcb73d59f5da179cab01ffea9e0099bc8ddd12048a9e059b689253c9de7d30305d4ad1cc3155289ccbf19fefcf4708d526cda5656c3ce16df0
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20150324.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20150324.ebuild
new file mode 100644
index 0000000..6092cef
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20150324.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-03-24_00-01-28/zip/netbeans-trunk-nightly-201503240001-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/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar
+	http://hg.netbeans.org/binaries/87405A9D166EAE11638A7F9C3C9FA3C3B6EDEDF3-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}"/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
+	ln -s "${DISTDIR}"/87405A9D166EAE11638A7F9C3C9FA3C3B6EDEDF3-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/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-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 287a09f..0dc3949 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_p20150324 (24 Mar 2015)
+
+  24 Mar 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javacard-9999_p20150324.ebuild:
+  bumped to the latest sources
+
 *netbeans-javacard-9999_p20150323 (23 Mar 2015)
 
   23 Mar 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 8775eca..e1aa093 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -46,6 +46,7 @@ DIST netbeans-trunk-nightly-201503140001-src.zip 206563358 SHA256 45e73ee894e29a
 DIST netbeans-trunk-nightly-201503150001-src.zip 206575066 SHA256 0582e1b5b709088e393fe88d0dcce4fe0b79bc7fd56ae952933270e4a976e64a SHA512 8c101f394dedf528978ae2e75ba0c767b754e395a792c1ddb590e839066a221347ac1a34674b6036895caec4b5471998856132327cd5bb727bcfcf1ab8a8e065 WHIRLPOOL 1a7b48bad020198e0d0c5eaef09511f2f9282ec67504d9dd4f96b81c0f2c52a4bbfc4aba2599179f73281bc9faf4d33661c672ae567cf46deaff7a15f4fb6ba9
 DIST netbeans-trunk-nightly-201503160001-src.zip 206576233 SHA256 2b90db4378f6999df5ace1efd4a1c819e3ae95ce424480fc0229e45be5fc6054 SHA512 a3258264d72c8fc95c92f99faa4b8d86e440b10907f81c3a08c397926e0606723b875f925cbf0072f63eeb023093be022510015d20d588826d9f4de360201667 WHIRLPOOL 3bb0b967b55613424cadb381340062d180d199b4b83f780785d2b0f84143c88518fec2fbad55fcc00fa0518fe36f17a81ceff8c9874f84b0cb30f2d7478458d8
 DIST netbeans-trunk-nightly-201503230001-src.zip 206651850 SHA256 bda0494e885ce4cbee7281730eab0083988c08c89fc6ea1edfc05a1ed38cfed2 SHA512 96fd079c1649a36fb108a8b4f6128142e5f8666fdb03ea3cd015b387bcaff46c5216974bbf9dfbe74aef79799a4dec8357fdaff6bcf0ef05158ea99ebfe265bb WHIRLPOOL aa2087cfe8d7caa0608eccc6d1ac2d3328afa13fe35166894bef62f74b3c239c5370fe32dc3f6a00ca08325ffed47976fd36775acafcff8df7e060848f0593aa
+DIST netbeans-trunk-nightly-201503240001-src.zip 206669022 SHA256 1c106c09dc8e4634331659e872020751589e794f73d0f89175c59e3fef119ba6 SHA512 a854c4f98402d12466c722bf9427c77956bcfc6869338d58217534daa3bf0ca1d7f6d8d791018af37e7df37f7ca07e4d8b92e65147b11bec92e725c0fb1a5603 WHIRLPOOL 601d8469b5bcfb0814765d42c6a41842912e2e9f742a0ee98b986cdd99c2f2c6e62aa585dacd3ea34e743b77cef2f45f595f0964b373d83bafcf2861376bd5dd
 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
@@ -83,5 +84,6 @@ EBUILD netbeans-javacard-9999_p20150314.ebuild 4982 SHA256 426de0da8c19349d584b3
 EBUILD netbeans-javacard-9999_p20150315.ebuild 4982 SHA256 b5d145019f63cb7db833ecbc2708731bab76070b1076ebbde23c6ca00a2bca61 SHA512 3183679d0347dd9c1a73304d412c1539a2407d26e4b700c887ef8ea59c24b7741c2d1c61c2e5d7ba45c56b8d5061c7542a31153779d0587e457c81c0e1264cbc WHIRLPOOL 0e8506eaa986156484f193796b33b10e3f0460df82caf6b77e6f23b1d29644cb7a07345a354c942f993836185fc5519774b8e77e062717495c6146932fc39550
 EBUILD netbeans-javacard-9999_p20150316.ebuild 4982 SHA256 71842cbbbdc4a281436f815b12c6cb23ccd617ea11d205f0b9267705ec47d6e3 SHA512 644d33112dfd34a2adc3fa6ff0aee772fd8a0258f93a28e6a8f9a1c88950da5c1bfd4574ab64c52f8d79159e9ec4d32d262ef918f2d49abf3cbf44bde9f05e75 WHIRLPOOL 1189d0eb17226359874885742bcb8c3f21f854341096b4e8fcba750f0f1b3107f234f08e6c096af8df083573dd884b016a52e757f7c38e8de0ca6d79e47fb735
 EBUILD netbeans-javacard-9999_p20150323.ebuild 4982 SHA256 0e21d08f3e6ef63ed886f81a62658a7404281b2871df18ed1fc972e83023f964 SHA512 e479fe19faa4603aa41ca8f2cbabe5b52a29b0fbb8f3097af66aade57f5c7801a19800f87a4b0c940f2cc827a3dbdd0bd80db885340ca902ab9710f69e0f5dfd WHIRLPOOL f6853a7e43c273cb43e5edb299e0a22ec45244d0d2a0741a9759c4cac4043083c06122b1fba0a3c0a703c25b1c889c8da5870b65a49d3830e3bfbf84a639a6bf
-MISC ChangeLog 160563 SHA256 24233d1c6816b6226f96de421b0efd602958697dd2877bb304166d51994306d0 SHA512 283d0ce1d5ed77d9239b2e587af834b4a54ae544b6aa76c3b434d5b87ef5be5e6599f24d9e838129e1d044b5246f52c781b4f4250ac543865a8c574f3467e609 WHIRLPOOL ac3544724b0b0dd60c76dac52f0bb4777171b208ee1b729ea87f395c9bf31f53fb42e0547d09ace0d8ef974f887292be78b4ce5c44a0b6a75c4538568f4f224a
+EBUILD netbeans-javacard-9999_p20150324.ebuild 4982 SHA256 8281b7cc1370516be0b29ba02b6c6d85fdb9c28cb4b864b38c32c87a3cce7aa7 SHA512 da8d4ce5208de43014f51370da2b509d0409abab4f56d09e8ab8c96fcd9a0d7e34827b8ae44cceb6fe7cda55b31191ab5b45920c7a9336b4cd98d62905082e17 WHIRLPOOL e400f0d276f2909963619ed80b07f62014078a81496fa6d43915a259bc3f8df65f53ee8efdde59ccb9255c3def165318f353c5119c8831a9b3584cbe47375c96
+MISC ChangeLog 160740 SHA256 08bb0770a7ccd65d9092df29652dd47dc72fa1eb157ecda95bbf457595c23a77 SHA512 f0632db80cbabc0639c4d133e0c8032ae41871ebd39a013ef3a93a6e6b522bf0d0cf78abd13c597438c1cc6026572467341e6b1be9de2cbb959210aa380b4ef6 WHIRLPOOL 0dcf8f395768c3fd52cfcb7f20ab51d7c8ef59500281bbaeed3524ac12afe2a8fcd7a44bf2f53a89038d2479604fb4f4bfe99d128c5b75ac287a172bd806fd59
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150324.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150324.ebuild
new file mode 100644
index 0000000..467cd0e
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150324.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-03-24_00-01-28/zip/netbeans-trunk-nightly-201503240001-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 f1d882d..2118bf8 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_p20150324 (24 Mar 2015)
+
+  24 Mar 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javadoc-9999_p20150324.ebuild:
+  bumped to the latest sources
+
 *netbeans-javadoc-9999_p20150323 (23 Mar 2015)
 
   23 Mar 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index 825154e..81679e1 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -49,6 +49,7 @@ DIST netbeans-trunk-nightly-201503140001-src.zip 206563358 SHA256 45e73ee894e29a
 DIST netbeans-trunk-nightly-201503150001-src.zip 206575066 SHA256 0582e1b5b709088e393fe88d0dcce4fe0b79bc7fd56ae952933270e4a976e64a SHA512 8c101f394dedf528978ae2e75ba0c767b754e395a792c1ddb590e839066a221347ac1a34674b6036895caec4b5471998856132327cd5bb727bcfcf1ab8a8e065 WHIRLPOOL 1a7b48bad020198e0d0c5eaef09511f2f9282ec67504d9dd4f96b81c0f2c52a4bbfc4aba2599179f73281bc9faf4d33661c672ae567cf46deaff7a15f4fb6ba9
 DIST netbeans-trunk-nightly-201503160001-src.zip 206576233 SHA256 2b90db4378f6999df5ace1efd4a1c819e3ae95ce424480fc0229e45be5fc6054 SHA512 a3258264d72c8fc95c92f99faa4b8d86e440b10907f81c3a08c397926e0606723b875f925cbf0072f63eeb023093be022510015d20d588826d9f4de360201667 WHIRLPOOL 3bb0b967b55613424cadb381340062d180d199b4b83f780785d2b0f84143c88518fec2fbad55fcc00fa0518fe36f17a81ceff8c9874f84b0cb30f2d7478458d8
 DIST netbeans-trunk-nightly-201503230001-src.zip 206651850 SHA256 bda0494e885ce4cbee7281730eab0083988c08c89fc6ea1edfc05a1ed38cfed2 SHA512 96fd079c1649a36fb108a8b4f6128142e5f8666fdb03ea3cd015b387bcaff46c5216974bbf9dfbe74aef79799a4dec8357fdaff6bcf0ef05158ea99ebfe265bb WHIRLPOOL aa2087cfe8d7caa0608eccc6d1ac2d3328afa13fe35166894bef62f74b3c239c5370fe32dc3f6a00ca08325ffed47976fd36775acafcff8df7e060848f0593aa
+DIST netbeans-trunk-nightly-201503240001-src.zip 206669022 SHA256 1c106c09dc8e4634331659e872020751589e794f73d0f89175c59e3fef119ba6 SHA512 a854c4f98402d12466c722bf9427c77956bcfc6869338d58217534daa3bf0ca1d7f6d8d791018af37e7df37f7ca07e4d8b92e65147b11bec92e725c0fb1a5603 WHIRLPOOL 601d8469b5bcfb0814765d42c6a41842912e2e9f742a0ee98b986cdd99c2f2c6e62aa585dacd3ea34e743b77cef2f45f595f0964b373d83bafcf2861376bd5dd
 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
@@ -86,5 +87,6 @@ EBUILD netbeans-javadoc-9999_p20150314.ebuild 6234 SHA256 145af5ed6f771552973131
 EBUILD netbeans-javadoc-9999_p20150315.ebuild 6234 SHA256 1c040d19b2fe23bf2d3eb276c90467175e68312a4e04c3ce897ad4c4a6673b39 SHA512 245fbe309ea2250eedefcc0b62d0eba9f4fd72929981b93d93c219295d327428364e96f03175ac4f0ab4fbd24e9c9728fd5a0402e1a752f8e8938b9e97527c21 WHIRLPOOL 86e8d640166e45dc8e057e3f042f9e90181fa548de0f4848f4ea063d4b8458aafbb31b9b83dd66b9ad7ec71569e0832740ffe3d372dc069f7c7711a8ae1bc47e
 EBUILD netbeans-javadoc-9999_p20150316.ebuild 6234 SHA256 be382c3fb2a6bf175648a39eca67f930a2e16f6b92abb7e8ae26428f7e84893c SHA512 e0060dc83a98c2e813c27eee1b567b1513a65568cc02a1b8ddc431782dcc4bb46a58a875260c7fe609b60dd48c17bdf7ee5bb7293963e2c91541ae85977fe821 WHIRLPOOL 1bd8bfc56e3ff09dfb1acd375065b0d07c1ac53784bcbed08bd7346231a810acda665ed47ca99621a4b83e4a482883ca384ddcd727d9033cf9b36a779a93cb1f
 EBUILD netbeans-javadoc-9999_p20150323.ebuild 6234 SHA256 63cad330bfe8c2f6c50aebe428dcff369d38ff54e558f88ed6c6618ade6c3d80 SHA512 f18a9c10c007c3b9bfca1118a9ddf043f8ad8eeec1e73a8419e64ea95cb69abe303a0f13aa2487ba22bce78ac69deaab0f70f87746e1f2b8c8cf820247be116b WHIRLPOOL 7aa943031dbefbf8c5d0ca832a4b592f1b7dd1d5e4e1647891f8f8b644c498e7ef5a23e08550e98bd7568c2c3c27e8c205f3ac18a0ca28aa721389c5444020ec
-MISC ChangeLog 158395 SHA256 0dbe235b472a6a66fac2c83791284c5b807750abe104316a0e07dd59847dbbef SHA512 c5d702feee7cd839cdd4944cb818ca1705073cc8d9c4cd98d73ab26285cbad96aad1f78124cb370336123003c50ad7f459a643f5859004cf4392ca3eef633d53 WHIRLPOOL cf58f43a819ced10cd471ab87fbebc2642f7b617dd1edbcd04638664c8ddb9c7b4d53dab3a04e5c7c8f60ef707d627037ff80a281c81c45148281866df68fe8c
+EBUILD netbeans-javadoc-9999_p20150324.ebuild 6234 SHA256 2d93ca5fc2bcc5a7723e0572c3ea1a965ad1abb739d2f54c96f8900ff1f95223 SHA512 d86607856d6aca09cd95ee6627284e2976a10e388c14096f0d2adb30fa24c065e19a74ec531a2d26fc63cc1eddd4012ab4d7069ae5b98b955268c1b2d1c3920d WHIRLPOOL 14e0c8bbd0ea2548fcecd130bcb112c11098fe320d7b4cbda3bc41b7250ac5804998f8310dfac3ab17ce0c90777aed0ed78eb32b87102a445ed1fa53dcb05adb
+MISC ChangeLog 158570 SHA256 8dd1b45f2ee9daf0b3dc9a5936d881f2a1b20547959ed4ddbb7906b1069c4011 SHA512 0aa313fd2ff8ec470f66ca2c0218d3d5926c6c3adf0bf19f44a29a403928ba1b58b238381612818f3cabb169d6dea31ed9b47a42e3db44a0868bb2745f0ca95d WHIRLPOOL ce75c05ddd7f591aba9874ccc6c0bbb2f7cd245963bb3d4121b9e19744f0c38df869ab5b62b3b4093fcdd4e3c98abc2327d5c7efa8c85b8d052a9aaf1b3e6821
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150324.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150324.ebuild
new file mode 100644
index 0000000..80ff98d
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150324.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-03-24_00-01-28/zip/netbeans-trunk-nightly-201503240001-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 8520db4..e799caa 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_p20150324 (24 Mar 2015)
+
+  24 Mar 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javafx-9999_p20150324.ebuild:
+  bumped to the latest sources
+
 *netbeans-javafx-9999_p20150323 (23 Mar 2015)
 
   23 Mar 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 560be3a..79bc3c6 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -49,6 +49,7 @@ DIST netbeans-trunk-nightly-201503140001-src.zip 206563358 SHA256 45e73ee894e29a
 DIST netbeans-trunk-nightly-201503150001-src.zip 206575066 SHA256 0582e1b5b709088e393fe88d0dcce4fe0b79bc7fd56ae952933270e4a976e64a SHA512 8c101f394dedf528978ae2e75ba0c767b754e395a792c1ddb590e839066a221347ac1a34674b6036895caec4b5471998856132327cd5bb727bcfcf1ab8a8e065 WHIRLPOOL 1a7b48bad020198e0d0c5eaef09511f2f9282ec67504d9dd4f96b81c0f2c52a4bbfc4aba2599179f73281bc9faf4d33661c672ae567cf46deaff7a15f4fb6ba9
 DIST netbeans-trunk-nightly-201503160001-src.zip 206576233 SHA256 2b90db4378f6999df5ace1efd4a1c819e3ae95ce424480fc0229e45be5fc6054 SHA512 a3258264d72c8fc95c92f99faa4b8d86e440b10907f81c3a08c397926e0606723b875f925cbf0072f63eeb023093be022510015d20d588826d9f4de360201667 WHIRLPOOL 3bb0b967b55613424cadb381340062d180d199b4b83f780785d2b0f84143c88518fec2fbad55fcc00fa0518fe36f17a81ceff8c9874f84b0cb30f2d7478458d8
 DIST netbeans-trunk-nightly-201503230001-src.zip 206651850 SHA256 bda0494e885ce4cbee7281730eab0083988c08c89fc6ea1edfc05a1ed38cfed2 SHA512 96fd079c1649a36fb108a8b4f6128142e5f8666fdb03ea3cd015b387bcaff46c5216974bbf9dfbe74aef79799a4dec8357fdaff6bcf0ef05158ea99ebfe265bb WHIRLPOOL aa2087cfe8d7caa0608eccc6d1ac2d3328afa13fe35166894bef62f74b3c239c5370fe32dc3f6a00ca08325ffed47976fd36775acafcff8df7e060848f0593aa
+DIST netbeans-trunk-nightly-201503240001-src.zip 206669022 SHA256 1c106c09dc8e4634331659e872020751589e794f73d0f89175c59e3fef119ba6 SHA512 a854c4f98402d12466c722bf9427c77956bcfc6869338d58217534daa3bf0ca1d7f6d8d791018af37e7df37f7ca07e4d8b92e65147b11bec92e725c0fb1a5603 WHIRLPOOL 601d8469b5bcfb0814765d42c6a41842912e2e9f742a0ee98b986cdd99c2f2c6e62aa585dacd3ea34e743b77cef2f45f595f0964b373d83bafcf2861376bd5dd
 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
@@ -85,5 +86,6 @@ EBUILD netbeans-javafx-9999_p20150314.ebuild 4723 SHA256 f3895282337c15646fa6cdd
 EBUILD netbeans-javafx-9999_p20150315.ebuild 4723 SHA256 38b27ec1bc59567f47f0dc9e6fdacb3879200e228bf23f54e1882e35bab9f7d0 SHA512 ceaa5ea56f7d148464f8a0a9b66901562f341e48bd141ac63ef6d8c7c260e6beb93d3e4d0b2a2db5abafee1c0efa1f40d9bcd4287325f0e7c8548eee5349959a WHIRLPOOL c1b1becdf4d3b2d08817205c31bd6a524b54d8696b85659a3713e511b4b997cb5c9fa11a0a6f6852b3569bfa5ac111faccc32f196fd984688646b43ec6710b68
 EBUILD netbeans-javafx-9999_p20150316.ebuild 4723 SHA256 40811067a1d7bf8ef93b2f8c219c5578278941fdcc8439e2d5ea8ab6941f1489 SHA512 d2efe0b77c6d9e39cb80ed4993f256d1b16ca924679c942bdd07671c125d2c0265d81887f417bf2ea7688c1b2d91e0315307b70135d66ea623e39c9d54d90227 WHIRLPOOL d991342a938e4c511e6087e700d131a413939306a5b6ad823b0029a80083ae3f8c9d90d5b6ad1bc765bae3830de97649cceca796c4f6dff8fa14dedb134e1594
 EBUILD netbeans-javafx-9999_p20150323.ebuild 4723 SHA256 e29583d1cd3d1d6930f030fd5fd3d428a8ba397b4eadf91ece6326ca3d2528ff SHA512 b058875cd5ad23714c220805f672f21e7f5ec403a08f705c6030a8589a0905dfe1531cdd982a020732311830ec47924d0b49e8bb8a5f1f71c809ec6457b62f4c WHIRLPOOL 2802053061e2b8f41e68e443cc23bd147fbc3451dfbf9a8fc229a6a4a43ee1f158368095948eb310d68801edb020e9ab37e5c3aade1d6871b074905c4f436c83
-MISC ChangeLog 143094 SHA256 8dafcf8f4c916deeaf86085bfd5217fd0e6266fd5f4503318c1a0aa77c4fd775 SHA512 a09779ab0924564ef09528ffc7d2efa54f0fdced56e24ac93435bb5b7e6c8e22c887a8abb660d10e0e86bee2fd4190b09ff97ad0d0a3ecd600ce958fff0ecd6c WHIRLPOOL c5a930369c87a31bf6d0de441a73dde153204d4a0bb118841fe094c644800a86a6780a11ee70e0662d36d3c9e86936b3a1d09d3af0f298f74ba33c81571ae2ae
+EBUILD netbeans-javafx-9999_p20150324.ebuild 4723 SHA256 3b93f5f9a02cd8be0a3d1487e942424a177ab592c633973507517d9ff410cf7e SHA512 87311d2098809434c7f17c8002d557d58ae61ef570e3b03e2605d9950a57ff37c4acd1ec28e6e06e13d923691cb59fa50d88ea364fe533a2f9612b060891def1 WHIRLPOOL 3419b6e738458b5f53419169b6fc8809300bd643bb5c1ad8fb85fd366cd8ca38acf25f8a653e07b1c2fbbe6055997b3c0c26c469458098bf6004f1ecad6c397b
+MISC ChangeLog 143267 SHA256 3896dde5e209174537093fa707140be926d596e84128324633e10ef062ebcf16 SHA512 4f2454539f1b42d31ad4ae88ec3d5b17ee4e28fcbae5c91b1f7c386a5fece7f0d2e7902815f454886631b77ebb7d92a691f84fd5ecfc972e10d044f38dca531b WHIRLPOOL 02dd017a70c7f7dcebacda436dca81cba8d8f856d877be373a9ba0ba033bdb9ec1d7c649b95ac5566911ca5323ac12128b03e138c5ea95b8d0c8dd380beca4ac
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150324.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150324.ebuild
new file mode 100644
index 0000000..7a0b256
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150324.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-03-24_00-01-28/zip/netbeans-trunk-nightly-201503240001-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.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 891f26d..56dc202 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_p20150324 (24 Mar 2015)
+
+  24 Mar 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-mobility-9999_p20150324.ebuild:
+  bumped to the latest sources
+
 *netbeans-mobility-9999_p20150323 (23 Mar 2015)
 
   23 Mar 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index a630f46..b2ea63c 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -52,6 +52,7 @@ DIST netbeans-trunk-nightly-201503140001-src.zip 206563358 SHA256 45e73ee894e29a
 DIST netbeans-trunk-nightly-201503150001-src.zip 206575066 SHA256 0582e1b5b709088e393fe88d0dcce4fe0b79bc7fd56ae952933270e4a976e64a SHA512 8c101f394dedf528978ae2e75ba0c767b754e395a792c1ddb590e839066a221347ac1a34674b6036895caec4b5471998856132327cd5bb727bcfcf1ab8a8e065 WHIRLPOOL 1a7b48bad020198e0d0c5eaef09511f2f9282ec67504d9dd4f96b81c0f2c52a4bbfc4aba2599179f73281bc9faf4d33661c672ae567cf46deaff7a15f4fb6ba9
 DIST netbeans-trunk-nightly-201503160001-src.zip 206576233 SHA256 2b90db4378f6999df5ace1efd4a1c819e3ae95ce424480fc0229e45be5fc6054 SHA512 a3258264d72c8fc95c92f99faa4b8d86e440b10907f81c3a08c397926e0606723b875f925cbf0072f63eeb023093be022510015d20d588826d9f4de360201667 WHIRLPOOL 3bb0b967b55613424cadb381340062d180d199b4b83f780785d2b0f84143c88518fec2fbad55fcc00fa0518fe36f17a81ceff8c9874f84b0cb30f2d7478458d8
 DIST netbeans-trunk-nightly-201503230001-src.zip 206651850 SHA256 bda0494e885ce4cbee7281730eab0083988c08c89fc6ea1edfc05a1ed38cfed2 SHA512 96fd079c1649a36fb108a8b4f6128142e5f8666fdb03ea3cd015b387bcaff46c5216974bbf9dfbe74aef79799a4dec8357fdaff6bcf0ef05158ea99ebfe265bb WHIRLPOOL aa2087cfe8d7caa0608eccc6d1ac2d3328afa13fe35166894bef62f74b3c239c5370fe32dc3f6a00ca08325ffed47976fd36775acafcff8df7e060848f0593aa
+DIST netbeans-trunk-nightly-201503240001-src.zip 206669022 SHA256 1c106c09dc8e4634331659e872020751589e794f73d0f89175c59e3fef119ba6 SHA512 a854c4f98402d12466c722bf9427c77956bcfc6869338d58217534daa3bf0ca1d7f6d8d791018af37e7df37f7ca07e4d8b92e65147b11bec92e725c0fb1a5603 WHIRLPOOL 601d8469b5bcfb0814765d42c6a41842912e2e9f742a0ee98b986cdd99c2f2c6e62aa585dacd3ea34e743b77cef2f45f595f0964b373d83bafcf2861376bd5dd
 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
@@ -89,5 +90,6 @@ EBUILD netbeans-mobility-9999_p20150314.ebuild 4418 SHA256 868338cda237157fce616
 EBUILD netbeans-mobility-9999_p20150315.ebuild 4418 SHA256 d7cac6fdd500bd76eb74d6f692d0d16198d628935909044ebf32efb1f048e954 SHA512 b3d8215b7ec38bf41db7e52507b781b45704b175641c28acda4396c890fcff3906a7aaa45ad61affcfb31c2ed42c60947e7e921df079312b4151a094177ace9e WHIRLPOOL b0d332186c1f00179581e3786ade5bcccf2907a7b133acdf1397f486f5822aea1c906b503355a9866d59fe46a1c89d1a07c717ba9855f7d3e74f42b3b77200ba
 EBUILD netbeans-mobility-9999_p20150316.ebuild 4418 SHA256 7a4d3cd5120af4a6fa1ab823c9a51fc0b0768593d5ed9565d88d268a09f50b45 SHA512 65d004d17cf83d8c555e14ce931b35dfe6e6c73fdf3af21eb3791ad7582179b9f1efc2ebda3eddf166c579aaac50dfa768547e37ea72ce4742bdd62dc613131d WHIRLPOOL 65aae18d60f14f23a5d7548feb8a80d31a8133763b4aa076c806211298d70b28c9cce4ca737f2886656df11936af2f4529e1cf547edcc3bb7c50846e82633a59
 EBUILD netbeans-mobility-9999_p20150323.ebuild 4418 SHA256 27a1cba40061216e88e594631d5a9216fa6753505251460f47af5dbaf0addae6 SHA512 cc3b25de7045f1701468875114bcbcb249f7d48e543c3a1f42ae193c1a00a4a06fb3a38e24802fe862001f02fac7ac1d0527728f5874f7a3a123a4f340da9bfd WHIRLPOOL 3b36cccd78452d7b48ab2bda9fa35b9f04d0d185e04a711eb4305018d4e794aad66b3c2f6e316cfbad20bbf1be67708af3bdaea2386a7ba68813a0217731bd6a
-MISC ChangeLog 160704 SHA256 ea8ec412beed5fae75d18abe56dbc7d7e9b3385f1b05d97e2dbae80963bbbe73 SHA512 9b8b1296a13c30e672a19fe0662b1d8cd3229e53f9664a639ca3aed5b3eac10e0f96775ddd8f93906a61cef60452b218b2bbdc00d33ca41e6ea65d839db1c324 WHIRLPOOL 7c4b358045fa56f39061843591d41d4167051b73a9fae2699ed1b45b9c2770e33f41b8ebbfdb90f0f09a12bdc323c4ee67cd29967c94625db0749e393f14c20e
+EBUILD netbeans-mobility-9999_p20150324.ebuild 4418 SHA256 1226d1a0a06fa3042ebda7c25664276b596c4126d17b4b0ca9e9f024ca4109bf SHA512 e04d06ce416a3761be7a58a202ea9eb2505f5c18f623df1b79ebd9ab26c11cbb6b512e4eb3d470b0bf1ccd83a41ff4cfeb42ae37a336bd427fe905c260736ddd WHIRLPOOL 37388599cda38e6cafbbc8dac0349d33133da4f143a8db90fb1486496b74ab420ea5dad7c275e7530ce40beedb8368fe3a5b0808db8abdd2ae8356e1f1ab156b
+MISC ChangeLog 160881 SHA256 2a98f8991e23d13f7e54f840220af22289ecfebdcd1b62ae6d23b860f4b861a6 SHA512 bfc334b218dc029617a9263ff94f7d2454093e10bb62be2782e0cf3c7920978f7a34f6c3991ced1ab3ca7326d348a9fdee86ced944b2ede3d596de5282a3c607 WHIRLPOOL 4eddf7f0874837cd8f503b9b25ec58e6bd08419c794c05e7406691f6bdbb53b2f6b0f1a10598d0437ab6ab0a60895a21ba220d153f04d9c04447e166402271ed
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150324.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150324.ebuild
new file mode 100644
index 0000000..4d03b20
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150324.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-03-24_00-01-28/zip/netbeans-trunk-nightly-201503240001-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 d51c932..f68a823 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_p20150324 (24 Mar 2015)
+
+  24 Mar 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-nb-9999_p20150324.ebuild:
+  bumped to the latest sources
+
 *netbeans-nb-9999_p20150323 (23 Mar 2015)
 
   23 Mar 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 0be38ca..1050b32 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -51,6 +51,7 @@ DIST netbeans-trunk-nightly-201503140001-src.zip 206563358 SHA256 45e73ee894e29a
 DIST netbeans-trunk-nightly-201503150001-src.zip 206575066 SHA256 0582e1b5b709088e393fe88d0dcce4fe0b79bc7fd56ae952933270e4a976e64a SHA512 8c101f394dedf528978ae2e75ba0c767b754e395a792c1ddb590e839066a221347ac1a34674b6036895caec4b5471998856132327cd5bb727bcfcf1ab8a8e065 WHIRLPOOL 1a7b48bad020198e0d0c5eaef09511f2f9282ec67504d9dd4f96b81c0f2c52a4bbfc4aba2599179f73281bc9faf4d33661c672ae567cf46deaff7a15f4fb6ba9
 DIST netbeans-trunk-nightly-201503160001-src.zip 206576233 SHA256 2b90db4378f6999df5ace1efd4a1c819e3ae95ce424480fc0229e45be5fc6054 SHA512 a3258264d72c8fc95c92f99faa4b8d86e440b10907f81c3a08c397926e0606723b875f925cbf0072f63eeb023093be022510015d20d588826d9f4de360201667 WHIRLPOOL 3bb0b967b55613424cadb381340062d180d199b4b83f780785d2b0f84143c88518fec2fbad55fcc00fa0518fe36f17a81ceff8c9874f84b0cb30f2d7478458d8
 DIST netbeans-trunk-nightly-201503230001-src.zip 206651850 SHA256 bda0494e885ce4cbee7281730eab0083988c08c89fc6ea1edfc05a1ed38cfed2 SHA512 96fd079c1649a36fb108a8b4f6128142e5f8666fdb03ea3cd015b387bcaff46c5216974bbf9dfbe74aef79799a4dec8357fdaff6bcf0ef05158ea99ebfe265bb WHIRLPOOL aa2087cfe8d7caa0608eccc6d1ac2d3328afa13fe35166894bef62f74b3c239c5370fe32dc3f6a00ca08325ffed47976fd36775acafcff8df7e060848f0593aa
+DIST netbeans-trunk-nightly-201503240001-src.zip 206669022 SHA256 1c106c09dc8e4634331659e872020751589e794f73d0f89175c59e3fef119ba6 SHA512 a854c4f98402d12466c722bf9427c77956bcfc6869338d58217534daa3bf0ca1d7f6d8d791018af37e7df37f7ca07e4d8b92e65147b11bec92e725c0fb1a5603 WHIRLPOOL 601d8469b5bcfb0814765d42c6a41842912e2e9f742a0ee98b986cdd99c2f2c6e62aa585dacd3ea34e743b77cef2f45f595f0964b373d83bafcf2861376bd5dd
 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
@@ -88,5 +89,6 @@ EBUILD netbeans-nb-9999_p20150314.ebuild 5003 SHA256 f353fe00a26ff451f3f691f4662
 EBUILD netbeans-nb-9999_p20150315.ebuild 5003 SHA256 b0566b91d500acc1b47df9ab6e88083f9d5ec3ccdb2adebc925e118a2be4abce SHA512 8a547379dea116e54ad8b86f81618d3e1163f5842c5e40f3edf01a12e47662ccaea1d7049b4abde39dd4f33ffa2b2ede8fa817de3bf6ea6e5b8ec0221abcac49 WHIRLPOOL 17b398e8bb85dc821e08cb746648a8ab2dc5baaf2cdc3eec40b94814e0bdbf87dc3fc5bb54e338d04977ad9f145aa774c7e2d18aa55ed1c3edd4712b738309b6
 EBUILD netbeans-nb-9999_p20150316.ebuild 5003 SHA256 97c22aa61dd1a6c358bbe6e261066c3e68cac01e2a07343544cce55d98261eaf SHA512 a72910e8288593a794a1b9348bbb796719b1aba6ceac2a2ffd61d0c223b90f23c260fd6067b61308b18967a80a464083fa5a0626460dc796ee1bd79a90bd592a WHIRLPOOL 74ec82b00f81071debc3467027a3d94c41b83ff10beddb86cb147bbea33e22fcaeef18b428c0d4851a55bdec12a5ee5cf36a9baafd45a8301db9b29e89ad7b5e
 EBUILD netbeans-nb-9999_p20150323.ebuild 5003 SHA256 ce23d2d82d911a759f51324bf178b247666a5eff746ce82617635fd8f683e5aa SHA512 ca70e8c611c73ae12c0a56d678c154619a5f4289a6c9cf95155071a6f13f69df0c257fc9828a6d886d308ff4c76ab811cae2eea54aebf3149f67eee99884f64c WHIRLPOOL 29c7319fdbd9d61faaf03802b3f9623eb2edb52babfdc42ec9d44de488c9ffd8f22191b28759ae50ae24cd3d5612dfe5dd00628c24b61c48add6ea713736275e
-MISC ChangeLog 150276 SHA256 1a3fa117cbe1b30a6f81a4702184ca911381a33387be73dd6134a6a37f002d3a SHA512 92a7179a9523ea796073fa00066eb1e20a4561ef6651ad135caf8eb81bb9d3a269418d086aabb65d3a1746b3074b3289dc4e3c2c6b4bea385b4e3e0b8fae86e3 WHIRLPOOL cdc971300e89ba8f1c6429ca74e44bdb5cc3bbaec75b3094337cdcba4da02f58e31315a16efe5114da6b768bfcf2e5fa38c439c673d564f500d91e1d60dfa5ab
+EBUILD netbeans-nb-9999_p20150324.ebuild 5003 SHA256 f6571da9d6acde03cb5c617d18d7df4d08b6b97123d689a2c36e6d1c129ca30f SHA512 9bfa7dd457ee88283e85c05b0319b771c6f18c626d80a33c11bd1ff6c13ac07842ae834e1146828e37214c344e59db7fe3d524ce0114904a374cf5a67d5844b2 WHIRLPOOL 3d283d6e90b7f3f5fafca614a82f6b03706d4ecd5db8f83bff34611eae8e35436fa73fd345df27170c2b5ea0df65652dc4eb90f699f1bb9ab589f0a05b64f2fb
+MISC ChangeLog 150441 SHA256 3cb7915faa51b7bf018caca65356447ef331cbd61209054f93e06c5248103f52 SHA512 e04c0c5c7299acc25e2e822932e9b270c2dfc1c4fa7b11d2f3dbebb89902654822a321d2b7c90b71087eee14bee6a4e330a4b21f25510eb10e930411f3d3dc3d WHIRLPOOL f75704cbeac0157ecd541750b4fb6e9dc3cd53f5b5914e61d3d565c9930a2c72630b4ca24b365acadc6c178e1f09718a537c44067a2c10c0054834a932fa6e9f
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20150324.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20150324.ebuild
new file mode 100644
index 0000000..5550b07
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20150324.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-03-24_00-01-28/zip/netbeans-trunk-nightly-201503240001-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 7994be9..c602041 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_p20150324 (24 Mar 2015)
+
+  24 Mar 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-php-9999_p20150324.ebuild:
+  bumped to the latest sources
+
 *netbeans-php-9999_p20150323 (23 Mar 2015)
 
   23 Mar 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index 2197ee4..d133417 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -54,6 +54,7 @@ DIST netbeans-trunk-nightly-201503140001-src.zip 206563358 SHA256 45e73ee894e29a
 DIST netbeans-trunk-nightly-201503150001-src.zip 206575066 SHA256 0582e1b5b709088e393fe88d0dcce4fe0b79bc7fd56ae952933270e4a976e64a SHA512 8c101f394dedf528978ae2e75ba0c767b754e395a792c1ddb590e839066a221347ac1a34674b6036895caec4b5471998856132327cd5bb727bcfcf1ab8a8e065 WHIRLPOOL 1a7b48bad020198e0d0c5eaef09511f2f9282ec67504d9dd4f96b81c0f2c52a4bbfc4aba2599179f73281bc9faf4d33661c672ae567cf46deaff7a15f4fb6ba9
 DIST netbeans-trunk-nightly-201503160001-src.zip 206576233 SHA256 2b90db4378f6999df5ace1efd4a1c819e3ae95ce424480fc0229e45be5fc6054 SHA512 a3258264d72c8fc95c92f99faa4b8d86e440b10907f81c3a08c397926e0606723b875f925cbf0072f63eeb023093be022510015d20d588826d9f4de360201667 WHIRLPOOL 3bb0b967b55613424cadb381340062d180d199b4b83f780785d2b0f84143c88518fec2fbad55fcc00fa0518fe36f17a81ceff8c9874f84b0cb30f2d7478458d8
 DIST netbeans-trunk-nightly-201503230001-src.zip 206651850 SHA256 bda0494e885ce4cbee7281730eab0083988c08c89fc6ea1edfc05a1ed38cfed2 SHA512 96fd079c1649a36fb108a8b4f6128142e5f8666fdb03ea3cd015b387bcaff46c5216974bbf9dfbe74aef79799a4dec8357fdaff6bcf0ef05158ea99ebfe265bb WHIRLPOOL aa2087cfe8d7caa0608eccc6d1ac2d3328afa13fe35166894bef62f74b3c239c5370fe32dc3f6a00ca08325ffed47976fd36775acafcff8df7e060848f0593aa
+DIST netbeans-trunk-nightly-201503240001-src.zip 206669022 SHA256 1c106c09dc8e4634331659e872020751589e794f73d0f89175c59e3fef119ba6 SHA512 a854c4f98402d12466c722bf9427c77956bcfc6869338d58217534daa3bf0ca1d7f6d8d791018af37e7df37f7ca07e4d8b92e65147b11bec92e725c0fb1a5603 WHIRLPOOL 601d8469b5bcfb0814765d42c6a41842912e2e9f742a0ee98b986cdd99c2f2c6e62aa585dacd3ea34e743b77cef2f45f595f0964b373d83bafcf2861376bd5dd
 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
@@ -91,5 +92,6 @@ EBUILD netbeans-php-9999_p20150314.ebuild 4423 SHA256 439fff2772c50f74e5cf2ec22a
 EBUILD netbeans-php-9999_p20150315.ebuild 4423 SHA256 b5e71de1b52ac1ab3bee9f2118bc9cd099f27a3048ad9bf45a7fbf77a9141075 SHA512 ede1e9245f817353e7ea6254ba1c3a8767f7a20423d9416b605e25e9f4ab8684794a1a6b4b122cba3d9dbe6c21f69dc139dd043aa5d1f609e9983673f73383a4 WHIRLPOOL e7f66dfa0226ce6ee0e69898e995ab39e81baeac21fc7a13a1487bd4b2005543b6b1b1e9a4c5d084aed7faa2e89a3c6344751bbc06033c5fa6bddad43d1e6a59
 EBUILD netbeans-php-9999_p20150316.ebuild 4423 SHA256 190c99e1462eb0220b306ae99ea777969571b5dd59608050c6d6ae8568a058f6 SHA512 e5cc5fef8f1e150aa617b40708ce26a6048ffa78f1a1558f89bdb6086279ee787af66f9f7b7381aa1da79c34bc0a7f28740a49fabbc08b8d8f97733e7641190e WHIRLPOOL 1e8409fe941a698bf5cfe7266bd7869aa04740b5e381528c61bf17b25974c7cd8cacf88104545953b509a46c3a867fedf77226c3318307922bf206d0641b1bd4
 EBUILD netbeans-php-9999_p20150323.ebuild 4423 SHA256 4af3b32b676b8a74e8a2c282b1688e1c9aaa8eacc1c0d712b86ad323933b41ec SHA512 8eb7772c9aa94451a4eeb2713dc9b39725ac3c03b2914a21bcc8ca2a81a4d8929461ce6775e744c75a925c551bf815f347648a0002cf8d4d9ec8de8cc4419643 WHIRLPOOL 4077b2254d4fbb124d902981f4880fb0e23101e787b9e534b0725f9019d7f83cdcdde3e7f3fbd6269412c26d4be7fcad12a50f83a9d8078742803e3823bcf3d9
-MISC ChangeLog 149902 SHA256 008ed4ffce8c52f4b84fbe625958a66e427f5467a5b8bdd8888ec225faf12ef6 SHA512 404db39dcc03c6aeb770c0cdc9676a9aaebb26c951beddbe62659c394afa54b6b1753d8e4171ad183f2f65734fdc43122c41bb4eae30abe782e2ef6e5aae773d WHIRLPOOL d25a4c7dfbe8399d5e193572ae233bdfea782752c14ddea17a96d596cc5934b6ef839837c3e028ae1906e86ebcbe5a1bb5689e769910c411b5e7186d182891b9
+EBUILD netbeans-php-9999_p20150324.ebuild 4423 SHA256 ec4f78cf66e882f56769714b5b56c22911b9a804f661b1e26977da66118f3651 SHA512 e24a7735484e1609060d366a3057c471104abb558c4b6a1564bc815eda6931b590033eeeba9e599922edda6b295e4c66470944f82543d9b6ca458aea0a2084bb WHIRLPOOL a3794aebbd85e21f0626ec64937701cbea0cbfbde4ead43376b8083491fc6f86581ff72a4902d101c9787e8d392e60e49875d801ad6e6d1ff781d033c8862643
+MISC ChangeLog 150069 SHA256 65f666a69f290f0cefc14dae7e66105c7099eff5ac62e4a4130f8cbb9d568d8b SHA512 990760f432fdaff396a2a71eb52bdd208be16543eff0cc8079ecb99172714b811c7ab07206d6cb8bb0ce5e165627890909b756cd48bb60326f7a5f96173ce190 WHIRLPOOL abf724fea023f4b6bb5231de5423d560df4ac52088b426b810934b289be428d8c0a630a6d768c0afe5f0079dd866a6f4fcf613c6f9e2151401c6082a37db1204
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20150324.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20150324.ebuild
new file mode 100644
index 0000000..e5875cd
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20150324.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-03-24_00-01-28/zip/netbeans-trunk-nightly-201503240001-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 9f59a86..c993d9a 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_p20150324 (24 Mar 2015)
+
+  24 Mar 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-platform-9999_p20150324.ebuild:
+  bumped to the latest sources
+
 *netbeans-platform-9999_p20150323 (23 Mar 2015)
 
   23 Mar 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 2bebeb5..73e552c 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -68,6 +68,7 @@ DIST netbeans-trunk-nightly-201503140001-src.zip 206563358 SHA256 45e73ee894e29a
 DIST netbeans-trunk-nightly-201503150001-src.zip 206575066 SHA256 0582e1b5b709088e393fe88d0dcce4fe0b79bc7fd56ae952933270e4a976e64a SHA512 8c101f394dedf528978ae2e75ba0c767b754e395a792c1ddb590e839066a221347ac1a34674b6036895caec4b5471998856132327cd5bb727bcfcf1ab8a8e065 WHIRLPOOL 1a7b48bad020198e0d0c5eaef09511f2f9282ec67504d9dd4f96b81c0f2c52a4bbfc4aba2599179f73281bc9faf4d33661c672ae567cf46deaff7a15f4fb6ba9
 DIST netbeans-trunk-nightly-201503160001-src.zip 206576233 SHA256 2b90db4378f6999df5ace1efd4a1c819e3ae95ce424480fc0229e45be5fc6054 SHA512 a3258264d72c8fc95c92f99faa4b8d86e440b10907f81c3a08c397926e0606723b875f925cbf0072f63eeb023093be022510015d20d588826d9f4de360201667 WHIRLPOOL 3bb0b967b55613424cadb381340062d180d199b4b83f780785d2b0f84143c88518fec2fbad55fcc00fa0518fe36f17a81ceff8c9874f84b0cb30f2d7478458d8
 DIST netbeans-trunk-nightly-201503230001-src.zip 206651850 SHA256 bda0494e885ce4cbee7281730eab0083988c08c89fc6ea1edfc05a1ed38cfed2 SHA512 96fd079c1649a36fb108a8b4f6128142e5f8666fdb03ea3cd015b387bcaff46c5216974bbf9dfbe74aef79799a4dec8357fdaff6bcf0ef05158ea99ebfe265bb WHIRLPOOL aa2087cfe8d7caa0608eccc6d1ac2d3328afa13fe35166894bef62f74b3c239c5370fe32dc3f6a00ca08325ffed47976fd36775acafcff8df7e060848f0593aa
+DIST netbeans-trunk-nightly-201503240001-src.zip 206669022 SHA256 1c106c09dc8e4634331659e872020751589e794f73d0f89175c59e3fef119ba6 SHA512 a854c4f98402d12466c722bf9427c77956bcfc6869338d58217534daa3bf0ca1d7f6d8d791018af37e7df37f7ca07e4d8b92e65147b11bec92e725c0fb1a5603 WHIRLPOOL 601d8469b5bcfb0814765d42c6a41842912e2e9f742a0ee98b986cdd99c2f2c6e62aa585dacd3ea34e743b77cef2f45f595f0964b373d83bafcf2861376bd5dd
 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
@@ -105,5 +106,6 @@ EBUILD netbeans-platform-9999_p20150314.ebuild 8293 SHA256 80fd35760c8ba8730057a
 EBUILD netbeans-platform-9999_p20150315.ebuild 8293 SHA256 40c5f130cb6e9f50b6c9eec93bf4aaffe856fb36ab02c7bd27ad9198d24f15a1 SHA512 1c015ffe6923539a8f42099b13037f4645257b3ed3f97ef5a579cc9e235fd684f4106d2916f3d084ebafa1f5bd87904f0768829f02e3b2075e8a840762bc7f09 WHIRLPOOL b655f8fe1665c7f88e2110403676ee102fba726df7fc46657c04def300d22a342c980fc430ca2ebe5d257f4474e9d6633b1e378443aeb031b8f08032cd75b581
 EBUILD netbeans-platform-9999_p20150316.ebuild 8293 SHA256 f4ee283252fe197fc11193e673f37fe3229479571efcdbf370ac70711525daa1 SHA512 57ff1cfa46e5190b5c34a96f27b23e75f48a8fa8805a187d3c8d663d1e993c0385292e8e49a1bb8d6213f297e637313da77f9a7193c54594fccb0ccb2770f7a4 WHIRLPOOL e1622972c8d5902c042abb913caa68e25e1b5f7adc787220d025b1b69893d6968c7e5477c0fe38ece41d333fbac372da66515cb5337e3d8c7c6c75843b901276
 EBUILD netbeans-platform-9999_p20150323.ebuild 8293 SHA256 66eafb06bf2c53dd51b1ed079120158f78ed0aaf5d4f47c538d5a771629e2969 SHA512 cd77074d2eae6d36c808047f8cf3ef5931f2ea8f01c88287150c3339f71435809dfaa9471f9a28cdb5dedf1a2aa071b157c3d4656184a6e05894c93220d88e99 WHIRLPOOL 529231b425b79067f33787ca191417a8890a178b16e0230221fe8d2e9ed6a97d05489e1b0a8ba74ba6cc78795c7b494215d8470dfbfcd7d9c2e57c1705b4bb33
-MISC ChangeLog 161300 SHA256 1b227d37a6667cbb2e70ab63ffa3682327d164b7e0bc5617b81c1011f3e7323d SHA512 2e30fbec126f08280ec5108672d96e47857a9370bcc3ce5623629d5f2f8302843b4ea09e937e33680378a2ea67a5c85d230645e5fe3f81b767a56be6836dea8f WHIRLPOOL 0a263bc5cbc0716686b5fe0e008f705b426defd71ec4e97f7d38ddb7a3829ec5917d47c1f8283833dcde5c69449c8c369ea09e09d5df8f275f36b5d3892fad72
+EBUILD netbeans-platform-9999_p20150324.ebuild 8293 SHA256 46a2bab3291c824dc95270b8a083cec510ab905d822e951c47b3706cd4bd00ee SHA512 a8f97151480b3adca93efed43678fa954ffc0d820e55e4267bee0e8f5c1d71d6f526bffddaa3374a4e5bdf20f8cb0b8bf8f80e9aedb4212082767114a8a72032 WHIRLPOOL 6e0d0a6cfd642580d3cb18e65b2566c4faecd97486ac47d09914cdf85450417d5db00ce27c90155737e3de3196b29d869bebca4f4b234063e244e11135d5e35f
+MISC ChangeLog 161477 SHA256 7fc34c7ace19c38358a2feda6b79878396aae893bb2973d1fd8ce41a35a16bfa SHA512 dfa5c5471c3a81d44cbe18fd33710518fb079750d6fc383f9f415e4575529845374db728bdfe5a18b7813fcd2d3927e9c45ca83e1d12c9f49b8b51773fcb6e17 WHIRLPOOL 7163cfc2ccd0f4970d2a8d376642c3634e8318ff90299013f35eac138980b78bee6b4061c69d754d6a6d5d748892b709b32f2c0c9ef1175c6150811fed18a66c
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20150324.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20150324.ebuild
new file mode 100644
index 0000000..bf3af1f
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20150324.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-03-24_00-01-28/zip/netbeans-trunk-nightly-201503240001-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 ea6ad49..009fda5 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_p20150324 (24 Mar 2015)
+
+  24 Mar 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-profiler-9999_p20150324.ebuild:
+  bumped to the latest sources
+
 *netbeans-profiler-9999_p20150323 (23 Mar 2015)
 
   23 Mar 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 38426c5..9350080 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -43,6 +43,7 @@ DIST netbeans-trunk-nightly-201503140001-src.zip 206563358 SHA256 45e73ee894e29a
 DIST netbeans-trunk-nightly-201503150001-src.zip 206575066 SHA256 0582e1b5b709088e393fe88d0dcce4fe0b79bc7fd56ae952933270e4a976e64a SHA512 8c101f394dedf528978ae2e75ba0c767b754e395a792c1ddb590e839066a221347ac1a34674b6036895caec4b5471998856132327cd5bb727bcfcf1ab8a8e065 WHIRLPOOL 1a7b48bad020198e0d0c5eaef09511f2f9282ec67504d9dd4f96b81c0f2c52a4bbfc4aba2599179f73281bc9faf4d33661c672ae567cf46deaff7a15f4fb6ba9
 DIST netbeans-trunk-nightly-201503160001-src.zip 206576233 SHA256 2b90db4378f6999df5ace1efd4a1c819e3ae95ce424480fc0229e45be5fc6054 SHA512 a3258264d72c8fc95c92f99faa4b8d86e440b10907f81c3a08c397926e0606723b875f925cbf0072f63eeb023093be022510015d20d588826d9f4de360201667 WHIRLPOOL 3bb0b967b55613424cadb381340062d180d199b4b83f780785d2b0f84143c88518fec2fbad55fcc00fa0518fe36f17a81ceff8c9874f84b0cb30f2d7478458d8
 DIST netbeans-trunk-nightly-201503230001-src.zip 206651850 SHA256 bda0494e885ce4cbee7281730eab0083988c08c89fc6ea1edfc05a1ed38cfed2 SHA512 96fd079c1649a36fb108a8b4f6128142e5f8666fdb03ea3cd015b387bcaff46c5216974bbf9dfbe74aef79799a4dec8357fdaff6bcf0ef05158ea99ebfe265bb WHIRLPOOL aa2087cfe8d7caa0608eccc6d1ac2d3328afa13fe35166894bef62f74b3c239c5370fe32dc3f6a00ca08325ffed47976fd36775acafcff8df7e060848f0593aa
+DIST netbeans-trunk-nightly-201503240001-src.zip 206669022 SHA256 1c106c09dc8e4634331659e872020751589e794f73d0f89175c59e3fef119ba6 SHA512 a854c4f98402d12466c722bf9427c77956bcfc6869338d58217534daa3bf0ca1d7f6d8d791018af37e7df37f7ca07e4d8b92e65147b11bec92e725c0fb1a5603 WHIRLPOOL 601d8469b5bcfb0814765d42c6a41842912e2e9f742a0ee98b986cdd99c2f2c6e62aa585dacd3ea34e743b77cef2f45f595f0964b373d83bafcf2861376bd5dd
 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
@@ -80,5 +81,6 @@ EBUILD netbeans-profiler-9999_p20150314.ebuild 3478 SHA256 4635eba56c5aa98f649ab
 EBUILD netbeans-profiler-9999_p20150315.ebuild 3478 SHA256 64671f88bd1244c78f3e6b66c762f5ce1672d65dbf697108bf23fc17d28a3660 SHA512 90a97e01cf0dfa364f767b5500d2d20394b8c564f3b9c8e5d4369dc2f1210ec762fa2b6c892be5b37b2325863af29d0b59978fb7e95b3224f7aaeacfed7059f6 WHIRLPOOL e4399b8de1a3eeea644f2ef1ff5dbbdb03bd587b060ae7c6489ffae14f400636a4781167c2c1a5c67f5fa020067a397fdf5e9cfe51c43667c0b539ba5b9734b7
 EBUILD netbeans-profiler-9999_p20150316.ebuild 3478 SHA256 b0161313529fd1d5730a090142d40a5e48f4a8e0b9d79ba037fc782125dcbc89 SHA512 6090dfc6eb76ea25de639e97c552c2764decedc2818655a81dc8ce9c9a78287da8da3ee114b3a42e0b72026ef4cf3e8227d1ddab9835c93f0e549b8a6886e2f4 WHIRLPOOL 0cc44f20605f9dfb066501533a70261b5cdfd601165ecfad610dfb53bb8125f5bcd3c601c0dbb35560be7fe5de841fc129dd5accd8d7f94d6ad47976fff59cb9
 EBUILD netbeans-profiler-9999_p20150323.ebuild 3478 SHA256 113c2713743534038d996dc573833576902c5baf158af22a64752ecb2ed40750 SHA512 d60122719f229ca5bc30594fae93c6adfc76b71ca58f60eca757cf0cfb082d2dbc4afdbf66184b106e105c9f9d1ffb10387dda0266ae37b4354b1c72b373b70c WHIRLPOOL 6d42a868f42403d8c368cb612c724f886b1d40763b59b210a4d313c5c77c8e24518db22369a30fc39460c395daef7c6751fa91cf9f53104a2f13c8a87f923956
-MISC ChangeLog 160761 SHA256 633b203e60131e9748ec02c969c49249a35ecb369169a4f566f49e10f08aa54f SHA512 5b2155eb03be99d41991a84fb2b0f023acff36021e65dea55caa5023a9bb84ff11176e8465db1b381e51b30b25108471fdf2a23875e9b742bcf7450d938421fd WHIRLPOOL e51a0bffb17c538e3d86ef167a44dcf675794abf09216f364fa1c6148b8e71545310818d64017940bb1d6abca3af837a5848930094b1505ad0e36c8d5b7fb005
+EBUILD netbeans-profiler-9999_p20150324.ebuild 3478 SHA256 9828cd94bb308a3143068bb77b5bb41815d38baef5095e14af2d0c2c1082ac4d SHA512 0be7c0960f1b8fd482dc2fc2418d8e8d4ab075764637d39be3ba7511b7c4746fa129e66bafed91b9784e9103b89cc1c5fe273a0ec54b5e664cde3b7ace926a40 WHIRLPOOL 712050b4677d0d1e568f06f34b3e06ea9f55b8774655097d0a3509759583c0c7cddb82538ca5cf84cb18c246a2fe7fd25e545d3a226f9a757ba2dbdd02685c2d
+MISC ChangeLog 160938 SHA256 1cfc060c36bf38f5d641741b40635dc7149b4e7e59bb85d80109fbbba2e0d7f5 SHA512 5bf5f14acfc8fbc5c0f44b253e7c5c5e944083e3cb89ea50a926e613334b44ae9f2d57b008210c313727d62b2c59ee02067bb5368c60c823c09352f7ecadc3af WHIRLPOOL b61e8151dda8d1341f99f46f27cb932d6abc8f2f338bce2bda71886d89fb2526bdb4a5e55a2ac2353fa5eb9fbc0487725d3f86a7277eaf1241e8ec353be9795c
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150324.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150324.ebuild
new file mode 100644
index 0000000..85009fb
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150324.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-03-24_00-01-28/zip/netbeans-trunk-nightly-201503240001-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 b6ebbf8..c71a857 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_p20150324 (24 Mar 2015)
+
+  24 Mar 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-webcommon-9999_p20150324.ebuild:
+  bumped to the latest sources
+
 *netbeans-webcommon-9999_p20150323 (23 Mar 2015)
 
   23 Mar 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index 755cd6f..7397d0a 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -49,6 +49,7 @@ DIST netbeans-trunk-nightly-201503140001-src.zip 206563358 SHA256 45e73ee894e29a
 DIST netbeans-trunk-nightly-201503150001-src.zip 206575066 SHA256 0582e1b5b709088e393fe88d0dcce4fe0b79bc7fd56ae952933270e4a976e64a SHA512 8c101f394dedf528978ae2e75ba0c767b754e395a792c1ddb590e839066a221347ac1a34674b6036895caec4b5471998856132327cd5bb727bcfcf1ab8a8e065 WHIRLPOOL 1a7b48bad020198e0d0c5eaef09511f2f9282ec67504d9dd4f96b81c0f2c52a4bbfc4aba2599179f73281bc9faf4d33661c672ae567cf46deaff7a15f4fb6ba9
 DIST netbeans-trunk-nightly-201503160001-src.zip 206576233 SHA256 2b90db4378f6999df5ace1efd4a1c819e3ae95ce424480fc0229e45be5fc6054 SHA512 a3258264d72c8fc95c92f99faa4b8d86e440b10907f81c3a08c397926e0606723b875f925cbf0072f63eeb023093be022510015d20d588826d9f4de360201667 WHIRLPOOL 3bb0b967b55613424cadb381340062d180d199b4b83f780785d2b0f84143c88518fec2fbad55fcc00fa0518fe36f17a81ceff8c9874f84b0cb30f2d7478458d8
 DIST netbeans-trunk-nightly-201503230001-src.zip 206651850 SHA256 bda0494e885ce4cbee7281730eab0083988c08c89fc6ea1edfc05a1ed38cfed2 SHA512 96fd079c1649a36fb108a8b4f6128142e5f8666fdb03ea3cd015b387bcaff46c5216974bbf9dfbe74aef79799a4dec8357fdaff6bcf0ef05158ea99ebfe265bb WHIRLPOOL aa2087cfe8d7caa0608eccc6d1ac2d3328afa13fe35166894bef62f74b3c239c5370fe32dc3f6a00ca08325ffed47976fd36775acafcff8df7e060848f0593aa
+DIST netbeans-trunk-nightly-201503240001-src.zip 206669022 SHA256 1c106c09dc8e4634331659e872020751589e794f73d0f89175c59e3fef119ba6 SHA512 a854c4f98402d12466c722bf9427c77956bcfc6869338d58217534daa3bf0ca1d7f6d8d791018af37e7df37f7ca07e4d8b92e65147b11bec92e725c0fb1a5603 WHIRLPOOL 601d8469b5bcfb0814765d42c6a41842912e2e9f742a0ee98b986cdd99c2f2c6e62aa585dacd3ea34e743b77cef2f45f595f0964b373d83bafcf2861376bd5dd
 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
@@ -84,5 +85,6 @@ EBUILD netbeans-webcommon-9999_p20150314.ebuild 4997 SHA256 de26b5f81c361ce727db
 EBUILD netbeans-webcommon-9999_p20150315.ebuild 4997 SHA256 c8170b82d9a16f0b79b744c12129b5d7b8905b25501fb0f1184593631d97afd5 SHA512 667ed5dab2d2c4fb7bc8d8c4e11ee86253dc470a6e023fe7df09b79e2319c8d78523c3138d6efa0f952cb46d04b6e168e33788da2d8dd4034219340b979d93ae WHIRLPOOL 4d19a4e59ee07f5a30ce28f93078d3ca1ab9babbff13fa35b108263d1f95b6639ab949832aa9e0f05ca9407887f3dbaf7c9947ff7f7a6b7cdef01ad785a6d105
 EBUILD netbeans-webcommon-9999_p20150316.ebuild 4997 SHA256 bf448230c0ba69a162066f03aa1fa1727a1e617c778bc004dd56b15a626635bb SHA512 281871654218b616d90ae7c903b3ccf80f082a5f11a099f14d836daf9531c1d5056240251c6fb2a7d3d8b9738116c264b865de3b5b4fd3da0c9cf26da582935b WHIRLPOOL c0227f953de93a854b088c53beabe0dfca54bff70acc3e1fb6db21fc78a738577d79a0270997ffc63143a698b3a029b0f34d07527abed7f7196d4f12086c9f31
 EBUILD netbeans-webcommon-9999_p20150323.ebuild 4997 SHA256 8ace52e674a57588c562d87eccf13c8dec884ead4114bfa2248af7c6d02e0c07 SHA512 c1c41d6ab97b01003654415082f303e35746b4b6304c73ba2b3c63cd950a22370ffa1c9afed25c686e69c88035f80e02df24a2852e51854cf09c2d870fb99ae5 WHIRLPOOL 82026cd19d9a28ae1196b9ae6487bbec82365c1cdcf576953d94bafbc62576d571eb3e37e84b775a7688b901c5453f4265c30edaf0dadea01213541e1161e0ae
-MISC ChangeLog 133742 SHA256 9ac55d4accd194b085033bd1e92b5a7b220dd7066e487f1885c97361df56755a SHA512 5d4d2da8b645375813f59dc93183c44cdaf0aabfb369374fb89c7561a5129abe06f5dae898ec8857651897ba76172be223e5e8d6b1ee67ea847bb7176cd4edc7 WHIRLPOOL 1e67dd347989d0bd8f61c0878f207505f33d9c9784697d704d0a394f2a5ffa4c1ea7520d6e5600dffd4725743e615629fd61f141f74d6bafd1ff250711830b33
+EBUILD netbeans-webcommon-9999_p20150324.ebuild 4997 SHA256 b3b88dc4892c739ebd14180925db0df5a15fdef4ab5e5043c6b470b2996fb76d SHA512 c2557356b63cc6618b45bf73fab63ac2b90551eff90039260cd6145cb38404f7cad9c1166f3becd73699ce5fef226026537f8f45aab5a08121955fe768e832ee WHIRLPOOL c31e1faaa6a8c7c20ca82e03445d11cac75e3b2308ab162eeface3813fcebaaf13d34d06d30f4f72ee034e04733ab6ad8f7be9b97f2bed4a5ee78b7943e3b83a
+MISC ChangeLog 133921 SHA256 ad39d6ec92bcf8594f1f3c26618d5e196356505c4c09266f4002203adb6ea173 SHA512 b1111cbb12c8ccd9b8a4064178adb60f457b99efdf6b41d2a889a860a10c1feb5186217ff51c102601ad97e1a68f69c5081d0c9027d8cab38446db519838c715 WHIRLPOOL e0d4933a6c4950064a1bb0f8f82921825de7c5c1171839fe3e923a5f8e6b865f50d5b2f9f17032abea9ada24521831759a174c2499af1945d52f603dc1bce624
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150324.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150324.ebuild
new file mode 100644
index 0000000..b3cc8a4
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150324.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-03-24_00-01-28/zip/netbeans-trunk-nightly-201503240001-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 2c24ecc..5b383e5 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_p20150324 (24 Mar 2015)
+
+  24 Mar 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-websvccommon-9999_p20150324.ebuild:
+  bumped to the latest sources
+
 *netbeans-websvccommon-9999_p20150323 (23 Mar 2015)
 
   23 Mar 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 9be1711..75d9be8 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -43,6 +43,7 @@ DIST netbeans-trunk-nightly-201503140001-src.zip 206563358 SHA256 45e73ee894e29a
 DIST netbeans-trunk-nightly-201503150001-src.zip 206575066 SHA256 0582e1b5b709088e393fe88d0dcce4fe0b79bc7fd56ae952933270e4a976e64a SHA512 8c101f394dedf528978ae2e75ba0c767b754e395a792c1ddb590e839066a221347ac1a34674b6036895caec4b5471998856132327cd5bb727bcfcf1ab8a8e065 WHIRLPOOL 1a7b48bad020198e0d0c5eaef09511f2f9282ec67504d9dd4f96b81c0f2c52a4bbfc4aba2599179f73281bc9faf4d33661c672ae567cf46deaff7a15f4fb6ba9
 DIST netbeans-trunk-nightly-201503160001-src.zip 206576233 SHA256 2b90db4378f6999df5ace1efd4a1c819e3ae95ce424480fc0229e45be5fc6054 SHA512 a3258264d72c8fc95c92f99faa4b8d86e440b10907f81c3a08c397926e0606723b875f925cbf0072f63eeb023093be022510015d20d588826d9f4de360201667 WHIRLPOOL 3bb0b967b55613424cadb381340062d180d199b4b83f780785d2b0f84143c88518fec2fbad55fcc00fa0518fe36f17a81ceff8c9874f84b0cb30f2d7478458d8
 DIST netbeans-trunk-nightly-201503230001-src.zip 206651850 SHA256 bda0494e885ce4cbee7281730eab0083988c08c89fc6ea1edfc05a1ed38cfed2 SHA512 96fd079c1649a36fb108a8b4f6128142e5f8666fdb03ea3cd015b387bcaff46c5216974bbf9dfbe74aef79799a4dec8357fdaff6bcf0ef05158ea99ebfe265bb WHIRLPOOL aa2087cfe8d7caa0608eccc6d1ac2d3328afa13fe35166894bef62f74b3c239c5370fe32dc3f6a00ca08325ffed47976fd36775acafcff8df7e060848f0593aa
+DIST netbeans-trunk-nightly-201503240001-src.zip 206669022 SHA256 1c106c09dc8e4634331659e872020751589e794f73d0f89175c59e3fef119ba6 SHA512 a854c4f98402d12466c722bf9427c77956bcfc6869338d58217534daa3bf0ca1d7f6d8d791018af37e7df37f7ca07e4d8b92e65147b11bec92e725c0fb1a5603 WHIRLPOOL 601d8469b5bcfb0814765d42c6a41842912e2e9f742a0ee98b986cdd99c2f2c6e62aa585dacd3ea34e743b77cef2f45f595f0964b373d83bafcf2861376bd5dd
 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
@@ -80,5 +81,6 @@ EBUILD netbeans-websvccommon-9999_p20150314.ebuild 2727 SHA256 b6f62c688483a6d5a
 EBUILD netbeans-websvccommon-9999_p20150315.ebuild 2727 SHA256 7660ee2638efd17ae6c8749c7c9a6f171c424b69a85b0a4a61f0c56127fe3b3f SHA512 e71af30d03905a96972131667d72f8e516ca1819f51ea34244847e296d6f5c3cd800095d28e85a07201433db8862ec181caa7a3f1ecab553017b09e369d8833f WHIRLPOOL 3acb7904890ec8831cb01882692a9c62f5bac2c0bbcff3cbe72dbf6738c0ca66174c6d5cee5f6eb9b592fb9f2ee389b774ec001a5a7d6a7b684697639257767d
 EBUILD netbeans-websvccommon-9999_p20150316.ebuild 2727 SHA256 1e659b0aa4ff810542a7d6f0ad93907b1be5f758790055025014d09d5a4475f7 SHA512 b9a0cc5226e34b0a600427acc7e8b66f6552aec544329f5ba5d19db6c4c848de71195828c0d7e3eaf8d4a730f6327d0cead9d714f08ef0bc25be7c78f4f0f72b WHIRLPOOL ed7cbc283755e9ce76270d9b7e52767c815260289b5abfb6865e8b97e0db9ae9810fcd0a5fd0e19892bf6f3d50bc3458b5f7941fa285f4356a804ce62c2fd273
 EBUILD netbeans-websvccommon-9999_p20150323.ebuild 2727 SHA256 22b456b742d1bcc9ddad172565d80fb8f1809ac4819c20670cf6768840153f14 SHA512 cc84fbc3055f0785408403ef7e62801b197f7e8dcd93c0d24ce2be3a2df8d0c12f639826cd4f514f25072bae280e7ce4b6921f891f408a40b42ba551f778942a WHIRLPOOL 1ea28fbb116c8d04bea3cc9c234ccb85c7a353f7153add3e1d003e8fa0ce93908de1084f134c0bff44aa4a54ece74c9ef92f484b83209a425e00f39fb44ee202
-MISC ChangeLog 168426 SHA256 1e54f0373798a3917afd6918f1127a69bee9d47ed2c51c1e764b27cee5248d01 SHA512 292f9eafdc8da6ae975a63c58ad0b068983882fdaf6c7cfff808e2f49c2b6b6e0eb4240ec270ab17f34d98e67335a7aeeeeb16cb235f54482cd78fec5732c36a WHIRLPOOL d2bffe0bee64d99d02187cb9981ab2e9ce68b3ebc27d36014ac79fdcc82e2d710e26aeaaf063b32991102906c75d5713e7d89c9af958976aa174e8e1e027d1ff
+EBUILD netbeans-websvccommon-9999_p20150324.ebuild 2727 SHA256 f98113607baeb95d5d78b8960f863011b47565b32456121be0a2ded3cdfae153 SHA512 d615f8cc13632821fed1b1a83c15be4b315c53215b03865dac208e95e1042a970636addceb5833ab3dd596ea46b129d6fdfef85934f3be34d2de15b5a7ed31fd WHIRLPOOL aaf1d0561b81128d5dd0002cadc5de30b4344abd47752e70c2e3a8e0bbdc8e29a06844cf85cc321021e34752de4b08e5ca9f0df7993fab1ed9ad9c73586d671f
+MISC ChangeLog 168611 SHA256 f89e690a2c0c9bfc25b280847e236aadca3e1a01c1b987ab175f34fab0ef1946 SHA512 12b3966041d061051fe87c3f3ef145b7bc9bc974d3c467b6f434eb04110c33bcc45770e5f96c0e27dc5bb007a59f62d3129a61be6e69f1c37dd8d8c01be3ba0f WHIRLPOOL dfbc34f1bc73c378032cc2201c76f30e1bd785611c074e02d8ad1aa588d8b053dec6d6c71737511b7d851e62750bbdc162783c9c55e661408a07132d61b34ef1
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150324.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150324.ebuild
new file mode 100644
index 0000000..fc66397
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150324.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-03-24_00-01-28/zip/netbeans-trunk-nightly-201503240001-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 2cc6719..c85df58 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_p20150324 (24 Mar 2015)
+
+  24 Mar 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-9999_p20150324.ebuild:
+  bumped to the latest sources
+
 *netbeans-9999_p20150323 (23 Mar 2015)
 
   23 Mar 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 5fd9cb7..7f77427 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -51,6 +51,7 @@ DIST netbeans-trunk-nightly-201503140001-src.zip 206563358 SHA256 45e73ee894e29a
 DIST netbeans-trunk-nightly-201503150001-src.zip 206575066 SHA256 0582e1b5b709088e393fe88d0dcce4fe0b79bc7fd56ae952933270e4a976e64a SHA512 8c101f394dedf528978ae2e75ba0c767b754e395a792c1ddb590e839066a221347ac1a34674b6036895caec4b5471998856132327cd5bb727bcfcf1ab8a8e065 WHIRLPOOL 1a7b48bad020198e0d0c5eaef09511f2f9282ec67504d9dd4f96b81c0f2c52a4bbfc4aba2599179f73281bc9faf4d33661c672ae567cf46deaff7a15f4fb6ba9
 DIST netbeans-trunk-nightly-201503160001-src.zip 206576233 SHA256 2b90db4378f6999df5ace1efd4a1c819e3ae95ce424480fc0229e45be5fc6054 SHA512 a3258264d72c8fc95c92f99faa4b8d86e440b10907f81c3a08c397926e0606723b875f925cbf0072f63eeb023093be022510015d20d588826d9f4de360201667 WHIRLPOOL 3bb0b967b55613424cadb381340062d180d199b4b83f780785d2b0f84143c88518fec2fbad55fcc00fa0518fe36f17a81ceff8c9874f84b0cb30f2d7478458d8
 DIST netbeans-trunk-nightly-201503230001-src.zip 206651850 SHA256 bda0494e885ce4cbee7281730eab0083988c08c89fc6ea1edfc05a1ed38cfed2 SHA512 96fd079c1649a36fb108a8b4f6128142e5f8666fdb03ea3cd015b387bcaff46c5216974bbf9dfbe74aef79799a4dec8357fdaff6bcf0ef05158ea99ebfe265bb WHIRLPOOL aa2087cfe8d7caa0608eccc6d1ac2d3328afa13fe35166894bef62f74b3c239c5370fe32dc3f6a00ca08325ffed47976fd36775acafcff8df7e060848f0593aa
+DIST netbeans-trunk-nightly-201503240001-src.zip 206669022 SHA256 1c106c09dc8e4634331659e872020751589e794f73d0f89175c59e3fef119ba6 SHA512 a854c4f98402d12466c722bf9427c77956bcfc6869338d58217534daa3bf0ca1d7f6d8d791018af37e7df37f7ca07e4d8b92e65147b11bec92e725c0fb1a5603 WHIRLPOOL 601d8469b5bcfb0814765d42c6a41842912e2e9f742a0ee98b986cdd99c2f2c6e62aa585dacd3ea34e743b77cef2f45f595f0964b373d83bafcf2861376bd5dd
 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
@@ -88,5 +89,6 @@ EBUILD netbeans-9999_p20150314.ebuild 7216 SHA256 7150f469e58b7e39d275cc56a09fd9
 EBUILD netbeans-9999_p20150315.ebuild 7216 SHA256 9b519e3e37e82b7d8de15644a6c28d14413a973a2b471166d0d21f5ffcb85f46 SHA512 0af051c4127c8c67594f0984ae41cde26aac97a4c4eba8add7a57b14b7f33f73b9fb43e8d73a09273469dd53808207a83a8ce57d3159ffa75b041dcbcc04b8cb WHIRLPOOL c9e5adfc66d88976763d21cc50d2bcd681c11f5c8cd0d963c67e0b97ecf183ea91a93cf59b780382a5fdb3a1563d3b57d3158d6cdfcc680b0479068c6454d997
 EBUILD netbeans-9999_p20150316.ebuild 7216 SHA256 b11346d97b2b908ba7e9570355cc8ad764d1ca7e85df00903a6a9c9035fbe8c6 SHA512 9952387f70d7e6bd62f574c696ea017925b8dbafbd265e2dba54b88217c2c9054b1abe08b0efc2e71cea80679a3bdf85da3ac32eb0f2c922af1ca181d319e6e2 WHIRLPOOL fff97c283de1104f2a3c6468735b45e3f8fa6c97436da248e0a1d385642f895655c4f43cea0d99070c82c1197b54160d1b44d6803ab7e28fae921ed22cbe7122
 EBUILD netbeans-9999_p20150323.ebuild 7216 SHA256 1b01149cc664cd07885506e8cfb3103f237694a89b85774c37bad79e98cf6080 SHA512 3b3c1704965caba518598885c1085d4eea3380dc524191a6b3d3b8961b8b251f10eac20e6320d830219dd94170b87253f827427a41cce83162995e778daad4d9 WHIRLPOOL 0a2da81bd1edf0b1044a400f0dd4534d0b41da4c0935f33aec1f7cf0a535aba380944c893f0684bf5a1eb049ada82ed56cc05ebc0d405ae7dd59cc3f48042d8a
-MISC ChangeLog 143311 SHA256 b8dc6207516588971995a9ca0ed87127d393984b02121f5ff8d72f0690de2ed7 SHA512 b46dd287e6a69eba2c972b44cf4c96bf074931576a46b2fed39a560b3a9b73f6f5285c786519b127eb2fa1c4b0f3fac8d19fdaf738ea56b7790d298f30bb15e4 WHIRLPOOL 5eb7e00fe657e1cd99836b1916857c8c634ed3a84f9885c68dea644593f3352cf5c389d8e6b5d7a35667c80b1e5a3738d52c754981b340880073fb8f27922a08
+EBUILD netbeans-9999_p20150324.ebuild 7216 SHA256 22e015b703ae482343570770b4bc9451e014d5188e9bc8bca6e463cbe1ef8ad2 SHA512 4e080eb17b31cd4a42d2cf32f40f3bffdccdcc7abfdd5817fc685164523cb9eade4a56dcf6e5e67fb80a61975ad10fbf3c09d596857bd268d322d1d40dd364ed WHIRLPOOL 63ca0c50ada056325dd02551faa40b93d98ac93ee9225eac4f8a8d864b95afe1281a1e536bd7add41db8f1b6216df05ca31fdf940b542447688d5abba6b981c6
+MISC ChangeLog 143470 SHA256 a631ae489a175b1e404e6e09a3d0ba58508f754abea764493454e06e5a3e8eeb SHA512 1a588004a71b040ee664dd5c36322e727f589889dced0349ec23bad44b0d636f188feb2aee6a5bf44934799f69717a186d6e9ae7fcf1836cd4a282101baa8a14 WHIRLPOOL 41ca6c14e083f07216056a1aca9339b342b568dd522346d1624b476d864d5d3fbaecf8b19089386c01d42847af7926eed2198dccfe5de4f221c7d289e8845f27
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

diff --git a/dev-util/netbeans/netbeans-9999_p20150324.ebuild b/dev-util/netbeans/netbeans-9999_p20150324.ebuild
new file mode 100644
index 0000000..142e2a7
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20150324.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-03-24_00-01-28/zip/netbeans-trunk-nightly-201503240001-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] 5+ messages in thread

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-websvccommon/, dev-java/netbeans-php/, ...
@ 2016-03-29  8:06 Miroslav Šulc
  0 siblings, 0 replies; 5+ messages in thread
From: Miroslav Šulc @ 2016-03-29  8:06 UTC (permalink / raw
  To: gentoo-commits

commit:     7640f4ce0e1c8ba9be527d133b018f57211e5a8b
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 29 08:06:38 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Mar 29 08:06:38 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=7640f4ce

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.2.28

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 5679aa8..1b320d7 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00
 DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
 DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
+DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 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_p20160226.ebuild 3384 SHA256 18676f86e44d877da64e956673a5b86fcd9665e69204457d44edce3c259c2090 SHA512 3993374523b2f7f4c4bd3a2632590bf995018fa6d45e379be0b6a58081eca543f355671302a5a35f0c74ac1a42776cf9cefe438159e0debcaebe9b11d8040cd6 WHIRLPOOL c6392ed9c67796607dc259cefd70456ed84e94139b63242477c687e4960798df5eb126999d0a073056186300843fd89540579c81abc1aaa84bc8f8d48cb9e56d
@@ -44,4 +45,5 @@ EBUILD netbeans-apisupport-9999_p20160317.ebuild 3384 SHA256 1a071cabfe5f4815a40
 EBUILD netbeans-apisupport-9999_p20160318.ebuild 3384 SHA256 a4bf2510eb7029190e63338a58d9527f53b1dbb65bcc9502b782df59d6faa157 SHA512 cb0795fdee3eded2db10d7da62009d0569315a15e2079520fee27077de26d576649c57345d93318837d4640dc3f095d0c8728a56c18bd0633b1540de64065495 WHIRLPOOL 0b04a21f24b2761b1c348053b0beefc87bb5d4151c91eeb9a348ef972e3a8e8671ec12e229437c8a62e708074844194759949964e74a4a57e05de8f72783d16c
 EBUILD netbeans-apisupport-9999_p20160323.ebuild 3384 SHA256 88eaedaad525293991e3452d337d3f9ccc7f53265450fd6ced94b3c7e4fc10f6 SHA512 6805198573b4ee320ff940bb6b1c0ee141053694593037a05ce6a497f1be71181a098b1bc99c7049297ca6b64bf126ecb427a856fa70e98370e15d2fde788df4 WHIRLPOOL d4811090e31e79712918c7ef184eecb13104eee5d1bd3b6927fdeff67fc28465eb9b8a77f39b3f6d7a911c21009a26ec8969c1fe890c1bae5bdd80a00f749bf7
 EBUILD netbeans-apisupport-9999_p20160324.ebuild 3384 SHA256 2963cc052879394b00589a73cd07f1a7dfd49d889b7200cdc92e79f5c9b5c4d3 SHA512 efe6718073360ee833c449fd64aed116b2ce5da98c548aa6aa5e31c6851a6614706a281fc554cb2da02f000b7facfdfc2fbd5134390778320a88b77834c86470 WHIRLPOOL 5cd254ba84de8043074573625db464e6101d6d1dee051b139c9f7ceabf10971feb87553965efdd38486aaae3834ee4957f8671b1fa71c04554464536dbe4f05c
+EBUILD netbeans-apisupport-9999_p20160329.ebuild 3384 SHA256 258837e6ec254494ddcd21ab0a8326fc4bff27a84e3bd385d04fb7b3f629a3cb SHA512 1a1b48e97574aca19409322cb5d19524505fc5a2a646a2d3535998d723cf8d50bdf045b9dd5decda7f42a69ee6d055cd6c84e1f7efd662da4a4d166553b37a8e WHIRLPOOL b798b996f505b86701421970c257c21e5735673211092b44f22b7797898c6a51d0069ada2927f3c5919ad3cc868a7be16444ed7db70830bb9708b128c915553a
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160329.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160329.ebuild
new file mode 100644
index 0000000..2574452
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160329.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans API Support Cluster"
+HOMEPAGE="http://netbeans.org/projects/apisupport"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-29_00-01-48/zip/netbeans-trunk-nightly-201603290001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r15-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 c5536e2..73455ff 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -37,6 +37,7 @@ DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00
 DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
 DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
+DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 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_p20160226.ebuild 4790 SHA256 3bf157310b9648255834e8329ea52e7313483edc9a019600d7454d040c25a957 SHA512 ddec7543bf7b250d53bf5e2375d927bdaafe8387cd34f4e90686163a9943e41fe86f1427a34b6b47c43f71d58be11bbceefc3904bba95c352138ff2051a53c2a WHIRLPOOL c129fb90dc65276a1035e9a8edbb1df541945d68c709e2e9d8e30da46402e647d52f923f984317ab6794f43b04e12f4869e1be69cc21e65ef866c304ca6d2042
@@ -58,4 +59,5 @@ EBUILD netbeans-cnd-9999_p20160317.ebuild 4790 SHA256 9033abd5562dc6e6da55eba4d7
 EBUILD netbeans-cnd-9999_p20160318.ebuild 4790 SHA256 df1601c74401f28b42e367cf55f93faf5c57eb1b342d5aaa47061dfac73b70cb SHA512 70848039871673c546e6956b30592628b91aa6510774f557a654cc06b0d09af69626573f3df68be91cbaa9de91c087a07fbff7370bace1dcec5731c5ec563a13 WHIRLPOOL 46de36701caf7f46ca010ca4890289d2dc74bbb6411194accf584ef68827f18bf92ef005fbf5f18abd51b36bbd0556635a933ab84d4fc2a47dfa21a9eac75c03
 EBUILD netbeans-cnd-9999_p20160323.ebuild 4790 SHA256 b45a5478c2329595bc11fe97e89a02d0732f5c8fd75a299292e29d7d5970a3f1 SHA512 cadb56df12a4544c795f56efe929e944c504d4a851144c0b959d7a8005a861186fbbc6fbb6fd05a7b6950af6a30224e3194bd1933a48baa2e36d785c4db6dd6c WHIRLPOOL 1b0368afa7fe0c42c52cd09eb2bfe698399cc0e749eddec1ad8924dfc1a7113de5e1f5329bb617b12064d232bbb55df232f0ffabe8793cb1f8bac7a83b827c1e
 EBUILD netbeans-cnd-9999_p20160324.ebuild 4790 SHA256 6615b7137dbebabf0cf45a58e945c0ac81ae3ecd6c3bb32235a76835586b60fa SHA512 9d89803cd8510c6fcb0ae87ba9fc1391906cfadc4e775432fb0219bc817083faee54f8dddd1326479eac84ed80e4dfaa501175a3fb1f5c1ded933e4b9cda33e4 WHIRLPOOL 389fee02b5f1975a47fcee54899bd4b4ffaa216f7bb7b09a113d22d1e8cfc73f506a6c030d14397cd5851774d8c89fb0d17e42cffba29160b6673f0068f556ce
+EBUILD netbeans-cnd-9999_p20160329.ebuild 4790 SHA256 4d5333ecbc15f387317dd1a5f18e929cdd5ce598f157d0fdcf77ae3a10be9eb0 SHA512 46cbfa9fa42bab6cbfd38f4e8c651e3a48dbc9c508a843c85e775754d70c87b0312c6146ad6eaa4269c36588e73554e282395c7e96d46d0203975693e9307202 WHIRLPOOL b6b391d7479b9512f1d1e53d19d3b00c9903fd571e6b6e03945355932d51e601fc4c1e59710d5cd592cb15369f30f5b188ce4c91647c5b1c66d3f86d0c2f3a28
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160329.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160329.ebuild
new file mode 100644
index 0000000..efea26d
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160329.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans CND Cluster"
+HOMEPAGE="http://netbeans.org/projects/cnd"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-29_00-01-48/zip/netbeans-trunk-nightly-201603290001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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/38DAC4EB409E96D3AABD4D3F5807505BB751C043-clank_0.3.6.zip
+	http://hg.netbeans.org/binaries/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip
+	http://hg.netbeans.org/binaries/E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip
+	http://hg.netbeans.org/binaries/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+# These files are for remote development and debugging
+QA_PREBUILT="usr/share/netbeans-cnd-${SLOT}/bin/*"
+
+CDEPEND="~dev-java/netbeans-dlight-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	>=dev-java/jna-3.4.0
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.cnd -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r15-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}"/38DAC4EB409E96D3AABD4D3F5807505BB751C043-clank_0.3.6.zip libs.clank/external/clank_0.3.6.zip || die
+	ln -s "${DISTDIR}"/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip cnd.discovery/external/cnd-build-trace-1.0.zip || die
+	ln -s "${DISTDIR}"/E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip cnd.remote/external/cnd-rfs-1.0.zip || die
+	ln -s "${DISTDIR}"/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip cnd.modelimpl/external/open-fortran-parser-0.7.1.2.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r15-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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.1.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 94c1195..54b035d 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00
 DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
 DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
+DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 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_p20160226.ebuild 2968 SHA256 4b6fb15fa3f63b94f65b14f049c54f3f2dadbb677f5f7d48d57a157a226e9163 SHA512 c92e9235c6225d58e87f64d581b2b0b6de951e794c863f2a54fd0965b9d25540465ffb06ffa3ffac12098fa17d9ac1497ac34755c1162b3f43990373df527e2e WHIRLPOOL af62f009adff8f896bf803c4e9b3dd014198fa3c40bb127e9adcb18efab16fb3fefc94e84a2eff096142b520eab30ecdcfb18269ec93ac9a67e6c684292744da
@@ -47,4 +48,5 @@ EBUILD netbeans-dlight-9999_p20160317.ebuild 2968 SHA256 8915c4c2d0aa3cafe72d4b5
 EBUILD netbeans-dlight-9999_p20160318.ebuild 2968 SHA256 9fd185fed7b6965963c5b533347e7d63528235af613dadc2f348ab81cbfbe874 SHA512 bb1d6a4e63daaed2909179ba75375e7da5edc5ca73736166d2938af7094863d528eebdb197b8575abaf9578c10abc46be3d05d1b64973348db920568a7f30553 WHIRLPOOL 1f5ce94abe9a9202c8cfd11ffa6254e7b00ec3d4fd427436ed4aa3fb843fac6f70e98275f154fa4d78023805b73cbe67cee4135660e5f67f4ea9e925a4ce3770
 EBUILD netbeans-dlight-9999_p20160323.ebuild 2968 SHA256 91643a3d24626b8209a58899f272f0776f882d7e1330ed76fe83a2a72b985eaa SHA512 aefd98a2a7b88b6a4edca6876be5c83dab37c86312e16a7d7feccaf7ce956a08ff3e8381aa753a6fdef4c35937b69540076d07bf8e0cdc492b738caa7995920e WHIRLPOOL f135a3b61b8d03d2e466089c6d7abe5acde926a1dd60490d69257dc3142da7715bcb4143b59b14dec27fa7bb99ad10a2bae59db2a84f8950283d6a2460ddc111
 EBUILD netbeans-dlight-9999_p20160324.ebuild 2968 SHA256 8fb715281d7de1790f70125e7c28d26d53fd09b315f5edc1f7cd932a1bfb32db SHA512 28f7a7697ad50ef0f4d4911a6e97c7b0cf7f6c8567aceb5cc570ea1ba0851da7bdc406914dc95f72b6085b8d60a05adb229e2d0a84a5e5b4e979ae58990a1fa5 WHIRLPOOL fb50116043f6877ce33c8711f03b7fedb031720df837ee0446ae016b6a9956c87dd0d9a7ff42aabd663a9deeb712c87964a30ab910004c168e0e892d8e33e89b
+EBUILD netbeans-dlight-9999_p20160329.ebuild 2968 SHA256 d408c3c49ef3e8fb3b20fcf752f17e16b848b5cfe7079492ecb13b2c5ceae885 SHA512 6543a4ca09fc73557f5fc5006c3a6e8d56e14cf0ec93e5d434a9ebc5b9aaed976a40e035a0844d8dd7ffca4384cacf0487ef329f9e949f2cb7c5fe15a259d5c4 WHIRLPOOL 5f8a29ffeef2d2a6d755f7b0a114f1031462cb987fa5c444b7a0a82c0c0a5578dace8236530c9dc7cda961406da2c7cb61c55e710704b438a86a4fcfeead459b
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160329.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160329.ebuild
new file mode 100644
index 0000000..41e66fb
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160329.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans D-Light Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-29_00-01-48/zip/netbeans-trunk-nightly-201603290001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/0F89C62CA701D20BA9A9A526D4D017888C3B5A65-fs_server-1.0.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.dlight -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r15-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/0F89C62CA701D20BA9A9A526D4D017888C3B5A65-fs_server-1.0.zip dlight.remote.impl/external/fs_server-1.0.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r15-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 21d782d..e872f48 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -55,6 +55,7 @@ DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00
 DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
 DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
+DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 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_p20160226.ebuild 15825 SHA256 a6010d4c7134d830756c12c80f0bc478e2bb852e10879e3c51b47d1e666133bb SHA512 b87762419a3a7518024f1a909fd2d8865258ada275941b20d3d7b87bf136779a8315d9e0bf0ad765ff3f017f8eb8494fb2d73be375b71b547d245a0e108f7d4d WHIRLPOOL dbc6211c6a3f992e5cba1f040a1592224d1a61d83ad2f08da301a18be6676cf53c66fdf027e69e711fa3ad3e0d72328a8b2386884ea6e96d55f06aa8ed712db4
@@ -76,4 +77,5 @@ EBUILD netbeans-enterprise-9999_p20160317.ebuild 15825 SHA256 4f2fa626c07ffeb3e1
 EBUILD netbeans-enterprise-9999_p20160318.ebuild 15825 SHA256 e1153728673703675acd0655006d6d4414c130d47d1ef48ba3aa282e12ad2db4 SHA512 1f78c2496cbd01ea5ce4a06d626d978228ef75895508d4e88b7a3410a5ad1c2771ed53e81598a94e7adecb8744649d3314d8c5b0dbc05d274e7fb2eeac7ebf6c WHIRLPOOL 4acc2564cb3d2b6f2639000a673e83ca8830482dbfecf4b88db28a617d636b1b05faf45aa1760e82aa3fe4eb56cc07015ed22e7924fb8065391e7de3341f4a05
 EBUILD netbeans-enterprise-9999_p20160323.ebuild 15825 SHA256 ff658282faaf219891dbf9a1c2d95320f26a084fe1b38d123a7154c54eca36e7 SHA512 cf018a3be15ed0a97f6d5c8b1be2155085c57cefb65853013c25e7b94fde6ffc4dbcf016a50a40712b8b41f5f57786a9017f4d1f53ea1ab400775e986c8270bf WHIRLPOOL 0a1e3d705a21e2ab915cdfef89f8f362cd220540130a1019116f7c31d0861c2de2dc0089679243fa5289151fa57208aeb9733e8a906c25cce621695fee0b31a8
 EBUILD netbeans-enterprise-9999_p20160324.ebuild 15825 SHA256 37728049eaa9e52e9b79c1483769163e770f4c2314805dbc83cd6d7d342406a5 SHA512 7d202a74a29f2e1548e7a078a485a8db9cdf007774517cba99defe203379353a229dce42787e6c71fad1fe1cc67ff0e69bfca23e0ceb6334d5f8cf1355396e1d WHIRLPOOL c541d6d79a12d6eecb3c1d0207bac6dda0ab7f8d06b5b80862352104dec0e3f11a4b46b038c297b45a3f40393fc6088630d5c48b8019de9d43711a78839278c5
+EBUILD netbeans-enterprise-9999_p20160329.ebuild 15825 SHA256 2ea849e62c0cbab8245d1bd586ecb01a7bd30643edf79a323fda308e45167912 SHA512 e58893fba0fd96ef6da5eff515b3e9b3cd29b10857f39c8639d089531e8c879460b5c1e9920391b61770f9842bda93553440d22d20b6bb3a9c07ce027d275d9a WHIRLPOOL b51afee9442614ae919bdca9523896be9ac352e8270d5e9ef7950ec13b6da8a7815f8b923c77ae6ad53cc4e79e26d13eb0941c79b58a4774a464417f3a5ae4d6
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160329.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160329.ebuild
new file mode 100644
index 0000000..aefce5f
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160329.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Enterprise cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-29_00-01-48/zip/netbeans-trunk-nightly-201603290001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-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-r15-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 4bdbdfc..2fa4234 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00
 DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
 DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
+DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 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_p20160226.ebuild 2913 SHA256 c18d3872c9c5e33c071814b58f05b5550608fe70a10fd7871c20f4918695ec82 SHA512 a47cb04204e8edc7623c511439e9c47213286463daee2b7c5200dd4de77567ad534266618dd603eb73056270746c52365493b4dfc3bf38777330d46ccb2d9125 WHIRLPOOL a040bc1ad2f7f650609ea979eaa8d88cbf6d35162cd27df3fa91950b28a8221ba3ad2b163b4582b9519965325054f31ed6c602b9ce268c669e47521ffe3f9c35
@@ -44,4 +45,5 @@ EBUILD netbeans-ergonomics-9999_p20160317.ebuild 2913 SHA256 52f165b1a959e0d0d1d
 EBUILD netbeans-ergonomics-9999_p20160318.ebuild 2913 SHA256 2edf1ef963b14ced4503f9a90d5f984ea8c5b09124f46072ace319e2e6ca9f99 SHA512 8fff57c0c944ea948b82f2a64d01095259079e754baa5ce65fb4d3284981d2c57f2778537b4af4c7978137259bda90f332bde95106397f28827533d74967386f WHIRLPOOL 0f4a9588486f1661b795fca54479ecc9cadcb371712af38ad56473b5d7f1739c90fb532e7758a8b5085d1777ab4f422b255077dbe435f563f9564c0ae6b426e8
 EBUILD netbeans-ergonomics-9999_p20160323.ebuild 2913 SHA256 bed218767277e7c09f35753e37f5d6bc3eb7b6472d0ab86ff0b6a6dcb1bc3b3d SHA512 69840a6b0971ad77db60bfb34b59b3b33d355a1e98c8eac6d887429ae3cff4fa75521055f458cc47c9c35210e28ffafa6712634300ac626d4620939c97dcfa96 WHIRLPOOL d3cc043d84e34937ecb38ff653caeb817d26226b9c972d17d4e7e0723fd48a6e7e288e7dbfd07b42a53e8df4b86aeeb59d302e3d205013842f07b3a9922aabe9
 EBUILD netbeans-ergonomics-9999_p20160324.ebuild 2913 SHA256 e6c98bca21c43a04e9685d78b02deaeff6bff45126103b31618a0df224090830 SHA512 8d0076867f24cb09cea36a9348ff766351472efc39342a16209d43e98f5b400341a28fc753ead534d4f8540a1c025184c473b119973fdd6a00661a777cca4b79 WHIRLPOOL 3a48e023aaab8bca0d88e6d7bb50d1a713035d70e7db7f206e4d87140bafd700b815923e32b553b8cca57a30091ba6064ce121e987e34f5e1167207030b440cb
+EBUILD netbeans-ergonomics-9999_p20160329.ebuild 2913 SHA256 6a9e7506e25ea265e71e86742df6f05847bc47ec2af12448ab087ad236c0d511 SHA512 91e2130fcc32196e365e917126f6eaf3314ef667ab3ec1a840de55d04a199457536c3ed82b9351e0228f24ce2a7ee42b683a8b3a741acccd34433aad7f3a752e WHIRLPOOL abdae709ffc9cfbc4438dd2f5647f2135b5546706231d876fb96a66fa68198c2ae0b347fb93ba1aa1c352adbdfacd743c7f5bfdf29f8ab939eeca4b6bbe7940b
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160329.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160329.ebuild
new file mode 100644
index 0000000..b3e5013
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160329.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Ergonomics Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-29_00-01-48/zip/netbeans-trunk-nightly-201603290001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r15-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 ed2b44d..1f270eb 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00
 DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
 DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
+DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 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_p20160226.ebuild 3377 SHA256 34af177610d5d508c3442dc37c7e7d0241f00e016751d380daa4184f07285c7a SHA512 388590e881372070bda554ef20c73ab62a21018fc933ed0439e8d7ca3ef13dc09bd72393496ac02e4cface814b3ed49cc566b7d14a3898095cc0d6529f01baeb WHIRLPOOL 19d77544f7cce0b7d9a765dab7ad204d8ced3621af10fde8cf5be85c1b12144088a41a3b92d1e23becd8b8c66d9e4777d7ebe2d57c6c385f9b6a87c9c7828089
@@ -46,4 +47,5 @@ EBUILD netbeans-extide-9999_p20160317.ebuild 3377 SHA256 f68c3456143ad28df025625
 EBUILD netbeans-extide-9999_p20160318.ebuild 3377 SHA256 b9a02da0791616ec505c1c2a2db90dbb61f96e916b13e1dca95935492bec7a9f SHA512 e49d40d1d4c10171f864b175ced60552d0840c8b226579d682d9b404b53532715a3541a1bcdf91f57b8e5cf9ee97201b2ee7e5a07dcfaf5f8601fc746402e4e2 WHIRLPOOL 9892c5c4d6c2729f6454912e48b1e42c0bcb4ca3aaa5693ecdb5ef2a31ee71e89de42093998a7e2523106e5eb5052715d559226c72c4decfe08da22bcf28c14b
 EBUILD netbeans-extide-9999_p20160323.ebuild 3377 SHA256 c583f98fb3dddfe84291425cc2475a5799f010089c83c7da06391d114fd87f58 SHA512 7ba61d1c8cf405daaf3da17d5a1f28c922c904852482e54c320281b78dc10f4c6531f0335d548fb563353aac976ca165b1603ceec24a54b773bb8d5408e3f513 WHIRLPOOL 95cfb50e92e1f654f70445a46b139385e716b2d170f6ddd1eb4e8f6aa724f1c9740dcac9d0f581165d41b8fe37e7f21366afb33b69386daeca4848721b41826c
 EBUILD netbeans-extide-9999_p20160324.ebuild 3377 SHA256 8148eecf86a1840a72a286808d9ad14afb1d0849666fdf0e496049824d6e2a97 SHA512 3ba646c52fb178d757d712f2734f2a3b706ca5cb90b96f5ae5434b11221d8ad7634b8525213f03a3deb751d165896dd59d71ae28bbd26b7bdc305be06ed11df2 WHIRLPOOL 2cd08fa3cf305bf6ef60a662a9dda4b4e2b6da471573ee8ecb3d78b08ad23ce29916e2757cfea5aa79c8e7dfe1800ac88064c4098d855d5c1c15f3c98b8452e0
+EBUILD netbeans-extide-9999_p20160329.ebuild 3377 SHA256 707875c5589aac9391e819c9cc4b3fa53e06231c64efbcd6e2c02b9db23a07db SHA512 dddd8959468d71dd3c68b7c3a992d667b579ada303fc950a47b03d7e31e9c07453ce1f4a8aea8883e73904c6809171f76723f61370ab3e41abb36ab91114c6ba WHIRLPOOL 564347e65a44b44dc5bcfdf21ec9ec4a82f7d7a8caeb769e7e8e26826563c1ac0e09ba4f0a0b87cae777e20bffc59de4c61b985292215be86e033e74e83cba81
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160329.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160329.ebuild
new file mode 100644
index 0000000..318b9c2
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20160329.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans ExtIDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-29_00-01-48/zip/netbeans-trunk-nightly-201603290001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-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-r15-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 cd7e191..2169dae 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00
 DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
 DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
+DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 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_p20160226.ebuild 3416 SHA256 d148b14ff8d19271fd2b7f89d6473951c78407a521a894d030d7fa2c1cbf4210 SHA512 d3a89ad6543d9f80fec79e48c4452297b9705ef86d3fe68c04d37d183209761309ce48941548604de12fa59c015185fc257b33151d85cdc37c4382686a675321 WHIRLPOOL 1176ff945d81ffa62e80d12b73c2bf28accad2015cbd680ee08db05a838fba112f9e1a69bf4e7cf94fd4480d041dbbc63805987eefa94cc0f8eee4f9800af011
@@ -46,4 +47,5 @@ EBUILD netbeans-groovy-9999_p20160317.ebuild 3416 SHA256 c9c15ab6709d20709a6375f
 EBUILD netbeans-groovy-9999_p20160318.ebuild 3416 SHA256 4a926c35e0df3789d6403a6fdf761eb6f5d70c7634c3957b0d3ea8473bd987af SHA512 fb676c7154871b994cba18b40d70e12e9504f53465d3be27e095ee2a2702982f520fbafd3296e6f5cdb88c3cd57327caf6e59421c847fefdfdc79dd1fa38848c WHIRLPOOL 4589efafa72d8ffb90243e758597ae172d4c4d6e33e060b2210b3d266505235f09b63d3ffa7bc02571f8522ec3480c258a250e74184b6a3c76552b6aaee4041e
 EBUILD netbeans-groovy-9999_p20160323.ebuild 3416 SHA256 cae40b6dee59adc072b92f47ca65705df610e33f52c4a5419b3f4a588d7092e6 SHA512 061b3da802905ec04e2162e3802957df73d2b753be7f0c8abd5db73a16e9b5a150589792e30d7b017c23b522774f424cb2b5d6f12ec7ffebceea8bebd5d6bbee WHIRLPOOL d2a7c2648c7bfa42e4d79caaf38bcc6afac696b7d35af4407925d61b13c72941ccd2f832a65802590655eb86ccad014584227695419cdcb529b3c868e218d161
 EBUILD netbeans-groovy-9999_p20160324.ebuild 3416 SHA256 d1b0eb9dae7d7c44940c1c75f1b912dab879aee4ab606d09f1f447c87f981d07 SHA512 67ad98d92f2580f51c88416b6ec452151f498ff466dd5330eb8a1336d56eaf6c82b2def4bb2b11a76591d94fe56fcff83c3cc5de58bccf9667707ff5aa9c9d8f WHIRLPOOL 8f1674becbb39da6a11341120d1880234e74b7f4f4fcf0b0d18f701d4fa57ecc3c826d23b0434290964f6621cb630349d903a44db76085bba221a978e7e7bda7
+EBUILD netbeans-groovy-9999_p20160329.ebuild 3416 SHA256 5b438c070b98dc3eedc28545213cd082974849344a0cc767158938ab2d7f75ac SHA512 848e80f70976a647cabdcf9addea2a4c083a220b6d942e3d8aad9d02c1f836fae80e2ce9574b5b5802c83dc591d194892863f9655b2cfffb3b12c7107d616760 WHIRLPOOL d3acbadda3a41be9aa4460f5d905a8e9102f7924b9ebc6b63283738f5d43712bbec5988a5e475f8e6dc8a26685d034f7c1c9bda893e24119ba9933dafb2e2736
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160329.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160329.ebuild
new file mode 100644
index 0000000..46bb590
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160329.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Groovy Cluster"
+HOMEPAGE="http://netbeans.org/projects/groovy"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-29_00-01-48/zip/netbeans-trunk-nightly-201603290001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-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-r15-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 f4256de..a03a97c 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00
 DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
 DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
+DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 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_p20160226.ebuild 4126 SHA256 393417e9a8f381c0abf6ee340ef41628afb27418119d4c37529df0a7c91043be SHA512 73998b964bb5c12e20475ea8343f7a45e28a71905327bdac21103a697a93db24d42bb948cf4c7047cbce57be7d62617174fea9b605d503db972ff6e191429e08 WHIRLPOOL fe83e39f47becea6cfccc49ed33cc07d8d4e89afc2eeca91998db156898bf5ccb4911b9202af2d9097720f8a924c2b27f69c0bb21ab4afa1ff6167a9cda3f1b2
@@ -49,4 +50,5 @@ EBUILD netbeans-harness-9999_p20160317.ebuild 4126 SHA256 ce03fcd0de453da4e2a92e
 EBUILD netbeans-harness-9999_p20160318.ebuild 4126 SHA256 6ae8166ae7e7384b5e91bd09aa8e30bc0f830150a618c2c27db5319ee6c18851 SHA512 d06edabe7275a2a35f4b627bf33efc6147b859197a75f601a069684845d6ac9eac2ceb7710d43b4b0702041ae18fa1f7e4ae0449d41ee1cc0b1e5dbce5fb3105 WHIRLPOOL ed980870f12b1caf4ea2cef8878c06900d4fc3191f553b2441aec137251c4962590b524d3e8dec30864b48edcb435c4285b7d6a3d8a0b7fd43dd04c0c3490e24
 EBUILD netbeans-harness-9999_p20160323.ebuild 4126 SHA256 64a3e3eee2f5b7a30ced6a751742f0018eb14556d27af01342869f4acc59d179 SHA512 217c9adf60a041d2e8924b4a76a54e6454e7d1e0577d7a3329b16bda8741026fbed47af84627b606178d8b6c9ae287e8ab05b79640a875568febf1ad5afae8b3 WHIRLPOOL 2b05a70fe465352ed4a785aa8c4e654fdead5c8a8ffca2822aa068f6cc096f5404769abd87920e14e59f8999384c611cb64702f9a6a8b6c2a7aeb1ed8c8c52bc
 EBUILD netbeans-harness-9999_p20160324.ebuild 4126 SHA256 7b33730ce7e775358592b3fd4a75f5508efcf5180ed3b619cdc7f46197a24b2d SHA512 c89f6b8e2a6e1db0537292fa8388821c00587e8c1f324a0a292fd0b07a52570ad3ef612d372527f215fdda8c181662be44cd7b50d095fb7fa1d77a227fd70363 WHIRLPOOL 31d32dbd1a313a478641a89ef289f82ab86bd33226ceec3035ec366de71d68c2fb546e95f2766d837fa0e892345632c3aa8e76fa2abb0a8c2e21ad71e3ad8289
+EBUILD netbeans-harness-9999_p20160329.ebuild 4126 SHA256 554e05f0c33d64d1e2e90fd8469828e6c2ff9c687244d280f30148bea2e7ba25 SHA512 9253104aff0393e09e80f98a4f2617561ebd34ed28cfadfc72d7ed342dcaef0ede7d0fa386301903f7e2a889745e1da3d1f6d41519d33744d4a0a4d59c899d92 WHIRLPOOL 5cb5b8defea45d709867274d6ea105ced205c89f1ad7dea54ddb7655b745cc3fb983ceb2a9efa13ce86da1c91a1cf137e3db9d86d2509a5669093fd88b94a5a8
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160329.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160329.ebuild
new file mode 100644
index 0000000..4ceab29
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20160329.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Harness"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-29_00-01-48/zip/netbeans-trunk-nightly-201603290001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-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-r15-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 5573dd2..4a80c3d 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -155,6 +155,7 @@ DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00
 DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
 DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
+DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 EBUILD netbeans-ide-8.0.2-r2.ebuild 29330 SHA256 4822cbe26fc19685164c35d69e75bc20578ca8a5ce3394fe97bde6acc721fd2d SHA512 552f35cb1aa5429beb70c72a0cd2a3aa3a006f5870ec4084e88632a39e2ccdc05d0b2b15a87f26c72cdffb3c9a6fa0a124a8d501edeef9aa9580396922071e8d WHIRLPOOL 4c9bce3ca21d5ae61ef9392b9282c2dff9de7f82f2e83d2944a2906ca2180ef0ffab59489bdbb6afc7ba88d5143d77b47a0cf6b219a5a4d385b68afcacd3fe6d
 EBUILD netbeans-ide-8.1-r2.ebuild 30301 SHA256 892f20531352d85b5b72b1c85352eefa444917b515b0b564f04c4f91d1e654f9 SHA512 50af4873fd3ea7755b0d33b086be7e07766b6c009a46ec3954a67a1da9930378bcf9da6d18b7e60078b31af4b36ccf060f22378a8ef26b3829ccf30a529dd023 WHIRLPOOL 1024af16e7cae7f4728dd37f88031be33253b7c62548a095d3e827abeccb6c183d34ce312bd1a0f808f0d107aff217e4b81b7a17eecc6842e1d914d7061df2c9
 EBUILD netbeans-ide-9999_p20160226.ebuild 30235 SHA256 0836616c278109eb1b3212474011bce707085786f31552abb1a421ebf054e692 SHA512 779483e1b664e077765f2e70213848ec9283b935003ab790e75dc82467249eac07da6e9aafadeaa45460dbde7b9d4ef2dd59c7290819d6edae46c0eb6c63e652 WHIRLPOOL 0eaf9e3e2a1bc34ff78c17b7eb5e3bfdef6c554825cd872892e712c16c9bfd786227a4dda98743d28d85a36d0f1b06e0ad8ab1552803e08a7b3e56ea642b9c04
@@ -176,4 +177,5 @@ EBUILD netbeans-ide-9999_p20160317.ebuild 30250 SHA256 280833d0184aa941e05a2bf9b
 EBUILD netbeans-ide-9999_p20160318.ebuild 30250 SHA256 d9180327b8af7764ec36c8bb8bcd39f77776922482810290acf54d12af4c24b8 SHA512 5ceabfa4c585ba734aa8961d5ef65ed27f871e17c3f0f328add00ef6caa77d2dde7ec4f048a600a0f2e5211235fdc4cc00572c181b544e267a1e78fbd63e6247 WHIRLPOOL 2ae77f9a6a195fef9614ea7456907c0d9504bdaf43e5673d646300daab9888f56114a4e3dba07edd8c0f66c4df2daeafc6b6dd8b7f7f610c46466096ac35e9c5
 EBUILD netbeans-ide-9999_p20160323.ebuild 30250 SHA256 2bda5de8b196a6ffed491baea0330ab492b40d95510c336705ee8738255365bd SHA512 dbc858271d0823a30357b958abd0ed1b8374a2b31f946d6902e5d520006d5d3f37903f6d058082af71c226fb4034cfe41f40d7f336d7cb5df2097aaca9a672f0 WHIRLPOOL 10b0beb0952f480a5e22e7e1ad09d266e7952f399458132e2e41693ef606df64f5743caadb7a1bb6053a4bf47f336479b6ea732f7104c1bb465215ca18d5f86b
 EBUILD netbeans-ide-9999_p20160324.ebuild 30250 SHA256 04d607de1b06ae0204605a9efdb571c3ce8cbf03bbff115f348b63312d905855 SHA512 5f7cad19077abe7a4ee7c379a94c28b876f8afa3f97118d4103593a3ad5c05d3f347f64819cce11028a5ccf5e0859de42fd8908c09cc99d74b06a33860665d4a WHIRLPOOL 191534270b75b92f56a8907aa25b3de604cfb18923f2b186c12eb80e0e3727e3aaa3d262279e65e7b79e55808223dd7f21a5d6eb7f4f4f0a2d710042f2c51a14
+EBUILD netbeans-ide-9999_p20160329.ebuild 30250 SHA256 6d14e82007f2246082db0d0e01bb93e578b0ff3f1b2a9aa68b83a4f8a18eb1a4 SHA512 08351979dd42e6f6d5d4ac383661eb0fb5d8b6716a32346270681fc58091b32115075c6ad4c1c6af153f5f2c55d4c3a4046af824fd21bba8b62537953880f5fa WHIRLPOOL fd35a92dd12cdff6145f19447d7666a2df19f8c206ef5bbda455d7019682b35bbce6bc3f90df9f426719d98f93492c1f513e22f1fb758dccdf60126596a46791
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index d9144c8..da1e1c7 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -1,5 +1,6 @@
 DIST 29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar 1366247 SHA256 4eae7d13d7493c86df8b84b9a922dd9e8302e47ac80efcc47094344ce64de27c SHA512 06d887e5cd47b6bd86ea9e1a26c604b630285129dde43e6068d4b36f0e81c39cd91757e3323e77316e76b0fdf8c18a609bd216c7103ac8a4d947abd0ed6bab47 WHIRLPOOL 27c9f01d85f31781bc76411701ea5668644d83ec761f9d42ab93e3932cfefe5a6277429f889a6f9c68ce9efeb2cddaecb6ae8aa2c42ce8ea9b3a06305f2657c1
 DIST 2B9EAB164D8748F9793F6A0D29B6463E97B284DA-indexer-core-5.1.1.jar 227233 SHA256 7bfaa3a602bf388094c8fcfba989f0b121c0e71c6df4c3328244615a5cb24d59 SHA512 7669d2e11346b62420ab9db2e9a5a24bcea356099ae4d6f0a57c75ba168de9d24160277b8f044ca9a5f637c2591778150288a963787b6983d093ad64fac83550 WHIRLPOOL ba0f5a67dbc3a64ca0b21cb1f1a74b4e9b2d2c4d7a5f127de9940f375b70d0bc321f5ce6aa607bbe27d39dbdfd1d179b1457b5fcef65c0a0d4420e1194657192
+DIST 31BBCDA106D5970A775FE3DE0B284FEC192530A1-nb-javac-impl.jar 3035317 SHA256 8829fcf9e37d1183aebf7bdebbd8a607f9e8c86791b75cfd64dccc3f32848ba3 SHA512 eb20b3701156c9644ab20e7f1fad92a5af5304093f7ea9e40051cb7d4cbd0332270dc95c03311eb439de112dcb29905710a20c9aa7ad17738bbd468607b9dcb8 WHIRLPOOL 7221b1b832f703147fb9efcf5a21afbc49c03ba6361b6570a4937eb9c929272ebf0f944aeafc253a3cc9b6cebf6bf5ced31a65ef0477a5d2581fc4af0c941648
 DIST 37781101C4BAF40437CA4D1A16149647B4082F3B-nb-javac-impl.jar 3036086 SHA256 8e0b2df2152fe9a8d8e66982923aa621e3c1e25fece2c4c614b3ceb029a2d0ca SHA512 b9512af9379b7308bf678c7a21be76b6fe69dec4570f892642328c15a8438f5ceee5c253ceb491d6f73edd89190198e536ec87ab6080de13aeea19b4e8ca02e5 WHIRLPOOL dfc4b8996c92d2fb2b0563363fbc28810656ac9cc07016503c76b8aa8fe92fea0489e2e68d3d9be43073664aa102564196aace334294be7ee092bdc16c26d1ce
 DIST 3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar 45718 SHA256 18a77f915276751b01ed8e7feaf344e78f5ea62bf53b7bb6a821a22865165044 SHA512 1abad0ebdb35d8fd4eec1350ac497cc6a372239aea9eb6c45a94265f46e4e5c2458fe5e4d0e1e067effc9ba8629451abf169bb4820274484f9c2404271b21727 WHIRLPOOL 7aeb90a8661d8eaa2ee2a5953932e3b829187554bf605bb5e55abb42edb82ff13a6e4b4acb8f3615a74961f044ebaf19343e3d403a476a019890cadeead73dd5
 DIST 562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar 23838 SHA256 0c05ac203cfc63f1a6d59dea84d915220e18e8e37a57cfbb317e769f992f3e8f SHA512 a39da963b1e0c0111870bc3989e10c70dd136c0276099b48cadc70706f76b0b2ba1ece6df67c05bf8e26a4638b19b28b454df6c23ed5a9d4936d3cc5506ec4b1 WHIRLPOOL 88043adc7057b68647d9205782e46a2d7824533b9a46366e7949459e88fd2ac7be6dcd1bc1c7371e071c7efc5fcf6d3956c211f97932cee0e0a4f47c58db6983
@@ -53,6 +54,7 @@ DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00
 DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
 DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
+DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 EBUILD netbeans-java-8.0.2-r4.ebuild 13298 SHA256 d4172dfdec5afecb1cd099e18a21aa872c7822bff40b192b5f4ec4d35e6e0ef8 SHA512 48ae6f7141117fbf58123ded750d76f2e7311211a6be3b62bd491349817460da11f781ec5694da91584315547c32008f568fac3bfb406dbdb5ed7fd825ff694e WHIRLPOOL 73fb68aec003707c14b2b390c2de80f24e1e5413cf7e16cf7e661af47c908e2d559214580379e45e21d316767987ac906b5a119a61ae39f03c3d01dafad49b7c
 EBUILD netbeans-java-8.1-r2.ebuild 14814 SHA256 1f49212c90fcaa9a6483f19bb60c963520f20aa08c2a509aa19cc7fda12e4564 SHA512 2d6b225f5d32f0ce1801124808b0cc2101f16a703540877c4818be06694742cfa262c3a2e7018761254f9244a7992eb7fe9bc15cdb20f6f4cb83958789c0ef42 WHIRLPOOL 8557163a46ea91a47efec3c272b8a8a0f2acbf9eaa8f6c280d0ddaac6dd8b2185f06716ab12ebf76fb87fe6c05ab1a14bfd281875ebef586f1304d2162e5f2dc
 EBUILD netbeans-java-9999_p20160226.ebuild 14930 SHA256 fc9c476d372a29d8699e21fcd7452ba730898f33dc9711b38dbd475c6ec743f6 SHA512 f674aae89d47aec2de403d15f8afe0d5baba2c5adcd1bb200b9486f0a4626b13ce03f795c199888e990179a721d3bc53e8bb7950a6a630a96ef43ef5f13606ad WHIRLPOOL aad7150ab031335e97bc666eef873dc34714ab83d2df3f199bc3dd083f4058295c77a278616830707636c0dfb8fb7147a7a27dde944b1db1206f1dcc17f378a8
@@ -74,4 +76,5 @@ EBUILD netbeans-java-9999_p20160317.ebuild 14930 SHA256 795be76cd0800c4bc46f7492
 EBUILD netbeans-java-9999_p20160318.ebuild 14930 SHA256 ed99658a8aa6b5fff711e5117d68e428f79a789dba4bcfd5a1fe61805fdfcd59 SHA512 c1ca5e2c5d5862009fbc532f140b9b77ed6130edff37dbe069635d3ed7f3ea05f32c7e7336763807bf391cc75f67fa62ca5c2480ed4a8fa389aca86e153030eb WHIRLPOOL c9953168b1cb056079284e65196e0b10565a5bdaeb570639155cc2051a01e7a892f7110ee743db13ecb2b18e05f02a5a6ada48f42bd9be8b30b82b4c6a3045a1
 EBUILD netbeans-java-9999_p20160323.ebuild 14930 SHA256 c6ce42878879b67b80dde5580208c87c15391646f3df1866e8e1c73a2213b1c7 SHA512 3fcba554c4d3f22c093082393974885a329bb2d7ac3c3b9559e3307946a9a67f6c44b45b321448fe68a0b1e47d0db2262b6c8c3dac7f2c1df6e63b2e7a8b2201 WHIRLPOOL 32802eb70b582d546ca3a955146f007e9c6ed0919bf965693ca0da2b4de98cf6dce16fc4964ed6c893e0356994744a35ecf19507026850490895c2af58764562
 EBUILD netbeans-java-9999_p20160324.ebuild 14930 SHA256 6d2d83b1a29b2b515be25315319dd88c8f2d549c9f3207ded042d87144add95e SHA512 b9c0abb6265b022ef28197ed0ec826ae2428d00e4f4a747178f8fa6f8c6232c5164cb621e338abe3ddca85822306a97a55a4189d16eb2c4315a134732d6a3f7b WHIRLPOOL 52bfc7c68a7aa73f62367b43c9ffd02714a3f12ec059239b8e2db9558e6107fddfa0bf52677bbc07614daa10036dc33f38daa4d53747cf56c80034c91032186c
+EBUILD netbeans-java-9999_p20160329.ebuild 14930 SHA256 b5130c99937fa3eace6917bf544981290651cd55749f5f60af944e50bc9822fe SHA512 3fb99d19f29835e9eebc58227a7e5d8bc4b3f078885f43f294bc00ce33f86c395e50ea72ea072bb103d1ac7e72487d6c347640a8cec0b6e44dc86cdfbb573453 WHIRLPOOL 78445a2941bc4e890ddf7888602ef4f81616d8c57f8b5f23e515e11347e6d6e90c3b73f278cb49a69b1f782f34901500c4a08e0a64627ff510e89145c020af43
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160329.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160329.ebuild
new file mode 100644
index 0000000..3ae1a9b
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20160329.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+# Maven cannot be unbundled because it depends on exact maven version and exact content of maven directory
+
+DESCRIPTION="Netbeans Java Cluster"
+HOMEPAGE="http://netbeans.org/projects/java"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-29_00-01-48/zip/netbeans-trunk-nightly-201603290001-src.zip"
+# jarjar-1.4 contains also asm libraries
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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/31BBCDA106D5970A775FE3DE0B284FEC192530A1-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-r15-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}"/31BBCDA106D5970A775FE3DE0B284FEC192530A1-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-r15-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 4db8dd7..3b12bd3 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00
 DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
 DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
+DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 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_p20160226.ebuild 4971 SHA256 e47ba2e3e2ba7b1407b873668eb341f1c7bcc0af6f202524d03830d771db418d SHA512 654aab63a0d07577b744ec686ae8dc3c2d61cc934798f61fece32d3619bbe8e6b148271695d56544aefba06ef33888e93df7824040ce2f87f8d31f8691aa2448 WHIRLPOOL 7a0e5f77cd3672589f580c181903f3a2e68d3e119fb4e406760a54d775760493825df80fdb425702cacf2e8604a20dc7620a4b43016133aa3866dee7a01d542b
@@ -47,4 +48,5 @@ EBUILD netbeans-javacard-9999_p20160317.ebuild 4971 SHA256 491df3c98164a05ae23d9
 EBUILD netbeans-javacard-9999_p20160318.ebuild 4971 SHA256 056699e04063ee897948036907be6bf83365b0f8305e3dc516c75cfd22f935b8 SHA512 c00f7a769bb86713a7f6e08b10459972da5a8b0d64290316b11d0764302c851c08dcdf24d3c9a351d7921287395a17b75dafc2620c3df498b541b22c3e7e4627 WHIRLPOOL 06362f02d0a87760e59ed257a06c2d9df21c25fe38cae339e3fc424f813abb46a7ccab6197cc76131258ed6a78987e5764ea49842c0745a0562933f8ab4813fb
 EBUILD netbeans-javacard-9999_p20160323.ebuild 4971 SHA256 304241fa6209ff3e1cf3bfc82965b593e706860bdc9fdbf898428725b602b014 SHA512 cb95ddafcda3a2f94f4535e9d106f2ccf3a23e027cea3f510aafb508c13e899132bec1f89512805515fbec872a917b197425c9e5db80cb4f5637a16b7ba731ea WHIRLPOOL 001a3357ef99f759d08eba878eeb9d1f829338ab21e5a0806d02477419081663708c98a9f7c2d56d5b97b67d1a9cf457f5917f0e247764910114d4b2e34cdeb8
 EBUILD netbeans-javacard-9999_p20160324.ebuild 4971 SHA256 fa4b9ae984e18ce3dbe111254d82bd64fd5465ce8d9bc8db8a59ce3d5f3ab940 SHA512 7063b2c576bbc77aa98284b0929aaa4e17ce8317d22087c858503dd1ac55d743c8e337488469da6d76b6055b088f279105cbcbac7cda136f54ef13fb587078d5 WHIRLPOOL a38a74b0cdf930f2313ac2746d91120855090d2e2f4aca96049dae5a492a2e29c93aa25e5de1d7d3cd1e5cd6432467336d822ee35bdb23333eba3589aef27268
+EBUILD netbeans-javacard-9999_p20160329.ebuild 4971 SHA256 05e935166a8e1155d8fbc78b06f19cc45b4425bab40cf2de1f73e76e69094cc0 SHA512 4f98bad550427586b746e58c76f8511433831c3566a25820fe0b028515feeda881c2647b03c28f02df2b7e170dcdd3b68022b8598240b4748a5cc87b875d4c34 WHIRLPOOL 61ec4cceb7ce93510f4827a87ac404d16f375ec7e1c621191057aed27681ae6390934b8c9831729efbb94f58073f914dcb7c6d630e9cb101d6f0595de6f67098
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160329.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160329.ebuild
new file mode 100644
index 0000000..d164b5b
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160329.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaCard Cluster"
+HOMEPAGE="http://netbeans.org/projects/javacard"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-29_00-01-48/zip/netbeans-trunk-nightly-201603290001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-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-r15-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 b38f79f..39855f8 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00
 DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
 DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
+DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 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_p20160226.ebuild 6293 SHA256 44dccd18e1094dd3bd7f93c6a612394b1377d76d1d5ad6b5b22917b7882a0bd4 SHA512 1f51fd4ebe3ddf9465550ecf9d24adb0acefbce99a066bb0e0df6b107717788fb5b740508f8b3343b6870f60a58e797f4f07959073610b850efa2e86d9571624 WHIRLPOOL 220187d969ec51ae82e946edb1d20c3ec5599592751c63ba788992c328cf608b22934a4559624792d8510c67863a3afc9fd47397ffcb6db45eb212c9c70f8d9c
@@ -45,4 +46,5 @@ EBUILD netbeans-javadoc-9999_p20160317.ebuild 6293 SHA256 ccba0cc3f2c9c218e249db
 EBUILD netbeans-javadoc-9999_p20160318.ebuild 6293 SHA256 94c55bf82cc3a3c779f08957a2d8c0532bff6f9f9fd9f8bd691199c34ba17960 SHA512 a253b65835d939c2e88ff7f1d6d0f30992ccdff1d89f6a20517a74c1b76941b2cd4d5e279be7b28dd422b47d60f55911770ec5e5fa1f18b59f1ec5df1367b8ac WHIRLPOOL 2b7047fe8b601b61a3f4639f058bfd531e409a61a95bda0582d4c44d68e9e3c3c2be85a8faf4a750a95303f3ac8908703106576eeef571bb89b7da7e9e8f868c
 EBUILD netbeans-javadoc-9999_p20160323.ebuild 6293 SHA256 a0d7dfbb1f4ad34d6cfe54c149cdad842345449c3c640917bdbf96fa9b2e16e9 SHA512 09a676ab446a5b13157ca1290f034c8d85fc185f2fed5e62bbf2d47a005d5edad7fbe1df2c11e85e1267132d511ffef5237fa6dadc980f3688d108e199358406 WHIRLPOOL 4428da9319652f8000a3a83fefaf5eef6bb77364817c287c5565008962592074fb06e69f40b9d147ecfa7887f945d397a417e9e365fcc6c2bbefe08b6683652a
 EBUILD netbeans-javadoc-9999_p20160324.ebuild 6293 SHA256 8ad366e2a582d6278e1368fc110f6099445272bbcf88476f5296ec4149b4960d SHA512 a4f7fc8b05756d122a792ce2b6a8e2471185711b4c612d3434cd464dad9c8ddcf481fdeeb21645b607c4a4f002b0b444a6713b02b437d90f24fc3c199a98d9f6 WHIRLPOOL aba5fb3f4c6787673772306a653aeb979adfcdeeba1065bc41e3409f0006e5e35ac31e002684bfefa1b798bce29260e94a2ea5c8c3974dd17f29e00ff74de69f
+EBUILD netbeans-javadoc-9999_p20160329.ebuild 6293 SHA256 c2aa61de03070ede75a2b55ebc9227dea09dee2382762d87557a5d84a63ac8af SHA512 87b4db3bb2cf60834a9a59436ebb90a42ee1f62d700916d78ab4c8dc5d6b00f623efba0b8b32a574ee6aa22f622b0f004a9f3e8d2b911ac3644f833a18cf86eb WHIRLPOOL 0ddb5511d52baa63550345a2bbf4af0bca40533d2958bb07e8ae8e6a1733af77d1ce7b749fd3afc3bcf2e735eec7041adcab86daea0c2087f4ec50b5ad6920d0
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160329.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160329.ebuild
new file mode 100644
index 0000000..97c5b62
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160329.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaDocs"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-29_00-01-48/zip/netbeans-trunk-nightly-201603290001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-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-r15-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 8378e00..eceb7d4 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00
 DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
 DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
+DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 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_p20160226.ebuild 4717 SHA256 65d06a481db89dc3734e1e09c11ef3cb3fc4b212a3512e5c2d871de35ab6fa25 SHA512 b72bee6950fc1231be8cb6f02ddbe2c5b95e84061ac90b7a9b3b4e3bead61d2661bb6c89284334a9f4e38e0636b3c5efeb8c99eff6b7f249b68b556f818fb802 WHIRLPOOL 0a5c2f159e3c1701e5c4a8df36d77882ccac36de3d0cb5ea17b57ffdb60b8823b0dc2856cc2a5df0d82458350100905627c9ca7ee83737487a54638a53de0f76
@@ -52,4 +53,5 @@ EBUILD netbeans-javafx-9999_p20160317.ebuild 4717 SHA256 fb1f635f5c5704857ea78a0
 EBUILD netbeans-javafx-9999_p20160318.ebuild 4717 SHA256 a98b52d8510e05b83888095205f09ca6e6aef0a8974e3f7e02f89db3d9b9ad4a SHA512 de84cda652907da0af796186bf487db82ec633899ed93d4e6d9df538bf0893aa97f364083707d573e115a2eaf3c4d85dabfca3586be6712c8098e883159eb8a5 WHIRLPOOL 3193c22d944a64b2f7b471098ae0ed136052a91b6f7ec2efc7bf4cde4b53cc8966a0c1a2e80b4ae78d16bbc3310ffab876f7577f13676442e0f3a8ec781a2c7e
 EBUILD netbeans-javafx-9999_p20160323.ebuild 4717 SHA256 acee79578d7f2ddc855790643f5c3cab5c04789a55609ee1748f112a28539bca SHA512 6ebf45a1e5db61d201d9131a1ce5b38105a2863b71b2ce8b8c6220d75505e874809f4a2f87ae7c0065458c896210b279d326cae108288797c0c23c84bda11c72 WHIRLPOOL f9a674934de5f0dc52a785884b0e7b746d9176f3d387ea3097e74ba8f8e093960ce5d5f7d2751caa05899e4d48773712283f68f5753b7a8bd300d984b04e135d
 EBUILD netbeans-javafx-9999_p20160324.ebuild 4717 SHA256 7aa6eaaef143638e949bb428afa2c01fe8b0a0df4e917bf58354c62dcea99582 SHA512 05c4d99f3cbe68fc9308a0289efad3ead6943de08d9ee2a632510491a4355452783daf2c5ae94b8f59a96c4e7d6541d95a377fcb820ec9c9de630cd460c5db9b WHIRLPOOL 3f7e4149b0c6eb55ec7d57f0b7f3b6698170b83778c8b3e81749fb1c5e7e66316b2f3406aa8cd5326063e762809d1839cea800522793e9f05d1323d9cf4c843c
+EBUILD netbeans-javafx-9999_p20160329.ebuild 4717 SHA256 4d939865949ce42fc60478a9795efdf59b3ff8b8022a03ada209029cc7b5b179 SHA512 8b74ef8017987be3ef086dd7dd03190b328f9f3c794d24641a7ed4b605cb301f9da6679d1848e0f1fd9707ba3cdf5cb67ef899280ee3b38c64e8435156b12550 WHIRLPOOL 265e288ee9608ab69fa1b749ebf513f4f6f7d2e3b416e670ffd4232e39acda5b76c71eedf7cc8d041fc8a508c65f00a2ccb96fa9ebed833a108bf7c01ae8f1a5
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160329.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160329.ebuild
new file mode 100644
index 0000000..b3c0ca9
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160329.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaFX Cluster"
+HOMEPAGE="http://netbeans.org/projects/javafx"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-29_00-01-48/zip/netbeans-trunk-nightly-201603290001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-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-r15-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 e5a2619..130825f 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00
 DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
 DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
+DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 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_p20160226.ebuild 4412 SHA256 bbec2e6c2e650d2fc08f509630fd75b94ab377164e8039f739412a9733703e23 SHA512 6ee2a3cac08f3dee80da86aa60b49427682d9fba372f79459249d08a536eaab7aadb8a028db7500bfc7c9c4701ce5b84919ad34391e7527d833a52ea747560f0 WHIRLPOOL 838385e60b32c9cc438a1406469f21983038b62ff3bb158d16ef14d2675af940b371efbfbf14bedcc4cd7e1ef4a1ae73839a9f7c06b66149d89c9ad3ea585b2d
@@ -44,4 +45,5 @@ EBUILD netbeans-mobility-9999_p20160317.ebuild 4412 SHA256 c874d20f71d2227100460
 EBUILD netbeans-mobility-9999_p20160318.ebuild 4412 SHA256 357ef62e12cdb2bf03ed092bdc0a11d1a438827263d12f34dbc4ed63ead26751 SHA512 1110898e3b5d77ab0c7237daa1091b2c34e2de0cb9b9f9bfce195be22e32e0b74e2c669aa94575cd45535fbcaa084694cae85c9378b79dd556d038ab5696f8dc WHIRLPOOL 72e4781b2ee1d5e067f461ae0559a6a9397284a93ed1a3d422c151f662a2756050efd2ca1762aec78401fe7ad9555f0d3bfe0db65b9cc484db34ee86bfb952ef
 EBUILD netbeans-mobility-9999_p20160323.ebuild 4412 SHA256 2c08c29b61f44d19335f0bf220f7ec820b0192d0ca47d769c711a2d72ead05d0 SHA512 4b398ca24c711f2f1bcf1afc481ed4a280afd96cb80a12f110b0e0413fe9b16d2d256675a10d40b7e53b70715487af45717513300268b97cc15d76228300e212 WHIRLPOOL 8c18bd51f1b207fc4e50bc627cb4486eb214cac313445bebabb1219a77df8c9f373a4be08b8653fa42a17c7f271ba29d0adf305adba642f9ec7726e351bcc5d8
 EBUILD netbeans-mobility-9999_p20160324.ebuild 4412 SHA256 7fe3799569385c9d5b492d941cd6e1291be71122c1d041fa3e85cd3f21a67efb SHA512 98c7cfbb2591f306d7e1c5f5f5be0dcbfecb24dc2f6686450088e2613bb64ff8edb3f259fb84246f526dbd4bfdbd3004d3074578485add9b0c10d304cd18c951 WHIRLPOOL 8289df14147a5e400f3ce83c471413ee1d6e1e2890045c35680b3096203eb51e705d4ffa34c7a94c67ac8ffb65b5b82c548efd93df0b93729fea28077d738ac0
+EBUILD netbeans-mobility-9999_p20160329.ebuild 4412 SHA256 ada2e09f2e3bbb228882c05f85344ac4cb0bb57e16db30b9b13790db58ddaa64 SHA512 6c11ee026c449c23d36b36f120e5150e1e8758440489c80c8b253bd1e91ce36fe649bbced71ec20e9aafde7d0400df93e3550c43b1f5849f9475400b82f48a26 WHIRLPOOL 9e4aff71b105d8cdb7f0aa665963bc4226a84cbe419733b396aaa6b328a64c8e3a6209471ddcaa179eb7ec16a4af822fde9253f528c6759ce9e645ca92189441
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160329.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160329.ebuild
new file mode 100644
index 0000000..bc6471a
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160329.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Mobility Cluster"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-29_00-01-48/zip/netbeans-trunk-nightly-201603290001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r15-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 1862170..d24e30d 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00
 DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
 DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
+DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 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_p20160226.ebuild 4111 SHA256 459b48abe12e8b6aa8270805cd48fbda1bd7125426f991b1b4f10e13b25f69e7 SHA512 ebcd39ae8e705cbacb605179b24f48697949b3d3dfc69ced472d328eaa495dcb2874867ab89c666128099a14aba5c660652cd9491eda0ecd67fb056f6cd7eb8e WHIRLPOOL 0ee12ecd87f84db8425b661c6cd7d71e005205bb96a77b932a8ff194ca93e738d1d77ee415c8ccf1e0373c7afe7a79065d14179c188769956e8e3a786175fed3
@@ -47,4 +48,5 @@ EBUILD netbeans-nb-9999_p20160317.ebuild 4111 SHA256 04f02792389acbeb49fe367ec5f
 EBUILD netbeans-nb-9999_p20160318.ebuild 4111 SHA256 0916bbee7a2fa8b2a97f17239c82fcf46272caad5ad403ab50902a31b1d7f756 SHA512 db4ffebc264b1d0d3ec384facf77d16d8e6ee702909cf3207c801813f766a223a38c75c443d579b09ec4fab809cc67e6b5354d388ef81ada89819f9a64c81c59 WHIRLPOOL 2eb654a9bcaac8eea74a496817a064da47edff2b61df8a1cc4e6468d841552eeac9f2b2af1f98a08df258ca336eaf73df0ae25ec3e2fd418d7a7ebf80db875df
 EBUILD netbeans-nb-9999_p20160323.ebuild 4111 SHA256 0623097b6d76f3290926cb3660f7d32c333894a546bd0cf0d6c48a9ec7f8cc3c SHA512 f00bea390fbc4ef045609a3bbe6475aa5ceea8ec257d63b349cb37f8075eaa3ff991f49e5814a11e18f2f7c92bdebda6faa62cc2f05f98abf7264bb0a41532b8 WHIRLPOOL 62132505d1da38d702ea426d82940b85b0229529995e5352b6a67868a9a29d1aae88846aff1257f524e63fc2a8e7fc32b47ba1e601c5d09148d82a22fe80bf4c
 EBUILD netbeans-nb-9999_p20160324.ebuild 4111 SHA256 10e8e442718b389956aee352fb5d6a4a86c90037738e42d27e57b06e4dcc2193 SHA512 169f92c78c7b5cc03454c33d4d1872895b4d4f30bec8b90180b197a4af50862554226dd898708db5fb7c8ed507fc904b1f25aaadbacb2cf883f7d750c9c65abb WHIRLPOOL 3dd6231a22792d864b50fcb3271e2ebf65a460c88bf2548f689e57ca3dbad4cdd9248f40a9885694dcc69bcbea8139ec8d5e1c1c9a483f9465b6396d93ab7102
+EBUILD netbeans-nb-9999_p20160329.ebuild 4111 SHA256 76772682b35507ad629b6dce0d4f8565dd152de333a26921b30cd0a649aba7c1 SHA512 4243543e0f3f79cce79805602bcf9149a9d3310a8c9709e872c58b984ab56fb581827e7b6c656c3d6453f2185b97c390308d7b7b027d9b0cde43b0ce0605d844 WHIRLPOOL 89fa502a5bb2127f87264fa4e96012b8a8cc86666ba7e977c5a595af1d11d2dd16244288d9f1f1714859b932f616c0874c869b2367b4a5b1656840e16479858f
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160329.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160329.ebuild
new file mode 100644
index 0000000..ddf748a
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20160329.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Branding"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-29_00-01-48/zip/netbeans-trunk-nightly-201603290001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r15-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 f35c660..9059c05 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00
 DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
 DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
+DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 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_p20160226.ebuild 4418 SHA256 0b7f0264c328f605a440d95a92df29adb174dcb38a9da56ffca6f0acabeed204 SHA512 9da2ec6718e15411780f8d90aea41da30b348608177b14b55258230109c7a9bfa176fe5849a06c28a1cc19c79fbcdeb0a117a025eaf5e8c20d11524802230c42 WHIRLPOOL c4012442efd2fbda3a0e6d57df5b5fdaed62a992bf11110317eeb67f3424a6abf1db256af752281669e0d170d8c7aec0fdfa2ba1a2c282cd2045cd529a03c467
@@ -48,4 +49,5 @@ EBUILD netbeans-php-9999_p20160317.ebuild 4418 SHA256 cb50ef14aba92bd3390ecc90bc
 EBUILD netbeans-php-9999_p20160318.ebuild 4418 SHA256 675766ee5595a165e07df6435ccbc4c3b9fc06a04718f518f707a070f121cce5 SHA512 01c35192bb7d4bf5ed7fdc11249e02d3058fb69f0390c9dba1838cf61053a394a255999a40e69134c13c400061e49fded6928123e9b35f23522b44494170c7b0 WHIRLPOOL 2d9ea92b5e51dee994bd0353becede29f2b8053bb7f934368d322f3a815ca44a53ca7ff61e6e6fbfbcdc055a4df712623bbaf0289aa11504da3ba3a354566ad7
 EBUILD netbeans-php-9999_p20160323.ebuild 4418 SHA256 78af17d8ab7754bb43a899f0893624177e1e1c011d2c64868deeb3402f9ba9ee SHA512 8e88d0fb5b89a9b5546e3eeb22d78fa57a84ea9bac357b75e8add3e0a5367613e6af623df66e7eaf675018f21473264677adcdc0f73612d2f9754a7f35c5f8f5 WHIRLPOOL 635ba9612c20bf71236eb8481e1a69c835dfd24fc2d7f4331420f54c23a07a32361635512b25cd283b32cc54c7978555f59e25a42408827f8603623e3acc65d9
 EBUILD netbeans-php-9999_p20160324.ebuild 4418 SHA256 b0f98414bb7eca922a90d6881eea9c036bfd88db3bfbb272180a63104c1b0705 SHA512 b13d3e9b45aa5118350d15870edd543faea79bad4dc6e980ac951f9bad2b97a088130a750560969ddeafc01bfd4cb32a34659ea704c0a1e1c87d42d9421f05e5 WHIRLPOOL 61d2033daf1c4a34f6a2a9bb5bdc50ac6fbfab1ab2bde8022c87130dee0a81d55760b1cc2789c9f6ea0a1a076ee7bb4fb7e72098305b8383a07887e1e3ae2a12
+EBUILD netbeans-php-9999_p20160329.ebuild 4418 SHA256 819373c0d5d791ba49c87ed8164e8472788c20dc6fb4000d274b044dc0c8c40d SHA512 1dd59632f68ebacb49b6685c9767cd94d8760ebbcdb8aba9aa94a8ee0bf95578b56b9db7f2080d415bed7c2518d58de80ac7f7ad271d026a9feccbb37e5cdd9e WHIRLPOOL b5d380fe8cd2de24a73376e8d96dbdbf7b66ecba19fbb5c0055bb6d628e44ad7c5b0310ef325ec9f43beb729adc6be3464cc42559e960270ecc4a70abfbee345
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160329.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160329.ebuild
new file mode 100644
index 0000000..0daef51
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20160329.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans PHP Cluster"
+HOMEPAGE="http://netbeans.org/projects/php"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-29_00-01-48/zip/netbeans-trunk-nightly-201603290001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-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-r15-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 e47ab07..1b7a972 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -50,6 +50,7 @@ DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00
 DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
 DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
+DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 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_p20160226.ebuild 9360 SHA256 acef938e46799002469a5dd2fa9a77ebfc997a0151a1511efc38abde0925566b SHA512 50a9330f81a4a70d95e76f0558e93f065e41e701d254577d1fdb0c7fd7ec4974cd94591c439b0c55e005409173c0d2e412a9a2c2bad25b5af75dd2201432fcca WHIRLPOOL afe64db0ad385eba21a52172e540728016ab85a2d4c00ac32fa1957b519209579efd60326475e86c90d17fee016166d4355ceeb32815ee90b4d839c27eb7131a
@@ -71,4 +72,5 @@ EBUILD netbeans-platform-9999_p20160317.ebuild 9421 SHA256 5d9828f5deccf0c5dc717
 EBUILD netbeans-platform-9999_p20160318.ebuild 9581 SHA256 db1a1733e25b6f13dd9f6e6a7e47ae32f309b7d0cd8cbdb0873c153b1886349a SHA512 ed8b7439fd46ee3c448f95f354e3943478a0de160c234df13b009880fa4b1782cd2f95c51f8319c48e523d13d2bdcb0fbf71906ae9cbdf2441ce746c7da549a0 WHIRLPOOL 259f65c4c0e9a26e6b4e30b63373d24cbceaec8c588192edb9ddc03fd60491b861548a53958261d2caad01cce2cf882d57c5b5752dbba103f56cdfa3bcd3768b
 EBUILD netbeans-platform-9999_p20160323.ebuild 9581 SHA256 730095d721f39328d68495a7f502926a74e84fa380fb77601a3262e6d92ea941 SHA512 8513599e2a2a702d1587f5e3d1029db274a097b5ee494864b99ecf77be56a178e7831a0d36220cd44f7403c705da59bc318d84687f5f137829bc9769d406655b WHIRLPOOL 7c4799c8bac08a30f1760e900a5fa11858481e240af05063f3af8c51ce7b23dbfaf5bfac74ee3a1ef6f5bbe9ef75e39f5553c66a7570ef877abc1739b70767ec
 EBUILD netbeans-platform-9999_p20160324.ebuild 9581 SHA256 79e91e77a24f99f831ff797b7ff20042e796d9f3757fc675acb07809a43e9473 SHA512 ffb2cd293239f5031979b96161f75b394fe48481e17f5dd4868b59b4381182f5434c6d9df33a7359a54fb9a2384f4a1a99f36638e2f195836917c0ef72c992a4 WHIRLPOOL f0b2434b81bb9d0197c2a88c72df03fdc1ac96bb59974314cbd954e95f3a2f1e3c1261a80b1341f13f0a452f9c3e9098ba6c7128e4077522e804dbe9e2d6f32a
+EBUILD netbeans-platform-9999_p20160329.ebuild 9581 SHA256 408ddbf6b99d3f4e6b25ee751a25c88d16bfd01f968152d8a428900099fd44fb SHA512 6f7492e0fc4b2c6085ee1d5ca602796d04b901beba99334f0e549e3bd429ba4403ba520cf9660be6f5cc0b98c46ce1aae742ce8d6c5de1cc7eda2df812635bd8 WHIRLPOOL ecad3d56c5520af9fc8aeb1bf20ec82dbac721a4e337a702cecc009252d0a7985207b5e41d4fa2de492346324e6dfeeaf59a0af1fc52a1e3bac3a422179cb25d
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160329.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160329.ebuild
new file mode 100644
index 0000000..76921e3
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20160329.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Platform"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-29_00-01-48/zip/netbeans-trunk-nightly-201603290001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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/0388CADD903570B9FE30140C0EC39DC573389B33-jna-platform-4.2.1-patched.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-r15-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}"/0388CADD903570B9FE30140C0EC39DC573389B33-jna-platform-4.2.1-patched.jar libs.jna.platform/external/jna-platform-4.2.1-patched.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-r15-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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.1.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 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 6109756..c26d11e 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00
 DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
 DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
+DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 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_p20160226.ebuild 3472 SHA256 cf513aa4cac3a4780a032fb5a6dfe2b44d94eca33b1955c68dd81c5adc18f44d SHA512 0e507d7749f1200e9fb21c1acb594656098587937efc28c5259c1147df2625fbce79f327d0342007f0865a09820ceff4fb6cfe87eefab4abefd87bbfdc27bd7b WHIRLPOOL 1fa2c89ad1a1035b025e17dadf3d63d353bb4ba6b66eea9a3e7973eac0cedfe33098416319b2b5e3e9113d7fa909d9b39a72838e9868137af98c45d54364bfee
@@ -44,4 +45,5 @@ EBUILD netbeans-profiler-9999_p20160317.ebuild 3472 SHA256 a6f563645b63a5d298631
 EBUILD netbeans-profiler-9999_p20160318.ebuild 3472 SHA256 1584a63dff37711ad3c3879c17552f7e5ab3ecfe6a084cda5c9c593b831c8fac SHA512 cfb693f3956903efad33c131d8fd80b063c52f37d27a3f4d09346b6999d042dafc7c904635a8f873d72b0a767d1f2604ac4d0582022fa9cae91246dd3401596e WHIRLPOOL e7bc6e161d78bd7753919dee47a2423ced0ca2fedc3ae75891f7803001c7c3c9ebb9bd30d9c3a625b6a350165eadaea29e28068226733bb9e739de9c56bac33c
 EBUILD netbeans-profiler-9999_p20160323.ebuild 3472 SHA256 c2de8a0f149e8d1a7c99e4b8e637ead8f11b71c54687e5ae8e9f572507e6c627 SHA512 f998d4f56921170e937ad9b888e891e87c182db5a726644ea382aa219e069b515f10c429d79e7cd358cfb69a937c416bee10c635372074b5e7cfe01e6da1faaa WHIRLPOOL e6c48f5a04bef7b83c99060c104c799397de85461539f8d158a78cbffee114950d498d7d412d47d1ccf493945b3d6691a0721e64c742312d45c1ae6a75202245
 EBUILD netbeans-profiler-9999_p20160324.ebuild 3472 SHA256 168d3a2897c5239e5b89f7affa406260cd49bcf6ccee9d65ed21f89b885af6d0 SHA512 13e3fedf60c79689c8c73660dea081944a0fbe7c762a096579d097e17e6f6a315eed339d53e0a192e850a41b56830e3c6f1314d83601ef850239f3e9ea4372b9 WHIRLPOOL 441a214ba22467ac680643d1e3a8814662ab9001348a482912020fa768a657bc2025ab8c5d68193c34213217b4d4375a71ae1e2cb7a427980ba37939f0254c74
+EBUILD netbeans-profiler-9999_p20160329.ebuild 3472 SHA256 0e308bc5777440e00b2e6292a3eb23090c525799027c5bcf85df7aed10f3f24a SHA512 a1ec22a982ffca8075ebce0f3b54cbb2807a677ad77d2fd27eb32089ce5e9e61c7ef097d19423f4fc5494865fce471801ce15ee10d86c47f0c6b451f4630b02c WHIRLPOOL 9d50d36784cca80bb3d4fd24d41475395d68707fd4743a2af4d58ac890ad610a052c58a5d2a4c961f9bf21ebb183d1c367bafb6db9f30787579ae19909e15502
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160329.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160329.ebuild
new file mode 100644
index 0000000..6681c92
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160329.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Profiler Cluster"
+HOMEPAGE="http://netbeans.org/projects/profiler"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-29_00-01-48/zip/netbeans-trunk-nightly-201603290001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r15-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 ae96abe..9bf7988 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00
 DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
 DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
+DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 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_p20160226.ebuild 5280 SHA256 4def44255acf79f56ce8c4517b7b65fe946425506d1cf5b638058183b9e371c9 SHA512 4a85b6ac3b4be47ea80dba95dc0a6074555b7597babf6b54c9a3357d3868a33af2d3e0855331553de488c72c828f005ebcdcf3b939a93ea1b48a844682ca2bfb WHIRLPOOL adcf5609e086ed39181719fd0bec7482eed0de20e021d761c59fcdff653d601a7e2feccfec5ecea3a26554294b2928b8ee30acc8520262ce0146cbca4ca9b53c
@@ -60,4 +61,5 @@ EBUILD netbeans-webcommon-9999_p20160317.ebuild 5244 SHA256 2700f7310a1ec5e460f2
 EBUILD netbeans-webcommon-9999_p20160318.ebuild 5244 SHA256 c28b7fad684b23cc00ec1b404aacbf3656a80ef2adc7b92910b885f56b29984d SHA512 57e0cbeea116459c1fae1484cb874af830fe321ef3639e43129a01a3a7192b4b409e82818fb7c9c46c42d62c278dc6e32b43ece33287fca16763db002501855e WHIRLPOOL 628aae7addcdb8ce8fdc571c673bc1581839fcfc093c6804c4b48b9cd159615cf553d51c6b87c390e45722c306d759a62866bf39c3abb62af5fb34febe81a7d4
 EBUILD netbeans-webcommon-9999_p20160323.ebuild 5244 SHA256 f5303885a1987ffaae129cc10e43eaefd6c7e70ff139282a9eb9e86e24b28985 SHA512 aa5b7b80a499943507d6c415b505c9b02881dbabe45947d84f5400c6d9330d9fa43e15bd135055339349e5a84d93f105335ce8e7a380f7b0bd794bd7f09ddda5 WHIRLPOOL 75a4ffd50ae4cf02d298b04f05d1a1726639e9591f1a3ba16e1ebef187373dd792795b1ab69fbe5c62679f0e3f2fda1a92c79f0a9bfb8988c496a61afa6de026
 EBUILD netbeans-webcommon-9999_p20160324.ebuild 5244 SHA256 68e47a383d63da8f7db9efb8ec10ef6d049b081a422ef7eec679ef8a03cdf7a6 SHA512 6edcf74c4ac94f73ccb999bbcef8039688e04aef9516e881db89cee7fb682ab3381563a19a26992f7539a57d7757e97c09a5e2fabcc41b89018cc1fd89d36001 WHIRLPOOL a01a4440d32f5271f8e1635f23763f4f5fa1a71c0904f2a78e61bbd88e2666bc45b5aeb514478e319ea57a100726525d6680b11d8fcedebdcae01587b6608050
+EBUILD netbeans-webcommon-9999_p20160329.ebuild 5244 SHA256 9574bd4be256af06ef0b45f848889458280dee5bb35e8ba5ba0355dee994978a SHA512 65c4c0bed434072db1450fde2a424df522a4ad15eadb1de47ac0af740b6609e2491f3a679a2960f845390f205c431bee994fd776a4ed1cad3aa394dfab24296a WHIRLPOOL 5776a1a76517782efcd4fd7fc817e0bf541fea1c5565351c7c4516e6f78a90f90c5b77a2a57e8f1d81f51a6703a81a38351ee9bbfab01aea3f991934b11696a8
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160329.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160329.ebuild
new file mode 100644
index 0000000..9bcceab
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160329.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-29_00-01-48/zip/netbeans-trunk-nightly-201603290001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar
+	http://hg.netbeans.org/binaries/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim
+	http://hg.netbeans.org/binaries/0929AC5F40B5A8667021408748D64F30F77B3165-libiDeviceNativeBinding.dylib
+	http://hg.netbeans.org/binaries/2A38DA3DB5D36DBBDC0B03990B46810F72430D5E-libimobiledevice.4.dylib
+	http://hg.netbeans.org/binaries/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib
+	http://hg.netbeans.org/binaries/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar
+	http://hg.netbeans.org/binaries/C1BB9FF4232248B0054E5A26A33474A251EA19CB-libusbmuxd.2.dylib
+	http://hg.netbeans.org/binaries/D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip
+	http://hg.netbeans.org/binaries/1EFED55F8C442E4DB1C2338A5C35D494364F9ECD-ojetdocs-1_1_2.zip
+	http://hg.netbeans.org/binaries/CA8F6968FED0BE20E786C70CF9B603F4D7B66C68-ojetdocs-2_0_0.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+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-r15-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar libs.plist/external/dd-plist.jar || die
+	ln -s "${DISTDIR}"/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim cordova.platforms.ios/external/ios-sim || die
+	ln -s "${DISTDIR}"/0929AC5F40B5A8667021408748D64F30F77B3165-libiDeviceNativeBinding.dylib cordova.platforms.ios/external/libiDeviceNativeBinding.dylib || die
+	ln -s "${DISTDIR}"/2A38DA3DB5D36DBBDC0B03990B46810F72430D5E-libimobiledevice.4.dylib cordova.platforms.ios/external/libimobiledevice.4.dylib || die
+	ln -s "${DISTDIR}"/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib cordova.platforms.ios/external/libplist.1.dylib || die
+	ln -s "${DISTDIR}"/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar libs.jstestdriver/external/libs.jstestdriver-ext.jar || die
+	ln -s "${DISTDIR}"/C1BB9FF4232248B0054E5A26A33474A251EA19CB-libusbmuxd.2.dylib cordova.platforms.ios/external/libusbmuxd.2.dylib || die
+	ln -s "${DISTDIR}"/D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip html.ojet/external/ojetdocs-1_0_0.zip || die
+	ln -s "${DISTDIR}"/1EFED55F8C442E4DB1C2338A5C35D494364F9ECD-ojetdocs-1_1_2.zip html.ojet/external/ojetdocs-1_1_2.zip || die
+	ln -s "${DISTDIR}"/CA8F6968FED0BE20E786C70CF9B603F4D7B66C68-ojetdocs-2_0_0.zip html.ojet/external/ojetdocs-2_0_0.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r15-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 2e11aea..406d3d9 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00
 DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
 DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
+DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 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_p20160226.ebuild 2721 SHA256 69c6a48bc572ba9bc77bfc4631ddfe2fc12727b4ed218e58959f6be46e7c0448 SHA512 23e76bb47f71a267363ba434becd1c567d5002629c9e13e20437381e4158333af75182847a8fc3147dba69bda5319d50aa2edaba51dfe87ba8a8a8daab2c45a0 WHIRLPOOL 4fe9d791c26863723fa62de791cbd0630231a5101c6386d31258ecbb26011e86b4cd373f15dfc35fb284618b41ad4ec453a2a1da17ab148cc45cfa5652cd49bf
@@ -44,4 +45,5 @@ EBUILD netbeans-websvccommon-9999_p20160317.ebuild 2721 SHA256 904ac318e98083851
 EBUILD netbeans-websvccommon-9999_p20160318.ebuild 2721 SHA256 f261ea6ee8ad3f4bf7f777a1517edf187dddf7dc4d307df50f5b2f229c8fb7b8 SHA512 999cc373f762a7c91780c5b62e2e6af3dd82c14c4f0167cc575c45a09122a94feb528563fc9b376ba1fdbe8f4e1d216d024f8155b0c53bc4995adf12626efd7d WHIRLPOOL 5cd9d416043483556147ca910919219268100496da2dda93c760190f5d4a7090376e2aaac514336e34168e10f61c28c47876fcc5960b06be030f78306403a0c0
 EBUILD netbeans-websvccommon-9999_p20160323.ebuild 2721 SHA256 711867c40a107ccc31f760f1bb5cd3957463dacf73941f56a6b1f0ae6f51dc63 SHA512 4928f51238e92f1ef03b72e91b5af73712c6afe2e10482bfe201d5d66a10d3602b12f4ebbf573a24c6bb3fbb4cf1d07c008b54c86b53738267d7f75070d83843 WHIRLPOOL 06ebddd26c8cfb1ae6bee59553c2e5e9d122a2df58b61e9380eb4dc982cd0661a24d27dd96decf56efe5f0d0c71d072f9fb912902471129b49a40bf3025b38d0
 EBUILD netbeans-websvccommon-9999_p20160324.ebuild 2721 SHA256 6f92ed2c034b804b696299c9ddd0aa4b979a3b25c6dd823691e3b954be5b7d39 SHA512 d00031236e9b41eee02b1d7a341dae013f2703ed92da99c0da1c0aa3c9a457e3a81192c07be1a0de7c85a39b9742250154a54f5d00a0b6099ad3e681d7e3f1d1 WHIRLPOOL a49ca571afd94a384bc44c0acc13e8ebe6323cd6dc10263c665b2fd67652918d5f55767e291c6c31ef24bf654792219ea7efb8b94a5cd903c24705aa79490911
+EBUILD netbeans-websvccommon-9999_p20160329.ebuild 2721 SHA256 fb51b0a08b8465241559bfebf5095a411373358181eeac146ec70a4c3f33320f SHA512 f7e9e77887499aa7c7b50daeb9e7268149bd10c795271cd21604c55334c2b8d2fa998e577ba6405442dcb29310a319ab20957cab84434308ec74d607a0f03f1f WHIRLPOOL 438e98bd55965923bf88fba5d4f21a4399e556596c70056289d1ec176811e15a8016e5d33eb83f37ab07bfc80f7ac8198211244fae6bd2f78927283862d53589
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160329.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160329.ebuild
new file mode 100644
index 0000000..0267e00
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160329.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Common Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-29_00-01-48/zip/netbeans-trunk-nightly-201603290001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r15-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${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 6c06a7e..e9d2c8b 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00
 DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
 DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
+DIST netbeans-trunk-nightly-201603290001-src.zip 210075905 SHA256 d0f49348e05e834122cff66c11d1e228cd2aca800b6176773e9c3e70cab325ee SHA512 8252e49618ed71b361fce2036679e6175c84a6883f6d744c2451fe4184431011ba3879fe7068a905dd138f17cb40b053ca7858c4250fc5a6b6f66fbc9c2f96e7 WHIRLPOOL dd46cad0ba8940eb3d95f7e1f4176804cf2c4bcf1ecc95611307e7102055304ac58f2d839a82c44988524bdb83daa8f4292d2d2ccbfd09bdf8846fc328cbb4d5
 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_p20160226.ebuild 6939 SHA256 26aaa8f427926fe184550a8f6025271886c7ccd8b16a4e605e6672d904c4a3b2 SHA512 9c99d3fa5c892fbb0b3b486e6f5a2a03947868840074e08569f06e06beb8d1b2374ce51c5244b892ccc0974913f10939d2b057a306774b5b8163d101a3784a6b WHIRLPOOL a243f9fa4d0635c7e85b0eb263551f8ce2c21f773a4298ffdf649a96e4245ac0119fcbc1474c53d6f2eea7e7fb3e995da34c16d7fdc387f6dc9c76b0f292d6ef
@@ -47,4 +48,5 @@ EBUILD netbeans-9999_p20160317.ebuild 6939 SHA256 a897b7ae94ad8027afe154a2d8dca5
 EBUILD netbeans-9999_p20160318.ebuild 6939 SHA256 fbc2d450376c4bdeb779ae76020fbeea61a4591763505cddf4bdb9993cda3eca SHA512 d3d0e73641486fc9c608a8cb40e297d49bc23ec77b47eecde7251b88dde5108edb50d82cdf64fd738bd34b721b3a348db7712f5771663ed27e8287b6806538d4 WHIRLPOOL d668f8ad9a80289c7b05260d3c44af546b971cb67bb0371388ea3a782b60ab269078342bb050869276a932983ed051f01525c363766ae625ffc0e274fa7ffd4b
 EBUILD netbeans-9999_p20160323.ebuild 6939 SHA256 2058f071a7fc4ac7bcaaad80217741227698a3567c1f16221d44841e91ef6c95 SHA512 aeb4f33680687e96fceccc9d720d473f987b952a331e311bbd088bb1810bd4d3a2498f2ca1722ac0e3ec900faa7b8add4aaa68ea4fe803e61be8deb4d6692e36 WHIRLPOOL 880154f5145d6a7d6d0c8ca1b6071e14c038101b37fa9c7ed785c3afc0c9edde2cf1496181b3424035d1bb957dfe8598435d8cf1a41e6dcba4bb63d933f24a9f
 EBUILD netbeans-9999_p20160324.ebuild 6939 SHA256 6b17d7a80c248d7a2c3ce8e393b1aa57fcec9b09a246ca45e08e4ba1b9443b3b SHA512 e336f58f4dda5631c1461c15e8955e4c59e8f026446db1c44ab5da7089eb462d87cd45428d1f26bf0cf474f2c1c256de29716561b451f85ed63d2a0654b2e017 WHIRLPOOL fa88ec5604daf7f59a3295be11f49617dd36c79ca4bb1edeaea385baedd0eee87d763a2fee5080a02edec03679f60ee5d019ce308c0e52af19d5146429c4fe4b
+EBUILD netbeans-9999_p20160329.ebuild 6939 SHA256 a95ba6f56fa964c2d5f1cd023c56b1d2ce7b7b5fc25854998fef25706f762ca3 SHA512 4db2b9cee4fa4f1e0e5dfee7958b47e445448db4b926f15af92708d3f1a8c1f5e98cd76a2e29503e4636a2d0e55b25ffecadef7a0dbf652870e50ebe96d2f64c WHIRLPOOL 934fb6887354027586c36233ae42d1fcf455b27730026585d5538da3d6bdabe0e4e32700a764ef0588e9f588cc763a495c41a19e5ab0fb01a5d2e5f4e8322fe8
 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834

diff --git a/dev-util/netbeans/netbeans-9999_p20160329.ebuild b/dev-util/netbeans/netbeans-9999_p20160329.ebuild
new file mode 100644
index 0000000..7349410
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20160329.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-29_00-01-48/zip/netbeans-trunk-nightly-201603290001-src.zip"
+PATCHES_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-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-r15-build.xml.patch
+
+		# Support for custom patches
+		if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+			local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+			if [ -n "${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] 5+ messages in thread

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-websvccommon/, dev-java/netbeans-php/, ...
@ 2016-05-11  8:00 Miroslav Šulc
  0 siblings, 0 replies; 5+ messages in thread
From: Miroslav Šulc @ 2016-05-11  8:00 UTC (permalink / raw
  To: gentoo-commits

commit:     bdc8a6651256be1889e25beca74ebc8a91b77f68
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed May 11 08:00:42 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed May 11 08:00:42 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=bdc8a665

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.2.28

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index f6ec44f..a9f348d 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -16,6 +16,7 @@ DIST netbeans-trunk-nightly-201605070002-src.zip 213540102 SHA256 6a040f33a06dc6
 DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 DIST netbeans-trunk-nightly-201605090002-src.zip 213540102 SHA256 66971c1eef81c99ed06f84dcd00acef703867637d7d475a27fc29fdf6e6c71d0 SHA512 70dd67358e41754eb9e39769e6a2eade6a3af8893c7faaa57fb1766f189d70b12b6871a90661e1362f42a6cefe586fd618a963c4afa5487220ffa9ab8e64ade3 WHIRLPOOL 736e2d0b824d5a22b988cc687c96da61e867401ff68a835f95c2af078f563d39a4a8e713b76f7f9c50759c1e6dac2785d006d66b3ff23d71e9cefe07aabca58d
 DIST netbeans-trunk-nightly-201605100002-src.zip 213543139 SHA256 81799ceebdbc9c8614a4779961c5345676bd39a980325298b109cb3e36f85b90 SHA512 5a77c688669d44b4ad162a36153bb04a0a3ee9743b68266fc64ecce415821105e9dedadfa2d4d0a6a91702f2f4f3cf0cd239e0f71197d9e0fa343ad493f8d64d WHIRLPOOL ca281b37a4b16fb6ae9dcbbc209ad3a28d39a4743a73ad2314b0378e0c91a911c9b3235ce7e22f443cb56482ae568955b1c5d7c67058422168f0ca0ebc870e16
+DIST netbeans-trunk-nightly-201605110002-src.zip 213548255 SHA256 602c5f93b24a7212efb02eba11e61862131118057aa66799bb9cd23ae7c6e71a SHA512 e55665a6cc61259e31c9c35f75c23bfdd3b59e30cd9bc4a3edd03d5ae844f8aca3afcf09b668802406e0c2d18d1779089abd92c36c7624ad80d840713ceba8b4 WHIRLPOOL 54331cd70301fe4b4a5763a0a9af007dad396b0674799f3c755093da3bc59d3c43cbf8d5845948c6aa2bee4014e8b865cd63a16c8704dcffc268efe55caa368d
 EBUILD netbeans-apisupport-8.0.2.ebuild 3314 SHA256 b68fe791f275fe4fcc8b00888688949b8927cb39db2cf9ad7860017c6d20adee SHA512 35c4bbcd34ec0eaef8a2de86c13333d2bf092db61af48558c3e173bb17dbf8fcd15001307bd7c498f4ccdbaa4277e1ee42ff0909af6170039165b547f646c383 WHIRLPOOL 206fe8d5f64e76827d3eb958a629ba087e8a16c2797752f5d9e62dff4166653677587a81be19e0a2c6adcf49292255d532e1f542c02550b1cf6ffd51467bde3c
 EBUILD netbeans-apisupport-8.1.ebuild 3338 SHA256 d249a09cd1a527bfc4f0dc87b1768aad9f05fc7fe7079fad0094c27d416d030c SHA512 47e5db58581625b23157ef7a7b6e340fce1327db85e015369ac32791178a0836af3348397ac6ff4439ab246170d3318c2062994c81019ff361084f00d432c9c8 WHIRLPOOL 8e379c9219b7730a15c10216bed00c3ec104f84b252d32da629f066095897398a4d8818e07cda5afdf94b115b97ead8de6a9529f38c81c1c41144067f119e54e
 EBUILD netbeans-apisupport-9999_p20160428.ebuild 3384 SHA256 e866d9fd43d85c959d598d6111e061a3138aea2a9133f516f547a15370086e3a SHA512 cdf600716d69e7b50162f7556e2f70c6cfe9c998c94529be32305cb6bcf732ff568cdb7a3529478c12c72693a8aaa3edd10b2e752f875f6a40ef9599daff9bc1 WHIRLPOOL 5571ecd51924a63326a4759bdd584da6e7c2e5f9b33b7eeea01e4afbd58d6bdf6360e964896112aab5dde57c7b52d136e37e35f35883f3762543afb28a84cd42
@@ -31,4 +32,5 @@ EBUILD netbeans-apisupport-9999_p20160507.ebuild 3384 SHA256 ae79acb7c64cebe92cc
 EBUILD netbeans-apisupport-9999_p20160508.ebuild 3384 SHA256 61ba5483e2004475b2c7bea0f45961c63233cf5d9fc23226ea238999e0c61711 SHA512 1962ce40f3ba4505b0c80562a6e9a1267d2d0c1d3b2051b54b5b5977223093e2f760e699784ecb19421074b52b5a112281dbd6a9ef617e0cb88f537288c06586 WHIRLPOOL fa0de9ba1ab7043f95017b86763b56558d6e2b6c2379992fd55653196489be8fa8e1f38dc306476ba395d0b24ddf104b7c2574a6c419ca740084c86e4fef5123
 EBUILD netbeans-apisupport-9999_p20160509.ebuild 3384 SHA256 7fd79fba6602bf3ae00ded8da0944ba86fd86904278e1bc8a981cb6fd64dde4c SHA512 d917c9a8c2760c76ee852ce5a26e437b4efa67ce74cab34658eddd300a53cee6badb6713e914f9051a3382e7e5814d515a47c06019bda2f31ef42e4100c22ae8 WHIRLPOOL 41154cbb10a8b1e20f4e4835a31a233b49bedc76545d16a3ea4214d7871c3936ce0ede94670fc25ac7474ca8c33f092ea9afb575bf8932729763dc75be499e1f
 EBUILD netbeans-apisupport-9999_p20160510.ebuild 3384 SHA256 76b9d11c82033fdcf4465323f498d17e155d9458966062d0e5044fd318bece58 SHA512 12232f9cf1e96f68a1ff2cb90e17fa8170f1536d0b41edf00228d2471e9e66ba6a6331e5a034cd7b4710b9f91e80e0ebe6c1a68f7b0fb210f08da18681417037 WHIRLPOOL fe0f74bdcbef9cfbcc1c7deff9e67487c7ab828c68caedbd5b9b5b257af4ddd07d1cd871922d33209c105f8a8020a761fa8ecd4d93be6ca04f1e19e6f77850d3
+EBUILD netbeans-apisupport-9999_p20160511.ebuild 3384 SHA256 6070a2de2af04898326ab6d065867bf3c5201caf67826be3e66fa58f5cd2adb3 SHA512 71aea3177881b3d91396d8641b45b85169330c57a9cb1d243358576f5cbe47751ec1a1eb6e12739793fb839d254f9f37be1c8238382a394a5bcd2652ad81a3e5 WHIRLPOOL 10bd79ac2fb2ee3eb9dd27a19df195519cf4f18b94defbd8e29dedb2d627fc285564f1d6e1affec7e46a850e991c8ba96498c6c6a58f8d2e109f87b33885352f
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160511.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160511.ebuild
new file mode 100644
index 0000000..f4a5aa5
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160511.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans API Support Cluster"
+HOMEPAGE="http://netbeans.org/projects/apisupport"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-05-11_00-02-33/zip/netbeans-trunk-nightly-201605110002-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 4993685..ed71d12 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201605070002-src.zip 213540102 SHA256 6a040f33a06dc6
 DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 DIST netbeans-trunk-nightly-201605090002-src.zip 213540102 SHA256 66971c1eef81c99ed06f84dcd00acef703867637d7d475a27fc29fdf6e6c71d0 SHA512 70dd67358e41754eb9e39769e6a2eade6a3af8893c7faaa57fb1766f189d70b12b6871a90661e1362f42a6cefe586fd618a963c4afa5487220ffa9ab8e64ade3 WHIRLPOOL 736e2d0b824d5a22b988cc687c96da61e867401ff68a835f95c2af078f563d39a4a8e713b76f7f9c50759c1e6dac2785d006d66b3ff23d71e9cefe07aabca58d
 DIST netbeans-trunk-nightly-201605100002-src.zip 213543139 SHA256 81799ceebdbc9c8614a4779961c5345676bd39a980325298b109cb3e36f85b90 SHA512 5a77c688669d44b4ad162a36153bb04a0a3ee9743b68266fc64ecce415821105e9dedadfa2d4d0a6a91702f2f4f3cf0cd239e0f71197d9e0fa343ad493f8d64d WHIRLPOOL ca281b37a4b16fb6ae9dcbbc209ad3a28d39a4743a73ad2314b0378e0c91a911c9b3235ce7e22f443cb56482ae568955b1c5d7c67058422168f0ca0ebc870e16
+DIST netbeans-trunk-nightly-201605110002-src.zip 213548255 SHA256 602c5f93b24a7212efb02eba11e61862131118057aa66799bb9cd23ae7c6e71a SHA512 e55665a6cc61259e31c9c35f75c23bfdd3b59e30cd9bc4a3edd03d5ae844f8aca3afcf09b668802406e0c2d18d1779089abd92c36c7624ad80d840713ceba8b4 WHIRLPOOL 54331cd70301fe4b4a5763a0a9af007dad396b0674799f3c755093da3bc59d3c43cbf8d5845948c6aa2bee4014e8b865cd63a16c8704dcffc268efe55caa368d
 EBUILD netbeans-cnd-8.0.2.ebuild 4510 SHA256 0a9a4e58e28f395b5bcb017016b6ddb1b77afe393d0e5bd81cc05e3a32076c71 SHA512 2b1fedfe292fa140920fd11829e77127f9535e08b8307886accfa37e6d11195a1204e6b71b2640937da0711c3ce0bbf80c0eaa3c248a64fd61b6a3d99d5de14e WHIRLPOOL 10b1518360ade5d6f1f27c79a10f630b94a2ec5062e18df11f9828d4b374e6cbdea0b9f770e01c117ca90fa194dff9bd3be6a468075c2d35167fb78a7bb32794
 EBUILD netbeans-cnd-8.1.ebuild 4744 SHA256 e008e92761489558e039a07d4858b5a9745aa38c38c57668cba8b5f6a28dbd9b SHA512 724af3f292851fa1a04ccc95fe0a4f9d0fab5503ce31d2ff11be73779d67bd0f38835b334684f628f8eea2dde44543e6b872611b2bd6c01191ccfe26e69f4ec2 WHIRLPOOL 59ddd65a105dafeb8b783f457ec7a8c67a5a3aceb78ca60ac7c4f45f330b28b429ba6236a643ca0023189a9ebdb1ca0182ec0546943ec2494693859aa8f95515
 EBUILD netbeans-cnd-9999_p20160428.ebuild 4790 SHA256 af153a0e0435678331a5a5a43c3f393786a0f804dedbc7fbccc3b539cea583bf SHA512 cae08e9b98753c358da559fdf3387c860fd8ba8a4dd5d787f843b4cfe8f1aacf9bb1d57be5b7e52849abcfcc219262b8bcc338a6ff05451aefd2e434a4d86eee WHIRLPOOL bfaf9faa4bbed952d542ec45d51daa200bb307a922889ad6b586fec4f3386ca995ca1dac974e789a072abb4d69b58ae7c0056086966329af07244a23c0924370
@@ -43,4 +44,5 @@ EBUILD netbeans-cnd-9999_p20160507.ebuild 4790 SHA256 b757a262243b08e47ee3adb9d7
 EBUILD netbeans-cnd-9999_p20160508.ebuild 4790 SHA256 fc7ea76cdc4b24eba4336f573331143c12dc1293b8b71de66c16575b7733e54e SHA512 ad209f568643a44e3f06050b1be9717213d0c7829e30913f1d8b4c165e87d25ca00a4d11fd7b6d724041a5e37cd9e215ff1d4352bd0a6e0f4b5354e0c96e9fec WHIRLPOOL 4a529fe1254fe901404fd4234bccf0a43b5e26cee5a33c074c7a3096c2331adfc1ab8706d63924b2f5e384261578936595fbb106c4f61d625fa86771f83182dc
 EBUILD netbeans-cnd-9999_p20160509.ebuild 4790 SHA256 634a93714f06a487e3616ebe16d3c1028198e4067ff5a7c5e372d14219ff92e5 SHA512 4ebfc36d849ecf51c3878b755b11447a521bb94569ffa5e58018c6f282c6abcb39f275c52f53197dc6cfa40834842a702815ba27440853ea8c2fdf410c9d6bb6 WHIRLPOOL 4c518d23d4b50187d632b6fba4e6f426245ca274283e437db230f569a799792b9513da0cc8e5270d77db7b1a8bf78a29e8a1176bda362ab8abb7020e2ce24f09
 EBUILD netbeans-cnd-9999_p20160510.ebuild 4790 SHA256 2cfe6b0c56b1b1335fa8b8d77fafb90335414d8291f145b2f925998f9895f6b4 SHA512 16a93a47f3eb1b0d3de84bdc366c20ad265571ef8ea9f4fd1ee014176fa9896c7fcc5d88fd2c0a2999929ff5c988f3286a95572e0e4d698c0e5ca6f4859d0954 WHIRLPOOL 00c6ecc4991d2cdd9cf08619c59b452eb8fc018ea57a46cb9de5b6bc25a1ba0dfbf04243e7ca097823c7a2e46676842fd2cc9c519eb184e7c0f596ef0a8469b3
+EBUILD netbeans-cnd-9999_p20160511.ebuild 4790 SHA256 c15dbed6ccf54ea834a0d253b074f3e621dc72481d223b03538146f522e64921 SHA512 e411410e397f7a5683861367d82ec3dfc708055db58c36963d5cbcfbc5b85f870c580567cbb0c00d7e726494ff7254db59cf52b8d5da8447222084a3b2624c98 WHIRLPOOL 7c343567a085eed7e0acef09bee47115ba605547e9381e38bbc1ee731771e3d32cd56c624fc44ab112188fb50a798a2f4634e200e9ecc3f19ccaf2cebd6162f7
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 2a0dcfb..036cade 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -19,6 +19,7 @@ DIST netbeans-trunk-nightly-201605070002-src.zip 213540102 SHA256 6a040f33a06dc6
 DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 DIST netbeans-trunk-nightly-201605090002-src.zip 213540102 SHA256 66971c1eef81c99ed06f84dcd00acef703867637d7d475a27fc29fdf6e6c71d0 SHA512 70dd67358e41754eb9e39769e6a2eade6a3af8893c7faaa57fb1766f189d70b12b6871a90661e1362f42a6cefe586fd618a963c4afa5487220ffa9ab8e64ade3 WHIRLPOOL 736e2d0b824d5a22b988cc687c96da61e867401ff68a835f95c2af078f563d39a4a8e713b76f7f9c50759c1e6dac2785d006d66b3ff23d71e9cefe07aabca58d
 DIST netbeans-trunk-nightly-201605100002-src.zip 213543139 SHA256 81799ceebdbc9c8614a4779961c5345676bd39a980325298b109cb3e36f85b90 SHA512 5a77c688669d44b4ad162a36153bb04a0a3ee9743b68266fc64ecce415821105e9dedadfa2d4d0a6a91702f2f4f3cf0cd239e0f71197d9e0fa343ad493f8d64d WHIRLPOOL ca281b37a4b16fb6ae9dcbbc209ad3a28d39a4743a73ad2314b0378e0c91a911c9b3235ce7e22f443cb56482ae568955b1c5d7c67058422168f0ca0ebc870e16
+DIST netbeans-trunk-nightly-201605110002-src.zip 213548255 SHA256 602c5f93b24a7212efb02eba11e61862131118057aa66799bb9cd23ae7c6e71a SHA512 e55665a6cc61259e31c9c35f75c23bfdd3b59e30cd9bc4a3edd03d5ae844f8aca3afcf09b668802406e0c2d18d1779089abd92c36c7624ad80d840713ceba8b4 WHIRLPOOL 54331cd70301fe4b4a5763a0a9af007dad396b0674799f3c755093da3bc59d3c43cbf8d5845948c6aa2bee4014e8b865cd63a16c8704dcffc268efe55caa368d
 EBUILD netbeans-dlight-8.0.2.ebuild 2898 SHA256 08402481b573b90396431be03bda45904b2dd29f0086e09a111fe362e310c3f7 SHA512 3f6d6c9ea0043382562fbe47ad16e3273032407a74cb44ec7ff26736f96483835af4be8674361e910912a550b9fe592cc5a28c2b93b6b993076553195c35eac5 WHIRLPOOL 9d8706ccbc0d97b0f5d64ebf22c36316b08d8fbccd57408119ca5f5faef08c7f82677bf67488ff611eabeaa730e4c9a730c50966d94d738cfe79330ac147863d
 EBUILD netbeans-dlight-8.1.ebuild 2922 SHA256 f003a099e3f82f5ab53dcc56d86c00a662c98f47480feacac2a77ffea90ccd0f SHA512 94706ac4d8570deb8860236300cfeddfb2c3cbfd385ecb438a039991deeb018f292f6dbb2267d7c701b7f1b5b88d200f2c25696fb3204fcf205c15155b26d1fc WHIRLPOOL 1e44f40c8e2c03b7aa7385ef20a3247ea15a4d4705ce4b5f860bffe236eb578ab3d912f2cc2457e5906158ae747edc3b6b92463336c69af9cd58eca3fccb223d
 EBUILD netbeans-dlight-9999_p20160428.ebuild 2968 SHA256 a78d9fe846d94ed422c84a3dd06ff9b4eba872d64ffd217817f93f3bface22ba SHA512 c8ba6923704e00c0da015c99217c078e2eb3b548fa80f0a17d6189e94e7781ae57cb5c9a67e3921fb1c4dbba717b73cb0b56542ad247c0ec740578cf981ed78d WHIRLPOOL 6828cb5cd0d0669bf1114d12f86dbc386cb3f49df002501b61bfc518c507882f961ebc63cce7e9d3382961189be71e51ca4acedcbc93c9d7547bcd93b9f36750
@@ -34,4 +35,5 @@ EBUILD netbeans-dlight-9999_p20160507.ebuild 2968 SHA256 8a863ea0e2ea87cd29f49b2
 EBUILD netbeans-dlight-9999_p20160508.ebuild 2968 SHA256 4e995c8c7dad8e19189296675718454986ed6bf2d864ea87f9728a6fe23e52e9 SHA512 42ae7bb92998312e3c9473751421e32381aec11859cb4666bf5ae4177947d7c7b83e3e1444c76e6dfc6f2f42f378d5ed3df1c1f77cb701f57943f22a4f4122c2 WHIRLPOOL 85b6bb59f0ac646919204db6651c344b4aebc8c6cf6767bcad21024128959f12eaa7cc4ee8fb08de5e0bcdfca387243b9054af9abf2955fe80895c83abbb57ee
 EBUILD netbeans-dlight-9999_p20160509.ebuild 2968 SHA256 4460f0f9ef9a1a6c049136b56233d609ee2f0a78ead9bbd52713e79d617afdad SHA512 ad8357c3c82598ad5212eda45fa7a42bbb860b2c42dac93dd3f20a89fb386739b78bd167c1a0a73e62bd55fe7a46300bf2c8d096f87dfe51538a87324f7e769e WHIRLPOOL 1040259e3c2bc6e8460e8008e510ef6f79f1398280c52286e734db598685c0118da7f40401f2cc989c9d21c55807775aec36aafd1023494ee3d72edc3e50a7a6
 EBUILD netbeans-dlight-9999_p20160510.ebuild 2968 SHA256 7c1f062ccb88f21de8d65b72d0048e562b611da602fb9d2ccf68b23813ff4638 SHA512 4ebd0285cf6c2d49ba5d03a0a2f6f059eea277cce1c076c495b671e0b32eda8c81101599bc8083e660633483d16e2bb29e335dc27355e9692127f2901420e842 WHIRLPOOL 91e164e7c4129a72854f2b4754ec5355f17e77d97683741f8799dfe8dbea698bbbf45e436319aeb7bba2da3c064ecd94789875aebe92b0325ff1de7ee3439149
+EBUILD netbeans-dlight-9999_p20160511.ebuild 2968 SHA256 1cf186f526e836a00f33cbd51bf9e6b572585856fb7cf2a19785b1b1db77ae54 SHA512 cf27d3917e972a447701e5dd7a9a66fcda7e290fc43517429ef861a2ea4d2a11f8e84dc93abde07e4b2e9fdc5d28ae87d3685e4e391725d8582af2e1b8db6ff2 WHIRLPOOL 8fa46fc978044792790551755aa3fda7e5d6bf470cf8e2dbc2d62a26b646488e97ccd75c96eca1a9163dc5289e17d7e9307f477a358da764b80e025d1de48314
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 18cc162..975c249 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -48,6 +48,7 @@ DIST netbeans-trunk-nightly-201605070002-src.zip 213540102 SHA256 6a040f33a06dc6
 DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 DIST netbeans-trunk-nightly-201605090002-src.zip 213540102 SHA256 66971c1eef81c99ed06f84dcd00acef703867637d7d475a27fc29fdf6e6c71d0 SHA512 70dd67358e41754eb9e39769e6a2eade6a3af8893c7faaa57fb1766f189d70b12b6871a90661e1362f42a6cefe586fd618a963c4afa5487220ffa9ab8e64ade3 WHIRLPOOL 736e2d0b824d5a22b988cc687c96da61e867401ff68a835f95c2af078f563d39a4a8e713b76f7f9c50759c1e6dac2785d006d66b3ff23d71e9cefe07aabca58d
 DIST netbeans-trunk-nightly-201605100002-src.zip 213543139 SHA256 81799ceebdbc9c8614a4779961c5345676bd39a980325298b109cb3e36f85b90 SHA512 5a77c688669d44b4ad162a36153bb04a0a3ee9743b68266fc64ecce415821105e9dedadfa2d4d0a6a91702f2f4f3cf0cd239e0f71197d9e0fa343ad493f8d64d WHIRLPOOL ca281b37a4b16fb6ae9dcbbc209ad3a28d39a4743a73ad2314b0378e0c91a911c9b3235ce7e22f443cb56482ae568955b1c5d7c67058422168f0ca0ebc870e16
+DIST netbeans-trunk-nightly-201605110002-src.zip 213548255 SHA256 602c5f93b24a7212efb02eba11e61862131118057aa66799bb9cd23ae7c6e71a SHA512 e55665a6cc61259e31c9c35f75c23bfdd3b59e30cd9bc4a3edd03d5ae844f8aca3afcf09b668802406e0c2d18d1779089abd92c36c7624ad80d840713ceba8b4 WHIRLPOOL 54331cd70301fe4b4a5763a0a9af007dad396b0674799f3c755093da3bc59d3c43cbf8d5845948c6aa2bee4014e8b865cd63a16c8704dcffc268efe55caa368d
 EBUILD netbeans-enterprise-8.0.2-r1.ebuild 15075 SHA256 41d376117ad1d8d59c8194debfd29dc42f5fd4de70aee12a2134ec143a604dda SHA512 4cd9de88e9a401cc0be88e3e2605abc411c47307818376b2bcc00f9ae570b21324f2bf00fd83e819bfa076da0fb07811fa1f0f9362a6cd0ee05b63221a199000 WHIRLPOOL 73f4518c14430fe7aa3614ebf1b11a06ba0e9bce7479af2770db3a114f149d575a16a655218f757ed416b5149228ac56dac700f5a8d5e034cc838bfa4092e636
 EBUILD netbeans-enterprise-8.1-r1.ebuild 15888 SHA256 d4c04ccfee01a46819020cb7cf8fd8297618f3c0431ae2d9dd7eec8131f988ab SHA512 6c7c39c378cb79d3f382cb80d07710a8c5233aaf0df8fb58889ee6aa6bde73624efa6aa49b43f84105685094a7aff89e4b6367ffd1fd113da27b42d50d07e983 WHIRLPOOL e678e2a6957e428c1b6e51469c0e7cc6a08da2c797f1575b6bb660a7f3281c00f071179de459e27c983304915b005baaf94ad4fae0a4c08162f218bf53b7d821
 EBUILD netbeans-enterprise-9999_p20160428.ebuild 15825 SHA256 d36265c231f1f56c998acc0e6268f1c61be91492a9243785066dbbfc6ff3053f SHA512 c7c3a2ab27a93d457f5f95341b6e740e66ee57dca0998cadb6f97842084a2450669fefb0bf3611c52df23b266bef5004b916e769e2fd6886915705729d79e91f WHIRLPOOL 8e461fad4f405bda6a70b1024fd9ef18b8070deda66b328838cd1eb6b0665727553075222d489c2f657eb286da8c33b48f1de347efd514f28860c8aa397c076c
@@ -63,4 +64,5 @@ EBUILD netbeans-enterprise-9999_p20160507.ebuild 15825 SHA256 cd489fd2fe291118ea
 EBUILD netbeans-enterprise-9999_p20160508.ebuild 15825 SHA256 bcf66354128206178639fcf4bb5bea1d5f466ad468bee9c12dc84ccfc965fd42 SHA512 fc599048d57451c2a79f6a463b4c0cc19070dad376f178281803f514e035b03c5d85be7598e08b7ac0712793e0766bfdeb08a51b7d03531883e7a29d1bdb7492 WHIRLPOOL 6f08fe9672954cba7c98092f18cc6ead68865f2bc6606fce04fceec261007e50539974c3a395d74fc2f44117cc1ccc882aa116cb18d331eb150171e57d106e0a
 EBUILD netbeans-enterprise-9999_p20160509.ebuild 15825 SHA256 57272ad6abf2862106d6af1a32ee5bec73e1b5293096e2e77c455f9ff8eb02fb SHA512 b257bd37e6258371baf5db70c474b19efc53eb776de945da1daff86359e09b0f537652212aae5270a7dde8854487828ee80881c4602c96513bfab5750395020b WHIRLPOOL 9181fd49e46ac1c95f02965c54532d5ea885069ca3f64cedffcdbeaf7e192764f510bd208e787729a68901a9916eea65bef15e7bc6a05c479ba1642b00097b98
 EBUILD netbeans-enterprise-9999_p20160510.ebuild 15825 SHA256 303d63c900c112cd20f95e4da156c4d2ec200fd4fb6eed31f2175faac8a4ad3d SHA512 e2e5d7d65b95408327d53c12d32dc195a784884336fbc1d902f410a36e041ba42c7e98d58e7cbfb795506624c2cb5c389ca85188e60cff0bc0f433eacb602746 WHIRLPOOL be26870ba7e71c14e7fe720bd405b29b4c148ee432eb88a56fd477d577ccf789bbea70cf02e2fd3065e10c42f0e46fcbdc9c5a519ccad44661683bad8531b9a9
+EBUILD netbeans-enterprise-9999_p20160511.ebuild 15825 SHA256 645a69d650ae079fc3612c5cffbe4c5d269c315363b6d427756c459912527413 SHA512 e6dd392b0bdd09b9525fa50977080a8a8152cf3415c9d41ab77a3f18af3a18daecea3510d51f9396a070f22541d99266a92c6ea03a2a7379f5cc7b56649eedfb WHIRLPOOL 718a31c3190cfce5f1c7c424fe6d7094e8fcd69feb1a8daaf7f323a83710e6c6aaa8444cf057d3a173eaa4c8ab01304435b0374e25377e2bbc096e18d46ce91a
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160511.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160511.ebuild
new file mode 100644
index 0000000..72effb0
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160511.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Enterprise cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-05-11_00-02-33/zip/netbeans-trunk-nightly-201605110002-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 0d09f53..1862927 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -16,6 +16,7 @@ DIST netbeans-trunk-nightly-201605070002-src.zip 213540102 SHA256 6a040f33a06dc6
 DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 DIST netbeans-trunk-nightly-201605090002-src.zip 213540102 SHA256 66971c1eef81c99ed06f84dcd00acef703867637d7d475a27fc29fdf6e6c71d0 SHA512 70dd67358e41754eb9e39769e6a2eade6a3af8893c7faaa57fb1766f189d70b12b6871a90661e1362f42a6cefe586fd618a963c4afa5487220ffa9ab8e64ade3 WHIRLPOOL 736e2d0b824d5a22b988cc687c96da61e867401ff68a835f95c2af078f563d39a4a8e713b76f7f9c50759c1e6dac2785d006d66b3ff23d71e9cefe07aabca58d
 DIST netbeans-trunk-nightly-201605100002-src.zip 213543139 SHA256 81799ceebdbc9c8614a4779961c5345676bd39a980325298b109cb3e36f85b90 SHA512 5a77c688669d44b4ad162a36153bb04a0a3ee9743b68266fc64ecce415821105e9dedadfa2d4d0a6a91702f2f4f3cf0cd239e0f71197d9e0fa343ad493f8d64d WHIRLPOOL ca281b37a4b16fb6ae9dcbbc209ad3a28d39a4743a73ad2314b0378e0c91a911c9b3235ce7e22f443cb56482ae568955b1c5d7c67058422168f0ca0ebc870e16
+DIST netbeans-trunk-nightly-201605110002-src.zip 213548255 SHA256 602c5f93b24a7212efb02eba11e61862131118057aa66799bb9cd23ae7c6e71a SHA512 e55665a6cc61259e31c9c35f75c23bfdd3b59e30cd9bc4a3edd03d5ae844f8aca3afcf09b668802406e0c2d18d1779089abd92c36c7624ad80d840713ceba8b4 WHIRLPOOL 54331cd70301fe4b4a5763a0a9af007dad396b0674799f3c755093da3bc59d3c43cbf8d5845948c6aa2bee4014e8b865cd63a16c8704dcffc268efe55caa368d
 EBUILD netbeans-ergonomics-8.0.2.ebuild 2843 SHA256 f9262f6ee7f2aed1fab9bf4cf756f565272e9894afa50b349735e39961e7acc3 SHA512 f158c27640541f7aef31da050e0811c07a251ae4797cc663b95a074a47eaf9d6bb7a9aa11ba38ea55e75c185f7dba74629ba6716a819e8ad68eb3db9ada71451 WHIRLPOOL 4fe9634fb673fb05dbba25996efc3a212ef3bb23ab6e7c732cb75de076feb930735e3901806fd9c801abc7ee8aa8eb800718065325d415371255a886474061d4
 EBUILD netbeans-ergonomics-8.1.ebuild 2867 SHA256 6d2c0b7221d47b64c77b243c8c5232c6d8c24d3199eae5799adafeac609b2e2a SHA512 6302c8c13d43ec51048e8b0439916746a01bb67f14e7cd21be95b4179df6106dcff1d3973b9191f7a36cf6f29d53b1d2308864f5f64d9f87f980ea264b1a97c0 WHIRLPOOL 63ceaad04323d9085dfb90d1e5075ad13f6e14e8991b13aafaf3fc174440152054f32498ac8d03f57917744887db3bc1efdfc30b473b8d1a33b514ec4960ea6f
 EBUILD netbeans-ergonomics-9999_p20160428.ebuild 2913 SHA256 03be7f911ef9e0cc84ae0c302552ce8755cfb31022c087e620b214d4becdef0a SHA512 4961338b8b363a36000ab2ee47d567bf8bf7fdd7e10d63c046f9b1d00ea415390e1cfeae5d02d6090afaa5ab45f7c05b1aa3fc071f1c073eaacb288eddad4832 WHIRLPOOL 110c80e66dfd1e0f880f50fbbc8795445dfb62f6c6b7424b0791067b9b28c58979bd7e56f4df31d3da8f86aa33df43529c3d3f1c795ff14424e8530176c7db46
@@ -31,4 +32,5 @@ EBUILD netbeans-ergonomics-9999_p20160507.ebuild 2913 SHA256 559f3095401160088d4
 EBUILD netbeans-ergonomics-9999_p20160508.ebuild 2913 SHA256 8705444f8ef6951d5917790f0917e6bb9b12e0c0208794b5dd3085c6233cc494 SHA512 c36eec83394e3c84ba830163b4c412c13e0869c2cff3f298f986efb4dadf0b78465964f4d4cdd319845f423f135b2d115230d039f2f78dacb7a84bc175cf1469 WHIRLPOOL c40f6a6100f1927303d309d7230c13ab661bbd47f02ed250e8a5613feae60a0429952908b218bfcd4c085b8fb800efd4caaf2bc24ca14b3ff033aad8c0152b86
 EBUILD netbeans-ergonomics-9999_p20160509.ebuild 2913 SHA256 71e01b8d234bcf0470e5b2cf33995dcc26082a49c6aab77bffa6499155379c86 SHA512 58206b2168c5bd84dd1b8cd68b49b14a6c818393af70c5300e610a94f7ecf1e7e356655eea9470bad51024f6765dead7af62ec6492ee84709665cc5c84cb985f WHIRLPOOL febbc831909999c3a07ab5c95df7d3591030be8e1b358b5b2b3f8a708310807ba340be8950b083a248cdddf23fae4e75607196125d9acdda5a21ceae73454652
 EBUILD netbeans-ergonomics-9999_p20160510.ebuild 2913 SHA256 360fc8a455dadf9f48501e7647ea782c8b21292ddb872c88ccf2d5739c1428d7 SHA512 85078ba666ef13fe169040d5d1034badf7eae24f3ae18283aa2826a977e873d2fef4afb9546f6620bd0afa69fe4ff5d8a1292ac5bc089da72d5e069cbe07b773 WHIRLPOOL 4bcdda2ad20409e2c5505f580eae23b8ef1da9123d22c6ad5e841fc08d4664922aa2e53621777f0240c0e11f089b7acd241d277f41e5325a42e24434737b8bf1
+EBUILD netbeans-ergonomics-9999_p20160511.ebuild 2913 SHA256 c72252d2952b197e10bf796fd8060b0115a1e5c78feff14fd6dbb45aeba55661 SHA512 ff365ffe9346d4515f7606cb4a8a0183a69c8ae2d3b2312f66af32e9db16cc43105d90930165597dead1522e1cb417ba3089a2924f35ce3ccdf13330708eb82d WHIRLPOOL b84c163ee2d5cdec6b22e6bdf3b369442985a4cdbd34d961a1c9c4707602e27361fd9fd589b52dadc4c4f83d55a2f826128f9e4d608e490a9dc3fe8734307ef1
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160511.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160511.ebuild
new file mode 100644
index 0000000..7fdddf5
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160511.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Ergonomics Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-05-11_00-02-33/zip/netbeans-trunk-nightly-201605110002-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 9ad7347..5774a2e 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -20,6 +20,7 @@ DIST netbeans-trunk-nightly-201605070002-src.zip 213540102 SHA256 6a040f33a06dc6
 DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 DIST netbeans-trunk-nightly-201605090002-src.zip 213540102 SHA256 66971c1eef81c99ed06f84dcd00acef703867637d7d475a27fc29fdf6e6c71d0 SHA512 70dd67358e41754eb9e39769e6a2eade6a3af8893c7faaa57fb1766f189d70b12b6871a90661e1362f42a6cefe586fd618a963c4afa5487220ffa9ab8e64ade3 WHIRLPOOL 736e2d0b824d5a22b988cc687c96da61e867401ff68a835f95c2af078f563d39a4a8e713b76f7f9c50759c1e6dac2785d006d66b3ff23d71e9cefe07aabca58d
 DIST netbeans-trunk-nightly-201605100002-src.zip 213543139 SHA256 81799ceebdbc9c8614a4779961c5345676bd39a980325298b109cb3e36f85b90 SHA512 5a77c688669d44b4ad162a36153bb04a0a3ee9743b68266fc64ecce415821105e9dedadfa2d4d0a6a91702f2f4f3cf0cd239e0f71197d9e0fa343ad493f8d64d WHIRLPOOL ca281b37a4b16fb6ae9dcbbc209ad3a28d39a4743a73ad2314b0378e0c91a911c9b3235ce7e22f443cb56482ae568955b1c5d7c67058422168f0ca0ebc870e16
+DIST netbeans-trunk-nightly-201605110002-src.zip 213548255 SHA256 602c5f93b24a7212efb02eba11e61862131118057aa66799bb9cd23ae7c6e71a SHA512 e55665a6cc61259e31c9c35f75c23bfdd3b59e30cd9bc4a3edd03d5ae844f8aca3afcf09b668802406e0c2d18d1779089abd92c36c7624ad80d840713ceba8b4 WHIRLPOOL 54331cd70301fe4b4a5763a0a9af007dad396b0674799f3c755093da3bc59d3c43cbf8d5845948c6aa2bee4014e8b865cd63a16c8704dcffc268efe55caa368d
 EBUILD netbeans-extide-8.0.2.ebuild 3307 SHA256 084e952eae1708b0fab785fd34313985e864dbc74a8531a0d5cdcf906e88f85a SHA512 ade8dc37aa932d7ec20966199e521311716061c23df08d02635f78efd2776f1d7bf040b0f9c9488b947bbbdfb3e33fa764723e3dfffa2214892bc6d685428f6f WHIRLPOOL ad2c26b005675ebca7d902ff1e6caa28552f3fda6795e327cc3584cf109f0ad6efad6516e15af5e70d689be236298b0948003e09a3da4991b3e29a1c85607b2f
 EBUILD netbeans-extide-8.1.ebuild 3331 SHA256 7d81adb3cba102e13678052bfe288e8417753ebceb69f69ce528ede3fedcef04 SHA512 ae445552036799069f31b40c145879ac55cf0964e168f328ac84f2d434171de8c4848e3416ad7425563e8565c09f798c9520bb3cb7511348f5d6a7522b878e40 WHIRLPOOL 44142233d4d3047ebb5c152992b484e5fef1fddd04cf274cc370f00beece5a75a986e5fadedd4bc18a01559c4f6cb58289cefbfc24d8d098d70056707e8b8f57
 EBUILD netbeans-extide-9999_p20160428.ebuild 3377 SHA256 b69e4995f884a7524e29274702b2eb3851dca8a7c74a618d98725fe26f951332 SHA512 c8fc3c04d1fc7b2586bcaa5972b1f40ac94b09097f4ad0333d50e9c494f2b2e131dd504c5a274d0b130b1887e2ace51eecca46f20fab32198a123591e6fde228 WHIRLPOOL d921c10e7a80ac065dea04ff546b5635eb8d251a37cc0d8b7533097cc4fc28683d3a60b1b9bb8459b1abc4878fdb306f07db6d80ca65e92dba9543b32866f412
@@ -35,4 +36,5 @@ EBUILD netbeans-extide-9999_p20160507.ebuild 3377 SHA256 48629a8cc108c70ddda7120
 EBUILD netbeans-extide-9999_p20160508.ebuild 3377 SHA256 4679473bbf738c87c3dffab2d96be9970dfb13034435bf02441631128289dc30 SHA512 7e04a176ec96a1425664e04c30a609e4f26482cb59e00fb3fb4308f9c11a8480d700ff790a4390adfdf9e1d19be57f9430b95c5bf61c75f97c1f5f6f4723f4fe WHIRLPOOL abfd7d9833403f9bce91ed9d80f46c7aa046b7e2f78447ff7d096e40937e497b61d6e3fc4939af471f27ffc7dbd065d88fbc5daab2fe323d21e17c06df44b166
 EBUILD netbeans-extide-9999_p20160509.ebuild 3377 SHA256 1040b9896b856e87ec46cfce82908ea4c16d62d398d313009bf6ba5dbfd368ca SHA512 02f9e4e7e57054891730959ff3103836920ca6a5ebeaa055a06f2c385be99e2a727b06718d5d31bfc4ba61bf18f0ad5caa8dde68519167bec27f11eddf7c8500 WHIRLPOOL 24c82564d6d04f0edd5c586e0b58c94565495110bbf8f5a3f0500c60dbd03c4ed4d000031db3a218381dc137d12c67a8f392dcf8cb0480f5ac776fec4cbe9143
 EBUILD netbeans-extide-9999_p20160510.ebuild 3377 SHA256 a3ebdb9887966afcd21d554d11e875fa9d504362f40c391a8baf5d3c6f7bb73d SHA512 28a546bef6f79e19e93e28e78594234a2e785e865a309242052bc23df29d7b60c5ccd4f0daecd64b4792b26307deb8a837642fb0a252ca671fc1944ff4f2838c WHIRLPOOL 74ad1a28f18703c6ebd73de0cd4a9c864908c460fb8fcda8d2986513802d468a714051c066544d980a2179d3b7202818d8984219f9f87842af59c036c7c8a9e0
+EBUILD netbeans-extide-9999_p20160511.ebuild 3377 SHA256 e15c6258909dbbd8adfd16f373d1f55e61b5bbab1cd2c7d766dbeb181bc17aaa SHA512 42ebebbedde871043c4777344fcb874c2ef09dcfcd3abb30785c3ce032062d11bdf9e8eb7b1cb3abf20ba74ad0714abde1d20f3c09c6a56e3b579dc5ea904039 WHIRLPOOL 7296c24aa2bf953ff49fba8159c0e3ecdb04461c77e64d9c914f5eae8706165bb4a34cbd18db99fdf6039eaa71539848cce06c970122bd7ad8dccd20d15dddc3
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160511.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160511.ebuild
new file mode 100644
index 0000000..fefad61
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20160511.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans ExtIDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-05-11_00-02-33/zip/netbeans-trunk-nightly-201605110002-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 667d20f..f52ea8e 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -18,6 +18,7 @@ DIST netbeans-trunk-nightly-201605070002-src.zip 213540102 SHA256 6a040f33a06dc6
 DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 DIST netbeans-trunk-nightly-201605090002-src.zip 213540102 SHA256 66971c1eef81c99ed06f84dcd00acef703867637d7d475a27fc29fdf6e6c71d0 SHA512 70dd67358e41754eb9e39769e6a2eade6a3af8893c7faaa57fb1766f189d70b12b6871a90661e1362f42a6cefe586fd618a963c4afa5487220ffa9ab8e64ade3 WHIRLPOOL 736e2d0b824d5a22b988cc687c96da61e867401ff68a835f95c2af078f563d39a4a8e713b76f7f9c50759c1e6dac2785d006d66b3ff23d71e9cefe07aabca58d
 DIST netbeans-trunk-nightly-201605100002-src.zip 213543139 SHA256 81799ceebdbc9c8614a4779961c5345676bd39a980325298b109cb3e36f85b90 SHA512 5a77c688669d44b4ad162a36153bb04a0a3ee9743b68266fc64ecce415821105e9dedadfa2d4d0a6a91702f2f4f3cf0cd239e0f71197d9e0fa343ad493f8d64d WHIRLPOOL ca281b37a4b16fb6ae9dcbbc209ad3a28d39a4743a73ad2314b0378e0c91a911c9b3235ce7e22f443cb56482ae568955b1c5d7c67058422168f0ca0ebc870e16
+DIST netbeans-trunk-nightly-201605110002-src.zip 213548255 SHA256 602c5f93b24a7212efb02eba11e61862131118057aa66799bb9cd23ae7c6e71a SHA512 e55665a6cc61259e31c9c35f75c23bfdd3b59e30cd9bc4a3edd03d5ae844f8aca3afcf09b668802406e0c2d18d1779089abd92c36c7624ad80d840713ceba8b4 WHIRLPOOL 54331cd70301fe4b4a5763a0a9af007dad396b0674799f3c755093da3bc59d3c43cbf8d5845948c6aa2bee4014e8b865cd63a16c8704dcffc268efe55caa368d
 EBUILD netbeans-groovy-8.0.2.ebuild 3346 SHA256 907e6cd11c222f15c826494b44929483803f0e4249de0d54db51e6855b574148 SHA512 8bb37121e7e32621959318d109b1d982e2c705a9deb7171f5fef1dcaed55fc5718b0bc9e6bbb2592cdaa5e96d874bb6e6bfa96d06fe09f14d5250c1485eb1da5 WHIRLPOOL d5e09fa1e975835f05c6132c091fee4ae9fc9dd671af9f5f88a9195d5cd4a93804f96687ed3f2bd741117fa65773f2c464b3cfd6697425039cc51a940efa2a31
 EBUILD netbeans-groovy-8.1.ebuild 3370 SHA256 ca32569d438060704e4d5d5e46be2ebf20bffdb0ae2471d8718ada8676f32082 SHA512 40555d2ffa0ddab1e55ca514eddbd98c6e721caa230cd174050fb56f144def46f389b0ac018068c9f509936c83235b2d3423cae8676db7c96e8782b0da73e4ad WHIRLPOOL 7b2b021581db21aa8ff90ea188ddeea0974ec84fdb064cf367a56a6fa53487affe89edb1880a83934a2cf0c586060a9192838687ffebf33b55e79d9ddc7ac986
 EBUILD netbeans-groovy-9999_p20160428.ebuild 3416 SHA256 e79a68a525a8e7b9929f6099fcd1e18066daf75b72d06556c2fa24ad49c5b998 SHA512 3d2b217ce426091f0f3cbc1f3ea8881fa21c5bb482da2830349d1283ab9192354100b994b1a3ce4cb86265356035b417e1855d3a50e88e13cd41154bfc00c83d WHIRLPOOL 72d71a968c86d7f7033c35b624852e32dfce945c6711a74b30ef71f3f017a6fc9ff1dfce9c57e1c4ccb273f60c7263dc221fcd7a26a0ffd2acaa4b5f44c05450
@@ -33,4 +34,5 @@ EBUILD netbeans-groovy-9999_p20160507.ebuild 3416 SHA256 48dc2fb9af109a0dfe29803
 EBUILD netbeans-groovy-9999_p20160508.ebuild 3416 SHA256 a964cc414b4db6f6e4940c71c72528d8baca5cb2270e945cdc4a928ede5c35ef SHA512 c683321445908e24df00614f8c74b68aaca339134ef898849483cce09dbc22e620c3875aeb740c728a77feafda65e013b0284598a00dfc912c64e21417e69a0b WHIRLPOOL ec6e1db72ae421a4caa1fdd13100a712c5fce27f6ea964dad2ffa6e23b55e9747a4d1b33725ac556d749d5b86198a5dd7fb661febb998762e92b959ea6192fc7
 EBUILD netbeans-groovy-9999_p20160509.ebuild 3416 SHA256 76bb4cdde0d9d0c7a01e02beb81438ead229733703dd192f38a5885f4c7ac9a8 SHA512 c544ef26165bad73786a4d5baa27624e26e737e0da45fb7f5ba976ef23f0ab63e54cc46c51fb9a5ebcc0a10f715b5fd7eb44b23055965fbbd4aa1c347811a3e8 WHIRLPOOL 77dac0b7d3e1bcce877efda4dbbc3a4e26026ce716f897f3009d8594230c9608b502984ef6beb4b1fcf1799dc5cd98c7d8bdbd8635b7e73b7cd59b3fd6ab433a
 EBUILD netbeans-groovy-9999_p20160510.ebuild 3416 SHA256 3ecd8385016d957b337ccc63aa3a7fab0e210fd1131e4ac54ac6cf2d4462ae54 SHA512 60186be2c12b3550d4c518fac428da8d049097990e360e5c685b4bbcdbd097e773e327066113cf708797bf02c0458c8ebc66e1040d9549ec76cd4e050779c169 WHIRLPOOL e4a4e2eb58acfebe3cdf3498b087a0d44cfb07917a78ba4a3dc9fa306d370f9f5c53bdc03e674c496bdacc17542d0c7df20d98f5025c56e477153a89237f4ca1
+EBUILD netbeans-groovy-9999_p20160511.ebuild 3416 SHA256 868387fa9981a95cb8c7535f5985eec54200363ef18d04f5574747256659d213 SHA512 8d72554edefb4241b0eb76cce3c447d46bb4f58cb17cf95b585cf091f4ed01ebc7f6a4a6692c2abf4a42c5db3fcb43b08425fb89db6efa5874615ee000594261 WHIRLPOOL 760d27ce2458408ff76fb066eefe6f0298aa3c9a84fe6bbbec06d35cad1c7e5dfbe65a155b9acc6f703df497d140e370829a9652d6f58948e073ec04e92a5ae8
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160511.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160511.ebuild
new file mode 100644
index 0000000..0cba539
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160511.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Groovy Cluster"
+HOMEPAGE="http://netbeans.org/projects/groovy"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-05-11_00-02-33/zip/netbeans-trunk-nightly-201605110002-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 702a7fb..8a67346 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -21,6 +21,7 @@ DIST netbeans-trunk-nightly-201605070002-src.zip 213540102 SHA256 6a040f33a06dc6
 DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 DIST netbeans-trunk-nightly-201605090002-src.zip 213540102 SHA256 66971c1eef81c99ed06f84dcd00acef703867637d7d475a27fc29fdf6e6c71d0 SHA512 70dd67358e41754eb9e39769e6a2eade6a3af8893c7faaa57fb1766f189d70b12b6871a90661e1362f42a6cefe586fd618a963c4afa5487220ffa9ab8e64ade3 WHIRLPOOL 736e2d0b824d5a22b988cc687c96da61e867401ff68a835f95c2af078f563d39a4a8e713b76f7f9c50759c1e6dac2785d006d66b3ff23d71e9cefe07aabca58d
 DIST netbeans-trunk-nightly-201605100002-src.zip 213543139 SHA256 81799ceebdbc9c8614a4779961c5345676bd39a980325298b109cb3e36f85b90 SHA512 5a77c688669d44b4ad162a36153bb04a0a3ee9743b68266fc64ecce415821105e9dedadfa2d4d0a6a91702f2f4f3cf0cd239e0f71197d9e0fa343ad493f8d64d WHIRLPOOL ca281b37a4b16fb6ae9dcbbc209ad3a28d39a4743a73ad2314b0378e0c91a911c9b3235ce7e22f443cb56482ae568955b1c5d7c67058422168f0ca0ebc870e16
+DIST netbeans-trunk-nightly-201605110002-src.zip 213548255 SHA256 602c5f93b24a7212efb02eba11e61862131118057aa66799bb9cd23ae7c6e71a SHA512 e55665a6cc61259e31c9c35f75c23bfdd3b59e30cd9bc4a3edd03d5ae844f8aca3afcf09b668802406e0c2d18d1779089abd92c36c7624ad80d840713ceba8b4 WHIRLPOOL 54331cd70301fe4b4a5763a0a9af007dad396b0674799f3c755093da3bc59d3c43cbf8d5845948c6aa2bee4014e8b865cd63a16c8704dcffc268efe55caa368d
 EBUILD netbeans-harness-8.0.2.ebuild 4055 SHA256 2674d562adc57648c82cac9f714f74f9d29dd7b7ff7fa7f0ef37c43ef0975489 SHA512 7d72bed5b955b2365a4c11fcd97a2d6f2372ab939fb9a03b3ff7915053f24d695373c1aa154f6e6916d37ef3ace7b38864d575419460382760500576dae52e49 WHIRLPOOL 72f54a6cb83f282a75f0abb073109414a7b8bcd4e9263466281e68ff34148a7343ed3bd78ebdc8afd109b6b9f5b9f15bfd0e250f418fcaa4986a7c886b57b9f6
 EBUILD netbeans-harness-8.1.ebuild 4079 SHA256 116b90d6e6fd1b1ad8ce99c81104262a416a485b3a3110beed70e9381333cec2 SHA512 77ca4bbaf078adf6e13c0fea0a8e673262aaed60dd799ec161584589fb4c791d9bd758c87f4272297d863d3992b54a66b77b7bf05135cada530d111e1c428e68 WHIRLPOOL d385cd6292f31a5817a2c096f960330186a68242b51ed26e4272f33a690a98175e0b622a5d5309e1e6a72ff824662964785b7d235cf3a73ba4d715cd19e89dbb
 EBUILD netbeans-harness-9999_p20160428.ebuild 4126 SHA256 6fa78ddd6b86962f5c5ddadd1493edf1f6545863f195b3bf390c970a07cb0b30 SHA512 6a9dc57df3f90fc79d5d372454fbabfa86ae4fbe951896018dfc6682663617721e3cbff4e68c051bf22c5d0764840ab2abf993f3754f7d6c27c44fe20125bc2e WHIRLPOOL 81e8cbac2a7fb4b976bdf5c6764f619f3b9130cf3c1d0f9ea80eebf3c58bba95aa61a8e5c10c2d52122a138c58fc51f5ce63fb36a1462e98577e64bed9e8637a
@@ -36,4 +37,5 @@ EBUILD netbeans-harness-9999_p20160507.ebuild 4126 SHA256 cdfeb4da090e8f479fc8b3
 EBUILD netbeans-harness-9999_p20160508.ebuild 4126 SHA256 5caa0e368ffa4302371570aa1bb29fb6b66f0ab056bad9681ecd1b6624a5a8c7 SHA512 77db748695ea1956a94f95a02d7764e5540cba76475b425e8b63cdc206f96e8e0dc4f4bbad60f940e69ca394eeb0ee56dd41eb517d3409c981b38817c5183642 WHIRLPOOL 64be326d31bc967f5a1138e8e71813f0b047a39cdc5b58726371ea755264fecea2d4ee61d8072607ba7fcd906812f9004e31e9a094963f08a3497e7979560f1b
 EBUILD netbeans-harness-9999_p20160509.ebuild 4126 SHA256 dabda08ea807f55eca94d3ec782a20336150e6c4d3679beb183b1c2434e13966 SHA512 968330628521993bfe8eb1e5fb38a29378f460b1ab52241e8f3d80bc7b62a072e9f256864674ec86c6d1b1f321cdf527f559fad360a064b020e5814c67b1b7e6 WHIRLPOOL 165298507056a96a1b763994eb1e8d82386035a2eeb064bf9a36432cca14f5810e619b424c723e7e6956aae8b5c18364654686e08241ccfb5b65e8d3f4a9e5e0
 EBUILD netbeans-harness-9999_p20160510.ebuild 4126 SHA256 cab1554305c46a4fee506be36c9ae969df880e21c6e6117ddb0d1cf74bc759c3 SHA512 1d995fc37b5073effb84a2df29904fb2f4d980bd86b4731c892ae8be2e84cbba0da1725848b4bfb1e8f9f64b0da779c1fc36ece2bb89997e23df0e55fcb77780 WHIRLPOOL 84c84d4c34c2ad7fdf71f11c2d99b5ea16f5aaaf36bb6d1f906a0bb6721aa5b992cd7b003e90c1a62023d91813e3c311c5f28d4719d2f7205f0e917147814f9c
+EBUILD netbeans-harness-9999_p20160511.ebuild 4126 SHA256 54b12a89b78e95faa67bbde903dc3135b8a402b907eb460ab8768cff2dc6f8d0 SHA512 81db5d811cd380407c1da06dc0488c34318b57aa81d18a06e25dd9fef3ef474dbf38b9d98790362e5e7595a560511458764aa2cfedc767bfc4c2fce8a6de5ea4 WHIRLPOOL 6737c403bbd45fdcd97cf3a551df43f7509fee46d230f65900cef8b31431a1eec8cce903a3def2ea96a69cb28cbd5f183d195de5a95c9572a19291a5e58aa930
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160511.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160511.ebuild
new file mode 100644
index 0000000..97c04eb
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20160511.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Harness"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-05-11_00-02-33/zip/netbeans-trunk-nightly-201605110002-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 4255711..fae5569 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -155,6 +155,7 @@ DIST netbeans-trunk-nightly-201605070002-src.zip 213540102 SHA256 6a040f33a06dc6
 DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 DIST netbeans-trunk-nightly-201605090002-src.zip 213540102 SHA256 66971c1eef81c99ed06f84dcd00acef703867637d7d475a27fc29fdf6e6c71d0 SHA512 70dd67358e41754eb9e39769e6a2eade6a3af8893c7faaa57fb1766f189d70b12b6871a90661e1362f42a6cefe586fd618a963c4afa5487220ffa9ab8e64ade3 WHIRLPOOL 736e2d0b824d5a22b988cc687c96da61e867401ff68a835f95c2af078f563d39a4a8e713b76f7f9c50759c1e6dac2785d006d66b3ff23d71e9cefe07aabca58d
 DIST netbeans-trunk-nightly-201605100002-src.zip 213543139 SHA256 81799ceebdbc9c8614a4779961c5345676bd39a980325298b109cb3e36f85b90 SHA512 5a77c688669d44b4ad162a36153bb04a0a3ee9743b68266fc64ecce415821105e9dedadfa2d4d0a6a91702f2f4f3cf0cd239e0f71197d9e0fa343ad493f8d64d WHIRLPOOL ca281b37a4b16fb6ae9dcbbc209ad3a28d39a4743a73ad2314b0378e0c91a911c9b3235ce7e22f443cb56482ae568955b1c5d7c67058422168f0ca0ebc870e16
+DIST netbeans-trunk-nightly-201605110002-src.zip 213548255 SHA256 602c5f93b24a7212efb02eba11e61862131118057aa66799bb9cd23ae7c6e71a SHA512 e55665a6cc61259e31c9c35f75c23bfdd3b59e30cd9bc4a3edd03d5ae844f8aca3afcf09b668802406e0c2d18d1779089abd92c36c7624ad80d840713ceba8b4 WHIRLPOOL 54331cd70301fe4b4a5763a0a9af007dad396b0674799f3c755093da3bc59d3c43cbf8d5845948c6aa2bee4014e8b865cd63a16c8704dcffc268efe55caa368d
 EBUILD netbeans-ide-8.0.2-r2.ebuild 29330 SHA256 4822cbe26fc19685164c35d69e75bc20578ca8a5ce3394fe97bde6acc721fd2d SHA512 552f35cb1aa5429beb70c72a0cd2a3aa3a006f5870ec4084e88632a39e2ccdc05d0b2b15a87f26c72cdffb3c9a6fa0a124a8d501edeef9aa9580396922071e8d WHIRLPOOL 4c9bce3ca21d5ae61ef9392b9282c2dff9de7f82f2e83d2944a2906ca2180ef0ffab59489bdbb6afc7ba88d5143d77b47a0cf6b219a5a4d385b68afcacd3fe6d
 EBUILD netbeans-ide-8.1-r2.ebuild 30301 SHA256 892f20531352d85b5b72b1c85352eefa444917b515b0b564f04c4f91d1e654f9 SHA512 50af4873fd3ea7755b0d33b086be7e07766b6c009a46ec3954a67a1da9930378bcf9da6d18b7e60078b31af4b36ccf060f22378a8ef26b3829ccf30a529dd023 WHIRLPOOL 1024af16e7cae7f4728dd37f88031be33253b7c62548a095d3e827abeccb6c183d34ce312bd1a0f808f0d107aff217e4b81b7a17eecc6842e1d914d7061df2c9
 EBUILD netbeans-ide-9999_p20160428.ebuild 30761 SHA256 d6735e6e8cf412cbfb9dd4a2f0f68f8296b74e03fe87b12150506f7c063f281d SHA512 d3c49f4a00823801049688170c461ebcc5de106f30fa11e232d953a56cf196c946610cbda0216f393c28923efd5017a28d8fc5870d90e98c6a5fd347a400711d WHIRLPOOL ba3d111337fd5e21e3a4e97457c1f00f2b53b0af20991833203c6f68301520853731f63b291d6adc55d6a96b42d52e13e6d65bd6dcf529c39bc40f30d334155a
@@ -170,4 +171,5 @@ EBUILD netbeans-ide-9999_p20160507.ebuild 30761 SHA256 fe5d92a8e420dcc61f1f3ea61
 EBUILD netbeans-ide-9999_p20160508.ebuild 30761 SHA256 62d2935857bc57848e7eb87dbfa621cad343d4544d2742cc3c6ccc5dc399f286 SHA512 0851eddfe367bca706a34fe7314500a6299cb900e379664eb9013ad083c3059221356a9af7770ad0118502a97fe61924925cf7f82a4598a9268794d5e40ccf7b WHIRLPOOL 4abc9e4e34567a1799489cc118415d84d2ac07c6c70307073d550ba536cc95ca54f736179a745d0be282c9e8e231c23d9d400c6d27e3b9081f2ec0951c8ac152
 EBUILD netbeans-ide-9999_p20160509.ebuild 30761 SHA256 0e5ff720a23204dcceb35db8c534d6e10192a31fc55fd6e581acf2cfaa9af7b4 SHA512 bd577769ecde9579a7afaf127d0f2e65e9ee0022656298a3bea39b10d643e13530f25290e682eea71bfd63b68d3a53c42ca6eb7f80dde73ec57ab3bb81bec16f WHIRLPOOL 4afa4fc84856b4709a6129db4be187b20b7cbcc990706994d83d591f61a4eda2b0f302f8f77fb111ac2007e2f458f08e925a3a8115076b9664bb59d6e35dd8f6
 EBUILD netbeans-ide-9999_p20160510.ebuild 30761 SHA256 9b3d5cb28dab6a86db7618f9a887ba56d109a84b3daa13e5b752046a60669ad9 SHA512 a76e0ee014e1e6e0b93a5030d0dc608303df1e897800ebf798b68edf287cb5d3c81c867c1e5e5477bfa1204f307d880a95792e54472fb282bdc90152fd8dddd3 WHIRLPOOL 8ae1a82ae0fbf399469cca313ca3d2371b0c83a3531bda958372a92a752e37d27b0fce1ddd650478e44bf2f95e5e5aca261db72752072f1796295316dc1ac4cd
+EBUILD netbeans-ide-9999_p20160511.ebuild 30761 SHA256 3ed771326781d266a28f271deb473e1d2cc6dd437765fab0687171363c563f40 SHA512 0857109270ac223dc95e75cc1cecd6192b1e721ea059073b4b567ed38c380f9b07e45531e496ce9cd7d189ce18671d2ec5365d781d1b7bd79e0223084b722bff WHIRLPOOL a138a6a9cd235a9a7a27b4bebc6231ad4e23092b7c36a22574cab555190e42fce73c712af4c97f226cc44fc6f328a612b7d0d31a9807f3a03bf4c616c63769c2
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 915aa2c..73426d1 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -49,6 +49,7 @@ DIST netbeans-trunk-nightly-201605070002-src.zip 213540102 SHA256 6a040f33a06dc6
 DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 DIST netbeans-trunk-nightly-201605090002-src.zip 213540102 SHA256 66971c1eef81c99ed06f84dcd00acef703867637d7d475a27fc29fdf6e6c71d0 SHA512 70dd67358e41754eb9e39769e6a2eade6a3af8893c7faaa57fb1766f189d70b12b6871a90661e1362f42a6cefe586fd618a963c4afa5487220ffa9ab8e64ade3 WHIRLPOOL 736e2d0b824d5a22b988cc687c96da61e867401ff68a835f95c2af078f563d39a4a8e713b76f7f9c50759c1e6dac2785d006d66b3ff23d71e9cefe07aabca58d
 DIST netbeans-trunk-nightly-201605100002-src.zip 213543139 SHA256 81799ceebdbc9c8614a4779961c5345676bd39a980325298b109cb3e36f85b90 SHA512 5a77c688669d44b4ad162a36153bb04a0a3ee9743b68266fc64ecce415821105e9dedadfa2d4d0a6a91702f2f4f3cf0cd239e0f71197d9e0fa343ad493f8d64d WHIRLPOOL ca281b37a4b16fb6ae9dcbbc209ad3a28d39a4743a73ad2314b0378e0c91a911c9b3235ce7e22f443cb56482ae568955b1c5d7c67058422168f0ca0ebc870e16
+DIST netbeans-trunk-nightly-201605110002-src.zip 213548255 SHA256 602c5f93b24a7212efb02eba11e61862131118057aa66799bb9cd23ae7c6e71a SHA512 e55665a6cc61259e31c9c35f75c23bfdd3b59e30cd9bc4a3edd03d5ae844f8aca3afcf09b668802406e0c2d18d1779089abd92c36c7624ad80d840713ceba8b4 WHIRLPOOL 54331cd70301fe4b4a5763a0a9af007dad396b0674799f3c755093da3bc59d3c43cbf8d5845948c6aa2bee4014e8b865cd63a16c8704dcffc268efe55caa368d
 EBUILD netbeans-java-8.0.2-r4.ebuild 13298 SHA256 d4172dfdec5afecb1cd099e18a21aa872c7822bff40b192b5f4ec4d35e6e0ef8 SHA512 48ae6f7141117fbf58123ded750d76f2e7311211a6be3b62bd491349817460da11f781ec5694da91584315547c32008f568fac3bfb406dbdb5ed7fd825ff694e WHIRLPOOL 73fb68aec003707c14b2b390c2de80f24e1e5413cf7e16cf7e661af47c908e2d559214580379e45e21d316767987ac906b5a119a61ae39f03c3d01dafad49b7c
 EBUILD netbeans-java-8.1-r2.ebuild 14814 SHA256 1f49212c90fcaa9a6483f19bb60c963520f20aa08c2a509aa19cc7fda12e4564 SHA512 2d6b225f5d32f0ce1801124808b0cc2101f16a703540877c4818be06694742cfa262c3a2e7018761254f9244a7992eb7fe9bc15cdb20f6f4cb83958789c0ef42 WHIRLPOOL 8557163a46ea91a47efec3c272b8a8a0f2acbf9eaa8f6c280d0ddaac6dd8b2185f06716ab12ebf76fb87fe6c05ab1a14bfd281875ebef586f1304d2162e5f2dc
 EBUILD netbeans-java-9999_p20160428.ebuild 15656 SHA256 197082a052d63c9aea66f8595e7a2cdc28ef3a0c3e662f4dbf215d794e2b8129 SHA512 5658fd47bd0582945b333a666e47eab9d358fe92277725edfdedde5ae5572b51aed6a63808e13c5d27bb788738fcd263baf36c6b1ff8740153fd89605a5aa9f4 WHIRLPOOL ac7ecbd6bea378255961f986f2998bc6bfdd6bff3343df76ad4f3445bf2d8a0815437cf547dd50a9b4ed4c80b57c027e77b9c39b22ed3d9769dce35672ec02fa
@@ -64,4 +65,5 @@ EBUILD netbeans-java-9999_p20160507.ebuild 15656 SHA256 058bdb033b7b744213295643
 EBUILD netbeans-java-9999_p20160508.ebuild 15656 SHA256 e89c743f36445b911e302574b328c168da74cd5920b5c89f3478862d80ffcfb2 SHA512 3021aa13c5d6cc1dba386ac4108a3954ec85f4ecd1019a06cf7df90f7efec8c648faf546b960ae8f3a3816b18f68664868c12cea2198312d84c19eb3a1b71fa9 WHIRLPOOL a63e996040b157d3abb68929e7625c27e43b8f23cb80c4debef879c961556e8197ecf357912b4047c415ec2fd8342c74a7546d5daa1bfa59df36e6e49096ad05
 EBUILD netbeans-java-9999_p20160509.ebuild 15656 SHA256 29ab60ca56e7a1f926dd9b8013516e61e668279c9d092061472b27adeec2b09b SHA512 a83845713dc7919a243a4ebab81cbeae8715e3fb502009662806bd28add7d6e6be1fb08d840ceb94ca4a8e2d0975c9d8914737a2aa21026f2d701494cfac9e3e WHIRLPOOL c523e6aa4853a01c5a68f33dc756b226df57af528dd79e3cbf8ce1606201250ef206bb636163e84638cbe57ff6755e030f3913427367052dbcb9334214bce0c3
 EBUILD netbeans-java-9999_p20160510.ebuild 15656 SHA256 ca144b73521fbf96be99aec0478c194d1cdb17bf59c8d8d01cfacc077a9a7001 SHA512 51dee47abb633c6843b78c26efbfa21b92a29d977c0f6bcac7500706bf1259eaadafe4ec257d259deba2f42e72821cf6125ca0528b7922cb11a6354e147d9dbf WHIRLPOOL 6fa1212823c8bda91a011282d8ff7fc85b8cd6129413218569e1a625bbe10e26c29a75adf79cff947ba93dfdd71c9315c3fbcd318f7ad6b1544ac21bd8daea0c
+EBUILD netbeans-java-9999_p20160511.ebuild 15656 SHA256 9d7e0689f23ec7106fee4140a07a5c8ebf534cb72a9c90eabbb3ee563a0e2ef2 SHA512 3a6142f32ee93ffa527e2697a194aafc65045455e7f3ef74bc0c2d1eedbaa18a7d3a5c0fba4a5f566880ce33972300b1a1b7ef7a738f64bee1ed63f1f8db5b92 WHIRLPOOL 0dcf0186d20906f6bc6d3fe661a2b9570ceb00961496a3d27dbe92c23d2b0e5a640c477d6947fe0526883a4d010ec4ed7bd164215cd5e621b15d66f7d5bb141a
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index c2e2fc2..89f9a5e 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -19,6 +19,7 @@ DIST netbeans-trunk-nightly-201605070002-src.zip 213540102 SHA256 6a040f33a06dc6
 DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 DIST netbeans-trunk-nightly-201605090002-src.zip 213540102 SHA256 66971c1eef81c99ed06f84dcd00acef703867637d7d475a27fc29fdf6e6c71d0 SHA512 70dd67358e41754eb9e39769e6a2eade6a3af8893c7faaa57fb1766f189d70b12b6871a90661e1362f42a6cefe586fd618a963c4afa5487220ffa9ab8e64ade3 WHIRLPOOL 736e2d0b824d5a22b988cc687c96da61e867401ff68a835f95c2af078f563d39a4a8e713b76f7f9c50759c1e6dac2785d006d66b3ff23d71e9cefe07aabca58d
 DIST netbeans-trunk-nightly-201605100002-src.zip 213543139 SHA256 81799ceebdbc9c8614a4779961c5345676bd39a980325298b109cb3e36f85b90 SHA512 5a77c688669d44b4ad162a36153bb04a0a3ee9743b68266fc64ecce415821105e9dedadfa2d4d0a6a91702f2f4f3cf0cd239e0f71197d9e0fa343ad493f8d64d WHIRLPOOL ca281b37a4b16fb6ae9dcbbc209ad3a28d39a4743a73ad2314b0378e0c91a911c9b3235ce7e22f443cb56482ae568955b1c5d7c67058422168f0ca0ebc870e16
+DIST netbeans-trunk-nightly-201605110002-src.zip 213548255 SHA256 602c5f93b24a7212efb02eba11e61862131118057aa66799bb9cd23ae7c6e71a SHA512 e55665a6cc61259e31c9c35f75c23bfdd3b59e30cd9bc4a3edd03d5ae844f8aca3afcf09b668802406e0c2d18d1779089abd92c36c7624ad80d840713ceba8b4 WHIRLPOOL 54331cd70301fe4b4a5763a0a9af007dad396b0674799f3c755093da3bc59d3c43cbf8d5845948c6aa2bee4014e8b865cd63a16c8704dcffc268efe55caa368d
 EBUILD netbeans-javacard-8.0.2.ebuild 4906 SHA256 944fee40d693c2c287e748f70ba565f3cd84bb7c19110f8be716134ec20694a7 SHA512 1f66cd2756effbfde7d43f9da7d8d93cb6252c58a02ee3d821f6faeaf63bf3c63e28f80c6eb44689e3aa954452a2f3893c65e75de84158dff1da0d94cafea14a WHIRLPOOL 88197e03008b8acb1ce62f72783bb096d9a3fc2a289b83367841a8adbee2bf822031f9bd6051831515ee44b1d5d2a109c5646f98ca723506f27c874301fb4189
 EBUILD netbeans-javacard-8.1.ebuild 4930 SHA256 5342d0d3f4207da3d36eb19f0fa78015f33b4a6e6435fcf43b7f568afabb9d02 SHA512 5275ae0fd617e26cd8580f6256a766bdd9cc0299f5a488be5a97744ec6abddf262e5fb1db358b9ac00203bbedfe7ac152828b174856d9cf6fa06e1e2128e219b WHIRLPOOL 427bfed5b61a421340acf7ec0cfb5e88a8b4a68cb546b9d0546b7c69ab0e29700d03e2bf58641bde63a2a43579b0521c028cf57dbf25af280fb0732565a30617
 EBUILD netbeans-javacard-9999_p20160428.ebuild 4971 SHA256 953faa9ef469c397ce24d47c608926a014b50202ec5197261f4d7118a5a2be0c SHA512 a14dc4090bef622fd3b13dcf19d2f692996d541b54ee156c2bd7cc87da5a5273c955fa829026f88e3d04be09f4275e41be797eee29a64c0b5af13eb7955b9527 WHIRLPOOL fed09a4d12a7adb2ac2de781f5452df9764cd56ae26e8396d516c06e739af88f34b44135f1a7a136d972ff545fb807d69fd6ed2fb82370eb09020a4f822e8a8e
@@ -34,4 +35,5 @@ EBUILD netbeans-javacard-9999_p20160507.ebuild 4971 SHA256 4db71464037647eb5949f
 EBUILD netbeans-javacard-9999_p20160508.ebuild 4971 SHA256 362fd2ccc9f3d6392a5a673fbc5f7b8a7cadfceb50791306688d220851f95876 SHA512 cbbd1f4f446862cc19adf06f4ff4633d205cea6feabf112fccbdb8559728bfc641523ee88eaff859d6a893414b5bacaa04aee5203a748a076ee066004b0911c3 WHIRLPOOL a0f9f8373cb8624927fe0856b25071ac7731fde1419845dd8211064bf6d5490da1f02595c338a0ddd814e4430747efd23d155100396264a01c3261ce4b9ecc06
 EBUILD netbeans-javacard-9999_p20160509.ebuild 4971 SHA256 0238fbffa6366316bfd4a329a6b0ec5c4c1d5adfb219fbc6edaea5871e48c160 SHA512 5b0b689144a904ce7e2a3db7c1f7868d38385fddf70c0f4f217a0be8ab0d6cae9b736bcb3a8e4874de9fafa0ed7f40a5a9c07eb30951cfd16d3e24cab1ce77ca WHIRLPOOL e98c3bba882f9233adc5f759d4c37bfbd0c064898cc71aebea4d7f18f0fd54ee8681bc50e9d862d92966394e6d66c1686894c6a52db6d7fb38cb3f387ff3ddd3
 EBUILD netbeans-javacard-9999_p20160510.ebuild 4971 SHA256 af902405d2d6c0892eb97018a1e9fa3b10f5ee79f64bc9a7f528bab25a204176 SHA512 aedd15b6efad6872ed18ffd6186e41974375bc9d663b209974d014b1926ea932e9129d5e07a6113dc4a9855d64227a5a4c782fd166ff2858b93453ee0d885deb WHIRLPOOL 59be59f2258588d04620088ba7b3dfb7c111fdbbf205f0c0409eafe7bc28401f1580e06a46717cece830475c2581ceec2f99c0ec5e7bdba95e20dbb3145b2cfe
+EBUILD netbeans-javacard-9999_p20160511.ebuild 4971 SHA256 8bc59d3bb1421e53c510876cabe72b5c51aa8b45564faf6217c27955b29c30f8 SHA512 7806989664244038dea36ad18d4ac37cf1d7d6b4c8f191882a1fe61b36b20d92f2473f43bb145c181c87b1be88a9f00b6736cefc9642e07209855396246f632d WHIRLPOOL 7d8a84978940273fca96c147560bc882356ec18fd1570306ec50f3e4766e212e8db8a08a1635f4066938e2094c38f86a35f0cb11726509ac5a95cedf864fd495
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160511.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160511.ebuild
new file mode 100644
index 0000000..89070f4
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160511.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaCard Cluster"
+HOMEPAGE="http://netbeans.org/projects/javacard"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-05-11_00-02-33/zip/netbeans-trunk-nightly-201605110002-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 4330225..bbfed63 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -18,6 +18,7 @@ DIST netbeans-trunk-nightly-201605070002-src.zip 213540102 SHA256 6a040f33a06dc6
 DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 DIST netbeans-trunk-nightly-201605090002-src.zip 213540102 SHA256 66971c1eef81c99ed06f84dcd00acef703867637d7d475a27fc29fdf6e6c71d0 SHA512 70dd67358e41754eb9e39769e6a2eade6a3af8893c7faaa57fb1766f189d70b12b6871a90661e1362f42a6cefe586fd618a963c4afa5487220ffa9ab8e64ade3 WHIRLPOOL 736e2d0b824d5a22b988cc687c96da61e867401ff68a835f95c2af078f563d39a4a8e713b76f7f9c50759c1e6dac2785d006d66b3ff23d71e9cefe07aabca58d
 DIST netbeans-trunk-nightly-201605100002-src.zip 213543139 SHA256 81799ceebdbc9c8614a4779961c5345676bd39a980325298b109cb3e36f85b90 SHA512 5a77c688669d44b4ad162a36153bb04a0a3ee9743b68266fc64ecce415821105e9dedadfa2d4d0a6a91702f2f4f3cf0cd239e0f71197d9e0fa343ad493f8d64d WHIRLPOOL ca281b37a4b16fb6ae9dcbbc209ad3a28d39a4743a73ad2314b0378e0c91a911c9b3235ce7e22f443cb56482ae568955b1c5d7c67058422168f0ca0ebc870e16
+DIST netbeans-trunk-nightly-201605110002-src.zip 213548255 SHA256 602c5f93b24a7212efb02eba11e61862131118057aa66799bb9cd23ae7c6e71a SHA512 e55665a6cc61259e31c9c35f75c23bfdd3b59e30cd9bc4a3edd03d5ae844f8aca3afcf09b668802406e0c2d18d1779089abd92c36c7624ad80d840713ceba8b4 WHIRLPOOL 54331cd70301fe4b4a5763a0a9af007dad396b0674799f3c755093da3bc59d3c43cbf8d5845948c6aa2bee4014e8b865cd63a16c8704dcffc268efe55caa368d
 EBUILD netbeans-javadoc-8.0.2.ebuild 5993 SHA256 baf9da38d87b86eb8ed10ef46017361f36ca8583dd90885c9d1667a51851bc52 SHA512 892bc25b30dc26e3ee7c8be9aaf8542c00a7fa1d1d8f883d82bebb816edfa93e1ee9abeac1b0c47ecc8b4169bcaded56c5c71f18151fdc22fe241fcee0fd4521 WHIRLPOOL 2012f28f3ba5074b4d262b20e9a1c8ddf590ce444339ec1a404c890867c1271e38f9f9e09717d0648fae061553f5c8da3d97a70c35c8e853fe4894fb6fd4ec96
 EBUILD netbeans-javadoc-8.1.ebuild 6247 SHA256 5f0ab01cbea85353ac471a46e341750785f4889732c9da111d77b87bbd1bcc2d SHA512 4a4636f4f58a9baba9d9f5bac4ee7d4f57c0e07d6790902d34974383660f2926c4c4b16a27bacc2a3a7a0a6d5b7699caae90bb2ac513ac8e0535e46d11ec345e WHIRLPOOL 9cbac0234b9f1a8122df116512d5154b7e85561fd9541e0a77dc5c2b5863cf3238400ac17d05499e950705309faa97caace6da00c912ea07d6a74b0076f683ed
 EBUILD netbeans-javadoc-9999_p20160428.ebuild 6293 SHA256 a45afe043254c2596f50568a88fe8e61738ee230c369fdc09e583b1898af2b35 SHA512 4a06b6abae4513a4fc810f735546777ff7f68f63f49def5a210dad83e09a75c44b59c80afb5bb6a22f6bcaa28ff97021ac2b987cbb2d4f4715abf7e3ac5d090b WHIRLPOOL a8a400e470bcab256c606583faa300745e3fc8f604c0788e3a37d6015c7f1e6781d4444472dfa6359a1b6001d2769ab175da299c783c5e5f6e8261890c41f407
@@ -33,4 +34,5 @@ EBUILD netbeans-javadoc-9999_p20160507.ebuild 6293 SHA256 ada56bc2a7f2b96c0dbc17
 EBUILD netbeans-javadoc-9999_p20160508.ebuild 6293 SHA256 a461652ca3d47c9a85410ab1643ba0e39cdc0180c20d603dd103d73d9d8e98f2 SHA512 03c07c187d736659715ed8dbfdf5f155a1e80cf90b58427e4148813ef2a78958a8c23962842bbd19086c95725c1ba76430fbce6e93fa42adfff68b6c5a834c6a WHIRLPOOL a23386c2d77323529aff85fb3d10ff0af93a4abc404feafdc341cdbb9fdca99349ea8e29f3c49d0b131142e19194e18838908ca8be815eb40f471e185c601a38
 EBUILD netbeans-javadoc-9999_p20160509.ebuild 6293 SHA256 6fb3b5cbe7c9d001009a2ce8777b9241e13e59a90745d81a409fae865e97ed28 SHA512 a89ad8e4983f57ca2da8003debc737b6bd602e50d35fbd74fbc800bfed63a3fc3cea1ceea5db1d27e0f25e930c691b91ab64536892acd46a9e281cffa9079744 WHIRLPOOL 6db001498bec7bef8061ee03e1b0f37ff40a4c315ffb0dcc5855032eb45a31c4448d65a97d90692e07c3f354c7e8f7eae418a6c79a13a1f39f3025ffadbbc89e
 EBUILD netbeans-javadoc-9999_p20160510.ebuild 6293 SHA256 01df95a9d9ad7909dded384ca922ff5477af48ed18dfa0ea150f7f138cd9cfea SHA512 a8d9e94f8d9f88dabdbfb4ac48b41bcebfd1c85bf13eda8560711165fb99a210674556031f91292193979dd858ae4b2b9c7977f4f4a5957787ce8750d0a0daf8 WHIRLPOOL 90955d532f9aacf30d1914e8ef1fe6bb066e4dfd3aad69ab3159fbb102c55bf1093b58b60e68c38975643175feac9505af89938780029a541eb005f2ae17f31a
+EBUILD netbeans-javadoc-9999_p20160511.ebuild 6293 SHA256 a985a54a64b18b3aa56405fc46ff67df8e115804a66d0d96484e2b3247c2732b SHA512 9452fb6085001a698382dd13e6ec9a1b364f5499e700bfb6f4d4a6ad82b1182aaeffc32ae4df976245a86f2878b936a106f591299e2e89f4b809005f303e6e50 WHIRLPOOL 79e63943b9616cd4e2140b3f928587174234bb522b05a8831eea963c085b7f1a0db39d525ffc6bb698ce68021381ec415dce866a4d3a60fc5edc4ff9d6651ec7
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160511.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160511.ebuild
new file mode 100644
index 0000000..24a0b08
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160511.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaDocs"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-05-11_00-02-33/zip/netbeans-trunk-nightly-201605110002-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 5f0ed7e..7b5901f 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201605070002-src.zip 213540102 SHA256 6a040f33a06dc6
 DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 DIST netbeans-trunk-nightly-201605090002-src.zip 213540102 SHA256 66971c1eef81c99ed06f84dcd00acef703867637d7d475a27fc29fdf6e6c71d0 SHA512 70dd67358e41754eb9e39769e6a2eade6a3af8893c7faaa57fb1766f189d70b12b6871a90661e1362f42a6cefe586fd618a963c4afa5487220ffa9ab8e64ade3 WHIRLPOOL 736e2d0b824d5a22b988cc687c96da61e867401ff68a835f95c2af078f563d39a4a8e713b76f7f9c50759c1e6dac2785d006d66b3ff23d71e9cefe07aabca58d
 DIST netbeans-trunk-nightly-201605100002-src.zip 213543139 SHA256 81799ceebdbc9c8614a4779961c5345676bd39a980325298b109cb3e36f85b90 SHA512 5a77c688669d44b4ad162a36153bb04a0a3ee9743b68266fc64ecce415821105e9dedadfa2d4d0a6a91702f2f4f3cf0cd239e0f71197d9e0fa343ad493f8d64d WHIRLPOOL ca281b37a4b16fb6ae9dcbbc209ad3a28d39a4743a73ad2314b0378e0c91a911c9b3235ce7e22f443cb56482ae568955b1c5d7c67058422168f0ca0ebc870e16
+DIST netbeans-trunk-nightly-201605110002-src.zip 213548255 SHA256 602c5f93b24a7212efb02eba11e61862131118057aa66799bb9cd23ae7c6e71a SHA512 e55665a6cc61259e31c9c35f75c23bfdd3b59e30cd9bc4a3edd03d5ae844f8aca3afcf09b668802406e0c2d18d1779089abd92c36c7624ad80d840713ceba8b4 WHIRLPOOL 54331cd70301fe4b4a5763a0a9af007dad396b0674799f3c755093da3bc59d3c43cbf8d5845948c6aa2bee4014e8b865cd63a16c8704dcffc268efe55caa368d
 EBUILD netbeans-javafx-8.0.2.ebuild 4647 SHA256 15e5e0b1c4729852dd55e5bfb2dcb520ba7c959bd9927d315c0abcb3f94e4ecc SHA512 520c60264fee67b0ccfd50ced0cc8586d5653d5186fa75c6b7cd8b400aae834de446b7e6145ad38df7e68207391fb360ef4834140e096d48add568fed387ac98 WHIRLPOOL 416a56ceb2ba85e3923ada0c8ef485cdd6fa16b3423b8fd0de523fa54dd082cbaedee5da4f1a92b50e440195f9256376f50e99a850d70ccdcb8c0ff370007f7c
 EBUILD netbeans-javafx-8.1.ebuild 4671 SHA256 2a12bebaca0ddbb03b84c33de7f5933f76a8381db3c40013fc4014687ded6cd4 SHA512 ff410f96e808c414e3e9485461866239080098e46e843ee771a78a0afffddc1c776697dccb276daf7f87dadf915a212bfe9c2a07b3a8a9057cb3ea19b77163fb WHIRLPOOL 51729142255a16d4cd949d4bf5f3b681d36bc83f30dad39aad9d1dd56f7dcec0dae4377817350e7947d518129a74eec7f227c3cb1600ac168ea90d056b87d195
 EBUILD netbeans-javafx-9999_p20160428.ebuild 4717 SHA256 d66d24fd69cf70db58c771a8022cbd16fe687b8fa04fad227460c9c4c16a282f SHA512 a8eadadc1e636c9a3907909fdc8f39af3c3f789dadd440f3717f183e28489b6f6d07e82ef1665b06dba6f2d7d750482c7f22b55ee8a38356d8208ba3e5c27ff5 WHIRLPOOL 2a938d9fde09ab500cb042026520f13f99c6d74452a230f146bf6d69930a6d4e1e3d108fa7e1d459712e6c6893b758d4f42025e0d5e32dc24db26b97b980194b
@@ -39,4 +40,5 @@ EBUILD netbeans-javafx-9999_p20160507.ebuild 4717 SHA256 3afb6a822cb9b2a6f0d2ee4
 EBUILD netbeans-javafx-9999_p20160508.ebuild 4717 SHA256 d6774497eca22aee6fe81b14e15c98ee7757ae8857d0d759e976f967e464fabb SHA512 fcc85e62aae48f322f2e0d8efb259e3cae587598e01675549fb279eec4149e0972018574fac90f8b9312db4f058d84dc4fa90a1f562e3b33f67421695e728521 WHIRLPOOL 0eb76d3bb1e15bb8592031c20d37a9dfd50f28550282ca2aa49cf2b311d21b687de6c0de9a6bcd6ac76bbaa8c6478360174cca919320a87b5920b4810099f127
 EBUILD netbeans-javafx-9999_p20160509.ebuild 4717 SHA256 312a897fa784c1682001ccaae74dcb2abc0c9829f9f134456fe875c19e23d5c6 SHA512 41c1acb48e92bb6395404878b5e5b542b1cf4e871a4c3e2c0e6ba15290346ffab8ee5740effedc770936d72f02e83ffda1eb4903306a9c4dd1806a2a6e637ee8 WHIRLPOOL 6100b951087cd8df0c2bdc615e7e0f199a6edccb50dd488f46d6c4143e3cd6ee460148763742b01f0240359ec9bed790e3100b101a8b81afa584e1871523adc6
 EBUILD netbeans-javafx-9999_p20160510.ebuild 4717 SHA256 f4d5ac25dcdfd6b6ce57c98b83269ec95e9b2159b99e5263a5b9147db1d6f9ca SHA512 cf0ed54acdcaa414b8acaa5140adc5eb45d73c27bfb7899a4e32f54e8bb10c75e532c46ffbd95bc6d52fc70e87ff56104e57fb518ae0068a7b2d64dd20df9874 WHIRLPOOL 0409e77bcf017e2aa3c8970eb7415c371aec82fad142a171866be5b6d9361b740928b3b4e514c439133633cfa9ceb95b59cf8e87a0296d65ebfb3c23f84c0817
+EBUILD netbeans-javafx-9999_p20160511.ebuild 4717 SHA256 bb19bfb3f21d21966888ff6048b4ce114f7c9e1375ec9f159a8fce3b33ad240f SHA512 b69faa17df8b1112007fe69c9165b7c30852c4353e9e93eef4568b55b581549f643dca32a64055324261f5a4d8e3337c1a27d58e8a754201bff04948195b3b55 WHIRLPOOL 3647afada75f82d0016bcd01f97ac5218af82efab6cf4a4da0bd2b8c780dc1818c33ae6e8615f182f0110c7b71a02f40f890fb2e542a639670eeaf2a0066d1c0
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160511.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160511.ebuild
new file mode 100644
index 0000000..6163737
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160511.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaFX Cluster"
+HOMEPAGE="http://netbeans.org/projects/javafx"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-05-11_00-02-33/zip/netbeans-trunk-nightly-201605110002-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 d57f306..d21b109 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -16,6 +16,7 @@ DIST netbeans-trunk-nightly-201605070002-src.zip 213540102 SHA256 6a040f33a06dc6
 DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 DIST netbeans-trunk-nightly-201605090002-src.zip 213540102 SHA256 66971c1eef81c99ed06f84dcd00acef703867637d7d475a27fc29fdf6e6c71d0 SHA512 70dd67358e41754eb9e39769e6a2eade6a3af8893c7faaa57fb1766f189d70b12b6871a90661e1362f42a6cefe586fd618a963c4afa5487220ffa9ab8e64ade3 WHIRLPOOL 736e2d0b824d5a22b988cc687c96da61e867401ff68a835f95c2af078f563d39a4a8e713b76f7f9c50759c1e6dac2785d006d66b3ff23d71e9cefe07aabca58d
 DIST netbeans-trunk-nightly-201605100002-src.zip 213543139 SHA256 81799ceebdbc9c8614a4779961c5345676bd39a980325298b109cb3e36f85b90 SHA512 5a77c688669d44b4ad162a36153bb04a0a3ee9743b68266fc64ecce415821105e9dedadfa2d4d0a6a91702f2f4f3cf0cd239e0f71197d9e0fa343ad493f8d64d WHIRLPOOL ca281b37a4b16fb6ae9dcbbc209ad3a28d39a4743a73ad2314b0378e0c91a911c9b3235ce7e22f443cb56482ae568955b1c5d7c67058422168f0ca0ebc870e16
+DIST netbeans-trunk-nightly-201605110002-src.zip 213548255 SHA256 602c5f93b24a7212efb02eba11e61862131118057aa66799bb9cd23ae7c6e71a SHA512 e55665a6cc61259e31c9c35f75c23bfdd3b59e30cd9bc4a3edd03d5ae844f8aca3afcf09b668802406e0c2d18d1779089abd92c36c7624ad80d840713ceba8b4 WHIRLPOOL 54331cd70301fe4b4a5763a0a9af007dad396b0674799f3c755093da3bc59d3c43cbf8d5845948c6aa2bee4014e8b865cd63a16c8704dcffc268efe55caa368d
 EBUILD netbeans-mobility-8.0.2.ebuild 4342 SHA256 e9b4ff8fe38904346bc21a82219696e97322bf9df4e9d4cad2259b6f08bbe7f9 SHA512 338711fe61c469cee80e499ddf8c3ad70a3a38e6658311afcd1d24edd1a99b87566fafcbd392bb958b589796e0913d2574b07570870c8d3382a91a324227082f WHIRLPOOL 855b2817c36bea67c8fb368a0740be18b71dbebb2b98a154552f002a56eaff34f54eee2698379d7200a6042c1de699df23e7717b5b6c532776852d8757b74cb0
 EBUILD netbeans-mobility-8.1.ebuild 4366 SHA256 fe10d103a284b8f82b67179ea52d51d57b43cfc4a4084b97e3f9650526621497 SHA512 36bdf0948b41bfe4f9c66fe093030d5f27b90f5a89be94dfbd176e3887b249d5aa3eb9b0924df142291f0d693f274eef840ed3a7f658106847327befd0374710 WHIRLPOOL f9dd44e6401367b2df73c5f1428bff53547ac012068297667666d0241c29310aed4413a368e5350a996af37ad026e875325467b1a165cba6953d99a5da3a0d76
 EBUILD netbeans-mobility-9999_p20160428.ebuild 4412 SHA256 92ec38e61718089a7a0f048629e2390b138113cfd286ba1e8168edd9ac86aae1 SHA512 0b0b3e80376fecf0af36478252595774af197c427a8162cd2394e43d3e1772a730434cf07de1680be0bd7c3777d826c822334ce4f36c42d7a05e8aae306c4a3e WHIRLPOOL 2b317f045489273543ccd76df12009bf2b9230912a5ba4814ad5e1dab25dbe92cd0b317d4458835ed64d6386bb5216b328e1afc53d60fb9b07848397581c6bdf
@@ -31,4 +32,5 @@ EBUILD netbeans-mobility-9999_p20160507.ebuild 4412 SHA256 4ade3fc523c138d3c50ca
 EBUILD netbeans-mobility-9999_p20160508.ebuild 4412 SHA256 9ebe4871b1ca45bbb0f4fed226041933c682b8b639c4de2f53be9a144851aa03 SHA512 900a839a97f4a2bc1584753e6d6665735cc746b9f07b38e54d69d102fb9bf8cc26071df41f174c926c873d6c4941a3e9dc28e09efc7960a9c83016707666a354 WHIRLPOOL 4afa0a3e00c4a26f3d38e5aa0542483a1a4a833b980f92d65a4c90320abb39b12be0871fa7e8a61d98d49eac9596821e00656e77e41b421107e20399aa22efcc
 EBUILD netbeans-mobility-9999_p20160509.ebuild 4412 SHA256 908e7de5175f0903aaa1e8cacc061bfb2ed56ce70efbab9669a426e8723453c1 SHA512 0707fbfa9561e460ad4f51505670b68740d6b33af383c63d5d7ac7c6685a9987af50f412a9750722be33dc1341b21ef31334a66be805b6778162c849fc7247c3 WHIRLPOOL 30a391e4c491ec8022ec9c6aa96f9544b8986fef724a1725862f9408fa5e9b5b64a56558e59001b2d011c6e70935271d0070828402d8c613487c0649643900d1
 EBUILD netbeans-mobility-9999_p20160510.ebuild 4412 SHA256 372d496a60f7ceacd63f092483026a966229bb2d2b66e247198aaca86fc88963 SHA512 f8982330341776ea63768a7d68bb2318685774c42bdfc349f6ffbc529e7f1a92b6d8b15480c42b204e712ac4bda241fec4681fab690a15d0da31c2aee3b4824b WHIRLPOOL f021c760072c90531eebc35791a03f85ffb429957de45f4d39bcbbeed5f181851e67a9cb1681e498891d0cc84c04cfd5056b4a191306ca6c58d548b108f5b531
+EBUILD netbeans-mobility-9999_p20160511.ebuild 4412 SHA256 1bd7a1fcd4968ea853a332d57efa7b44093d35d56a3543bdbde884d2a6251816 SHA512 17d41e3f7e8a890bfbecc34c68e47f205a8749dd4919bf0cb341aba53af15f3e185a2a877eb685dcbf093afb2318fe11abb9ae91e2b7b85313d29809d7e86481 WHIRLPOOL 4afe1b3fb655f6627f0db9312f2599fecc8f5198f304fbadc50d94d37c94cad93ef72e5760288ba6c5178c9b26a28576f5f183bfb4c948c9db77abbea24b3a34
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160511.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160511.ebuild
new file mode 100644
index 0000000..a6a60dd
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160511.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Mobility Cluster"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-05-11_00-02-33/zip/netbeans-trunk-nightly-201605110002-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 45532f4..a5e06c2 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -19,6 +19,7 @@ DIST netbeans-trunk-nightly-201605070002-src.zip 213540102 SHA256 6a040f33a06dc6
 DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 DIST netbeans-trunk-nightly-201605090002-src.zip 213540102 SHA256 66971c1eef81c99ed06f84dcd00acef703867637d7d475a27fc29fdf6e6c71d0 SHA512 70dd67358e41754eb9e39769e6a2eade6a3af8893c7faaa57fb1766f189d70b12b6871a90661e1362f42a6cefe586fd618a963c4afa5487220ffa9ab8e64ade3 WHIRLPOOL 736e2d0b824d5a22b988cc687c96da61e867401ff68a835f95c2af078f563d39a4a8e713b76f7f9c50759c1e6dac2785d006d66b3ff23d71e9cefe07aabca58d
 DIST netbeans-trunk-nightly-201605100002-src.zip 213543139 SHA256 81799ceebdbc9c8614a4779961c5345676bd39a980325298b109cb3e36f85b90 SHA512 5a77c688669d44b4ad162a36153bb04a0a3ee9743b68266fc64ecce415821105e9dedadfa2d4d0a6a91702f2f4f3cf0cd239e0f71197d9e0fa343ad493f8d64d WHIRLPOOL ca281b37a4b16fb6ae9dcbbc209ad3a28d39a4743a73ad2314b0378e0c91a911c9b3235ce7e22f443cb56482ae568955b1c5d7c67058422168f0ca0ebc870e16
+DIST netbeans-trunk-nightly-201605110002-src.zip 213548255 SHA256 602c5f93b24a7212efb02eba11e61862131118057aa66799bb9cd23ae7c6e71a SHA512 e55665a6cc61259e31c9c35f75c23bfdd3b59e30cd9bc4a3edd03d5ae844f8aca3afcf09b668802406e0c2d18d1779089abd92c36c7624ad80d840713ceba8b4 WHIRLPOOL 54331cd70301fe4b4a5763a0a9af007dad396b0674799f3c755093da3bc59d3c43cbf8d5845948c6aa2bee4014e8b865cd63a16c8704dcffc268efe55caa368d
 EBUILD netbeans-nb-8.0.2.ebuild 4927 SHA256 7531e50c4d76608bf925efdba4f54f522de3a8ceeef4d48807fb4ee48bfabdf6 SHA512 925734f331cf228066c5c9e614f48b756af31cac8b559cfe756347b6a2cb0ce362c7c41489a25084f2ed3f2e415baefd148a54f39fc00269fb14179efe056cb9 WHIRLPOOL e3224c5f22bb8e4792a5f98bbe819e071ff18c99533ce05a3fc1c5898ddcca1e3ce34487ba78159bb4d60155acdf15ae4fe81189ff2d5b1bc77ffd9ee4e20aca
 EBUILD netbeans-nb-8.1.ebuild 4065 SHA256 c1bfd704ecaa1fd62b149114b7391b4633a90a8a1d87645b833731920aa6efbb SHA512 56bda99c3d05522d5becb032177e4b4411d862d18a069e2d4343ddc8b08d05ed6c3199588e28aece7e583ccc9f95517621780a246bdd65c7d3edf072a61ef1cb WHIRLPOOL b9a43e6b4ada929bcf2aaed0bffe9cdfe0b9dbbf001e8ee4f2ab3cf8a08e27d318ea435d0580c80fd23cf921d261ca9b54d54a2b2e7a53173f955bde03aa0a12
 EBUILD netbeans-nb-9999_p20160428.ebuild 4111 SHA256 8e968459df586e6fc8b27eb683e2b0936dba423cccdb334af64c3918d2749843 SHA512 9ca5684d63d1efe7b5158014375752449fbce3a3fb86acfcd12a14f7c9195fefca83d11379906cbd707a48a60ae24a5312c9823acf337811e1d00e9711dbe126 WHIRLPOOL 8ddbc652a3ef6a2fa079498f3d59900f7a507d4494a2aa514cfaae3a1b67fba2880d80a9d285a9513fb9e00e6c3c842b3e8faf6060d1b545706cb2c871443f2d
@@ -34,4 +35,5 @@ EBUILD netbeans-nb-9999_p20160507.ebuild 4111 SHA256 aa4417282a4c7f96f1e5f4482e9
 EBUILD netbeans-nb-9999_p20160508.ebuild 4111 SHA256 e9d9fb384d3788ac7c4a42932975bf98c90414d825c09c370d2c3e99cebba7e2 SHA512 627f46cdf769caa505ff05762655445b2611483152cc63847ba60e5e79ba3eeb58f0fd8edf07d4facde87bf0833f7f73f466b3822222a9605705ba3c26a109b1 WHIRLPOOL 7fa12467be9dea5143b7daf39dc69c453c0ccd51ddb34250f9ffcdc2414c714b1f3d8a6d7ca95beff3316bcc5a51506ee2f3ea4cf985c35137032d05e6e39a39
 EBUILD netbeans-nb-9999_p20160509.ebuild 4111 SHA256 0da6fd134a9596bf761a7da79fcfdcdc083f04310fccfdb9ecc0deed3fdfb5a4 SHA512 143a840bb6d1754db31ea6237e92bc6c047efbb9e1a23f3fda5efb6021ed3e7ff20baacd5a5acebe0dcc5512e583c1ea017cb11b6464f28017ec0993393c3b50 WHIRLPOOL fade0bd6525e3c53ba22ff2442a25756022970631b792057545813d11c9f921810357000e56edaf54a6ad18ad4ad5010a00b61c560af04707bef8a76ad2e397d
 EBUILD netbeans-nb-9999_p20160510.ebuild 4111 SHA256 fc5001e76ac33f16ad0d92e33b527ed6ce38da8225593b2c769a396def33442d SHA512 55349e47dbeeadb1362d25832043cd843f89b6ffe0fd5db0c1b25fc5bd9ef40f8d71190193c7446d1108d3515f876d04f5c00c32c227642ad58433f5f0ad87ca WHIRLPOOL 2fac6f8ec2d542fbd497c6bab4a9807e158dc39f707005007c1505c48e5caa43e4843593fcf2540dfccb24c6af5125fe75fa18c00a9f6b2687dec8d75840563f
+EBUILD netbeans-nb-9999_p20160511.ebuild 4111 SHA256 a36478096c6f3a2dc0b239167376e914ac52dfe294de5607e974a25135018647 SHA512 d3499e5f1300a73f02ac22f24f404028c559439183ea1b82af93e01c6655b7a68a2c1c195a840cd8409576dca33b94a89937e8a66d9445d79807bc39ad811716 WHIRLPOOL 058a05b678fff23fc335b2db82f0dbce1f8a69a2c2dd27ceab8792e2a17b8ea7997e2926a12a553d5efd3a3698d0fd4e6d728946d3c891e9625142f8c6853780
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160511.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160511.ebuild
new file mode 100644
index 0000000..cc0d561
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20160511.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Branding"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-05-11_00-02-33/zip/netbeans-trunk-nightly-201605110002-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 165465d..0a9aeac 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -21,6 +21,7 @@ DIST netbeans-trunk-nightly-201605070002-src.zip 213540102 SHA256 6a040f33a06dc6
 DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 DIST netbeans-trunk-nightly-201605090002-src.zip 213540102 SHA256 66971c1eef81c99ed06f84dcd00acef703867637d7d475a27fc29fdf6e6c71d0 SHA512 70dd67358e41754eb9e39769e6a2eade6a3af8893c7faaa57fb1766f189d70b12b6871a90661e1362f42a6cefe586fd618a963c4afa5487220ffa9ab8e64ade3 WHIRLPOOL 736e2d0b824d5a22b988cc687c96da61e867401ff68a835f95c2af078f563d39a4a8e713b76f7f9c50759c1e6dac2785d006d66b3ff23d71e9cefe07aabca58d
 DIST netbeans-trunk-nightly-201605100002-src.zip 213543139 SHA256 81799ceebdbc9c8614a4779961c5345676bd39a980325298b109cb3e36f85b90 SHA512 5a77c688669d44b4ad162a36153bb04a0a3ee9743b68266fc64ecce415821105e9dedadfa2d4d0a6a91702f2f4f3cf0cd239e0f71197d9e0fa343ad493f8d64d WHIRLPOOL ca281b37a4b16fb6ae9dcbbc209ad3a28d39a4743a73ad2314b0378e0c91a911c9b3235ce7e22f443cb56482ae568955b1c5d7c67058422168f0ca0ebc870e16
+DIST netbeans-trunk-nightly-201605110002-src.zip 213548255 SHA256 602c5f93b24a7212efb02eba11e61862131118057aa66799bb9cd23ae7c6e71a SHA512 e55665a6cc61259e31c9c35f75c23bfdd3b59e30cd9bc4a3edd03d5ae844f8aca3afcf09b668802406e0c2d18d1779089abd92c36c7624ad80d840713ceba8b4 WHIRLPOOL 54331cd70301fe4b4a5763a0a9af007dad396b0674799f3c755093da3bc59d3c43cbf8d5845948c6aa2bee4014e8b865cd63a16c8704dcffc268efe55caa368d
 EBUILD netbeans-php-8.0.2.ebuild 4347 SHA256 585b2488d748f3d0f87c17c951870e167aac7bf10847428add786e4a8a446583 SHA512 1431305d4f340cb0a2c7c896c54d45f6f02ef82a4201f82053278b98511a5a4a68210317530e9cdf5cf1f495996d3a3f9c4b2c3c479aa407abd375072ab3182f WHIRLPOOL af8476f2ff2d119f2657e6be03cfea1160f86e41bd791f40609f1bc8a8aada46ba1081e4f2417b0fddde931fa4e43d20956c0fe1d4fdf3617b78d01afd23f9b4
 EBUILD netbeans-php-8.1.ebuild 4371 SHA256 a9e7565a8cbcc5dfca4d9449f43b959911c47ad8da59648e383ecce55c4b0064 SHA512 67d43532ea43abf007adce73e7da2345d9cc42229189ba90d254d7764e19e3fd3c86b990ea2fe08cf52e49422def481046fe6e0e447fdc1de1680ac59f51d9d3 WHIRLPOOL 433275570fd81db477180e58909ebd50b83cde03bd5df807cc9ee213e2f3a44f65f3ec4877851aa6322e7752969aa72313ee7b35b8ee07446e8c22be4321d536
 EBUILD netbeans-php-9999_p20160428.ebuild 4418 SHA256 ff39622b2f582fb73f069ddea76fcb846f2fdbdce6559af061a13ead577d4a47 SHA512 3f71b975e8316433510e89914be7a1ffe7837a39d42a4c8f25a033b82d54bee62cafe0a28d45cada322594dfc328f43c2a1a05abbec1e43e207f73fcb225e128 WHIRLPOOL 696cf1a13fe113a7156da0fa4db41802052c5885a1cde7eb5eac17431ca31792576d22d4cecc6b2bd5ead506abb0e3a3d0dee62183b346aed1aa146234c7df8a
@@ -36,4 +37,5 @@ EBUILD netbeans-php-9999_p20160507.ebuild 4418 SHA256 f83ac8bf9041f6fa0c4941a260
 EBUILD netbeans-php-9999_p20160508.ebuild 4418 SHA256 e87d5f34e2875998b5038f80e156c8f3ad130e61f72d91e85a324f2e00fbec32 SHA512 1d017ecf250e196514c5468257cc9a2c023ddf66248dadbd6ea9a3b2a5f7c98cb2e59ef0d28724b9be98deb1ae29311b6ef2a75a77a190ea24a4eb6552b024ca WHIRLPOOL 9842c381b442ca55052871a8e64932caceb5a0cb361b81f13add5e6bf1f34a7d4ae14df439928e7fef8468cb2add3bf6c4f9a774ce7b7d7ba8656f5abf0e2eff
 EBUILD netbeans-php-9999_p20160509.ebuild 4418 SHA256 5b2baf69a3b790eac3b19a542cf542ffe89e37ab7239287af42b3189ecee994b SHA512 884281622fe327e8c76bb9f2766594cba315a9c026f820e9b6d28c4ec89de0a67893fbef36c90bf0fabe2b4fa84329c5a8ce73e61282d59abb85699e90cb0b3b WHIRLPOOL fdbac22e21975dde85ec735e099987f0e17f4fda989ba543664d5923988503df96b306f0f64c606cacac8dd363a868020fd2a73a7ba684249c8745fe4edde55a
 EBUILD netbeans-php-9999_p20160510.ebuild 4418 SHA256 541e67e102ba3bb94d6e25f8d1cf6fdfdc65d606765c6690af4728219260de80 SHA512 821a43e67f4368f16e6a478256d27ba994c3533309c64afacb505e91f2df48b557d882fc1f301db5e534a7cf82281ad516f1a5b085cf6cbb2ffaf75fe8422635 WHIRLPOOL 9f47a6856fc3eee9382e038b1bda23676416ae1ecd4d78ce287e18f881e3a228dcc3fba32657a92f4b27f813745541a4853fbdd5504360dc8a1c5fd5c7f65a6e
+EBUILD netbeans-php-9999_p20160511.ebuild 4418 SHA256 ce5c87a721bd9553c68330155afe63cdc77470837fb9d4958bb73163fc6dd60d SHA512 4092b344571aa183c51c26621f459ffc4a7d2a80c56a38d2b86e2796aedcf8b3d583245f1731e518925f21882901c304e3933148faa27da40219a05ebbbd1fc5 WHIRLPOOL b9ee6f0e2ce417efd5d797a3684d698c71009f634ff19ea03886c2f78a2738263f234b3571f3fdddcbb7ed06f1a755ff35197468ba9b7320a8c7b2f776b0ce79
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160511.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160511.ebuild
new file mode 100644
index 0000000..ab0b9ef
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20160511.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans PHP Cluster"
+HOMEPAGE="http://netbeans.org/projects/php"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-05-11_00-02-33/zip/netbeans-trunk-nightly-201605110002-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 92439c5..d226d41 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -42,6 +42,7 @@ DIST netbeans-trunk-nightly-201605070002-src.zip 213540102 SHA256 6a040f33a06dc6
 DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 DIST netbeans-trunk-nightly-201605090002-src.zip 213540102 SHA256 66971c1eef81c99ed06f84dcd00acef703867637d7d475a27fc29fdf6e6c71d0 SHA512 70dd67358e41754eb9e39769e6a2eade6a3af8893c7faaa57fb1766f189d70b12b6871a90661e1362f42a6cefe586fd618a963c4afa5487220ffa9ab8e64ade3 WHIRLPOOL 736e2d0b824d5a22b988cc687c96da61e867401ff68a835f95c2af078f563d39a4a8e713b76f7f9c50759c1e6dac2785d006d66b3ff23d71e9cefe07aabca58d
 DIST netbeans-trunk-nightly-201605100002-src.zip 213543139 SHA256 81799ceebdbc9c8614a4779961c5345676bd39a980325298b109cb3e36f85b90 SHA512 5a77c688669d44b4ad162a36153bb04a0a3ee9743b68266fc64ecce415821105e9dedadfa2d4d0a6a91702f2f4f3cf0cd239e0f71197d9e0fa343ad493f8d64d WHIRLPOOL ca281b37a4b16fb6ae9dcbbc209ad3a28d39a4743a73ad2314b0378e0c91a911c9b3235ce7e22f443cb56482ae568955b1c5d7c67058422168f0ca0ebc870e16
+DIST netbeans-trunk-nightly-201605110002-src.zip 213548255 SHA256 602c5f93b24a7212efb02eba11e61862131118057aa66799bb9cd23ae7c6e71a SHA512 e55665a6cc61259e31c9c35f75c23bfdd3b59e30cd9bc4a3edd03d5ae844f8aca3afcf09b668802406e0c2d18d1779089abd92c36c7624ad80d840713ceba8b4 WHIRLPOOL 54331cd70301fe4b4a5763a0a9af007dad396b0674799f3c755093da3bc59d3c43cbf8d5845948c6aa2bee4014e8b865cd63a16c8704dcffc268efe55caa368d
 EBUILD netbeans-platform-8.0.2.ebuild 5406 SHA256 98e9861da45ead0d2d975a0527315df5282870b2d7e71a089724d91c18852e81 SHA512 cadbe66132d3ad81f6d149e20731b558c11c529e2ec15b1fe47ff97d99a3f4b4612fa5c98c435c4ff979eaefab6702721db009a03162202c96b4b411cf9f872a WHIRLPOOL 9552948e8bbad308f4379eaae69d8c214da9fbfab87d75226949b69ddca3e68c2d36c4d05738196073e5b959ab0b764064c9186d421198937122aa4bdc4988dc
 EBUILD netbeans-platform-8.1.ebuild 9320 SHA256 4a03fc6a399aaab949edb3df7c629da5bc7ce6288d44dbc848097352c2b4ae3a SHA512 7015cb042dd4e371cdcad49838eb2e4109d1ec505ac618f3a6f98d4dce328ab34be90a3cb0820896bd75337a180a1bd9c91c842a143fdffdf033696d5f496402 WHIRLPOOL 8c5311df396a374bf9d8c994b37c5c9fe6aa3c82a9e9e0824a5caefb0006fd9b44f4fdddd387ee12da48592929d5c4dd7e7fb2d866c9ddaf76acf5b3adbe310e
 EBUILD netbeans-platform-9999_p20160428.ebuild 9520 SHA256 43ab2d84807ce29e75b611c4aee4269e1cd2ab9bcd41220e572d68f2095280a1 SHA512 698447f4e5a9dbe05337a59966f05fe7f4bc8517dd463571b65d6ab777239191ee341fb56b1c9c1b479b3fad247c5284c3712f3b142839d930214f36d75e194b WHIRLPOOL b38abccc36b868f0f07607a2d487335d134554c44e085418dd4e15b6dbdbca18337fd1dc50729bc92e2e076210fb6be7caf1502c76e3100d4e0fdd8d56e3fe1f
@@ -57,4 +58,5 @@ EBUILD netbeans-platform-9999_p20160507.ebuild 9520 SHA256 fcfc478007eaaa9c120f6
 EBUILD netbeans-platform-9999_p20160508.ebuild 9520 SHA256 2af3567fecb758a6da54c9ee47a357e9afaa73fed0c0f264a4d7651a6cbeb8fd SHA512 881e9129a0997690c01b118cbabc24ab4a80f590c1265d1126585a0c4ed40ea71e1b4320f1b9879e38c59f18637797015ec53e0ba122bd2d9717fbf717fc4b84 WHIRLPOOL faa4a3f8a1d11445e6e8008f112d690ad5c10b7b49aa66d747aac05bc934636ec93ce13bd4c4096716b46a8231a954720c4f6f2cc6b5d334fb3e352fd935ed76
 EBUILD netbeans-platform-9999_p20160509.ebuild 9520 SHA256 2e1e0ed8a20746dcbf2db69a4ff19ba100f9d6d79b4e8a017258c8b9377bc367 SHA512 4a9b8cf87c46237d3e5eeeb733b9e054759a9f5acc2ced3a5d22f171436528b75c5e2043905c391afdfacc2b46fbb93c3d2eab8557e0a681879f604e4bb5586d WHIRLPOOL bd5c8fa8c03d11d1c9ad52ae50de51b30dab2d2e35d9f25d27844e5b97c2b06184cd46018e13d8b69b44e769399d3720511b2fbca1f17d7fb63b6a24c392fd51
 EBUILD netbeans-platform-9999_p20160510.ebuild 9520 SHA256 d4a7b7220c868433ab675486c7e702248f59f870e86a78383ae0e060a2efbb3d SHA512 1a49b99d6e5865199225dc778fdf23fb40581df367526aa4a99d78f21404d5da014450888397d73395e366c79190dc5d2dde789141e0a7fdbb941bd7cdc87039 WHIRLPOOL 24f3c407cb5becdf0fb3906bc9c9351de2f33c9a8122c5cbfe1463437becd0384d0bc04840cab98d9cd636fc9258083145bd0634f045fd8cee3667cdfa20a6bf
+EBUILD netbeans-platform-9999_p20160511.ebuild 9520 SHA256 170eaa78be86dd1debe818bc761ebfddf7989afdaeff1853e043c456beed3052 SHA512 ada83a92d17ace4ebef21aeddda270751328cb43c2e05640006a3feb985a60744b6f23139abd9e72e3184443ed2d60610bd606470c182f8cf2e18f067be59c17 WHIRLPOOL 149167d212223f905ca1acdc9fd03f2fd8d4e3ed16edb4a3877c8096a02554aa9100cf22aa00ec3cbd49f240cd10799abd175f4a823ebaa3b9d100a1c5298ccf
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160511.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160511.ebuild
new file mode 100644
index 0000000..6046a56
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20160511.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Platform"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-05-11_00-02-33/zip/netbeans-trunk-nightly-201605110002-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 8b778e9..f946d2b 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -16,6 +16,7 @@ DIST netbeans-trunk-nightly-201605070002-src.zip 213540102 SHA256 6a040f33a06dc6
 DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 DIST netbeans-trunk-nightly-201605090002-src.zip 213540102 SHA256 66971c1eef81c99ed06f84dcd00acef703867637d7d475a27fc29fdf6e6c71d0 SHA512 70dd67358e41754eb9e39769e6a2eade6a3af8893c7faaa57fb1766f189d70b12b6871a90661e1362f42a6cefe586fd618a963c4afa5487220ffa9ab8e64ade3 WHIRLPOOL 736e2d0b824d5a22b988cc687c96da61e867401ff68a835f95c2af078f563d39a4a8e713b76f7f9c50759c1e6dac2785d006d66b3ff23d71e9cefe07aabca58d
 DIST netbeans-trunk-nightly-201605100002-src.zip 213543139 SHA256 81799ceebdbc9c8614a4779961c5345676bd39a980325298b109cb3e36f85b90 SHA512 5a77c688669d44b4ad162a36153bb04a0a3ee9743b68266fc64ecce415821105e9dedadfa2d4d0a6a91702f2f4f3cf0cd239e0f71197d9e0fa343ad493f8d64d WHIRLPOOL ca281b37a4b16fb6ae9dcbbc209ad3a28d39a4743a73ad2314b0378e0c91a911c9b3235ce7e22f443cb56482ae568955b1c5d7c67058422168f0ca0ebc870e16
+DIST netbeans-trunk-nightly-201605110002-src.zip 213548255 SHA256 602c5f93b24a7212efb02eba11e61862131118057aa66799bb9cd23ae7c6e71a SHA512 e55665a6cc61259e31c9c35f75c23bfdd3b59e30cd9bc4a3edd03d5ae844f8aca3afcf09b668802406e0c2d18d1779089abd92c36c7624ad80d840713ceba8b4 WHIRLPOOL 54331cd70301fe4b4a5763a0a9af007dad396b0674799f3c755093da3bc59d3c43cbf8d5845948c6aa2bee4014e8b865cd63a16c8704dcffc268efe55caa368d
 EBUILD netbeans-profiler-8.0.2.ebuild 3402 SHA256 8021dea620d1bc26214ff0ec285f8061c24693dd28a62a97a48ac3223707e920 SHA512 2660390337a973256b1aac3a02b14e16782c230fa2714ae695213b0cabc0eb60621c6a1ae234f9e57259a19de22a87447f9a89ab846bd59bcedd2be313c35072 WHIRLPOOL 5d1053ded03143b2de05b64cfbe59b515cb786d60bfa65566be795567bfaf5feb88a2f8e7161a05da512fafd523f871778d5ddeb3c6b89fc95885096e379f65d
 EBUILD netbeans-profiler-8.1.ebuild 3426 SHA256 81f8b3b135f021a2dbe7b5ccb53fc7fcf79908ab83ef14ca0e912732b7fb4b53 SHA512 210bc0c5214aa8f79f559cccf69f1ed885dd2d14dc55cd17bd89c8a7f04f1a76de5b414426337b2ba6e99576850f0753f13e41e0f424b3f0adc58001dffc217a WHIRLPOOL 293d12a03294532dc9ce10503b030282cb636f08af6300ea796885eb6a3fe36c9d37c2a07138d03e9c4d45b31352ce160901a96f659f26d50a0fe5caee3bf0fa
 EBUILD netbeans-profiler-9999_p20160428.ebuild 3472 SHA256 c01c6eaecbc72dff72adbdd14940ae8935b207096293026b94bc2e3f620e934d SHA512 9a0cfbe6a0e5b27611f4817889d3b102ecbf07c05987b558e17013711c3f40a2239a07c340effe846d54b14bd4f4987adef4c290563bfa461e56762d99f8c2bf WHIRLPOOL 4c47981cf634b924f82b4c9b8cd2fac84006454beb9d7923757b0eb5d82512b58090245fa068f66b6760ac83681106ab659ca036907d40faf9709274a99dccaf
@@ -31,4 +32,5 @@ EBUILD netbeans-profiler-9999_p20160507.ebuild 3472 SHA256 1d67a170f04bbcd6e74c6
 EBUILD netbeans-profiler-9999_p20160508.ebuild 3472 SHA256 4ec2a490ee4bdeaeb6d9cb5d243a1bda6cd04f3f1ddc4632b4247b5356d2fe7a SHA512 09d16b0dca1ebed31c18cb71032e9173a49c9bbffd046356d7da5ee4dc51f9d364fca9bf50ba9338942dcc79022850db551d733fca977040548a03a21e026c07 WHIRLPOOL 48437ada44ee16604ee5783cc955d07e17402b19c792bc8a57f9436feedcc036469b26db985378b1845c51f37b8a2ce8c4c98c6b18dfd6d85c4ead117706bccb
 EBUILD netbeans-profiler-9999_p20160509.ebuild 3472 SHA256 8259f7253fd6bd19fbf8457cdfc5d26e15cc933e7c1347e2f4afd38a01a7bbc3 SHA512 8c082a543f42cee90077478b15bfc6b31f3d43ccf612c6499b7f3c7277b7546927e1c90724f323ef1fe5fbcf50af515234ef1fd83a7a65b3648c58029fcc88f3 WHIRLPOOL ebd0ae80bb189db4ffc4cc3503328a2715ba79596555dad86fe15b3444db9cfa0249d2332ecf68388e5d73703541401d62ec13fc844ed20fc7a836a0207cec3a
 EBUILD netbeans-profiler-9999_p20160510.ebuild 3472 SHA256 6a2f06df6cac68032fa709368f479f7904b1bf07ef13a7b18e1e8da2cd34ea6f SHA512 9ea986bf126b637f9a086d9ff8e7ea8a58ebffd39f3ead8f6ebf86cef64686f732a0e847576cde80457fe9ac6b741a004726e8970173cfc1d31f540c1f15c9b1 WHIRLPOOL db55685cfbb27298a65cd093d30f1fd4e61d0e317539e88b23cee17b4bd23ce4667e300f3e400eb16a8e1f501aea4436ce21f71b17d22d4dcd9cf2f98c4d0a74
+EBUILD netbeans-profiler-9999_p20160511.ebuild 3472 SHA256 d57d428de93905d147dc6bd767dff8a24a8b048cdb795f3e800c1bf84d9f5d9c SHA512 0ed02e2b538f5af7bb9930e36a813d5828e2b34e0749f9b944a015eeae0b7d238563edf5785c64b391e7e19c21e826c6a631f8fb9ab441b02596bd08071f0e69 WHIRLPOOL 9b0a78678df7807467557ec72ab1efb6b103d0fccd2dd673e52909b91ba128372540bf911185cf4ecd23a6c4ccf5da449a96c691af8359890528f2fc49486b9d
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160511.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160511.ebuild
new file mode 100644
index 0000000..4758196
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160511.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Profiler Cluster"
+HOMEPAGE="http://netbeans.org/projects/profiler"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-05-11_00-02-33/zip/netbeans-trunk-nightly-201605110002-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 31eb8f3..dc9ae06 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201605070002-src.zip 213540102 SHA256 6a040f33a06dc6
 DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 DIST netbeans-trunk-nightly-201605090002-src.zip 213540102 SHA256 66971c1eef81c99ed06f84dcd00acef703867637d7d475a27fc29fdf6e6c71d0 SHA512 70dd67358e41754eb9e39769e6a2eade6a3af8893c7faaa57fb1766f189d70b12b6871a90661e1362f42a6cefe586fd618a963c4afa5487220ffa9ab8e64ade3 WHIRLPOOL 736e2d0b824d5a22b988cc687c96da61e867401ff68a835f95c2af078f563d39a4a8e713b76f7f9c50759c1e6dac2785d006d66b3ff23d71e9cefe07aabca58d
 DIST netbeans-trunk-nightly-201605100002-src.zip 213543139 SHA256 81799ceebdbc9c8614a4779961c5345676bd39a980325298b109cb3e36f85b90 SHA512 5a77c688669d44b4ad162a36153bb04a0a3ee9743b68266fc64ecce415821105e9dedadfa2d4d0a6a91702f2f4f3cf0cd239e0f71197d9e0fa343ad493f8d64d WHIRLPOOL ca281b37a4b16fb6ae9dcbbc209ad3a28d39a4743a73ad2314b0378e0c91a911c9b3235ce7e22f443cb56482ae568955b1c5d7c67058422168f0ca0ebc870e16
+DIST netbeans-trunk-nightly-201605110002-src.zip 213548255 SHA256 602c5f93b24a7212efb02eba11e61862131118057aa66799bb9cd23ae7c6e71a SHA512 e55665a6cc61259e31c9c35f75c23bfdd3b59e30cd9bc4a3edd03d5ae844f8aca3afcf09b668802406e0c2d18d1779089abd92c36c7624ad80d840713ceba8b4 WHIRLPOOL 54331cd70301fe4b4a5763a0a9af007dad396b0674799f3c755093da3bc59d3c43cbf8d5845948c6aa2bee4014e8b865cd63a16c8704dcffc268efe55caa368d
 EBUILD netbeans-webcommon-8.0.2.ebuild 4723 SHA256 e2ba39cb6f22c990acf9a492eac5707f130382d56f9bc1e3636e82cbe4d61938 SHA512 61955d38f829b3ed54bc5cb9a71da07f05676a2bf7219fa8073aeee0f0e2d0e73f7aa6ec1636be39fb071d3d2b9de7ceb813a247a61961874f4cc78697d4e568 WHIRLPOOL 1a272650fc2394716a790b79cb85a9322929c7cc96ea4776cc639fb869c5b536140dbdc632b1a8aa9cb1fc8e740050125c2ebe9390de7a8f4207e88e24924206
 EBUILD netbeans-webcommon-8.1.ebuild 4945 SHA256 55c57b638481134d659763154a7820467a9866707112cba0e60dbd9ba8cd2840 SHA512 a98987535f60b533bf0df701f83693a58584dfa9a10d5c8646186165d884fb7e8a3348ec77cbf25d1a8cc8cfd947bf54cdb30d251ae1a3fffb74947070d76579 WHIRLPOOL 36fe1b7b9b34a02fcda227aaeebed8a33562e6fe4a014c78e9a464d709bf5120322a35bd54a0ffa15c4dd4f3ae605cf6fc2d35c5652f7162ae646c61ad69210a
 EBUILD netbeans-webcommon-9999_p20160428.ebuild 5343 SHA256 3b6415155ed76a64dbed48af896dcb00fde8f49f53248bd544305bd6bbe01577 SHA512 d3a549390972da7e210c839116f2a9f0607b6bef416d3169493b00b525fb7280b5fbd9d633ca23d21168303ddb16e51af92272e9296d1dd9d6ca7437dfe7e4fe WHIRLPOOL b4d34bf8241733789c989859edb61d235868465a3362488b4a28dc66c7a4b866f97cf8a1178bf92c90078514d8b102a41bfcb2d6addd44b389277e7fb1436b2d
@@ -46,4 +47,5 @@ EBUILD netbeans-webcommon-9999_p20160507.ebuild 5343 SHA256 f030bedab10f8cff97e9
 EBUILD netbeans-webcommon-9999_p20160508.ebuild 5343 SHA256 8fb9d1fbd8ccd487072f542502f11963eaa593ada43e25dc423bc07c147086a3 SHA512 ca2e204fb95fb5163aaa50efad8fb543de6ab4fb6278c8366be53e5ee733f68d36fdb699e3add7f889a055fa004af375191b4dece7c3a1085468a830c76c0a87 WHIRLPOOL 4558220e141f3e7f4e204297f264e07eee13aee6e1164914046446a4a2d377314a1ef1848e8e173fdc183706a9acdb0561d087bc0b46badcf358952b35a73d94
 EBUILD netbeans-webcommon-9999_p20160509.ebuild 5343 SHA256 26d2b3a57ab81ee140e2d00392eeee8c3e02fe0730fd73c90a1a33bad1e16b2f SHA512 0f0b9e4379035b95e01ea308c240cb800aebc4ac345340b3c8c4c2ad69c5d4a8512c85f708dcddf58c00fadda20b512ebad5cfd3a387f89b8fb24f5c1c80fab5 WHIRLPOOL 3e93ad64eda81ee987bfc513816e187f20a92f6f957ef151906238e56a5692dc3b095c25148d614e21504df81e3b42cc1d823bb610d6d53bd599851f409dda43
 EBUILD netbeans-webcommon-9999_p20160510.ebuild 5343 SHA256 94beeb871a46f2793e16c5f18ae3502fa79af0708705fbb68737188826d9139b SHA512 fb6c775d0e72fd46691852a46287c3b13ccfa4d4bd837b35f4a38b91865c757ebc463cba1ad8a388ba04c521a750e17fa841906bed6b92f569a9a69d86abd1c8 WHIRLPOOL 8fab8bcd044f72127c8587c57be069679a2f46b401ebd52217fc45036768c873519cf0d790e5122052345c55f6b202bfbbc249ebec02dc1f23b9773f2bebfa37
+EBUILD netbeans-webcommon-9999_p20160511.ebuild 5343 SHA256 bceb0c2dcdacc78d4fa11e1bf1bf36e0c88a80fd58e6a5fccebd4379fd1537c6 SHA512 58d686961da7c3360f7307b55f84e8621d65cc8fb5dd43a4319a2ae99d1c9d2b11189212accae1813b25e6040c0869296d1b269f64bd8e7bc066592d4639a7c1 WHIRLPOOL 5a54837ea2a1aa9f7180bee822e008886636037d962c0fd8a586d288714c8cb41ff1dfc015b8301d2f6dc390cc08d90543b0a401858238ab54760eaa02187dd3
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index f48379c..fb16b69 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -16,6 +16,7 @@ DIST netbeans-trunk-nightly-201605070002-src.zip 213540102 SHA256 6a040f33a06dc6
 DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 DIST netbeans-trunk-nightly-201605090002-src.zip 213540102 SHA256 66971c1eef81c99ed06f84dcd00acef703867637d7d475a27fc29fdf6e6c71d0 SHA512 70dd67358e41754eb9e39769e6a2eade6a3af8893c7faaa57fb1766f189d70b12b6871a90661e1362f42a6cefe586fd618a963c4afa5487220ffa9ab8e64ade3 WHIRLPOOL 736e2d0b824d5a22b988cc687c96da61e867401ff68a835f95c2af078f563d39a4a8e713b76f7f9c50759c1e6dac2785d006d66b3ff23d71e9cefe07aabca58d
 DIST netbeans-trunk-nightly-201605100002-src.zip 213543139 SHA256 81799ceebdbc9c8614a4779961c5345676bd39a980325298b109cb3e36f85b90 SHA512 5a77c688669d44b4ad162a36153bb04a0a3ee9743b68266fc64ecce415821105e9dedadfa2d4d0a6a91702f2f4f3cf0cd239e0f71197d9e0fa343ad493f8d64d WHIRLPOOL ca281b37a4b16fb6ae9dcbbc209ad3a28d39a4743a73ad2314b0378e0c91a911c9b3235ce7e22f443cb56482ae568955b1c5d7c67058422168f0ca0ebc870e16
+DIST netbeans-trunk-nightly-201605110002-src.zip 213548255 SHA256 602c5f93b24a7212efb02eba11e61862131118057aa66799bb9cd23ae7c6e71a SHA512 e55665a6cc61259e31c9c35f75c23bfdd3b59e30cd9bc4a3edd03d5ae844f8aca3afcf09b668802406e0c2d18d1779089abd92c36c7624ad80d840713ceba8b4 WHIRLPOOL 54331cd70301fe4b4a5763a0a9af007dad396b0674799f3c755093da3bc59d3c43cbf8d5845948c6aa2bee4014e8b865cd63a16c8704dcffc268efe55caa368d
 EBUILD netbeans-websvccommon-8.0.2.ebuild 2651 SHA256 a195b307847c466dbb5f46eb04240358ce3c92cadeecb8fda1562304de46820f SHA512 933626bd2073f58e3508180c042e237b9e61ba6f3c992cf37ea43978ac2fc972d2dcc3ef0b5c390b3867296e197ed2605c43452c98e36acf0982e7338b6d1eb7 WHIRLPOOL c3db8f0b50116d0129f50778e1961166e76601d8c165e20e73d75c91b02c8a095067e0f13e18178d849dd29adcedaeee7d3e0e62f99be592d7ce159fd6af632e
 EBUILD netbeans-websvccommon-8.1.ebuild 2675 SHA256 c9ff3d598c5f76c2b69dd5488a80c63025acc3cd0cc99321a0e84a493502df36 SHA512 89daec44b860aa8011d9e5533230f89dad7bcc50a119664122d2718db3e53501d1319ae4b27eac1d71596671e9a7c21315a641346e6cbab22edb3c7232bf5ce3 WHIRLPOOL 521521094b396c98687e2054742e4c019023045f19b01a6cc3a5f826f4cabe9448254db8b834448f3b33368c76dd667942554e1bae459c55de2c571bb5cfb4f5
 EBUILD netbeans-websvccommon-9999_p20160428.ebuild 2721 SHA256 e06e7fe1eeda962aff7fbc12e4c46d0d1b20c20c2c312ae0ce8958a832ad6055 SHA512 00b42a7ffa32ea8488086b9ab2ca09610d920ff325e640077159ad4c08418e43855aacc741d094304a891e665c46be785997cd857c0607de49955e8475369404 WHIRLPOOL 5b30492d9257888e1ca4b45e092e2c7fe7548b4160939ac8f1f32dbe625b9534a669d62727abcd80be9809071973d27ea403fb1a765665a09c21dcd112485443
@@ -31,4 +32,5 @@ EBUILD netbeans-websvccommon-9999_p20160507.ebuild 2721 SHA256 c91a2d660f20c92ff
 EBUILD netbeans-websvccommon-9999_p20160508.ebuild 2721 SHA256 90693d0cdc122c82c9865090846c4efe9d310247693749002bb4176925fe6da4 SHA512 19f49b6c7a5afd4ae1355e9e0b431346b41cbd22369743f224e715743fc5df24288579ca2eea3531612d9344e3e33d0b976b696fc777485a5f6b02ddc0f7b914 WHIRLPOOL 5bb4bf8cf213a6c5563b7c92da1b6f56568e6a8e09c030db316f68741b57f3a33d1187babfe241912dea2b8e2d357872203cd2590df733509384b94705e08cf7
 EBUILD netbeans-websvccommon-9999_p20160509.ebuild 2721 SHA256 30f1ee7d8937f1882c9f9c4022620438806f893b08135f5d83ae80366342aeee SHA512 44fdc7066c7335cb56f1f3b7d555291aa0049aada881cb4858e2209e22e4758089fbc4c91c78ce0053c70b8e37ebca011f4c67eb1c9fcef52e62df5e7f19354b WHIRLPOOL b97d0d7a680cb528337f0dbef7ab60be959f547606050b419b8bdfbf78f63189d2c3f4ad134372d2adc75c8ba7a5352b85299569c115a492938cbdd46eb443d7
 EBUILD netbeans-websvccommon-9999_p20160510.ebuild 2721 SHA256 21a38dec4e28d33543f9b6a3cd6b806512956c865d17139c7757844d6639d431 SHA512 7cdb41d1b8551acac87afb54d4f94437972e562d076a672289dc6b0eeb2db49d6db66e2a475f994e9e0d5d09e268b81f34dcfd17a76eb44ed6cdd75ac119cd91 WHIRLPOOL ecdead77d310cef99581c0edacb8179698eac73293babb5cd4917ba8ec08107aafbaf870310b65b8eaaba6abf97b343146edc76a177d8e5f94051e506796e448
+EBUILD netbeans-websvccommon-9999_p20160511.ebuild 2721 SHA256 293fcfa18f47e56012f2a962e24216acf08647fc1ce20b8564ab02c56e12a03f SHA512 c1a7334ec24aaed2d99ef4c1e55c9dbc1578ccfbea3539b273a7b9e2af7ce6a7e2fe1df477a9173a81492df7945913f6834cfb19b9775ad321d7925056c228f1 WHIRLPOOL f902524ffbdff5fa4018603288dbaaa1b029ca15b58c4980e82b3efb2af0b8542845b31c928ec6c7c90db91b63d2dafdae5432be3f03e5dcb6be6cf84380c35e
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160511.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160511.ebuild
new file mode 100644
index 0000000..1f6bc0f
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160511.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Common Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-05-11_00-02-33/zip/netbeans-trunk-nightly-201605110002-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 f5a5d69..df9f356 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -19,6 +19,7 @@ DIST netbeans-trunk-nightly-201605070002-src.zip 213540102 SHA256 6a040f33a06dc6
 DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 DIST netbeans-trunk-nightly-201605090002-src.zip 213540102 SHA256 66971c1eef81c99ed06f84dcd00acef703867637d7d475a27fc29fdf6e6c71d0 SHA512 70dd67358e41754eb9e39769e6a2eade6a3af8893c7faaa57fb1766f189d70b12b6871a90661e1362f42a6cefe586fd618a963c4afa5487220ffa9ab8e64ade3 WHIRLPOOL 736e2d0b824d5a22b988cc687c96da61e867401ff68a835f95c2af078f563d39a4a8e713b76f7f9c50759c1e6dac2785d006d66b3ff23d71e9cefe07aabca58d
 DIST netbeans-trunk-nightly-201605100002-src.zip 213543139 SHA256 81799ceebdbc9c8614a4779961c5345676bd39a980325298b109cb3e36f85b90 SHA512 5a77c688669d44b4ad162a36153bb04a0a3ee9743b68266fc64ecce415821105e9dedadfa2d4d0a6a91702f2f4f3cf0cd239e0f71197d9e0fa343ad493f8d64d WHIRLPOOL ca281b37a4b16fb6ae9dcbbc209ad3a28d39a4743a73ad2314b0378e0c91a911c9b3235ce7e22f443cb56482ae568955b1c5d7c67058422168f0ca0ebc870e16
+DIST netbeans-trunk-nightly-201605110002-src.zip 213548255 SHA256 602c5f93b24a7212efb02eba11e61862131118057aa66799bb9cd23ae7c6e71a SHA512 e55665a6cc61259e31c9c35f75c23bfdd3b59e30cd9bc4a3edd03d5ae844f8aca3afcf09b668802406e0c2d18d1779089abd92c36c7624ad80d840713ceba8b4 WHIRLPOOL 54331cd70301fe4b4a5763a0a9af007dad396b0674799f3c755093da3bc59d3c43cbf8d5845948c6aa2bee4014e8b865cd63a16c8704dcffc268efe55caa368d
 EBUILD netbeans-8.0.2.ebuild 7167 SHA256 80e31382a0ceb680c2a055dc5c78c1dce8edf32c50bbae6a1c14a2c568492519 SHA512 0ab466ca247ec953896ef0ab3b01b43ffea3a9f37e9bcdacecfc0476226d45cef35e4ddf27f2b85628d9512ed304e6cc6cfe963a5e547217d08cad400eefc4b9 WHIRLPOOL d09668e669f4f8d7987ab02cf26104fc6e54ba29b8b497fe0013cc8816a2d7560c99e6e1b02db77ead872d5240b84c09e3fabbc3465587d1d1ca7d6fcae114c1
 EBUILD netbeans-8.1.ebuild 6891 SHA256 22a19f05bdcea85475c0451df867367b69363bfbc6280f78b087248d9f8e9513 SHA512 812b6cdae3e5feaf37db5ca8b5efa1b374d5492f11cfa1df2adbd3617986cdca6a79d2d4dffd024c8c48492fc8a21704190242f5741c5699b12070620cea2c87 WHIRLPOOL baf5f750574c01effa0d02c72194139fb2757be932054f4900ceb0534607064af10f2b5b38063ff2cca34e75ab5be23d00c7e5d90d1c724339666d20f1bb10d3
 EBUILD netbeans-9999_p20160428.ebuild 6939 SHA256 1b8ffc29323b7fe1c2308f75240c295e475626a7232fe70c6a6d096adce971fa SHA512 232be1939cb9767558f9befc29f085962d978b508940a093850602dd10a4ad49e801cb526d1ced56da3654bdf31f447619ac1bab2ae4c712fe858a475baffcc7 WHIRLPOOL 2e4d5265c0870bda91523777b9ddc9383e83a81befa8a86beb9c3f99990fa3ff6a22770d621a4120f8e891e607b61300308f5f3c433446e6bd59944fad8617c7
@@ -34,4 +35,5 @@ EBUILD netbeans-9999_p20160507.ebuild 6939 SHA256 31c569e6224f070ad110658828c58f
 EBUILD netbeans-9999_p20160508.ebuild 6939 SHA256 2e50741e1ddfb89297434a83c69a769b601c45e09b997e3949c6cb8bda7ba684 SHA512 c8bbd7235c751d7cbdd95fbe8cc06aca2359200e5e169f6d3072935c521b35505215c8f617811136b1d7b1ad22c899c8aea4836f5b7d5db33a022607087f706a WHIRLPOOL 03d5ca811132b3722078021f761478deeec336e01a833746fa556751a8429c5c7b1fad004695a20b61667ab748e50772f4785a3ca1633ee71e983c99ae96f261
 EBUILD netbeans-9999_p20160509.ebuild 6939 SHA256 abe5a2962b4043176a0b26eaed49db7ece4dbec81cefa0e651b11dafa7ac80ff SHA512 6826783a09cff2b8021ed29d70b5879418b961c497fcadf2de23c461d4c46607cc9cfb3e814fdd56c006bb74153805244563383cea81627199725bdd9b1a623b WHIRLPOOL b44c82ce5fa313a24e9e86103fac7dee5f8eb517dfe663386e337c9fe3c86ecc359774d548eb64a67c428b27498245984952835658b832ba50103dfb4584ff67
 EBUILD netbeans-9999_p20160510.ebuild 6939 SHA256 a3de05224d72877b2fa7d83175e7f32ea60b26cd8e8f3002776f84b8e77e4cbc SHA512 2af928ace0e29672e58d403e703170bebbb0c187e9a230d7fa2722b9e792bee9580905d1ed5974591e7b8fad2d84fd0b459bcf9b977b0423f2fec8467cd08459 WHIRLPOOL 15810136f4d402abd54888cda84ac877f55792bf86f1ec98eba064cefc16778a2ead6729834b2a546bde66054965b8e5b233b54eba89d479fc16a63e159c3c2f
+EBUILD netbeans-9999_p20160511.ebuild 6939 SHA256 9a7ce5c0d336ebc54d0e46570bc3d39a6c33886fd6e955d9f6c3d486822f6d33 SHA512 eef8cea51bd6e267218031d9214b9c14b8a83ffa7c44f7c51033f87112eb87508f42b80fdd93224919e7634d18d0a593fea0e84395bbcb6cfade1c6863c926e9 WHIRLPOOL 52fa84c4ec21559ae3892ccad11bd1fbf390d299118b89266ff4a5e8611f7d05c8ad41b4d4942e12a270f8cb3bdc2cdac27d3b32bf36e3fb4ccfc4fe4246dc02
 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834

diff --git a/dev-util/netbeans/netbeans-9999_p20160511.ebuild b/dev-util/netbeans/netbeans-9999_p20160511.ebuild
new file mode 100644
index 0000000..21d6aca
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20160511.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-05-11_00-02-33/zip/netbeans-trunk-nightly-201605110002-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] 5+ messages in thread

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

commit:     db76b169fa95bcf3a2cd0d39d9a7d0767eb625ae
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 13 09:47:05 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Oct 13 09:47:05 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=db76b169

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.3.2

 dev-java/netbeans-apisupport/Manifest              |   3 +
 .../netbeans-apisupport-9999_p20161013.ebuild      |  99 ++++++
 dev-java/netbeans-cnd/Manifest                     |   3 +
 .../netbeans-cnd-9999_p20161013.ebuild             | 115 +++++++
 dev-java/netbeans-dlight/Manifest                  |   3 +
 .../netbeans-dlight-9999_p20161013.ebuild          |  89 +++++
 dev-java/netbeans-enterprise/Manifest              |   3 +
 .../netbeans-enterprise-9999_p20161013.ebuild      | 254 +++++++++++++++
 dev-java/netbeans-ergonomics/Manifest              |   3 +
 .../netbeans-ergonomics-9999_p20161013.ebuild      |  89 +++++
 dev-java/netbeans-extide/Manifest                  |   5 +
 .../netbeans-extide-9999_p20161013.ebuild          |  96 ++++++
 dev-java/netbeans-groovy/Manifest                  |   3 +
 .../netbeans-groovy-9999_p20161013.ebuild          |  99 ++++++
 dev-java/netbeans-harness/Manifest                 |   3 +
 .../netbeans-harness-9999_p20161013.ebuild         | 102 ++++++
 dev-java/netbeans-ide/Manifest                     |   3 +
 .../netbeans-ide-9999_p20161013.ebuild             | 362 +++++++++++++++++++++
 dev-java/netbeans-java/Manifest                    |   5 +
 .../netbeans-java-9999_p20161013.ebuild            | 268 +++++++++++++++
 dev-java/netbeans-javacard/Manifest                |   3 +
 .../netbeans-javacard-9999_p20161013.ebuild        | 122 +++++++
 dev-java/netbeans-javadoc/Manifest                 |   4 +
 .../netbeans-javadoc-9999_p20161013.ebuild         | 156 +++++++++
 dev-java/netbeans-javafx/Manifest                  |   4 +
 .../netbeans-javafx-9999_p20161013.ebuild          | 112 +++++++
 dev-java/netbeans-mobility/Manifest                |   3 +
 .../netbeans-mobility-9999_p20161013.ebuild        | 114 +++++++
 dev-java/netbeans-nb/Manifest                      |   3 +
 .../netbeans-nb/netbeans-nb-9999_p20161013.ebuild  | 116 +++++++
 dev-java/netbeans-php/Manifest                     |   3 +
 .../netbeans-php-9999_p20161013.ebuild             | 115 +++++++
 dev-java/netbeans-platform/Manifest                |   3 +
 .../netbeans-platform-9999_p20161013.ebuild        | 155 +++++++++
 dev-java/netbeans-profiler/Manifest                |   3 +
 .../netbeans-profiler-9999_p20161013.ebuild        | 109 +++++++
 dev-java/netbeans-webcommon/Manifest               |   3 +
 .../netbeans-webcommon-9999_p20161013.ebuild       | 120 +++++++
 dev-java/netbeans-websvccommon/Manifest            |   3 +
 .../netbeans-websvccommon-9999_p20161013.ebuild    |  82 +++++
 dev-util/netbeans/Manifest                         |   3 +
 dev-util/netbeans/netbeans-9999_p20161013.ebuild   | 235 +++++++++++++
 42 files changed, 3078 insertions(+)

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 22158fe..af5d3ad 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -5,6 +5,7 @@ DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296
 DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde12073116a77c1844e4ca7a071d95930b7cd7d5ac SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7 WHIRLPOOL 378db0807a616205fee2623f1c1ada6284ecfc85badb06d68e56e91fbedbc4f73af3ce6e4e8eb8bdb9504d15cf20cdc2a30d5f9cad0c72329791f1a53803ca0e
 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-201609120002-src.zip 218010356 SHA256 265ec87ec62f15d8112229caf357bb081ad75359c131a4c47545f35563136641 SHA512 644685d3172272328048eb4cb91de128541cac95fbade58364f0d8841f0ed54a2578ef24be3749b960a39097c7849f6b553ae17e9cf9082b82deff93dfd5fee5 WHIRLPOOL 048bf90567bdd58598a4cecb78289b621a93736cd78c834cf329387b59fc645778bd610df1d8e403df26e2fee72c542e4f9cab54593208c81a5c6e9edc5e991b
 DIST netbeans-trunk-nightly-201609130002-src.zip 218011897 SHA256 40cb0d7c2dba73fa2d3dcddcbc1cf6a1bef06b551cf0a5ff9d6ce9ff12ea007d SHA512 26e5b258261386437534b6b8748a69c7fb7e9332e67584de9723ff7cf9067d20e5cb6d4e86eaf0c611378be0bef9517dd563ca824499efc4f1a89056860ac856 WHIRLPOOL 3b4bd5894c4f65d638a070084267814f00819936c9e4cf7ca758eb04f5500280daf16caa36137700659c10717738d98558b9c5e090c4df82e2d9247308a1f1d3
 DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318bfe333cedd1fbd81a4c6b870e0025f9f4f3ea3d6926bc18cb1c SHA512 81af61f842b23dd51b5610d4c1f9a7113f82e4ceaee2af4a4f4392b56f38b9ec92655c1e413e9b58a808207b308dc68ea8b94c24ef636db8d8ea81275f867470 WHIRLPOOL 8cc8b87bbf8299ab97e24ee64b1d982dfb942cb60a8d8a110b38207807c05b8a7f1c2a2a4d5df52a80c12eaa9ae08440e8f7e333e6a519d83759d2b50c42d015
@@ -28,6 +29,7 @@ DIST netbeans-trunk-nightly-201610020002-src.zip 218005806 SHA256 3d0a3bfc28fa05
 DIST netbeans-trunk-nightly-201610030002-src.zip 218005806 SHA256 54f1b4f61b69379600dfa69adaee9457fd056548646d21e026dac1cb69719549 SHA512 0ae6c8ade2eeae51795d75d44394cdb1972e4113c07e5f573bdafef84ecfba76373e4f78ac1e1737a91d60c8eeb801c1c09f724a9fa99a3ab423b1f02df1e95d WHIRLPOOL ba04e61ec0d8d14aef1882aac28e0853ce0fea5ce42c3cb5ef388ae29e955634e4cdc88846836139d0e4074b87ee624c73f14cea463b706a224c706c991db044
 DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 DIST netbeans-trunk-nightly-201610070002-src.zip 218006580 SHA256 f8d583408b3219efec6b892090955f255bd087c46a05b863a2de9d341236ecf2 SHA512 aa0efd3bbdb4dc2af2570608e5e5c1dcccc1537dabf6d13f9cae9174a272da6b315e97dbfda4c63ff0ab5404be8167c41aa49dba98c9a7eadc8e09fcb2855d46 WHIRLPOOL 2b0f76c982f2badeca4889ec9326dd77f421f0de407fd28318f5ed99b99ed51a6335d49bc0e8d7ecce21f63a784adc6920fef3598caebff288ed634b50516d99
+DIST netbeans-trunk-nightly-201610130002-src.zip 218229380 SHA256 02482b39c317970c794a4eb8c331121e67aa338a278d024d2cae0dee8ede0cf3 SHA512 eb855690d48046d16a2eb22dc93de8ddbdabc2cfd3cd16901ca16a36a4071aafef9061411b32414639d4239bcbe4d609c7a935f8dd932b7c38354d283d99e0e7 WHIRLPOOL 7ec6a0f0518da70610bd762254db42b4bc60670e4ff4063e9b55f4d789ffa52d546c7f3d01d83b001cea0a5d88b9078c7699c2648e4a81b7f2cb9a56cf584157
 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
@@ -54,4 +56,5 @@ EBUILD netbeans-apisupport-9999_p20161002.ebuild 3384 SHA256 e2da1aad4287937b628
 EBUILD netbeans-apisupport-9999_p20161003.ebuild 3384 SHA256 9e77ceabebb0c169aa62216b03ceae65d805fbad643abab3149501c7fdcfe96c SHA512 d24e9501918e1ba646bfde790a3d17b9329dabf1f70b7bdfe86a4134209e09a334d8f633875710878e8e3a2537e1e8a04193338e13eb23df443a8d07fb6c4d94 WHIRLPOOL db00f4a02686ee82a180f2d3ae4dd6e11ef4d52305beb63e576d0036420fd2ba67a5fea9d9619aa593335c5f00c93707af69d9b9d3bb1f361a7bff6df2953f98
 EBUILD netbeans-apisupport-9999_p20161006.ebuild 3105 SHA256 1ac7c89afa52a654ce234f4a14a01ef76fcca77294fc566c5e98eec04aa49d0d SHA512 905708e6bd95cfe9803a8973ac66818ad3a34c8ef7f005e3e71ea12e5718fe11f89198dc97a8e2eb941c131ef1f0dea523ae48e24ccb0f4a0391f87466cf18a6 WHIRLPOOL 3b90d9028722343b51cca150ff12374bfc367b0e91eb707fbb9dc57a3a038dcaf4da82fc5ba7758a4bfb337db56c9417145a8c71b8b3a83d381e401aba5a4ddb
 EBUILD netbeans-apisupport-9999_p20161007.ebuild 3105 SHA256 a36edf281a811d8282a36be4dedb39726e5fc5f49ed7d505ea116cd60d2e0acb SHA512 3a49fe9dd7dc5e281df8fe9b3badef1fd8dfe1a7ac4f7054c243c7608b61308d191856efb52b4f5eb2ccebd81a6b46c077634c732d977bcbaa4c891c17dd90a0 WHIRLPOOL c52f950acbe4e2649740ec516ee860cd7cb258f1148306f247d155bb752f113b02503017c56d1d9a36180f9d5eab499af4773a95c9f5754a6535108435f83ecc
+EBUILD netbeans-apisupport-9999_p20161013.ebuild 3105 SHA256 de3c94a8e63c59643c81da1af892b9937ceca3a6fe647437c926ddde0787d4de SHA512 10adc98f4021c66625fb336c8312a66ecbb9cc6f610f4e8348ba9f22e2b8f40615160c68d59e20812836462f16e07f4dd44f066060c8da8c4c7533ca8494549e WHIRLPOOL 3860e5aa08da6c6aa1c7c31f12c2fa8962fb36dbac6e47c32c97132521efd9ac8d6c8d6f2879a9965efddf676e7816cc420bbdf20a9db001d0223908b03a9d39
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20161013.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20161013.ebuild
new file mode 100644
index 0000000..e16a656
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20161013.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+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-10-13_00-02-33/zip/netbeans-trunk-nightly-201610130002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r17-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 virtual/jdk:1.8 )
+	${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-r17-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r17-build.xml.patch
+
+	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
+	default
+}
+
+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 8cdc45d..1c995ba 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -17,6 +17,7 @@ DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296
 DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde12073116a77c1844e4ca7a071d95930b7cd7d5ac SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7 WHIRLPOOL 378db0807a616205fee2623f1c1ada6284ecfc85badb06d68e56e91fbedbc4f73af3ce6e4e8eb8bdb9504d15cf20cdc2a30d5f9cad0c72329791f1a53803ca0e
 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-201609120002-src.zip 218010356 SHA256 265ec87ec62f15d8112229caf357bb081ad75359c131a4c47545f35563136641 SHA512 644685d3172272328048eb4cb91de128541cac95fbade58364f0d8841f0ed54a2578ef24be3749b960a39097c7849f6b553ae17e9cf9082b82deff93dfd5fee5 WHIRLPOOL 048bf90567bdd58598a4cecb78289b621a93736cd78c834cf329387b59fc645778bd610df1d8e403df26e2fee72c542e4f9cab54593208c81a5c6e9edc5e991b
 DIST netbeans-trunk-nightly-201609130002-src.zip 218011897 SHA256 40cb0d7c2dba73fa2d3dcddcbc1cf6a1bef06b551cf0a5ff9d6ce9ff12ea007d SHA512 26e5b258261386437534b6b8748a69c7fb7e9332e67584de9723ff7cf9067d20e5cb6d4e86eaf0c611378be0bef9517dd563ca824499efc4f1a89056860ac856 WHIRLPOOL 3b4bd5894c4f65d638a070084267814f00819936c9e4cf7ca758eb04f5500280daf16caa36137700659c10717738d98558b9c5e090c4df82e2d9247308a1f1d3
 DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318bfe333cedd1fbd81a4c6b870e0025f9f4f3ea3d6926bc18cb1c SHA512 81af61f842b23dd51b5610d4c1f9a7113f82e4ceaee2af4a4f4392b56f38b9ec92655c1e413e9b58a808207b308dc68ea8b94c24ef636db8d8ea81275f867470 WHIRLPOOL 8cc8b87bbf8299ab97e24ee64b1d982dfb942cb60a8d8a110b38207807c05b8a7f1c2a2a4d5df52a80c12eaa9ae08440e8f7e333e6a519d83759d2b50c42d015
@@ -40,6 +41,7 @@ DIST netbeans-trunk-nightly-201610020002-src.zip 218005806 SHA256 3d0a3bfc28fa05
 DIST netbeans-trunk-nightly-201610030002-src.zip 218005806 SHA256 54f1b4f61b69379600dfa69adaee9457fd056548646d21e026dac1cb69719549 SHA512 0ae6c8ade2eeae51795d75d44394cdb1972e4113c07e5f573bdafef84ecfba76373e4f78ac1e1737a91d60c8eeb801c1c09f724a9fa99a3ab423b1f02df1e95d WHIRLPOOL ba04e61ec0d8d14aef1882aac28e0853ce0fea5ce42c3cb5ef388ae29e955634e4cdc88846836139d0e4074b87ee624c73f14cea463b706a224c706c991db044
 DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 DIST netbeans-trunk-nightly-201610070002-src.zip 218006580 SHA256 f8d583408b3219efec6b892090955f255bd087c46a05b863a2de9d341236ecf2 SHA512 aa0efd3bbdb4dc2af2570608e5e5c1dcccc1537dabf6d13f9cae9174a272da6b315e97dbfda4c63ff0ab5404be8167c41aa49dba98c9a7eadc8e09fcb2855d46 WHIRLPOOL 2b0f76c982f2badeca4889ec9326dd77f421f0de407fd28318f5ed99b99ed51a6335d49bc0e8d7ecce21f63a784adc6920fef3598caebff288ed634b50516d99
+DIST netbeans-trunk-nightly-201610130002-src.zip 218229380 SHA256 02482b39c317970c794a4eb8c331121e67aa338a278d024d2cae0dee8ede0cf3 SHA512 eb855690d48046d16a2eb22dc93de8ddbdabc2cfd3cd16901ca16a36a4071aafef9061411b32414639d4239bcbe4d609c7a935f8dd932b7c38354d283d99e0e7 WHIRLPOOL 7ec6a0f0518da70610bd762254db42b4bc60670e4ff4063e9b55f4d789ffa52d546c7f3d01d83b001cea0a5d88b9078c7699c2648e4a81b7f2cb9a56cf584157
 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
@@ -66,4 +68,5 @@ EBUILD netbeans-cnd-9999_p20161002.ebuild 4790 SHA256 389611c5d219e189f0373735af
 EBUILD netbeans-cnd-9999_p20161003.ebuild 4790 SHA256 416cabb95417c2eb0bb823cbd45455e78dc60e706cd17f531059c2e719aa8f64 SHA512 414cf06c313e32624fe4f6e6f18037c29b698bd7fda1ff34352316fcd849e223d1da7490392b275a1243239cf267791cd96a031f9eae4215913646879081a459 WHIRLPOOL 7ac3f6abd54e0e7e087d15788d9fb1937daa5aef23631a9746dfbf6d770870867c473c18a044634ed4b1e260daf46ff300208d205c14949efbdc5dcc61d1ad0a
 EBUILD netbeans-cnd-9999_p20161006.ebuild 4511 SHA256 83075be1bd13fc71c0d1cb9bce7e5fdb0e4c554bac1e6348c47ed5f78d969045 SHA512 3df147c827a4ec82e3079aa31b1cc1eec7edf1b50c88b089d5f7ee2b8b6023ca291ac644295fcea5ab5831d13a7f1ab2fce8a751a7cb49247c2d0765bc8dda24 WHIRLPOOL 072c7593db0c3e659bbae13846f50e220de5b35ba19aea43e853bf608ced84600d96e824ed9cbb87e4ce86b50de375e332999d794abd1034bb7121e588162de2
 EBUILD netbeans-cnd-9999_p20161007.ebuild 4511 SHA256 c8ef1758fbfa7c8561301b8155a3c5258e062e50db74f2198e42a4a0d563355b SHA512 179cd0c08ebf52b43ce06de9dfbbb8a31737f7c8d5796bfba522160ef9c6cfc3dba4dbc5bac5a1685fb3bdf5ddd8be94c51f8ca57ff1eba0a3dc36e658485a83 WHIRLPOOL d93065a708bf7aa9cdc34bc79e69438a5bc07af5d843039c71b4b5ce918f76d780786d95ec05a5a7f89cd1af2739c08cf871027584487181ecacc7135c2cf115
+EBUILD netbeans-cnd-9999_p20161013.ebuild 4516 SHA256 7500674d16fc7ade5ce8a912e58383326d88244089b3b26b42fb6076c941e3a9 SHA512 c5f87a67ec4158c4e1a2f3b4e648f5e20ccc88849fb145dd4ced568269a7ea377e3747668e4182d09709ebd791a14eb6b96e806ae8052872d824e8980891733c WHIRLPOOL ba0a86efbfafad2affe66a45a5f9a2ffce984fac98211b9dafbbf98634efca243d096964790e10e7f0bace53c0ee9ca8fde1125a2cdaed3ee72c1889d7d02a4a
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20161013.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20161013.ebuild
new file mode 100644
index 0000000..fc6d26a
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20161013.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+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-10-13_00-02-33/zip/netbeans-trunk-nightly-201610130002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r17-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/F20EEEDF4FE6B93B180387576FB780EED9F79C66-clank_0.3.9.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:4
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND="|| ( virtual/jdk:1.7 virtual/jdk:1.8 )
+	${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-r17-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}"/F20EEEDF4FE6B93B180387576FB780EED9F79C66-clank_0.3.9.zip libs.clank/external/clank_0.3.9.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-r17-build.xml.patch
+
+	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-4 jna.jar jna-4.2.2-stripped.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
+	default
+}
+
+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 d1641d1..1195af0 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -9,6 +9,7 @@ DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296
 DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde12073116a77c1844e4ca7a071d95930b7cd7d5ac SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7 WHIRLPOOL 378db0807a616205fee2623f1c1ada6284ecfc85badb06d68e56e91fbedbc4f73af3ce6e4e8eb8bdb9504d15cf20cdc2a30d5f9cad0c72329791f1a53803ca0e
 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-201609120002-src.zip 218010356 SHA256 265ec87ec62f15d8112229caf357bb081ad75359c131a4c47545f35563136641 SHA512 644685d3172272328048eb4cb91de128541cac95fbade58364f0d8841f0ed54a2578ef24be3749b960a39097c7849f6b553ae17e9cf9082b82deff93dfd5fee5 WHIRLPOOL 048bf90567bdd58598a4cecb78289b621a93736cd78c834cf329387b59fc645778bd610df1d8e403df26e2fee72c542e4f9cab54593208c81a5c6e9edc5e991b
 DIST netbeans-trunk-nightly-201609130002-src.zip 218011897 SHA256 40cb0d7c2dba73fa2d3dcddcbc1cf6a1bef06b551cf0a5ff9d6ce9ff12ea007d SHA512 26e5b258261386437534b6b8748a69c7fb7e9332e67584de9723ff7cf9067d20e5cb6d4e86eaf0c611378be0bef9517dd563ca824499efc4f1a89056860ac856 WHIRLPOOL 3b4bd5894c4f65d638a070084267814f00819936c9e4cf7ca758eb04f5500280daf16caa36137700659c10717738d98558b9c5e090c4df82e2d9247308a1f1d3
 DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318bfe333cedd1fbd81a4c6b870e0025f9f4f3ea3d6926bc18cb1c SHA512 81af61f842b23dd51b5610d4c1f9a7113f82e4ceaee2af4a4f4392b56f38b9ec92655c1e413e9b58a808207b308dc68ea8b94c24ef636db8d8ea81275f867470 WHIRLPOOL 8cc8b87bbf8299ab97e24ee64b1d982dfb942cb60a8d8a110b38207807c05b8a7f1c2a2a4d5df52a80c12eaa9ae08440e8f7e333e6a519d83759d2b50c42d015
@@ -32,6 +33,7 @@ DIST netbeans-trunk-nightly-201610020002-src.zip 218005806 SHA256 3d0a3bfc28fa05
 DIST netbeans-trunk-nightly-201610030002-src.zip 218005806 SHA256 54f1b4f61b69379600dfa69adaee9457fd056548646d21e026dac1cb69719549 SHA512 0ae6c8ade2eeae51795d75d44394cdb1972e4113c07e5f573bdafef84ecfba76373e4f78ac1e1737a91d60c8eeb801c1c09f724a9fa99a3ab423b1f02df1e95d WHIRLPOOL ba04e61ec0d8d14aef1882aac28e0853ce0fea5ce42c3cb5ef388ae29e955634e4cdc88846836139d0e4074b87ee624c73f14cea463b706a224c706c991db044
 DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 DIST netbeans-trunk-nightly-201610070002-src.zip 218006580 SHA256 f8d583408b3219efec6b892090955f255bd087c46a05b863a2de9d341236ecf2 SHA512 aa0efd3bbdb4dc2af2570608e5e5c1dcccc1537dabf6d13f9cae9174a272da6b315e97dbfda4c63ff0ab5404be8167c41aa49dba98c9a7eadc8e09fcb2855d46 WHIRLPOOL 2b0f76c982f2badeca4889ec9326dd77f421f0de407fd28318f5ed99b99ed51a6335d49bc0e8d7ecce21f63a784adc6920fef3598caebff288ed634b50516d99
+DIST netbeans-trunk-nightly-201610130002-src.zip 218229380 SHA256 02482b39c317970c794a4eb8c331121e67aa338a278d024d2cae0dee8ede0cf3 SHA512 eb855690d48046d16a2eb22dc93de8ddbdabc2cfd3cd16901ca16a36a4071aafef9061411b32414639d4239bcbe4d609c7a935f8dd932b7c38354d283d99e0e7 WHIRLPOOL 7ec6a0f0518da70610bd762254db42b4bc60670e4ff4063e9b55f4d789ffa52d546c7f3d01d83b001cea0a5d88b9078c7699c2648e4a81b7f2cb9a56cf584157
 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
@@ -58,4 +60,5 @@ EBUILD netbeans-dlight-9999_p20161002.ebuild 2968 SHA256 c7f0d6ad80262e4e0177b4f
 EBUILD netbeans-dlight-9999_p20161003.ebuild 2968 SHA256 bf06c77423e570c1d3acc50bb1cae4c7468bff369cd3d9ef8c558dc2300a8365 SHA512 e44f6286ce76286c0e9e75d7117dcba739b81d9dbf7c0f775dcd635279e2ac345cda42ae97f4ab7a289e9ed62f1dee9a0d46e292a3ab8ee01e1e4bf945c8ccb9 WHIRLPOOL 704da522ab9c0ea87487784aeabfb04e1b365f4548b429bb7e55d8670ba718f89678524886b4ee3cfbf1c6cfc2f35a8f86bf5117602cf16f86d4f253ffe38fa4
 EBUILD netbeans-dlight-9999_p20161006.ebuild 2689 SHA256 12b67c54e0bcbc6877763416f87d93b5b28337c4abf3180d5391cc945c4a8dbe SHA512 d05ccb2529066755ca7188cef251e840ff25e192ce9b6ff80115e7497e10e6f1bdd272c8338b5f855557d3e7251de6d04cc48d58cf82281365ab0857dcea4f9c WHIRLPOOL 4b9c71d2cc0718e2bf8b506b6167acf6d54c7cac485d21b9faac9cb680f1b7e89ea033058e13a8d6c45e4bfcaf27036d6c45d273826e53b17f4b04e4198df89c
 EBUILD netbeans-dlight-9999_p20161007.ebuild 2689 SHA256 08119420af006c1983abfec8c7e5af1020e690ec729013337bf9d354cd55c497 SHA512 c2f9aff8a171bc623f99f781ea604b724393f5f4ee995dec0bf6eec9f292737854670b41fd5ae234f6bf08e642080201eb42d8fa2efd6938c58b9019e01564d3 WHIRLPOOL 7c9f321fd30d17d592c7ddcbf9cd6ba8f75fdced9ace2df2f7f29cfadb6da2ef12c81f7ab14c253ed99480ae1e1dce17c9adeae907e5d49eb556984dc03c903e
+EBUILD netbeans-dlight-9999_p20161013.ebuild 2689 SHA256 18de8686b947c9c8d0edf9152668736334a74e7e6d0885258b2aa6a1df7a69f2 SHA512 49fd7f79afc13dfc03f1932fd0978183328a6dca521fd7567d186294809de3836b068d687291ea18467219ab4c48c28e822b502f49a62817096c1759f75a83e8 WHIRLPOOL 77fee81693fb76031012e12e60e2e6f80a40fbd4353802d500cbe90b7dbf612b94a5ac6853a02e6e207262091664e415f3afe4007137fc7a51447c055abc3f5b
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20161013.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20161013.ebuild
new file mode 100644
index 0000000..559a9d5
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20161013.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+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-10-13_00-02-33/zip/netbeans-trunk-nightly-201610130002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r17-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 virtual/jdk:1.8 )
+	${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-r17-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-r17-build.xml.patch
+
+	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
+	default
+}
+
+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 6fa53d5..c1e3735 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -37,6 +37,7 @@ DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296
 DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde12073116a77c1844e4ca7a071d95930b7cd7d5ac SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7 WHIRLPOOL 378db0807a616205fee2623f1c1ada6284ecfc85badb06d68e56e91fbedbc4f73af3ce6e4e8eb8bdb9504d15cf20cdc2a30d5f9cad0c72329791f1a53803ca0e
 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-201609120002-src.zip 218010356 SHA256 265ec87ec62f15d8112229caf357bb081ad75359c131a4c47545f35563136641 SHA512 644685d3172272328048eb4cb91de128541cac95fbade58364f0d8841f0ed54a2578ef24be3749b960a39097c7849f6b553ae17e9cf9082b82deff93dfd5fee5 WHIRLPOOL 048bf90567bdd58598a4cecb78289b621a93736cd78c834cf329387b59fc645778bd610df1d8e403df26e2fee72c542e4f9cab54593208c81a5c6e9edc5e991b
 DIST netbeans-trunk-nightly-201609130002-src.zip 218011897 SHA256 40cb0d7c2dba73fa2d3dcddcbc1cf6a1bef06b551cf0a5ff9d6ce9ff12ea007d SHA512 26e5b258261386437534b6b8748a69c7fb7e9332e67584de9723ff7cf9067d20e5cb6d4e86eaf0c611378be0bef9517dd563ca824499efc4f1a89056860ac856 WHIRLPOOL 3b4bd5894c4f65d638a070084267814f00819936c9e4cf7ca758eb04f5500280daf16caa36137700659c10717738d98558b9c5e090c4df82e2d9247308a1f1d3
 DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318bfe333cedd1fbd81a4c6b870e0025f9f4f3ea3d6926bc18cb1c SHA512 81af61f842b23dd51b5610d4c1f9a7113f82e4ceaee2af4a4f4392b56f38b9ec92655c1e413e9b58a808207b308dc68ea8b94c24ef636db8d8ea81275f867470 WHIRLPOOL 8cc8b87bbf8299ab97e24ee64b1d982dfb942cb60a8d8a110b38207807c05b8a7f1c2a2a4d5df52a80c12eaa9ae08440e8f7e333e6a519d83759d2b50c42d015
@@ -60,6 +61,7 @@ DIST netbeans-trunk-nightly-201610020002-src.zip 218005806 SHA256 3d0a3bfc28fa05
 DIST netbeans-trunk-nightly-201610030002-src.zip 218005806 SHA256 54f1b4f61b69379600dfa69adaee9457fd056548646d21e026dac1cb69719549 SHA512 0ae6c8ade2eeae51795d75d44394cdb1972e4113c07e5f573bdafef84ecfba76373e4f78ac1e1737a91d60c8eeb801c1c09f724a9fa99a3ab423b1f02df1e95d WHIRLPOOL ba04e61ec0d8d14aef1882aac28e0853ce0fea5ce42c3cb5ef388ae29e955634e4cdc88846836139d0e4074b87ee624c73f14cea463b706a224c706c991db044
 DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 DIST netbeans-trunk-nightly-201610070002-src.zip 218006580 SHA256 f8d583408b3219efec6b892090955f255bd087c46a05b863a2de9d341236ecf2 SHA512 aa0efd3bbdb4dc2af2570608e5e5c1dcccc1537dabf6d13f9cae9174a272da6b315e97dbfda4c63ff0ab5404be8167c41aa49dba98c9a7eadc8e09fcb2855d46 WHIRLPOOL 2b0f76c982f2badeca4889ec9326dd77f421f0de407fd28318f5ed99b99ed51a6335d49bc0e8d7ecce21f63a784adc6920fef3598caebff288ed634b50516d99
+DIST netbeans-trunk-nightly-201610130002-src.zip 218229380 SHA256 02482b39c317970c794a4eb8c331121e67aa338a278d024d2cae0dee8ede0cf3 SHA512 eb855690d48046d16a2eb22dc93de8ddbdabc2cfd3cd16901ca16a36a4071aafef9061411b32414639d4239bcbe4d609c7a935f8dd932b7c38354d283d99e0e7 WHIRLPOOL 7ec6a0f0518da70610bd762254db42b4bc60670e4ff4063e9b55f4d789ffa52d546c7f3d01d83b001cea0a5d88b9078c7699c2648e4a81b7f2cb9a56cf584157
 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
@@ -86,4 +88,5 @@ EBUILD netbeans-enterprise-9999_p20161002.ebuild 15825 SHA256 e8a8200283468f0bb5
 EBUILD netbeans-enterprise-9999_p20161003.ebuild 15825 SHA256 42bcfd5ec2a21dcadf1395f0a33fd028cc49ef32a257a70bee46acb9ff00626a SHA512 e963a2454765f255d950abc19d763fe9999da4a7241dbd3ecd52a42d860375fe4277e7f52d2c91f4847f1b4f73fbd89b569c4870d05a754eee6d519aabe33f3f WHIRLPOOL dac8b9c38701083823f37166760f501857c12f3e5dc62bd7f5181b9f9fe259d015ed0d65935dae4f62b71147208d6207c8c3e5375682b73870ef8099f9539437
 EBUILD netbeans-enterprise-9999_p20161006.ebuild 15546 SHA256 925bedd046d59eaddb0b9eab21776812db9ac00a713c4032b0576458be354333 SHA512 81928edf65a13ec6a85c850f24e2a0d188e5a23f5ec3b0c5a0d99e57602318ff97439b52be71be9eb2c6f09d3bd2c2589b2a9d5fd19a09ede61e5beea45e7eeb WHIRLPOOL f8649e41faae0349164e336ee35377e58da8ca23df4326b016d319676f644fa598050aa79e06dc2746392a20b5dae857dbeab4083bb8a2fcb0df238fd1b72111
 EBUILD netbeans-enterprise-9999_p20161007.ebuild 15546 SHA256 d5fbbc626abdc252d24e123a5d226c4ee05a06180bfdf616186297d0165b49e2 SHA512 ee6bcf6fcfcacd6a3c332535b3232b5be548aaef4f8baa19fab512f518b1033526dcdd78ade88ced80a32d331d7c6cbe7959abfad4a61a19f32b6d3379833039 WHIRLPOOL 10a98487c1cf69c94f1d92ddda0b1334ababe770f173e417f289fe8967b1d2404ca8f4b10b783b5d1ae73d0f75f8e9ee0c88568e359a467930b593a88893fc89
+EBUILD netbeans-enterprise-9999_p20161013.ebuild 15546 SHA256 85201d48de2836f536ab236fee55c0be144fb2809cbf9817f5e410ecd3d9a550 SHA512 1a2626749d80ae14114a7556ff2dd74b1d7597e990321f7efbcad669c5cb1bf8a53bb85ced2cb1149c17daa0ae525633652294348639c69191e92adef82d8701 WHIRLPOOL 9dd0afd6abf9bcd415bd68f9a787dda3dac50b820cdc143e7bdb94467084c1828f3b0140ca55da71640768a88c1a59d13e230f209932a251b573a31e8845fd4c
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20161013.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20161013.ebuild
new file mode 100644
index 0000000..328b534
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20161013.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+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-10-13_00-02-33/zip/netbeans-trunk-nightly-201610130002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r17-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 virtual/jdk:1.8 )
+	${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-r17-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-r17-build.xml.patch
+
+	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
+	default
+}
+
+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 e609c99..c98643d 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -5,6 +5,7 @@ DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296
 DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde12073116a77c1844e4ca7a071d95930b7cd7d5ac SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7 WHIRLPOOL 378db0807a616205fee2623f1c1ada6284ecfc85badb06d68e56e91fbedbc4f73af3ce6e4e8eb8bdb9504d15cf20cdc2a30d5f9cad0c72329791f1a53803ca0e
 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-201609120002-src.zip 218010356 SHA256 265ec87ec62f15d8112229caf357bb081ad75359c131a4c47545f35563136641 SHA512 644685d3172272328048eb4cb91de128541cac95fbade58364f0d8841f0ed54a2578ef24be3749b960a39097c7849f6b553ae17e9cf9082b82deff93dfd5fee5 WHIRLPOOL 048bf90567bdd58598a4cecb78289b621a93736cd78c834cf329387b59fc645778bd610df1d8e403df26e2fee72c542e4f9cab54593208c81a5c6e9edc5e991b
 DIST netbeans-trunk-nightly-201609130002-src.zip 218011897 SHA256 40cb0d7c2dba73fa2d3dcddcbc1cf6a1bef06b551cf0a5ff9d6ce9ff12ea007d SHA512 26e5b258261386437534b6b8748a69c7fb7e9332e67584de9723ff7cf9067d20e5cb6d4e86eaf0c611378be0bef9517dd563ca824499efc4f1a89056860ac856 WHIRLPOOL 3b4bd5894c4f65d638a070084267814f00819936c9e4cf7ca758eb04f5500280daf16caa36137700659c10717738d98558b9c5e090c4df82e2d9247308a1f1d3
 DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318bfe333cedd1fbd81a4c6b870e0025f9f4f3ea3d6926bc18cb1c SHA512 81af61f842b23dd51b5610d4c1f9a7113f82e4ceaee2af4a4f4392b56f38b9ec92655c1e413e9b58a808207b308dc68ea8b94c24ef636db8d8ea81275f867470 WHIRLPOOL 8cc8b87bbf8299ab97e24ee64b1d982dfb942cb60a8d8a110b38207807c05b8a7f1c2a2a4d5df52a80c12eaa9ae08440e8f7e333e6a519d83759d2b50c42d015
@@ -28,6 +29,7 @@ DIST netbeans-trunk-nightly-201610020002-src.zip 218005806 SHA256 3d0a3bfc28fa05
 DIST netbeans-trunk-nightly-201610030002-src.zip 218005806 SHA256 54f1b4f61b69379600dfa69adaee9457fd056548646d21e026dac1cb69719549 SHA512 0ae6c8ade2eeae51795d75d44394cdb1972e4113c07e5f573bdafef84ecfba76373e4f78ac1e1737a91d60c8eeb801c1c09f724a9fa99a3ab423b1f02df1e95d WHIRLPOOL ba04e61ec0d8d14aef1882aac28e0853ce0fea5ce42c3cb5ef388ae29e955634e4cdc88846836139d0e4074b87ee624c73f14cea463b706a224c706c991db044
 DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 DIST netbeans-trunk-nightly-201610070002-src.zip 218006580 SHA256 f8d583408b3219efec6b892090955f255bd087c46a05b863a2de9d341236ecf2 SHA512 aa0efd3bbdb4dc2af2570608e5e5c1dcccc1537dabf6d13f9cae9174a272da6b315e97dbfda4c63ff0ab5404be8167c41aa49dba98c9a7eadc8e09fcb2855d46 WHIRLPOOL 2b0f76c982f2badeca4889ec9326dd77f421f0de407fd28318f5ed99b99ed51a6335d49bc0e8d7ecce21f63a784adc6920fef3598caebff288ed634b50516d99
+DIST netbeans-trunk-nightly-201610130002-src.zip 218229380 SHA256 02482b39c317970c794a4eb8c331121e67aa338a278d024d2cae0dee8ede0cf3 SHA512 eb855690d48046d16a2eb22dc93de8ddbdabc2cfd3cd16901ca16a36a4071aafef9061411b32414639d4239bcbe4d609c7a935f8dd932b7c38354d283d99e0e7 WHIRLPOOL 7ec6a0f0518da70610bd762254db42b4bc60670e4ff4063e9b55f4d789ffa52d546c7f3d01d83b001cea0a5d88b9078c7699c2648e4a81b7f2cb9a56cf584157
 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
@@ -54,4 +56,5 @@ EBUILD netbeans-ergonomics-9999_p20161002.ebuild 2913 SHA256 736b76ca1a024592d2b
 EBUILD netbeans-ergonomics-9999_p20161003.ebuild 2913 SHA256 e27bf86a550db668abab4d95f6926c7dc6b08b8ff3380931bbf263c4ff85c191 SHA512 157739cf7c26bd244928a723f6ddbf2c01d8a165c0d1aa1d0a5b3ec7b38e4ae0b4dc9f7cdeda26edd0b75db89e16e3f85b1fa0acdf2e90f750395e5b25f226a2 WHIRLPOOL 667461b64f1ac79640470e8e44c146cd4260b6e0cad76ad703ea74e681b415b32976986aed446b4408ff1769d9f6829f85f5f94121ff46734660200fc17b98da
 EBUILD netbeans-ergonomics-9999_p20161006.ebuild 2634 SHA256 bcf311d8f3a1f5d7eba689ce02a9d926f4ae362d8adcd0dd1c6733da9936ddb5 SHA512 abc40268f926164154ed0265e5c06a2697fb323f8891ea259419457fea7cf86a2144705c9e95179b485c5280aba5712d1149f66490fc746849886a499f71d23d WHIRLPOOL 9dba8e24fcfa701b3b6741e5f06070244a382ad07149c21ca8b37e87c16c5611e7ed841703956cf16fac0f8c980c465d599b17207a43d861bffeb9acb69983cc
 EBUILD netbeans-ergonomics-9999_p20161007.ebuild 2634 SHA256 3dac8961f3df4ab05e2c3e6c86284289916518f11f35761eb579f4855b41e47d SHA512 4439ef1d6fa243272ffa13bcd9334d28705133834b5382513bca8687f668fd25d84dbbf3c209305c5184fc4831797d3ccbfc9e99d28890209186dfafe4af6fc7 WHIRLPOOL 19020acba766cb56adfbbfcad7efa5f647d8ba7f0b96bfd7dd3685a61472b3926d200b605a223072e98ab13906f1e4704bbe98217e31893631a6e0f9ccf84532
+EBUILD netbeans-ergonomics-9999_p20161013.ebuild 2634 SHA256 7817bfc604597eda7d61c69958158ee2e8dc6b44916f38f430fa6af336224f17 SHA512 d71fae0600fddfe1deee0e0c9b914a510dfbdc6204fadd20734863bedb749f0d4c26297abe03dc1b2bba3e2a969e48f0f348be139b3490360b25c5d19fe015ab WHIRLPOOL 7f64e3f0829a0472655c08d60d6a1e274f9b42ec1d424602f816f7d74fa8c4beb3fec929c8421f4a87f7ee5d56672902c56e7f87fe2ca1c1fea2735505d1d664
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20161013.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20161013.ebuild
new file mode 100644
index 0000000..d4ab907
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20161013.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+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-10-13_00-02-33/zip/netbeans-trunk-nightly-201610130002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r17-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 virtual/jdk:1.8 )
+	${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-r17-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r17-build.xml.patch
+
+	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
+	default
+}
+
+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 63720dc..4f019c9 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -1,5 +1,7 @@
 DIST 22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip 2318445 SHA256 9d251f217f0f39c098d4fa576d77c720f8039b43becb15d88912d9c3fdcd2c3e SHA512 c696b7984a663257210b03bb9a7d4a8da8a53d7e727de068558380b14c0f17aefe8cfe310c0b96f277010756b277f500629db3c9d9a1fcf38f5113708d8dbd34 WHIRLPOOL a8e55e84ee661eb951dec065cf0f2ac6f19720a30bbe8432c95a56d531fdd2bb48a8359946fc8a1bc8d789a568bfed87bcdee04efdc86be58a518434616d6641
 DIST 545E2B7AB1BD579CC76E3836055877982C5CD0C6-ant-misc-1.9.7.zip 99139 SHA256 5d01703f77b598b0bc1fa026d6f48b7364457afe441c997b39c3969fedc078e9 SHA512 045d0bf82a498b7b222fca4cdf826443f2507f2594d857296b57e16f1475e6b892bfd8d21720a5d25a65d09e6b7bf8f051abca9ce55f030c748d0ad46cbfd7f7 WHIRLPOOL 06ab1ed1ca736eb6fefc47287a0b4140b980d3767bdaf719a32501d3cba876fc6c9d03c8822a3e5b67e5fbd02d6ebb19d360f666d1856087ce48408f8774a08d
+DIST 63D41674237D4EB5ED1C41D23EBBFD410615F566-ant-misc-1.10.0alpha.zip 99984 SHA256 0b74874a101daa85e52c9d7f8a9067294184329967da92e898f63841f946240a SHA512 87cc5c83d606e0afc56afa09cc6e8f273721935483562a5cac8a0fe9b0db508b078e157e53b020b0e8e071b4d984b4d5271c3e5785e2381717d5765d1a5f8da0 WHIRLPOOL d6e1368f313ab7a89371f994495f5c5bae6c107fa75a484dd157b1bb46bd785f014050854980c4e128becb190645f39edda8ae8df94fb7be243d331cc10890ac
+DIST 7B38E2908FFD70F2AB580D21A9E688A78C6365E7-ant-libs-1.10.0alpha.zip 2473000 SHA256 0df76dcab01c826a9a9fc0120ba1d00f0c2cff4a4c1489af9fbbd50dd7da0394 SHA512 9dc6ab83466e75be4c2e56dba645c84fb15c80d19edf445c23de308cd226f40fcd51918e4ed65a32517232417bb414a2b581954f12615e9ea5908a861e47bdba WHIRLPOOL bf20a7e14265f8bdd4abda261d3986d3295da751b99cdc7e999959cc6a20a93a10d1fb358926459ceb036d326009b8d283808e47a496420ae3b069bc63f82f2a
 DIST 95CCE237B1E9390FBED0440B601822813DB220E6-ant-misc-1.9.4.zip 95179 SHA256 040359927e4e0e77f28649de1618a5170200c31b00b5f4ac53fb5a06dfeee886 SHA512 977c9cd7c91c3ccce4d8bd9bafe6302c99bae2bc8e53ab1776602ba1e61770ac1a68c1109aeb6d609126a1916b3f4d961d2574a7d6b8a280262878e022c5edb5 WHIRLPOOL e1671f868a0da75d31408e1a91ebeaaa4ed03f40bc2a8040ba8e5d4b1ffe0dc71e2874d96240df0d0c9170bd0f12fca25a565504ba91462422f9f4de65a51208
 DIST BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip 2341753 SHA256 d643c2f579f13c9a4220df6243e2669349f7fd52ef10595aa7602af558067c8f SHA512 024b1458f74ae977f5864b543b39417205203f27ff94518aa61ee4c7336c887dc5704b71909fd2b6286c3a29a9ee0aeb86aafc32f741c7650adcacc8374f62ca WHIRLPOOL 6843d000325f46cbf6c3fa9c5b09ea37785c6bb7ad3f8438d186e60ea96822325e2f5a22485653f0e242afb1d8fcac5804d629cd549d6a07b319996f4ec822c7
 DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
@@ -9,6 +11,7 @@ DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296
 DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde12073116a77c1844e4ca7a071d95930b7cd7d5ac SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7 WHIRLPOOL 378db0807a616205fee2623f1c1ada6284ecfc85badb06d68e56e91fbedbc4f73af3ce6e4e8eb8bdb9504d15cf20cdc2a30d5f9cad0c72329791f1a53803ca0e
 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-201609120002-src.zip 218010356 SHA256 265ec87ec62f15d8112229caf357bb081ad75359c131a4c47545f35563136641 SHA512 644685d3172272328048eb4cb91de128541cac95fbade58364f0d8841f0ed54a2578ef24be3749b960a39097c7849f6b553ae17e9cf9082b82deff93dfd5fee5 WHIRLPOOL 048bf90567bdd58598a4cecb78289b621a93736cd78c834cf329387b59fc645778bd610df1d8e403df26e2fee72c542e4f9cab54593208c81a5c6e9edc5e991b
 DIST netbeans-trunk-nightly-201609130002-src.zip 218011897 SHA256 40cb0d7c2dba73fa2d3dcddcbc1cf6a1bef06b551cf0a5ff9d6ce9ff12ea007d SHA512 26e5b258261386437534b6b8748a69c7fb7e9332e67584de9723ff7cf9067d20e5cb6d4e86eaf0c611378be0bef9517dd563ca824499efc4f1a89056860ac856 WHIRLPOOL 3b4bd5894c4f65d638a070084267814f00819936c9e4cf7ca758eb04f5500280daf16caa36137700659c10717738d98558b9c5e090c4df82e2d9247308a1f1d3
 DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318bfe333cedd1fbd81a4c6b870e0025f9f4f3ea3d6926bc18cb1c SHA512 81af61f842b23dd51b5610d4c1f9a7113f82e4ceaee2af4a4f4392b56f38b9ec92655c1e413e9b58a808207b308dc68ea8b94c24ef636db8d8ea81275f867470 WHIRLPOOL 8cc8b87bbf8299ab97e24ee64b1d982dfb942cb60a8d8a110b38207807c05b8a7f1c2a2a4d5df52a80c12eaa9ae08440e8f7e333e6a519d83759d2b50c42d015
@@ -32,6 +35,7 @@ DIST netbeans-trunk-nightly-201610020002-src.zip 218005806 SHA256 3d0a3bfc28fa05
 DIST netbeans-trunk-nightly-201610030002-src.zip 218005806 SHA256 54f1b4f61b69379600dfa69adaee9457fd056548646d21e026dac1cb69719549 SHA512 0ae6c8ade2eeae51795d75d44394cdb1972e4113c07e5f573bdafef84ecfba76373e4f78ac1e1737a91d60c8eeb801c1c09f724a9fa99a3ab423b1f02df1e95d WHIRLPOOL ba04e61ec0d8d14aef1882aac28e0853ce0fea5ce42c3cb5ef388ae29e955634e4cdc88846836139d0e4074b87ee624c73f14cea463b706a224c706c991db044
 DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 DIST netbeans-trunk-nightly-201610070002-src.zip 218006580 SHA256 f8d583408b3219efec6b892090955f255bd087c46a05b863a2de9d341236ecf2 SHA512 aa0efd3bbdb4dc2af2570608e5e5c1dcccc1537dabf6d13f9cae9174a272da6b315e97dbfda4c63ff0ab5404be8167c41aa49dba98c9a7eadc8e09fcb2855d46 WHIRLPOOL 2b0f76c982f2badeca4889ec9326dd77f421f0de407fd28318f5ed99b99ed51a6335d49bc0e8d7ecce21f63a784adc6920fef3598caebff288ed634b50516d99
+DIST netbeans-trunk-nightly-201610130002-src.zip 218229380 SHA256 02482b39c317970c794a4eb8c331121e67aa338a278d024d2cae0dee8ede0cf3 SHA512 eb855690d48046d16a2eb22dc93de8ddbdabc2cfd3cd16901ca16a36a4071aafef9061411b32414639d4239bcbe4d609c7a935f8dd932b7c38354d283d99e0e7 WHIRLPOOL 7ec6a0f0518da70610bd762254db42b4bc60670e4ff4063e9b55f4d789ffa52d546c7f3d01d83b001cea0a5d88b9078c7699c2648e4a81b7f2cb9a56cf584157
 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
@@ -58,4 +62,5 @@ EBUILD netbeans-extide-9999_p20161002.ebuild 3377 SHA256 617168f38da940774310126
 EBUILD netbeans-extide-9999_p20161003.ebuild 3377 SHA256 5aca866ee1eb0be7fafcb596a59e7c4eaedffd03d9036cae142abc952ca89f1b SHA512 75c8de423093ce33cbc499a4993b3548bc5c099a3db1ac1b8fa82a4b43015ec3d2316b6a812b9e9925d1f4e1da6e928cc041544188429b4be9fcc21fe71a3ffe WHIRLPOOL 168cf97a216e78b151d847bae505d94436f3d5e89ac28293fdc5fd859351f8bf62412fa4f232f587d3da13460d0ad0a9e7cfeb2e377b63144c83f7db60f3e86e
 EBUILD netbeans-extide-9999_p20161006.ebuild 3098 SHA256 cafea0726625b95205e4192e4821db46f80b6a99abe539e9123294f5161a8056 SHA512 db4cf046c1413cd35471b44b22df34b641344b10e86b6c0273ced50fe74befb6a0251b4dd0424697c3d75663395a93452862904727daf2cc9c80784bc4e3ff66 WHIRLPOOL 5a8ba2065cc071bfeafebfaea3149f632c62788550046fd9513738fb2bb1615de86df58c50da364bdeceee88074ad1d017b4cba95ba9a7572f1b097e947c6d66
 EBUILD netbeans-extide-9999_p20161007.ebuild 3098 SHA256 79dff2cf7abb9eedb18b232ca209d57106b9c1b5560686c288370143b7104327 SHA512 458f142f8f1561801c7c69794a2f9bab52bccc7f2ada621683e922983216f21d4983f57a9ba23a61e711e52cd02ea6e8782d01b032e5424bf7d30eac3026a0ae WHIRLPOOL 019642d9e370568e5e5ce71e9e77bf9088079147ff6aee9c38d92f0cb8d750c02d3b19de1414f62432a009073dc0032dd978516530b3f7555f2c8b633a845c1d
+EBUILD netbeans-extide-9999_p20161013.ebuild 3134 SHA256 d98a0a91ef3bea983832a415cb97622317ad410368fb217bd0f7b162010716f8 SHA512 8a2de54b95752b95e54f64bebdf7e9ff1d635f3bcca9634f09dc251b323869279437ddd3e01b09321cdbfaaf8dcb05ffeabf653f40ca63fdb93219c4d499351f WHIRLPOOL e9f2b17515f249ec4e094ea0629726e63121f076e2ec85818fd3305f4fc799808be4692d0861605ffae0a45ef1278da04a901ef1b19d8a257d4166045ed93b58
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20161013.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20161013.ebuild
new file mode 100644
index 0000000..a27966b
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20161013.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+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-10-13_00-02-33/zip/netbeans-trunk-nightly-201610130002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r17-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/7B38E2908FFD70F2AB580D21A9E688A78C6365E7-ant-libs-1.10.0alpha.zip
+	http://hg.netbeans.org/binaries/63D41674237D4EB5ED1C41D23EBBFD410615F566-ant-misc-1.10.0alpha.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 virtual/jdk:1.8 )
+	${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-r17-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/7B38E2908FFD70F2AB580D21A9E688A78C6365E7-ant-libs-1.10.0alpha.zip o.apache.tools.ant.module/external/ant-libs-1.10.0alpha.zip || die
+	ln -s "${DISTDIR}"/63D41674237D4EB5ED1C41D23EBBFD410615F566-ant-misc-1.10.0alpha.zip o.apache.tools.ant.module/external/ant-misc-1.10.0alpha.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r17-build.xml.patch
+
+	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
+	default
+}
+
+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 c168afd..7bfef0b 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -7,6 +7,7 @@ DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296
 DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde12073116a77c1844e4ca7a071d95930b7cd7d5ac SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7 WHIRLPOOL 378db0807a616205fee2623f1c1ada6284ecfc85badb06d68e56e91fbedbc4f73af3ce6e4e8eb8bdb9504d15cf20cdc2a30d5f9cad0c72329791f1a53803ca0e
 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-201609120002-src.zip 218010356 SHA256 265ec87ec62f15d8112229caf357bb081ad75359c131a4c47545f35563136641 SHA512 644685d3172272328048eb4cb91de128541cac95fbade58364f0d8841f0ed54a2578ef24be3749b960a39097c7849f6b553ae17e9cf9082b82deff93dfd5fee5 WHIRLPOOL 048bf90567bdd58598a4cecb78289b621a93736cd78c834cf329387b59fc645778bd610df1d8e403df26e2fee72c542e4f9cab54593208c81a5c6e9edc5e991b
 DIST netbeans-trunk-nightly-201609130002-src.zip 218011897 SHA256 40cb0d7c2dba73fa2d3dcddcbc1cf6a1bef06b551cf0a5ff9d6ce9ff12ea007d SHA512 26e5b258261386437534b6b8748a69c7fb7e9332e67584de9723ff7cf9067d20e5cb6d4e86eaf0c611378be0bef9517dd563ca824499efc4f1a89056860ac856 WHIRLPOOL 3b4bd5894c4f65d638a070084267814f00819936c9e4cf7ca758eb04f5500280daf16caa36137700659c10717738d98558b9c5e090c4df82e2d9247308a1f1d3
 DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318bfe333cedd1fbd81a4c6b870e0025f9f4f3ea3d6926bc18cb1c SHA512 81af61f842b23dd51b5610d4c1f9a7113f82e4ceaee2af4a4f4392b56f38b9ec92655c1e413e9b58a808207b308dc68ea8b94c24ef636db8d8ea81275f867470 WHIRLPOOL 8cc8b87bbf8299ab97e24ee64b1d982dfb942cb60a8d8a110b38207807c05b8a7f1c2a2a4d5df52a80c12eaa9ae08440e8f7e333e6a519d83759d2b50c42d015
@@ -30,6 +31,7 @@ DIST netbeans-trunk-nightly-201610020002-src.zip 218005806 SHA256 3d0a3bfc28fa05
 DIST netbeans-trunk-nightly-201610030002-src.zip 218005806 SHA256 54f1b4f61b69379600dfa69adaee9457fd056548646d21e026dac1cb69719549 SHA512 0ae6c8ade2eeae51795d75d44394cdb1972e4113c07e5f573bdafef84ecfba76373e4f78ac1e1737a91d60c8eeb801c1c09f724a9fa99a3ab423b1f02df1e95d WHIRLPOOL ba04e61ec0d8d14aef1882aac28e0853ce0fea5ce42c3cb5ef388ae29e955634e4cdc88846836139d0e4074b87ee624c73f14cea463b706a224c706c991db044
 DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 DIST netbeans-trunk-nightly-201610070002-src.zip 218006580 SHA256 f8d583408b3219efec6b892090955f255bd087c46a05b863a2de9d341236ecf2 SHA512 aa0efd3bbdb4dc2af2570608e5e5c1dcccc1537dabf6d13f9cae9174a272da6b315e97dbfda4c63ff0ab5404be8167c41aa49dba98c9a7eadc8e09fcb2855d46 WHIRLPOOL 2b0f76c982f2badeca4889ec9326dd77f421f0de407fd28318f5ed99b99ed51a6335d49bc0e8d7ecce21f63a784adc6920fef3598caebff288ed634b50516d99
+DIST netbeans-trunk-nightly-201610130002-src.zip 218229380 SHA256 02482b39c317970c794a4eb8c331121e67aa338a278d024d2cae0dee8ede0cf3 SHA512 eb855690d48046d16a2eb22dc93de8ddbdabc2cfd3cd16901ca16a36a4071aafef9061411b32414639d4239bcbe4d609c7a935f8dd932b7c38354d283d99e0e7 WHIRLPOOL 7ec6a0f0518da70610bd762254db42b4bc60670e4ff4063e9b55f4d789ffa52d546c7f3d01d83b001cea0a5d88b9078c7699c2648e4a81b7f2cb9a56cf584157
 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
@@ -56,4 +58,5 @@ EBUILD netbeans-groovy-9999_p20161002.ebuild 3416 SHA256 59373c6ad49ab28a242d058
 EBUILD netbeans-groovy-9999_p20161003.ebuild 3416 SHA256 f2befe7a281b55414c517cfe99181e5c0f732a02df538f84151dcacbd4e378fb SHA512 9cc343fb137124ef08b4b3b20631ded9797d121a36bebacb7d83d34b8420d742ea7ec10bade24f3a5176cc4710891e17aaa86370166efc23883e4f5959c24480 WHIRLPOOL 35e280fadbe3aeaabe2cd854b8a5ec8926c8f492ab451fb30b46c3a44d624d030baa7b58693d9493454bddf024f57454fffc80ab47876c48aa0a77bb1cf5889b
 EBUILD netbeans-groovy-9999_p20161006.ebuild 3137 SHA256 5c831902537d50fa2c864fb652f1d9a6c21ce6580fb467314d46f5b9c9b41110 SHA512 8439b9303ab845cd2872c034b774d71872178c23af015d1a5c18b28107c46f054afebca6e37f28b79177625f0cf58819011256d260d2312af91eee53e0b1b2bf WHIRLPOOL 1da619ea307df31ec4c981e01b4db75609793d40d7745e611af686b2b2e377f4a435468167ecab1594345379103a18df34cb6cd9c5d9fecb6d2d8a305c9b472a
 EBUILD netbeans-groovy-9999_p20161007.ebuild 3137 SHA256 0fb2fc2cf4f814eb99d2cde4f8c9dda990f0aaafe39202023c1a7179fab23303 SHA512 7c3abdf2a8415d9e38a7899b9e856b26bae8bb8703e5ce6290e438fb7f4cfc88fec34622adfb5ca29e24cf6980c47f5c2a689befc381f4dd1481bc9723dbc814 WHIRLPOOL d0421b91f0eab13a97fd8a6d871d450e7367ba724b320f1520a14edcbd1319d44f8e578bd50355f087d255b652326da7dc13350d6419ae081e21154afe86bf60
+EBUILD netbeans-groovy-9999_p20161013.ebuild 3137 SHA256 b45a945c2c289508683d123583e09476c0723fc3cfa62b131e2a9f6a4ef8422e SHA512 5fe5e68c1865ac7079a63afcc1dbc77624b89fcd4f58020c8db9a9a33232f6b9fe321a3938bc6c979a313614ae2e7aa04e2e13cffb94fcf9d17fcd0ad96c12e7 WHIRLPOOL 8619d42014613dd52acaaf79a514a504d62be913ee5d6f9b7364e42e1585d90a1d4e08f73f25e4dd48bd9fbc9bc0cda75c4dfd6fcb4c04bf427706f4dccd6c41
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20161013.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20161013.ebuild
new file mode 100644
index 0000000..5ce0b03
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20161013.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+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-10-13_00-02-33/zip/netbeans-trunk-nightly-201610130002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r17-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 virtual/jdk:1.8 )
+	${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-r17-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-r17-build.xml.patch
+
+	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
+	default
+}
+
+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 b3918ca..5b0622d 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -10,6 +10,7 @@ DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296
 DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde12073116a77c1844e4ca7a071d95930b7cd7d5ac SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7 WHIRLPOOL 378db0807a616205fee2623f1c1ada6284ecfc85badb06d68e56e91fbedbc4f73af3ce6e4e8eb8bdb9504d15cf20cdc2a30d5f9cad0c72329791f1a53803ca0e
 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-201609120002-src.zip 218010356 SHA256 265ec87ec62f15d8112229caf357bb081ad75359c131a4c47545f35563136641 SHA512 644685d3172272328048eb4cb91de128541cac95fbade58364f0d8841f0ed54a2578ef24be3749b960a39097c7849f6b553ae17e9cf9082b82deff93dfd5fee5 WHIRLPOOL 048bf90567bdd58598a4cecb78289b621a93736cd78c834cf329387b59fc645778bd610df1d8e403df26e2fee72c542e4f9cab54593208c81a5c6e9edc5e991b
 DIST netbeans-trunk-nightly-201609130002-src.zip 218011897 SHA256 40cb0d7c2dba73fa2d3dcddcbc1cf6a1bef06b551cf0a5ff9d6ce9ff12ea007d SHA512 26e5b258261386437534b6b8748a69c7fb7e9332e67584de9723ff7cf9067d20e5cb6d4e86eaf0c611378be0bef9517dd563ca824499efc4f1a89056860ac856 WHIRLPOOL 3b4bd5894c4f65d638a070084267814f00819936c9e4cf7ca758eb04f5500280daf16caa36137700659c10717738d98558b9c5e090c4df82e2d9247308a1f1d3
 DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318bfe333cedd1fbd81a4c6b870e0025f9f4f3ea3d6926bc18cb1c SHA512 81af61f842b23dd51b5610d4c1f9a7113f82e4ceaee2af4a4f4392b56f38b9ec92655c1e413e9b58a808207b308dc68ea8b94c24ef636db8d8ea81275f867470 WHIRLPOOL 8cc8b87bbf8299ab97e24ee64b1d982dfb942cb60a8d8a110b38207807c05b8a7f1c2a2a4d5df52a80c12eaa9ae08440e8f7e333e6a519d83759d2b50c42d015
@@ -33,6 +34,7 @@ DIST netbeans-trunk-nightly-201610020002-src.zip 218005806 SHA256 3d0a3bfc28fa05
 DIST netbeans-trunk-nightly-201610030002-src.zip 218005806 SHA256 54f1b4f61b69379600dfa69adaee9457fd056548646d21e026dac1cb69719549 SHA512 0ae6c8ade2eeae51795d75d44394cdb1972e4113c07e5f573bdafef84ecfba76373e4f78ac1e1737a91d60c8eeb801c1c09f724a9fa99a3ab423b1f02df1e95d WHIRLPOOL ba04e61ec0d8d14aef1882aac28e0853ce0fea5ce42c3cb5ef388ae29e955634e4cdc88846836139d0e4074b87ee624c73f14cea463b706a224c706c991db044
 DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 DIST netbeans-trunk-nightly-201610070002-src.zip 218006580 SHA256 f8d583408b3219efec6b892090955f255bd087c46a05b863a2de9d341236ecf2 SHA512 aa0efd3bbdb4dc2af2570608e5e5c1dcccc1537dabf6d13f9cae9174a272da6b315e97dbfda4c63ff0ab5404be8167c41aa49dba98c9a7eadc8e09fcb2855d46 WHIRLPOOL 2b0f76c982f2badeca4889ec9326dd77f421f0de407fd28318f5ed99b99ed51a6335d49bc0e8d7ecce21f63a784adc6920fef3598caebff288ed634b50516d99
+DIST netbeans-trunk-nightly-201610130002-src.zip 218229380 SHA256 02482b39c317970c794a4eb8c331121e67aa338a278d024d2cae0dee8ede0cf3 SHA512 eb855690d48046d16a2eb22dc93de8ddbdabc2cfd3cd16901ca16a36a4071aafef9061411b32414639d4239bcbe4d609c7a935f8dd932b7c38354d283d99e0e7 WHIRLPOOL 7ec6a0f0518da70610bd762254db42b4bc60670e4ff4063e9b55f4d789ffa52d546c7f3d01d83b001cea0a5d88b9078c7699c2648e4a81b7f2cb9a56cf584157
 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
@@ -59,4 +61,5 @@ EBUILD netbeans-harness-9999_p20161002.ebuild 4126 SHA256 86c356a97e54d554f89fe4
 EBUILD netbeans-harness-9999_p20161003.ebuild 4126 SHA256 726e89bf5c16fea2c53736fa30fc4889a7e668e3149d6d12df67260fe30dab7a SHA512 8c67d1cde66e16db645c3bbb1ba1b1f8b1aaf68c6241703ccddd5494b6cab5ca2256397ec2f4985f6478ea1794d73504f812e8fdac6a55744505d434f3fcb646 WHIRLPOOL bd5307d74c2e74a99c0224e94d0c06285e17158f50e9069d9a6b6e39d24afecc0cb3491ab53b168cd49485cb123ca31c887a657455e90a8bcb1fc6b518938ad1
 EBUILD netbeans-harness-9999_p20161006.ebuild 3847 SHA256 5a1abb64ce82a846720fe11048588ea32d7eb18df5d905a6b4e2186b9d9cd587 SHA512 922c79d28e71abe5781f0cf512aa831c0817d6771b365abc1e0d4786ea8ae1540b943577dcb5b0ae380dbb80e61be43137f22403d20692eec13e7a5a241e8c89 WHIRLPOOL ad4ac665f55799ca9cbd46d224c2c55184ad9bf9188117eb86b025e35396093e37742f363a0213a1220e3a7c6e7f6dac637b78710b16d8ab288cc58a6834c14c
 EBUILD netbeans-harness-9999_p20161007.ebuild 3847 SHA256 d471612154289c87f26195f42ded57efe2788b3db502fa861b0b91e1de5d6175 SHA512 23b8dfaecc287b7751f534dff3e99dc79b92007f6a8be12c352f130bec7338f4540e2bf822022d84286d02c63547755721d60e3a230aa9e056d819e4cf0d6328 WHIRLPOOL 48e4a0cf3f8a129da708dbfef89c37c3f63bbb6d18c96a3b7f86923b0f6449bfeb401e73beaf24d4d8887edd7d8791be0dff69d1ac6b82fcf2122d83b140876b
+EBUILD netbeans-harness-9999_p20161013.ebuild 3847 SHA256 5cc45d055a707c151bb9d67b6c71dfc697ed290f0bd070154f2fa8eaa0e842a1 SHA512 c0ab0789640cd7952d86661df25d1c1beea69a8ca2eebab6a7dfe516b587bd3c256c5724513efe7769782892748c2298b1903ca25aaf53ede454253578349eb3 WHIRLPOOL 12126435307b4af0cc14287e8eac855c943ac1a69d80d5f88a547f268dbd72cd3a824174670390f10fda50e465140d5f266f326140a17e803a7b8bd88dd4d897
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20161013.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20161013.ebuild
new file mode 100644
index 0000000..f80f45c
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20161013.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+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-10-13_00-02-33/zip/netbeans-trunk-nightly-201610130002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r17-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 virtual/jdk:1.8 )
+	${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-r17-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-r17-build.xml.patch
+
+	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
+	default
+}
+
+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 a5e00aa..a42c753 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -144,6 +144,7 @@ DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296
 DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde12073116a77c1844e4ca7a071d95930b7cd7d5ac SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7 WHIRLPOOL 378db0807a616205fee2623f1c1ada6284ecfc85badb06d68e56e91fbedbc4f73af3ce6e4e8eb8bdb9504d15cf20cdc2a30d5f9cad0c72329791f1a53803ca0e
 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-201609120002-src.zip 218010356 SHA256 265ec87ec62f15d8112229caf357bb081ad75359c131a4c47545f35563136641 SHA512 644685d3172272328048eb4cb91de128541cac95fbade58364f0d8841f0ed54a2578ef24be3749b960a39097c7849f6b553ae17e9cf9082b82deff93dfd5fee5 WHIRLPOOL 048bf90567bdd58598a4cecb78289b621a93736cd78c834cf329387b59fc645778bd610df1d8e403df26e2fee72c542e4f9cab54593208c81a5c6e9edc5e991b
 DIST netbeans-trunk-nightly-201609130002-src.zip 218011897 SHA256 40cb0d7c2dba73fa2d3dcddcbc1cf6a1bef06b551cf0a5ff9d6ce9ff12ea007d SHA512 26e5b258261386437534b6b8748a69c7fb7e9332e67584de9723ff7cf9067d20e5cb6d4e86eaf0c611378be0bef9517dd563ca824499efc4f1a89056860ac856 WHIRLPOOL 3b4bd5894c4f65d638a070084267814f00819936c9e4cf7ca758eb04f5500280daf16caa36137700659c10717738d98558b9c5e090c4df82e2d9247308a1f1d3
 DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318bfe333cedd1fbd81a4c6b870e0025f9f4f3ea3d6926bc18cb1c SHA512 81af61f842b23dd51b5610d4c1f9a7113f82e4ceaee2af4a4f4392b56f38b9ec92655c1e413e9b58a808207b308dc68ea8b94c24ef636db8d8ea81275f867470 WHIRLPOOL 8cc8b87bbf8299ab97e24ee64b1d982dfb942cb60a8d8a110b38207807c05b8a7f1c2a2a4d5df52a80c12eaa9ae08440e8f7e333e6a519d83759d2b50c42d015
@@ -167,6 +168,7 @@ DIST netbeans-trunk-nightly-201610020002-src.zip 218005806 SHA256 3d0a3bfc28fa05
 DIST netbeans-trunk-nightly-201610030002-src.zip 218005806 SHA256 54f1b4f61b69379600dfa69adaee9457fd056548646d21e026dac1cb69719549 SHA512 0ae6c8ade2eeae51795d75d44394cdb1972e4113c07e5f573bdafef84ecfba76373e4f78ac1e1737a91d60c8eeb801c1c09f724a9fa99a3ab423b1f02df1e95d WHIRLPOOL ba04e61ec0d8d14aef1882aac28e0853ce0fea5ce42c3cb5ef388ae29e955634e4cdc88846836139d0e4074b87ee624c73f14cea463b706a224c706c991db044
 DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 DIST netbeans-trunk-nightly-201610070002-src.zip 218006580 SHA256 f8d583408b3219efec6b892090955f255bd087c46a05b863a2de9d341236ecf2 SHA512 aa0efd3bbdb4dc2af2570608e5e5c1dcccc1537dabf6d13f9cae9174a272da6b315e97dbfda4c63ff0ab5404be8167c41aa49dba98c9a7eadc8e09fcb2855d46 WHIRLPOOL 2b0f76c982f2badeca4889ec9326dd77f421f0de407fd28318f5ed99b99ed51a6335d49bc0e8d7ecce21f63a784adc6920fef3598caebff288ed634b50516d99
+DIST netbeans-trunk-nightly-201610130002-src.zip 218229380 SHA256 02482b39c317970c794a4eb8c331121e67aa338a278d024d2cae0dee8ede0cf3 SHA512 eb855690d48046d16a2eb22dc93de8ddbdabc2cfd3cd16901ca16a36a4071aafef9061411b32414639d4239bcbe4d609c7a935f8dd932b7c38354d283d99e0e7 WHIRLPOOL 7ec6a0f0518da70610bd762254db42b4bc60670e4ff4063e9b55f4d789ffa52d546c7f3d01d83b001cea0a5d88b9078c7699c2648e4a81b7f2cb9a56cf584157
 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
@@ -193,4 +195,5 @@ EBUILD netbeans-ide-9999_p20161002.ebuild 29849 SHA256 2d90e1fb1af8e4442a576e99a
 EBUILD netbeans-ide-9999_p20161003.ebuild 29849 SHA256 586bfa642127334c03507ea0e83914d24001fc212ecd21e308833813a56f9b5c SHA512 ee4cd6db7d9373dd836cdaa171a93cd2b228500fbb89eac4710597834aa731b700c0428b9dc457363d4c5e90f33ab61788f3bddf6fbc8119376a9745c2479f65 WHIRLPOOL 76d7b6a16e97a2a11a012c7d1240ed584b283e0a40000f291bd9b782e44a1dad1e519584c23c550b96842c2b0a7bce2307f954efae5cafa2f14609293822407c
 EBUILD netbeans-ide-9999_p20161006.ebuild 29570 SHA256 dac8d3d7ddf78d28ae2a5ca6ad326c6993abe92800f999c65798b0bd708d5671 SHA512 4d33fb475ad15c005c90d154e7911a25830cd1b63066b83e6ec8b01a9acbaf54ec861519d93553d0cef6d4845bc4922190b28bb44dc76f41e7e222af8ad8b19b WHIRLPOOL d9713010f8fd8190792c835b1aa1ee465bf5aece25906929b7f5da2f13d7a61a17a60a9c87417300010ad56ff7931561a9e56b14534566d59da116c0e80f1267
 EBUILD netbeans-ide-9999_p20161007.ebuild 29570 SHA256 5fd584a76f781f74cb7a74816fedffc56d068496b90fbda2b24595963da535bd SHA512 4afbb317f15f8887fff3b5c14d079f9955c85b0edb19c6d5acf5a0423366c87bf454ba7d11a7a68392417a3981fae823a4d2303023a5b837eaa2fbf8b1ae462a WHIRLPOOL 57dee3d3eb5b2fc287fd07a788a36fedbf25a55fa57a22ea5af3b5e57f0a7d8f6d296f7efd4305827857b600a8da986b1b9147d552baf2ab4bfa7d8c6902b486
+EBUILD netbeans-ide-9999_p20161013.ebuild 29581 SHA256 65830f564fe1fc3307fbddf1db393dc3cb5a19adeab33423a642fa54e4a7a69b SHA512 591118c8505d3f27f753967817dbba000c90963899a3884c858e393bd7e43548f74058701e9408c2589d65054e677fe1ef7357409d6c3ea0d85da9ca0664d4a5 WHIRLPOOL 48e51dfaf0d84fdd17396b13be26e500cc3218bf6ddcb6bb15ed762a8a578f8cc4346850b0d1429d07c222a660044c42aa03ca7e77bd10ac351ff97f2681139f
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20161013.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20161013.ebuild
new file mode 100644
index 0000000..1618b66
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20161013.ebuild
@@ -0,0 +1,362 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+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-10-13_00-02-33/zip/netbeans-trunk-nightly-201610130002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r17-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:4"
+RDEPEND="|| ( virtual/jdk:1.7 virtual/jdk:1.8 )
+	${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-r17-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-r17-build.xml.patch
+
+	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-4 jna.jar jna-4.2.2-stripped.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
+	default
+}
+
+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 54b1c30..afed570 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -2,7 +2,9 @@ DIST 0CD9CDDE3F56BB5250D87C54592F04CBC24F03BF-wagon-provider-api-2.10.jar 53529
 DIST 29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar 1366247 SHA256 4eae7d13d7493c86df8b84b9a922dd9e8302e47ac80efcc47094344ce64de27c SHA512 06d887e5cd47b6bd86ea9e1a26c604b630285129dde43e6068d4b36f0e81c39cd91757e3323e77316e76b0fdf8c18a609bd216c7103ac8a4d947abd0ed6bab47 WHIRLPOOL 27c9f01d85f31781bc76411701ea5668644d83ec761f9d42ab93e3932cfefe5a6277429f889a6f9c68ce9efeb2cddaecb6ae8aa2c42ce8ea9b3a06305f2657c1
 DIST 2B9EAB164D8748F9793F6A0D29B6463E97B284DA-indexer-core-5.1.1.jar 227233 SHA256 7bfaa3a602bf388094c8fcfba989f0b121c0e71c6df4c3328244615a5cb24d59 SHA512 7669d2e11346b62420ab9db2e9a5a24bcea356099ae4d6f0a57c75ba168de9d24160277b8f044ca9a5f637c2591778150288a963787b6983d093ad64fac83550 WHIRLPOOL ba0f5a67dbc3a64ca0b21cb1f1a74b4e9b2d2c4d7a5f127de9940f375b70d0bc321f5ce6aa607bbe27d39dbdfd1d179b1457b5fcef65c0a0d4420e1194657192
 DIST 3B96251214DF697E902C849EB0B4A0EFA2CD1A53-wagon-http-shared-2.10.jar 11763 SHA256 41706fa977afa65b9f6001b4ad1a8737502e6f2af8ebfc21ffb60042c4c913b1 SHA512 c834126f83008d75320eb33c5a752787d6ed7e96b4223aed329aabb08aad93d13d64a8be03d28f989d5f558e9233ae221e4eb9fec326df01b6be101ebab38b35 WHIRLPOOL 2b53e5857f8b3f9f3ba2acb04f623ff95aff1cb51b1edf389cbd4fe38d4f464d5f212e613f08103399e701158b36b1c9057f93fdd51b76517806f401ed4e0839
+DIST 3BB258C976F65C78D890CACB5C0D3096B793289E-nb-javac-api.jar 197128 SHA256 4f2f85bb8d27b1a305fa54fabc4df7e8bce64cd06aadf1073a9327b2eb1fc6db SHA512 c4f58f0368a48ac894590f905fdd6118ca62f37d61081d4ddd6ef36f02d2645215c7f4084a225c1c49264e5441f028e552d361dfa7b0fad2526e49591337cab6 WHIRLPOOL 61d111f27cc28e579b32c7ac23c950e021ec4103172ed899bcba47c61cdee8642a3c45177bf992bc69b7c2190a200cd7ac8db275d6dee1bbc6e74e5ff4e72ef8
 DIST 3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar 45718 SHA256 18a77f915276751b01ed8e7feaf344e78f5ea62bf53b7bb6a821a22865165044 SHA512 1abad0ebdb35d8fd4eec1350ac497cc6a372239aea9eb6c45a94265f46e4e5c2458fe5e4d0e1e067effc9ba8629451abf169bb4820274484f9c2404271b21727 WHIRLPOOL 7aeb90a8661d8eaa2ee2a5953932e3b829187554bf605bb5e55abb42edb82ff13a6e4b4acb8f3615a74961f044ebaf19343e3d403a476a019890cadeead73dd5
+DIST 45DA542728DD77AD51C6766ED6C3A1B71EF8DA77-nb-javac-impl.jar 3237471 SHA256 eb7773e5776e0054d74a4d9f9b32bad3bbddd6716840c57478ef74ac26af4a8b SHA512 4f060a0b4fbac2fb0fdf3a20c873cd76cad76fed645390eb6568e3d985a14b70ebf9a8181c4e12f9a2db18f9097fcea2370bb2316eee33c789b84c4700329d93 WHIRLPOOL 2cbf771fac086f68a6882e55b3a2c84bc3f3f624012a4bcae0d00ec1d60a24eaf40145c595eb6750ba565a2952d0a53fd89e005281344281f48cbd1e9ef9fa7a
 DIST 4EF309C09ABB5F8B2D0C6A4010205DB185729CDC-wagon-http-2.10-shaded.jar 2259008 SHA256 058d3ee2b7f6916502524ace23d6695a06abce7a00378ca457c63e65f45de759 SHA512 058d88fad0522a9fdae80552eecfa743cd771c7325b630762d13c1456f5f51024c6e88111d3e92ed97c69cc1013cc3d2e81332b94063113fc025951f871bf881 WHIRLPOOL d1f61fa4fe98efa7c81e5849f83636e9a798816db8f43156098781ebb95012e0f9707b562a2620eb006c72ce8e911357f3bdbafc68a9d3a2e032f7a978e8f13f
 DIST 562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar 23838 SHA256 0c05ac203cfc63f1a6d59dea84d915220e18e8e37a57cfbb317e769f992f3e8f SHA512 a39da963b1e0c0111870bc3989e10c70dd136c0276099b48cadc70706f76b0b2ba1ece6df67c05bf8e26a4638b19b28b454df6c23ed5a9d4936d3cc5506ec4b1 WHIRLPOOL 88043adc7057b68647d9205782e46a2d7824533b9a46366e7949459e88fd2ac7be6dcd1bc1c7371e071c7efc5fcf6d3956c211f97932cee0e0a4f47c58db6983
 DIST 5968566A351B28623DE4720B0ACB1E40338074D0-nb-javac-impl.jar 3046788 SHA256 7bb24641b0a4886d0787858685696dba109c245561fecb34b4f99aca42db13fe SHA512 600640efc8be0dba0081eb3969688936caf57c50dc1967e94471d8ec35d0361e62aa73d3d9546271a80fe3fa8e3bdda365616d2a6ed309dc6fa3ff84f31680ed WHIRLPOOL 292a7324adbf3f41e67a138f8be0bdfa1515c3f0995cb31e7152bfd71417b1501ad4ba5f69689fee05a816e71f9e4732c8e49b3cae2e11abf056e3a30adadedc
@@ -40,6 +42,7 @@ DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296
 DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde12073116a77c1844e4ca7a071d95930b7cd7d5ac SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7 WHIRLPOOL 378db0807a616205fee2623f1c1ada6284ecfc85badb06d68e56e91fbedbc4f73af3ce6e4e8eb8bdb9504d15cf20cdc2a30d5f9cad0c72329791f1a53803ca0e
 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-201609120002-src.zip 218010356 SHA256 265ec87ec62f15d8112229caf357bb081ad75359c131a4c47545f35563136641 SHA512 644685d3172272328048eb4cb91de128541cac95fbade58364f0d8841f0ed54a2578ef24be3749b960a39097c7849f6b553ae17e9cf9082b82deff93dfd5fee5 WHIRLPOOL 048bf90567bdd58598a4cecb78289b621a93736cd78c834cf329387b59fc645778bd610df1d8e403df26e2fee72c542e4f9cab54593208c81a5c6e9edc5e991b
 DIST netbeans-trunk-nightly-201609130002-src.zip 218011897 SHA256 40cb0d7c2dba73fa2d3dcddcbc1cf6a1bef06b551cf0a5ff9d6ce9ff12ea007d SHA512 26e5b258261386437534b6b8748a69c7fb7e9332e67584de9723ff7cf9067d20e5cb6d4e86eaf0c611378be0bef9517dd563ca824499efc4f1a89056860ac856 WHIRLPOOL 3b4bd5894c4f65d638a070084267814f00819936c9e4cf7ca758eb04f5500280daf16caa36137700659c10717738d98558b9c5e090c4df82e2d9247308a1f1d3
 DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318bfe333cedd1fbd81a4c6b870e0025f9f4f3ea3d6926bc18cb1c SHA512 81af61f842b23dd51b5610d4c1f9a7113f82e4ceaee2af4a4f4392b56f38b9ec92655c1e413e9b58a808207b308dc68ea8b94c24ef636db8d8ea81275f867470 WHIRLPOOL 8cc8b87bbf8299ab97e24ee64b1d982dfb942cb60a8d8a110b38207807c05b8a7f1c2a2a4d5df52a80c12eaa9ae08440e8f7e333e6a519d83759d2b50c42d015
@@ -63,6 +66,7 @@ DIST netbeans-trunk-nightly-201610020002-src.zip 218005806 SHA256 3d0a3bfc28fa05
 DIST netbeans-trunk-nightly-201610030002-src.zip 218005806 SHA256 54f1b4f61b69379600dfa69adaee9457fd056548646d21e026dac1cb69719549 SHA512 0ae6c8ade2eeae51795d75d44394cdb1972e4113c07e5f573bdafef84ecfba76373e4f78ac1e1737a91d60c8eeb801c1c09f724a9fa99a3ab423b1f02df1e95d WHIRLPOOL ba04e61ec0d8d14aef1882aac28e0853ce0fea5ce42c3cb5ef388ae29e955634e4cdc88846836139d0e4074b87ee624c73f14cea463b706a224c706c991db044
 DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 DIST netbeans-trunk-nightly-201610070002-src.zip 218006580 SHA256 f8d583408b3219efec6b892090955f255bd087c46a05b863a2de9d341236ecf2 SHA512 aa0efd3bbdb4dc2af2570608e5e5c1dcccc1537dabf6d13f9cae9174a272da6b315e97dbfda4c63ff0ab5404be8167c41aa49dba98c9a7eadc8e09fcb2855d46 WHIRLPOOL 2b0f76c982f2badeca4889ec9326dd77f421f0de407fd28318f5ed99b99ed51a6335d49bc0e8d7ecce21f63a784adc6920fef3598caebff288ed634b50516d99
+DIST netbeans-trunk-nightly-201610130002-src.zip 218229380 SHA256 02482b39c317970c794a4eb8c331121e67aa338a278d024d2cae0dee8ede0cf3 SHA512 eb855690d48046d16a2eb22dc93de8ddbdabc2cfd3cd16901ca16a36a4071aafef9061411b32414639d4239bcbe4d609c7a935f8dd932b7c38354d283d99e0e7 WHIRLPOOL 7ec6a0f0518da70610bd762254db42b4bc60670e4ff4063e9b55f4d789ffa52d546c7f3d01d83b001cea0a5d88b9078c7699c2648e4a81b7f2cb9a56cf584157
 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
@@ -89,4 +93,5 @@ EBUILD netbeans-java-9999_p20161002.ebuild 15656 SHA256 09463e8020da8010a85c59b9
 EBUILD netbeans-java-9999_p20161003.ebuild 15656 SHA256 3519ad9368cc1cb87c5b89b85e86bba62681e813627a719d0dcce876df059d05 SHA512 60596136600335a1b9fe49ad0a9a5b297174b1eb27e6923a2b550369cee02545dfe31292902b6d7c3d3374d76d86fa316ee71444a42ace0d2e073f7af865eda8 WHIRLPOOL ec979af061b73718f3d239e90f79b787873fcc27488fcc502bf1e0c32d76e7471d6827e1b4d213cdf5c3d995f0269f1439fa8540122d33248ea203520411d497
 EBUILD netbeans-java-9999_p20161006.ebuild 15377 SHA256 cfb710c4224b96bfe2473d84a619fdbb189cd0aa0745323fe6500b9155ddf766 SHA512 de86238e990c88e1e93f0c0b494435da9061eed36dc3c8e045690ffb621803229f4a9b60f17f0e3da2fa43252890f387c142e456a7aea82c834f80ea75992a06 WHIRLPOOL 6c5554de75b2ba99e10750eeb270b2a59374447fc21c016b80d9f0d3c133e59cd737e780aa311816200c0a5148f0adad112136fadc2625755acedaed8e69b805
 EBUILD netbeans-java-9999_p20161007.ebuild 15377 SHA256 e5297a6f6db87026d5ca1c795c3673d31af26e94fc4428da993394d4b95d8115 SHA512 9cf2dd3d72467077696a0473a72c9a990a4562bdd3d7f964e3dfdb7439b94aba49e10ff8c937be22637efaa7727f56aba0fcf5ba375c370d4d7c8ebe1ba56ebd WHIRLPOOL a97f9c35ea61a93d849c4db99f9aadf2d0d0f1b0565fcb7c964ee5e047d84f433a9616f726e72f82e5c540b445a0a7ea9f3f1b1df61a7f61fa6c5646eeab3c26
+EBUILD netbeans-java-9999_p20161013.ebuild 15377 SHA256 b7b0b8e7fefd1e01396992d80456485ad344c91def546858d658c217efcc5b37 SHA512 ddd93819773f0084d603c7ba05c2d8f503cb591256038662133e3acf1325bb29e196f63e38bdb18d5e4a2305427e0bfe780fa342f40dc702664285825eeca0f0 WHIRLPOOL 4400b9185bb5f22a37b7eca4787bd492653efec7052b0107b31f6a1dedd850404e00ef39abb3ee1f6c23b92dbbf936af343803d6a924fe923588c060d80162c3
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20161013.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20161013.ebuild
new file mode 100644
index 0000000..4b596d8
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20161013.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+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-10-13_00-02-33/zip/netbeans-trunk-nightly-201610130002-src.zip"
+# jarjar-1.4 contains also asm libraries
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r17-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/3BB258C976F65C78D890CACB5C0D3096B793289E-nb-javac-api.jar
+	http://hg.netbeans.org/binaries/45DA542728DD77AD51C6766ED6C3A1B71EF8DA77-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 virtual/jdk:1.8 )
+	${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-r17-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}"/3BB258C976F65C78D890CACB5C0D3096B793289E-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
+	ln -s "${DISTDIR}"/45DA542728DD77AD51C6766ED6C3A1B71EF8DA77-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-r17-build.xml.patch
+
+	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
+	default
+}
+
+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 48883d3..2ff8a2a 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -8,6 +8,7 @@ DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296
 DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde12073116a77c1844e4ca7a071d95930b7cd7d5ac SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7 WHIRLPOOL 378db0807a616205fee2623f1c1ada6284ecfc85badb06d68e56e91fbedbc4f73af3ce6e4e8eb8bdb9504d15cf20cdc2a30d5f9cad0c72329791f1a53803ca0e
 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-201609120002-src.zip 218010356 SHA256 265ec87ec62f15d8112229caf357bb081ad75359c131a4c47545f35563136641 SHA512 644685d3172272328048eb4cb91de128541cac95fbade58364f0d8841f0ed54a2578ef24be3749b960a39097c7849f6b553ae17e9cf9082b82deff93dfd5fee5 WHIRLPOOL 048bf90567bdd58598a4cecb78289b621a93736cd78c834cf329387b59fc645778bd610df1d8e403df26e2fee72c542e4f9cab54593208c81a5c6e9edc5e991b
 DIST netbeans-trunk-nightly-201609130002-src.zip 218011897 SHA256 40cb0d7c2dba73fa2d3dcddcbc1cf6a1bef06b551cf0a5ff9d6ce9ff12ea007d SHA512 26e5b258261386437534b6b8748a69c7fb7e9332e67584de9723ff7cf9067d20e5cb6d4e86eaf0c611378be0bef9517dd563ca824499efc4f1a89056860ac856 WHIRLPOOL 3b4bd5894c4f65d638a070084267814f00819936c9e4cf7ca758eb04f5500280daf16caa36137700659c10717738d98558b9c5e090c4df82e2d9247308a1f1d3
 DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318bfe333cedd1fbd81a4c6b870e0025f9f4f3ea3d6926bc18cb1c SHA512 81af61f842b23dd51b5610d4c1f9a7113f82e4ceaee2af4a4f4392b56f38b9ec92655c1e413e9b58a808207b308dc68ea8b94c24ef636db8d8ea81275f867470 WHIRLPOOL 8cc8b87bbf8299ab97e24ee64b1d982dfb942cb60a8d8a110b38207807c05b8a7f1c2a2a4d5df52a80c12eaa9ae08440e8f7e333e6a519d83759d2b50c42d015
@@ -31,6 +32,7 @@ DIST netbeans-trunk-nightly-201610020002-src.zip 218005806 SHA256 3d0a3bfc28fa05
 DIST netbeans-trunk-nightly-201610030002-src.zip 218005806 SHA256 54f1b4f61b69379600dfa69adaee9457fd056548646d21e026dac1cb69719549 SHA512 0ae6c8ade2eeae51795d75d44394cdb1972e4113c07e5f573bdafef84ecfba76373e4f78ac1e1737a91d60c8eeb801c1c09f724a9fa99a3ab423b1f02df1e95d WHIRLPOOL ba04e61ec0d8d14aef1882aac28e0853ce0fea5ce42c3cb5ef388ae29e955634e4cdc88846836139d0e4074b87ee624c73f14cea463b706a224c706c991db044
 DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 DIST netbeans-trunk-nightly-201610070002-src.zip 218006580 SHA256 f8d583408b3219efec6b892090955f255bd087c46a05b863a2de9d341236ecf2 SHA512 aa0efd3bbdb4dc2af2570608e5e5c1dcccc1537dabf6d13f9cae9174a272da6b315e97dbfda4c63ff0ab5404be8167c41aa49dba98c9a7eadc8e09fcb2855d46 WHIRLPOOL 2b0f76c982f2badeca4889ec9326dd77f421f0de407fd28318f5ed99b99ed51a6335d49bc0e8d7ecce21f63a784adc6920fef3598caebff288ed634b50516d99
+DIST netbeans-trunk-nightly-201610130002-src.zip 218229380 SHA256 02482b39c317970c794a4eb8c331121e67aa338a278d024d2cae0dee8ede0cf3 SHA512 eb855690d48046d16a2eb22dc93de8ddbdabc2cfd3cd16901ca16a36a4071aafef9061411b32414639d4239bcbe4d609c7a935f8dd932b7c38354d283d99e0e7 WHIRLPOOL 7ec6a0f0518da70610bd762254db42b4bc60670e4ff4063e9b55f4d789ffa52d546c7f3d01d83b001cea0a5d88b9078c7699c2648e4a81b7f2cb9a56cf584157
 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
@@ -57,4 +59,5 @@ EBUILD netbeans-javacard-9999_p20161002.ebuild 4971 SHA256 d19c43f8e973fe8450fc5
 EBUILD netbeans-javacard-9999_p20161003.ebuild 4971 SHA256 778a951b088e1f9442579a3c559b68559e76e6174eaec17e102afede7f1204fb SHA512 e1b836ae08037d75ee715125be7418cce295a470abebcc1cfde0ea2e150f14b9a691ebfc7c4fdd215cb1b444f94ce7f48c5f17cc9f6d0d956fdab6888a9a377c WHIRLPOOL bc595f64bcec4fcb0ac7e8107b35c0d38dafae2e2b30058cab3c384affb1c8f15dc76ba8c684c8b3eb44facb0813b3297eac3be2531bb4564d7b55d12dab3f69
 EBUILD netbeans-javacard-9999_p20161006.ebuild 4692 SHA256 9e5430c079d6bba27666d3eded9ebacd0acce266b164fedc89ff762ed0328552 SHA512 7a3e24f8ead71943581f771ab568c9f95744cb80dd66e93e566ced426b3029c5ce49bcb0e777f17007fca43164dce02e450457a7011b68a7735531bc1802cdfd WHIRLPOOL b0fb17aa5d7b25d8142e81e9fffd17e0fc0555a1979d070b6da7c8e9147563605b5bfdf438ea17b070619dbcca90449d349d401b68a05c0801ed6381ecbfa966
 EBUILD netbeans-javacard-9999_p20161007.ebuild 4692 SHA256 6fe05407a4c2383e6a69144a5c7abbedba2c62a4bb927488a084a55f677ed30c SHA512 984f9b19b91317946dfccd300a150c72a8e8dd1e792769b64247f94122f60dd86b59b4d1f5bb0e2aa8bd56edd81226e2ea5668143caee7ef76a774ab8f2e347b WHIRLPOOL a445bb2abf4efb9b3346a78c7ff916c0331313facc85581f6f7bb5145caffd6f36e9109e39be41634f6b4f51dcb6c23c65f3ed9e03500bfe487c2074c5e8d3ac
+EBUILD netbeans-javacard-9999_p20161013.ebuild 4692 SHA256 cc8d7d6876f2ea88b0373863dfcffe77ff675daf6386e92cc5af323ee1f400d5 SHA512 7ec49ee8649b5388cc23faa8badc0dea02cd4f79248cbf1302a8a4d35a44d5751c5f2256fe5937400a5799494de72097051809ae38cc13f5b4739e2592a2f7de WHIRLPOOL e8c65f95db89f33ac405750e4d72e37cf0085ab21ddced17d32897eab2e9003ba18ecb0dfca65f221cd03c8a3f80964c5979eab883fd6b90059f7afba5146315
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20161013.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20161013.ebuild
new file mode 100644
index 0000000..001059b
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20161013.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+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-10-13_00-02-33/zip/netbeans-trunk-nightly-201610130002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r17-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 virtual/jdk:1.8 )
+	${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-r17-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-r17-build.xml.patch
+
+	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
+	default
+}
+
+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 02cb74b..cd8035c 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -1,4 +1,5 @@
 DIST 22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip 2318445 SHA256 9d251f217f0f39c098d4fa576d77c720f8039b43becb15d88912d9c3fdcd2c3e SHA512 c696b7984a663257210b03bb9a7d4a8da8a53d7e727de068558380b14c0f17aefe8cfe310c0b96f277010756b277f500629db3c9d9a1fcf38f5113708d8dbd34 WHIRLPOOL a8e55e84ee661eb951dec065cf0f2ac6f19720a30bbe8432c95a56d531fdd2bb48a8359946fc8a1bc8d789a568bfed87bcdee04efdc86be58a518434616d6641
+DIST 7B38E2908FFD70F2AB580D21A9E688A78C6365E7-ant-libs-1.10.0alpha.zip 2473000 SHA256 0df76dcab01c826a9a9fc0120ba1d00f0c2cff4a4c1489af9fbbd50dd7da0394 SHA512 9dc6ab83466e75be4c2e56dba645c84fb15c80d19edf445c23de308cd226f40fcd51918e4ed65a32517232417bb414a2b581954f12615e9ea5908a861e47bdba WHIRLPOOL bf20a7e14265f8bdd4abda261d3986d3295da751b99cdc7e999959cc6a20a93a10d1fb358926459ceb036d326009b8d283808e47a496420ae3b069bc63f82f2a
 DIST BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip 2341753 SHA256 d643c2f579f13c9a4220df6243e2669349f7fd52ef10595aa7602af558067c8f SHA512 024b1458f74ae977f5864b543b39417205203f27ff94518aa61ee4c7336c887dc5704b71909fd2b6286c3a29a9ee0aeb86aafc32f741c7650adcacc8374f62ca WHIRLPOOL 6843d000325f46cbf6c3fa9c5b09ea37785c6bb7ad3f8438d186e60ea96822325e2f5a22485653f0e242afb1d8fcac5804d629cd549d6a07b319996f4ec822c7
 DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
 DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
@@ -7,6 +8,7 @@ DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296
 DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde12073116a77c1844e4ca7a071d95930b7cd7d5ac SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7 WHIRLPOOL 378db0807a616205fee2623f1c1ada6284ecfc85badb06d68e56e91fbedbc4f73af3ce6e4e8eb8bdb9504d15cf20cdc2a30d5f9cad0c72329791f1a53803ca0e
 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-201609120002-src.zip 218010356 SHA256 265ec87ec62f15d8112229caf357bb081ad75359c131a4c47545f35563136641 SHA512 644685d3172272328048eb4cb91de128541cac95fbade58364f0d8841f0ed54a2578ef24be3749b960a39097c7849f6b553ae17e9cf9082b82deff93dfd5fee5 WHIRLPOOL 048bf90567bdd58598a4cecb78289b621a93736cd78c834cf329387b59fc645778bd610df1d8e403df26e2fee72c542e4f9cab54593208c81a5c6e9edc5e991b
 DIST netbeans-trunk-nightly-201609130002-src.zip 218011897 SHA256 40cb0d7c2dba73fa2d3dcddcbc1cf6a1bef06b551cf0a5ff9d6ce9ff12ea007d SHA512 26e5b258261386437534b6b8748a69c7fb7e9332e67584de9723ff7cf9067d20e5cb6d4e86eaf0c611378be0bef9517dd563ca824499efc4f1a89056860ac856 WHIRLPOOL 3b4bd5894c4f65d638a070084267814f00819936c9e4cf7ca758eb04f5500280daf16caa36137700659c10717738d98558b9c5e090c4df82e2d9247308a1f1d3
 DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318bfe333cedd1fbd81a4c6b870e0025f9f4f3ea3d6926bc18cb1c SHA512 81af61f842b23dd51b5610d4c1f9a7113f82e4ceaee2af4a4f4392b56f38b9ec92655c1e413e9b58a808207b308dc68ea8b94c24ef636db8d8ea81275f867470 WHIRLPOOL 8cc8b87bbf8299ab97e24ee64b1d982dfb942cb60a8d8a110b38207807c05b8a7f1c2a2a4d5df52a80c12eaa9ae08440e8f7e333e6a519d83759d2b50c42d015
@@ -30,6 +32,7 @@ DIST netbeans-trunk-nightly-201610020002-src.zip 218005806 SHA256 3d0a3bfc28fa05
 DIST netbeans-trunk-nightly-201610030002-src.zip 218005806 SHA256 54f1b4f61b69379600dfa69adaee9457fd056548646d21e026dac1cb69719549 SHA512 0ae6c8ade2eeae51795d75d44394cdb1972e4113c07e5f573bdafef84ecfba76373e4f78ac1e1737a91d60c8eeb801c1c09f724a9fa99a3ab423b1f02df1e95d WHIRLPOOL ba04e61ec0d8d14aef1882aac28e0853ce0fea5ce42c3cb5ef388ae29e955634e4cdc88846836139d0e4074b87ee624c73f14cea463b706a224c706c991db044
 DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 DIST netbeans-trunk-nightly-201610070002-src.zip 218006580 SHA256 f8d583408b3219efec6b892090955f255bd087c46a05b863a2de9d341236ecf2 SHA512 aa0efd3bbdb4dc2af2570608e5e5c1dcccc1537dabf6d13f9cae9174a272da6b315e97dbfda4c63ff0ab5404be8167c41aa49dba98c9a7eadc8e09fcb2855d46 WHIRLPOOL 2b0f76c982f2badeca4889ec9326dd77f421f0de407fd28318f5ed99b99ed51a6335d49bc0e8d7ecce21f63a784adc6920fef3598caebff288ed634b50516d99
+DIST netbeans-trunk-nightly-201610130002-src.zip 218229380 SHA256 02482b39c317970c794a4eb8c331121e67aa338a278d024d2cae0dee8ede0cf3 SHA512 eb855690d48046d16a2eb22dc93de8ddbdabc2cfd3cd16901ca16a36a4071aafef9061411b32414639d4239bcbe4d609c7a935f8dd932b7c38354d283d99e0e7 WHIRLPOOL 7ec6a0f0518da70610bd762254db42b4bc60670e4ff4063e9b55f4d789ffa52d546c7f3d01d83b001cea0a5d88b9078c7699c2648e4a81b7f2cb9a56cf584157
 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
@@ -56,4 +59,5 @@ EBUILD netbeans-javadoc-9999_p20161002.ebuild 6293 SHA256 e7d753e3264e0624d6173a
 EBUILD netbeans-javadoc-9999_p20161003.ebuild 6293 SHA256 fae2c29fbd2f5a890ad33fdbc5370a0cda8ea3f49850a204f4dca1f2a8040974 SHA512 e8ec357f749466e487d8330fd75fb0bd30ed56281d79af2d1cdd75b1b93cf82e64ead70465f42dfea20674471e8d221733dc748b74911c624ee2859b1a88ee2e WHIRLPOOL b5f9b2783dfbd049a67d5923c10f0257ff79023669a3a9134aeb773229f9d09a6a328d7124fbda0631834d025bf5dc6722c51ba1441c95d35906edf63be17cf4
 EBUILD netbeans-javadoc-9999_p20161006.ebuild 5993 SHA256 7d9da2c94a963126765c29f8cc1028717cc0956647e151125218bc338ca67741 SHA512 7db4872f0506335261dab3fdf5d499fad0abfb712118f9cdd3eda4942a05b5070966cc46b706cd3244e87cf60e5a5bb42aa52c1f04f8395214d21383e58c8a39 WHIRLPOOL c1dc2fe5e881a8613a51f5d380ff7553c228d6e4038294a4fdae2ec50b8bf8d66d0920113ff92ccb8dd593864c8fc59d7baf7963135410f34cb0a9e0aa6819f4
 EBUILD netbeans-javadoc-9999_p20161007.ebuild 5993 SHA256 6438f62ed8bb1a2599edc04f25fc218f84e5fc892ad808c080638f565e50dc77 SHA512 9aa5dcfc3302a1830d7c049e64146f88889acaeaa02912877d14862e2a4f2cdc748eaeaac7c9307e417cc93acc29d86e9397d9e8e542aa62b7a538631d73c885 WHIRLPOOL a74a187923affeee3aacc14c9c6f6334490203b877fca96afa90adb6f84c72d0043a90fb5f908d90aa7b56a3fda13b3a95ddaeb03c068fa0fa38962062ac3aa7
+EBUILD netbeans-javadoc-9999_p20161013.ebuild 6011 SHA256 1a5b0fe2bed614c5329c38a2ee7465a395cdc19399fac5aab6acd4990d7466a1 SHA512 2bbbd6a4756dc4178b315d04c41668d4db86f809584695412e46c1e176bd30d64ed3840406350f43e511bbf6c1636fb5c31350b777ebddb27a53b49ec04d4d73 WHIRLPOOL ed692095e5bfc86b903ed5d9073466ad17a1c4206e21377d1871e4669422970903d807203c8d3767215427cdfdc3f47ef6e6f93fffda0efc2e1cae618c56940b
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20161013.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20161013.ebuild
new file mode 100644
index 0000000..ce01afa
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20161013.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+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-10-13_00-02-33/zip/netbeans-trunk-nightly-201610130002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r17-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/7B38E2908FFD70F2AB580D21A9E688A78C6365E7-ant-libs-1.10.0alpha.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-r17-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/7B38E2908FFD70F2AB580D21A9E688A78C6365E7-ant-libs-1.10.0alpha.zip o.apache.tools.ant.module/external/ant-libs-1.10.0alpha.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r17-build.xml.patch
+
+	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
+	default
+}
+
+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 d29cb81..561372a 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -1,5 +1,6 @@
 DIST 0F7FC8D69950B86D5F67529B5C551DB84C5BCF87-nb-javac-api.jar 132323 SHA256 e3591d9a40c8829eca5f12a12513f3919be4b07923b0aabad1ba4b9f472d79d1 SHA512 4aacd1a1bf7a177e496d604af5d55a05efeeb3c3d2aa6ebe7606bab9278980dc7ef37ef6debb405bf71bf4d4907b8ad2792a7a224987f2ca02fe7fa1be6808d4 WHIRLPOOL 23406d70f15bf7ddcda79a86985b9978a3b72fafcab6e8e3c665cf0958cc07aa095e9a857e5d9c097de52fe6d2bc4f0216f7cb50d4984d83e14d9fad1eba3e53
 DIST 20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar 61713 SHA256 38bf23ed74459460f3f0b91735455e9b74d406c72612b6aef7278161db119545 SHA512 2d06db5267ac5d8fd227819014177f0d5cc345583628f1ff2fff89f180a4269936a136af0b4649cf43603b0adab6ce3e3f525ef2033537c6f035b558c356d900 WHIRLPOOL acd74c6edad1c0e74d6475aecd0a00d2b0760bde5a76b9846b466ac03087d814a9bbb1c0b4ab3f2bc29a25c465fe1875f6a45e544c7468c4d60793795c37dd37
+DIST 3BB258C976F65C78D890CACB5C0D3096B793289E-nb-javac-api.jar 197128 SHA256 4f2f85bb8d27b1a305fa54fabc4df7e8bce64cd06aadf1073a9327b2eb1fc6db SHA512 c4f58f0368a48ac894590f905fdd6118ca62f37d61081d4ddd6ef36f02d2645215c7f4084a225c1c49264e5441f028e552d361dfa7b0fad2526e49591337cab6 WHIRLPOOL 61d111f27cc28e579b32c7ac23c950e021ec4103172ed899bcba47c61cdee8642a3c45177bf992bc69b7c2190a200cd7ac8db275d6dee1bbc6e74e5ff4e72ef8
 DIST 49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip 579550 SHA256 e173ba926f93e89bbb9c76bd2190b01e0af2d2b3223d2c78b4ed5bdaebbd78a0 SHA512 3de7720a392813cbbbc73a6ce2a745e10054c0888df61b1e623bf327f8a4584a9eaa07303fc41d01d2088fd6c868e7273c6355d23839dfaa9009d1f672520d58 WHIRLPOOL b6e2a6ca1bcea47dcff7d8a9ea043a5b76834bde9d9f715d5d3eb52211e5c0d8a9d0575c326fa2f1d4d2a5dd93bccdcaf20af45788e7e3032829ac85a83b64da
 DIST 5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar 187846 SHA256 40a7cdedd5a9724b07dadfb3e4e8cc71d6117052f59f13badd1bbf60370e45fd SHA512 548dcb27bc8aa61f17573e0e9896c361466a5d226b8e6b0d5f9a0181d17ce61ad5d137caa268c33da17e8541978427c3faa34be99d96817d09f22277f99dfda2 WHIRLPOOL 4cc8b27be4c5c9715b4103b7022290f9b84a554070de088035a1b80024c5540a456b04a3a80902ff345b1aa5d5b200157b3016b6023e7b62b6a0b1c80caa481f
 DIST A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar 109823 SHA256 18050686d2da634f3612a8100c405eb092dc06d86b8917c6b945d096daf49f94 SHA512 5a0089c36c35ffa2c243cbaee376a246dbfd3dd3f170fa233946b6134f9c80dda610f2900e8bbd1553c3e8bdd3b5548145c881745acc720ec1e059d8252b8399 WHIRLPOOL b01f2a78d653aea3f7a2369a66bef0ccda6026a38efe8f52616eed75df8ef80852ba509a4319ba183ab08d9141a138cde48addd910199f47b2ada7bfc5b24efb
@@ -13,6 +14,7 @@ DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296
 DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde12073116a77c1844e4ca7a071d95930b7cd7d5ac SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7 WHIRLPOOL 378db0807a616205fee2623f1c1ada6284ecfc85badb06d68e56e91fbedbc4f73af3ce6e4e8eb8bdb9504d15cf20cdc2a30d5f9cad0c72329791f1a53803ca0e
 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-201609120002-src.zip 218010356 SHA256 265ec87ec62f15d8112229caf357bb081ad75359c131a4c47545f35563136641 SHA512 644685d3172272328048eb4cb91de128541cac95fbade58364f0d8841f0ed54a2578ef24be3749b960a39097c7849f6b553ae17e9cf9082b82deff93dfd5fee5 WHIRLPOOL 048bf90567bdd58598a4cecb78289b621a93736cd78c834cf329387b59fc645778bd610df1d8e403df26e2fee72c542e4f9cab54593208c81a5c6e9edc5e991b
 DIST netbeans-trunk-nightly-201609130002-src.zip 218011897 SHA256 40cb0d7c2dba73fa2d3dcddcbc1cf6a1bef06b551cf0a5ff9d6ce9ff12ea007d SHA512 26e5b258261386437534b6b8748a69c7fb7e9332e67584de9723ff7cf9067d20e5cb6d4e86eaf0c611378be0bef9517dd563ca824499efc4f1a89056860ac856 WHIRLPOOL 3b4bd5894c4f65d638a070084267814f00819936c9e4cf7ca758eb04f5500280daf16caa36137700659c10717738d98558b9c5e090c4df82e2d9247308a1f1d3
 DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318bfe333cedd1fbd81a4c6b870e0025f9f4f3ea3d6926bc18cb1c SHA512 81af61f842b23dd51b5610d4c1f9a7113f82e4ceaee2af4a4f4392b56f38b9ec92655c1e413e9b58a808207b308dc68ea8b94c24ef636db8d8ea81275f867470 WHIRLPOOL 8cc8b87bbf8299ab97e24ee64b1d982dfb942cb60a8d8a110b38207807c05b8a7f1c2a2a4d5df52a80c12eaa9ae08440e8f7e333e6a519d83759d2b50c42d015
@@ -36,6 +38,7 @@ DIST netbeans-trunk-nightly-201610020002-src.zip 218005806 SHA256 3d0a3bfc28fa05
 DIST netbeans-trunk-nightly-201610030002-src.zip 218005806 SHA256 54f1b4f61b69379600dfa69adaee9457fd056548646d21e026dac1cb69719549 SHA512 0ae6c8ade2eeae51795d75d44394cdb1972e4113c07e5f573bdafef84ecfba76373e4f78ac1e1737a91d60c8eeb801c1c09f724a9fa99a3ab423b1f02df1e95d WHIRLPOOL ba04e61ec0d8d14aef1882aac28e0853ce0fea5ce42c3cb5ef388ae29e955634e4cdc88846836139d0e4074b87ee624c73f14cea463b706a224c706c991db044
 DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 DIST netbeans-trunk-nightly-201610070002-src.zip 218006580 SHA256 f8d583408b3219efec6b892090955f255bd087c46a05b863a2de9d341236ecf2 SHA512 aa0efd3bbdb4dc2af2570608e5e5c1dcccc1537dabf6d13f9cae9174a272da6b315e97dbfda4c63ff0ab5404be8167c41aa49dba98c9a7eadc8e09fcb2855d46 WHIRLPOOL 2b0f76c982f2badeca4889ec9326dd77f421f0de407fd28318f5ed99b99ed51a6335d49bc0e8d7ecce21f63a784adc6920fef3598caebff288ed634b50516d99
+DIST netbeans-trunk-nightly-201610130002-src.zip 218229380 SHA256 02482b39c317970c794a4eb8c331121e67aa338a278d024d2cae0dee8ede0cf3 SHA512 eb855690d48046d16a2eb22dc93de8ddbdabc2cfd3cd16901ca16a36a4071aafef9061411b32414639d4239bcbe4d609c7a935f8dd932b7c38354d283d99e0e7 WHIRLPOOL 7ec6a0f0518da70610bd762254db42b4bc60670e4ff4063e9b55f4d789ffa52d546c7f3d01d83b001cea0a5d88b9078c7699c2648e4a81b7f2cb9a56cf584157
 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
@@ -62,4 +65,5 @@ EBUILD netbeans-javafx-9999_p20161002.ebuild 4717 SHA256 c68aed568b8506525930317
 EBUILD netbeans-javafx-9999_p20161003.ebuild 4717 SHA256 8677f2d0c0904324d4632959b47ea2201b8f358f3ad9fc432db0fd3f023e68fe SHA512 b73c121bd343be41578e0784cfc1c309a53c85f2dd3e25f76da03e9f0f9b1095b52d9fb3d840d7448b3330a005b9869e8589dce0b2c39a9e710fe37eb24f0343 WHIRLPOOL 7608e056db01e76d8981b79656160a51cba61910865f95cd2e329afeeb6906d7a0cdcd3256ffc490d8fd2dc597beb6db10e5a618c5832c5d5fb02db9bb7365df
 EBUILD netbeans-javafx-9999_p20161006.ebuild 4438 SHA256 7bcc3fdf49723f026f063b4c4eb781e31ba146c6cdd7bf4eb74493ef04a90308 SHA512 5e0b2144f42d8fd3f65d7fe3aa24cd63637ebaae01a7a7ebbfd0702ded9f0184b7222018105b13bbc7508c2c7b34085a0a1bbb0578aa636fcd5d25ca8635fcca WHIRLPOOL 716336a54fbce9fba739c11c9a345fda2d1dfc70abae9fb1a97fb31b1b092664b29e2c4dbc6c05dbf2a9111daa20c412785b4b3ed2f6ff0d63befe67fa33a9fb
 EBUILD netbeans-javafx-9999_p20161007.ebuild 4438 SHA256 b33a6e486f505c9fc564bd291bf988941efe1b5f6b982e1025239e0a62a1c698 SHA512 97ba08a1a1a5b41c037b6e8420e5ad9eca0dbe15cf8306c6dd91658adcafbec91ee5031754cc252897e4a89e791038a2f71a4685a421a7ee31b594a803f6aa3b WHIRLPOOL 4a5e068c20aa305d9de3f6be91b5e64e3fe6aca2407ac8ce01ccbee249019c2686b9e436b99963302b280859213cd2d97ef6fbc36aa6febe2a88160111e8651a
+EBUILD netbeans-javafx-9999_p20161013.ebuild 4438 SHA256 6a64e15f6a831dd6136ebe60110409d8475caa52caafa7381d46ad1f645aa4e1 SHA512 8024354853a0228ed51090380fdfa9d8751f0f765fae03e65c43babe70e8baf7284a54dee82d3b6a7d191ee46e774a7690303c33ae95b6af4dc57677605c55c0 WHIRLPOOL 1cee74680e58a5fa575a26c0cc248a4576285117862f6a133429fc4bfe06618050cbdd052e00b110d0968162b960d12a0051cb3336f9751879aff1366b577831
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20161013.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20161013.ebuild
new file mode 100644
index 0000000..494e9c3
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20161013.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+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-10-13_00-02-33/zip/netbeans-trunk-nightly-201610130002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r17-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/3BB258C976F65C78D890CACB5C0D3096B793289E-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 virtual/jdk:1.8 )
+	${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-r17-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}"/3BB258C976F65C78D890CACB5C0D3096B793289E-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-r17-build.xml.patch
+
+	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
+	default
+}
+
+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 4a3b978..b9df20f 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -5,6 +5,7 @@ DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296
 DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde12073116a77c1844e4ca7a071d95930b7cd7d5ac SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7 WHIRLPOOL 378db0807a616205fee2623f1c1ada6284ecfc85badb06d68e56e91fbedbc4f73af3ce6e4e8eb8bdb9504d15cf20cdc2a30d5f9cad0c72329791f1a53803ca0e
 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-201609120002-src.zip 218010356 SHA256 265ec87ec62f15d8112229caf357bb081ad75359c131a4c47545f35563136641 SHA512 644685d3172272328048eb4cb91de128541cac95fbade58364f0d8841f0ed54a2578ef24be3749b960a39097c7849f6b553ae17e9cf9082b82deff93dfd5fee5 WHIRLPOOL 048bf90567bdd58598a4cecb78289b621a93736cd78c834cf329387b59fc645778bd610df1d8e403df26e2fee72c542e4f9cab54593208c81a5c6e9edc5e991b
 DIST netbeans-trunk-nightly-201609130002-src.zip 218011897 SHA256 40cb0d7c2dba73fa2d3dcddcbc1cf6a1bef06b551cf0a5ff9d6ce9ff12ea007d SHA512 26e5b258261386437534b6b8748a69c7fb7e9332e67584de9723ff7cf9067d20e5cb6d4e86eaf0c611378be0bef9517dd563ca824499efc4f1a89056860ac856 WHIRLPOOL 3b4bd5894c4f65d638a070084267814f00819936c9e4cf7ca758eb04f5500280daf16caa36137700659c10717738d98558b9c5e090c4df82e2d9247308a1f1d3
 DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318bfe333cedd1fbd81a4c6b870e0025f9f4f3ea3d6926bc18cb1c SHA512 81af61f842b23dd51b5610d4c1f9a7113f82e4ceaee2af4a4f4392b56f38b9ec92655c1e413e9b58a808207b308dc68ea8b94c24ef636db8d8ea81275f867470 WHIRLPOOL 8cc8b87bbf8299ab97e24ee64b1d982dfb942cb60a8d8a110b38207807c05b8a7f1c2a2a4d5df52a80c12eaa9ae08440e8f7e333e6a519d83759d2b50c42d015
@@ -28,6 +29,7 @@ DIST netbeans-trunk-nightly-201610020002-src.zip 218005806 SHA256 3d0a3bfc28fa05
 DIST netbeans-trunk-nightly-201610030002-src.zip 218005806 SHA256 54f1b4f61b69379600dfa69adaee9457fd056548646d21e026dac1cb69719549 SHA512 0ae6c8ade2eeae51795d75d44394cdb1972e4113c07e5f573bdafef84ecfba76373e4f78ac1e1737a91d60c8eeb801c1c09f724a9fa99a3ab423b1f02df1e95d WHIRLPOOL ba04e61ec0d8d14aef1882aac28e0853ce0fea5ce42c3cb5ef388ae29e955634e4cdc88846836139d0e4074b87ee624c73f14cea463b706a224c706c991db044
 DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 DIST netbeans-trunk-nightly-201610070002-src.zip 218006580 SHA256 f8d583408b3219efec6b892090955f255bd087c46a05b863a2de9d341236ecf2 SHA512 aa0efd3bbdb4dc2af2570608e5e5c1dcccc1537dabf6d13f9cae9174a272da6b315e97dbfda4c63ff0ab5404be8167c41aa49dba98c9a7eadc8e09fcb2855d46 WHIRLPOOL 2b0f76c982f2badeca4889ec9326dd77f421f0de407fd28318f5ed99b99ed51a6335d49bc0e8d7ecce21f63a784adc6920fef3598caebff288ed634b50516d99
+DIST netbeans-trunk-nightly-201610130002-src.zip 218229380 SHA256 02482b39c317970c794a4eb8c331121e67aa338a278d024d2cae0dee8ede0cf3 SHA512 eb855690d48046d16a2eb22dc93de8ddbdabc2cfd3cd16901ca16a36a4071aafef9061411b32414639d4239bcbe4d609c7a935f8dd932b7c38354d283d99e0e7 WHIRLPOOL 7ec6a0f0518da70610bd762254db42b4bc60670e4ff4063e9b55f4d789ffa52d546c7f3d01d83b001cea0a5d88b9078c7699c2648e4a81b7f2cb9a56cf584157
 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
@@ -54,4 +56,5 @@ EBUILD netbeans-mobility-9999_p20161002.ebuild 4412 SHA256 d09cef03636ae82512dad
 EBUILD netbeans-mobility-9999_p20161003.ebuild 4412 SHA256 2006c93378260e4564039c212a7cb57eb12c53fc9a3cc260864a4a59512967f5 SHA512 7389a433695ca3f5abba43fee9a4cdf34e78f7dc42ba5cdf4f628f562d6cd33f9e9f6a8d3d4aaac2a33c68e6cb662b1c2c28a08c14230ab22db5c4e7613df5e9 WHIRLPOOL 5199597a4c6d129329cb2ced9cb28c3dcc2d2581b9397bb2e8b6dfbeb07c54503d538aa3f9a27a3e74ec5a5c89a86b34ddebbc702a5b7432fcd21acdc3442044
 EBUILD netbeans-mobility-9999_p20161006.ebuild 4133 SHA256 252c993249cb9b7df0019bb92e35c6078a0a7ee552d4f2343f1feb6c6a91de9c SHA512 7bfd5e272cc80d99b4b0c1dc7608de96fab7e998d9c42446ec4f8f80fe43f9484dd32c73b1bc5bf76ad0925ad77ce3c4f6a138b941db39bae6a6c7e5e5e15ff9 WHIRLPOOL dc581fbe43bddddc2302523fc3cfa1a7b4c8ae075fdfe34dcb2c084b5a65c86b07689c168b569e067133bf52c35e479b32d653d61b0b0a3d59ae2da9611b614a
 EBUILD netbeans-mobility-9999_p20161007.ebuild 4133 SHA256 d8cc18ca2631e44feebf47f686433d45480d0e1ef8d23899a8ef155e2343b684 SHA512 527386264754a75a8ba59cb9eedc909c3504b9fe5e30c4d4d73cb31de24d3c72c984b838f5312077626f9f711f2a03da047de144ad94e9a686889281d317dace WHIRLPOOL 349c14562f4d9140f929525730acb31fc999128c43a96bc96b527164b75a8f2d467dcf2207c3da4fb37f7b78c4af60fe24c049631a7e1d926f7e2539038d5766
+EBUILD netbeans-mobility-9999_p20161013.ebuild 4133 SHA256 1e552e201e9912659c8741c1e745b03cf7ec999096848cb8fa1f69486a679e32 SHA512 251a5de4d4a6fb55a7fabc4c7a23b600b4994c492a1a5a99b2becd63f2eca863cecba836a2dac77583e57059e5e0b043dc43bd6a22c88925a639b5d860d3144d WHIRLPOOL 8edb9b538cceaca4b9e3f849d1fc8657f866dad58cd3c6063ea9b3fc9a433c5c6cdb05c84d868b5d15ada731f662c5c896dc76c0f4c2ca26635ee09b4c417039
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20161013.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20161013.ebuild
new file mode 100644
index 0000000..0508ab3
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20161013.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+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-10-13_00-02-33/zip/netbeans-trunk-nightly-201610130002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r17-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 virtual/jdk:1.8 )
+	${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-r17-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r17-build.xml.patch
+
+	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
+	default
+}
+
+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 771de7f..5090256 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -8,6 +8,7 @@ DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296
 DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde12073116a77c1844e4ca7a071d95930b7cd7d5ac SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7 WHIRLPOOL 378db0807a616205fee2623f1c1ada6284ecfc85badb06d68e56e91fbedbc4f73af3ce6e4e8eb8bdb9504d15cf20cdc2a30d5f9cad0c72329791f1a53803ca0e
 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-201609120002-src.zip 218010356 SHA256 265ec87ec62f15d8112229caf357bb081ad75359c131a4c47545f35563136641 SHA512 644685d3172272328048eb4cb91de128541cac95fbade58364f0d8841f0ed54a2578ef24be3749b960a39097c7849f6b553ae17e9cf9082b82deff93dfd5fee5 WHIRLPOOL 048bf90567bdd58598a4cecb78289b621a93736cd78c834cf329387b59fc645778bd610df1d8e403df26e2fee72c542e4f9cab54593208c81a5c6e9edc5e991b
 DIST netbeans-trunk-nightly-201609130002-src.zip 218011897 SHA256 40cb0d7c2dba73fa2d3dcddcbc1cf6a1bef06b551cf0a5ff9d6ce9ff12ea007d SHA512 26e5b258261386437534b6b8748a69c7fb7e9332e67584de9723ff7cf9067d20e5cb6d4e86eaf0c611378be0bef9517dd563ca824499efc4f1a89056860ac856 WHIRLPOOL 3b4bd5894c4f65d638a070084267814f00819936c9e4cf7ca758eb04f5500280daf16caa36137700659c10717738d98558b9c5e090c4df82e2d9247308a1f1d3
 DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318bfe333cedd1fbd81a4c6b870e0025f9f4f3ea3d6926bc18cb1c SHA512 81af61f842b23dd51b5610d4c1f9a7113f82e4ceaee2af4a4f4392b56f38b9ec92655c1e413e9b58a808207b308dc68ea8b94c24ef636db8d8ea81275f867470 WHIRLPOOL 8cc8b87bbf8299ab97e24ee64b1d982dfb942cb60a8d8a110b38207807c05b8a7f1c2a2a4d5df52a80c12eaa9ae08440e8f7e333e6a519d83759d2b50c42d015
@@ -31,6 +32,7 @@ DIST netbeans-trunk-nightly-201610020002-src.zip 218005806 SHA256 3d0a3bfc28fa05
 DIST netbeans-trunk-nightly-201610030002-src.zip 218005806 SHA256 54f1b4f61b69379600dfa69adaee9457fd056548646d21e026dac1cb69719549 SHA512 0ae6c8ade2eeae51795d75d44394cdb1972e4113c07e5f573bdafef84ecfba76373e4f78ac1e1737a91d60c8eeb801c1c09f724a9fa99a3ab423b1f02df1e95d WHIRLPOOL ba04e61ec0d8d14aef1882aac28e0853ce0fea5ce42c3cb5ef388ae29e955634e4cdc88846836139d0e4074b87ee624c73f14cea463b706a224c706c991db044
 DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 DIST netbeans-trunk-nightly-201610070002-src.zip 218006580 SHA256 f8d583408b3219efec6b892090955f255bd087c46a05b863a2de9d341236ecf2 SHA512 aa0efd3bbdb4dc2af2570608e5e5c1dcccc1537dabf6d13f9cae9174a272da6b315e97dbfda4c63ff0ab5404be8167c41aa49dba98c9a7eadc8e09fcb2855d46 WHIRLPOOL 2b0f76c982f2badeca4889ec9326dd77f421f0de407fd28318f5ed99b99ed51a6335d49bc0e8d7ecce21f63a784adc6920fef3598caebff288ed634b50516d99
+DIST netbeans-trunk-nightly-201610130002-src.zip 218229380 SHA256 02482b39c317970c794a4eb8c331121e67aa338a278d024d2cae0dee8ede0cf3 SHA512 eb855690d48046d16a2eb22dc93de8ddbdabc2cfd3cd16901ca16a36a4071aafef9061411b32414639d4239bcbe4d609c7a935f8dd932b7c38354d283d99e0e7 WHIRLPOOL 7ec6a0f0518da70610bd762254db42b4bc60670e4ff4063e9b55f4d789ffa52d546c7f3d01d83b001cea0a5d88b9078c7699c2648e4a81b7f2cb9a56cf584157
 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
@@ -57,4 +59,5 @@ EBUILD netbeans-nb-9999_p20161002.ebuild 4111 SHA256 4f2bb0d363b8be272ed808a291a
 EBUILD netbeans-nb-9999_p20161003.ebuild 4111 SHA256 563179374cd16b33a1e36e0b8bfcbc31bb4037f0db7f3070aa7aed5a21616477 SHA512 d991515625214ddb0305cf86972d8f91fddb38f23d8d8a9dfb73f58196e589b677f01718d4449bb94ef62f69c618bc62b584ca1d8ac9536cebe29494b08a72d4 WHIRLPOOL 23786719623ebf6c41879cda1b620003b796fabb791b21206ecac6095529feae74594e3d64c3e9fcc3a97c6517625181bccc16be51cf05d426e3794a74158aab
 EBUILD netbeans-nb-9999_p20161006.ebuild 3832 SHA256 14ac3542836d93698f5a5056a30fbd393f57edb4654b0407c48625c122dcc3fd SHA512 9f88f56346f1286169e42e115d414ad90a56783624177466f9a62ff4458f335e863bf6b6f040c84b23b1827a40a53867232efba9f6a716fc717d80e1819b57cd WHIRLPOOL a5df4170559afce6fbc00da10966dc293f07fa47204ad87c760d2508e05d70ecfb6703832b73e4d7c22ad417f19e561b472d3a8efc0576de9c23ab3d92a8c2b5
 EBUILD netbeans-nb-9999_p20161007.ebuild 3832 SHA256 7cc83d59fa8dfc08cae707103bd23f9b64a201f178612f48aac453018b2bcec6 SHA512 2492ea02d4ac75ecf3690d693a2626d82378bfad6a6eae51685c5b918a5149aed7b9b9e4037791777da9f356901eb497b7da2eaef339c59bbe8acf05e3ec2ecf WHIRLPOOL 8e373e75f49851fdf6b25c84da7802b527870360d62988e6c76dba97bd4f551589ccec902cb10d85974ebe423dfdfd05dd227376e51817ed9269e8edd559dd72
+EBUILD netbeans-nb-9999_p20161013.ebuild 3832 SHA256 eded42c2cc1a7ca8fd2d0f07077f58d1e5fdf1afe5cae38a2a8260bfaadc04de SHA512 31d9be058df03376dff7a7a31af728c52ef2ba06c813ab5ab89a7d8e57513de55bde3b1bfc4af255c842f5ad366338f66955b4257db9d9f7ad35e6e92f3a5a9e WHIRLPOOL b43847bb14015cad56f202f7cd8cba7df961ce131cfc5233b07a991be8fe4fdf317c98248d4d8915a0dc61cf47aaab5fc9b162ee4a0302f4d95ec5bc73bd208e
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20161013.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20161013.ebuild
new file mode 100644
index 0000000..00b1e7a
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20161013.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+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-10-13_00-02-33/zip/netbeans-trunk-nightly-201610130002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r17-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 virtual/jdk:1.8 )
+	${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-r17-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r17-build.xml.patch
+
+	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
+	default
+}
+
+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 a35c6ec..bbf4acc 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -10,6 +10,7 @@ DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296
 DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde12073116a77c1844e4ca7a071d95930b7cd7d5ac SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7 WHIRLPOOL 378db0807a616205fee2623f1c1ada6284ecfc85badb06d68e56e91fbedbc4f73af3ce6e4e8eb8bdb9504d15cf20cdc2a30d5f9cad0c72329791f1a53803ca0e
 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-201609120002-src.zip 218010356 SHA256 265ec87ec62f15d8112229caf357bb081ad75359c131a4c47545f35563136641 SHA512 644685d3172272328048eb4cb91de128541cac95fbade58364f0d8841f0ed54a2578ef24be3749b960a39097c7849f6b553ae17e9cf9082b82deff93dfd5fee5 WHIRLPOOL 048bf90567bdd58598a4cecb78289b621a93736cd78c834cf329387b59fc645778bd610df1d8e403df26e2fee72c542e4f9cab54593208c81a5c6e9edc5e991b
 DIST netbeans-trunk-nightly-201609130002-src.zip 218011897 SHA256 40cb0d7c2dba73fa2d3dcddcbc1cf6a1bef06b551cf0a5ff9d6ce9ff12ea007d SHA512 26e5b258261386437534b6b8748a69c7fb7e9332e67584de9723ff7cf9067d20e5cb6d4e86eaf0c611378be0bef9517dd563ca824499efc4f1a89056860ac856 WHIRLPOOL 3b4bd5894c4f65d638a070084267814f00819936c9e4cf7ca758eb04f5500280daf16caa36137700659c10717738d98558b9c5e090c4df82e2d9247308a1f1d3
 DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318bfe333cedd1fbd81a4c6b870e0025f9f4f3ea3d6926bc18cb1c SHA512 81af61f842b23dd51b5610d4c1f9a7113f82e4ceaee2af4a4f4392b56f38b9ec92655c1e413e9b58a808207b308dc68ea8b94c24ef636db8d8ea81275f867470 WHIRLPOOL 8cc8b87bbf8299ab97e24ee64b1d982dfb942cb60a8d8a110b38207807c05b8a7f1c2a2a4d5df52a80c12eaa9ae08440e8f7e333e6a519d83759d2b50c42d015
@@ -33,6 +34,7 @@ DIST netbeans-trunk-nightly-201610020002-src.zip 218005806 SHA256 3d0a3bfc28fa05
 DIST netbeans-trunk-nightly-201610030002-src.zip 218005806 SHA256 54f1b4f61b69379600dfa69adaee9457fd056548646d21e026dac1cb69719549 SHA512 0ae6c8ade2eeae51795d75d44394cdb1972e4113c07e5f573bdafef84ecfba76373e4f78ac1e1737a91d60c8eeb801c1c09f724a9fa99a3ab423b1f02df1e95d WHIRLPOOL ba04e61ec0d8d14aef1882aac28e0853ce0fea5ce42c3cb5ef388ae29e955634e4cdc88846836139d0e4074b87ee624c73f14cea463b706a224c706c991db044
 DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 DIST netbeans-trunk-nightly-201610070002-src.zip 218006580 SHA256 f8d583408b3219efec6b892090955f255bd087c46a05b863a2de9d341236ecf2 SHA512 aa0efd3bbdb4dc2af2570608e5e5c1dcccc1537dabf6d13f9cae9174a272da6b315e97dbfda4c63ff0ab5404be8167c41aa49dba98c9a7eadc8e09fcb2855d46 WHIRLPOOL 2b0f76c982f2badeca4889ec9326dd77f421f0de407fd28318f5ed99b99ed51a6335d49bc0e8d7ecce21f63a784adc6920fef3598caebff288ed634b50516d99
+DIST netbeans-trunk-nightly-201610130002-src.zip 218229380 SHA256 02482b39c317970c794a4eb8c331121e67aa338a278d024d2cae0dee8ede0cf3 SHA512 eb855690d48046d16a2eb22dc93de8ddbdabc2cfd3cd16901ca16a36a4071aafef9061411b32414639d4239bcbe4d609c7a935f8dd932b7c38354d283d99e0e7 WHIRLPOOL 7ec6a0f0518da70610bd762254db42b4bc60670e4ff4063e9b55f4d789ffa52d546c7f3d01d83b001cea0a5d88b9078c7699c2648e4a81b7f2cb9a56cf584157
 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
@@ -59,4 +61,5 @@ EBUILD netbeans-php-9999_p20161002.ebuild 4418 SHA256 5d807aff4d48a9e24bff26e373
 EBUILD netbeans-php-9999_p20161003.ebuild 4418 SHA256 dfcc278a3c19f9e6ecdb7ca064f610ead7ff14413a3bf33505526c3603998f28 SHA512 f41fd0d14d0304a306c977afaa3766ec11f1ca8d93445541931c45435e41b404921f53cc950770a4515ed9a5f503985c6a68e569754fa09600694f1017328797 WHIRLPOOL aa8d55279a94729899b26f1a813907bb1aa96ddc51c5f889030cf9ffdb28d72043aa1c2d0e7ecfe5e8d9d2606bfe06ec8f316167177128339edeec99062c5978
 EBUILD netbeans-php-9999_p20161006.ebuild 4139 SHA256 fe65a8263647b2786fa2988a45c03893d275dfd111eca77e1a3bfcf496e66543 SHA512 e8c8263a0c0d2d7713d555d7402fbfc7e2192a4f2a3d86adfe646308121a0ab396c08a1577577546df2fff5bf2a9f7a4e38a11aa91273562cb06192c297a276f WHIRLPOOL cb2a3cb18c43f580e94380e9f5a853515ec70906c49059ae863e5d1759816c7f4ebd7617ab263e29dbc512aa01b1fb04710eed97940bb1d72406047acbaaee06
 EBUILD netbeans-php-9999_p20161007.ebuild 4139 SHA256 b9c0fb9b043117d0e35486d0b67f45ca54381b09a655b3a62a451f10ac620247 SHA512 f1b19f9b063dc0443623ba7a5300c38314226601dbd175dcac2afaffebf57e58e7e64b7266876e46c4c69e2ae7dedbd1989201525d9a4705e28d5e5d91941820 WHIRLPOOL acbe5626fd48992bd37116a2039f3df60fac83d3b3f1cf1dc54f77da9dc5b4de37aae314f28a49346d4e8aa507dec3b75f4a13c2b85eb078d4030d64490ca978
+EBUILD netbeans-php-9999_p20161013.ebuild 4139 SHA256 7d7322a832ee76bfea95795dbc8fe8ed7b5b9d21c0fa02c9ea3dba070bb640fd SHA512 77fc83cfaff6b7e0413eba53440a3dcabf52a6eb8c4bbcbc0ad6733165650a154a21267f2f87353ba3a04941510d417f8c4963d681d0f505aaca469bba64536e WHIRLPOOL 2c8f4f652e0d8c60242ac92071a3da0455796bcfbdb5b96737b8845b84746faf8625400aa24e64d167a6b295c7cb85580efd0f4a0a8b5fe22918128feb04ebee
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20161013.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20161013.ebuild
new file mode 100644
index 0000000..c41ebcd
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20161013.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+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-10-13_00-02-33/zip/netbeans-trunk-nightly-201610130002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r17-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 virtual/jdk:1.8 )
+	${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-r17-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-r17-build.xml.patch
+
+	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
+	default
+}
+
+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 5dbb31c..91d4319 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296
 DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde12073116a77c1844e4ca7a071d95930b7cd7d5ac SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7 WHIRLPOOL 378db0807a616205fee2623f1c1ada6284ecfc85badb06d68e56e91fbedbc4f73af3ce6e4e8eb8bdb9504d15cf20cdc2a30d5f9cad0c72329791f1a53803ca0e
 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-201609120002-src.zip 218010356 SHA256 265ec87ec62f15d8112229caf357bb081ad75359c131a4c47545f35563136641 SHA512 644685d3172272328048eb4cb91de128541cac95fbade58364f0d8841f0ed54a2578ef24be3749b960a39097c7849f6b553ae17e9cf9082b82deff93dfd5fee5 WHIRLPOOL 048bf90567bdd58598a4cecb78289b621a93736cd78c834cf329387b59fc645778bd610df1d8e403df26e2fee72c542e4f9cab54593208c81a5c6e9edc5e991b
 DIST netbeans-trunk-nightly-201609130002-src.zip 218011897 SHA256 40cb0d7c2dba73fa2d3dcddcbc1cf6a1bef06b551cf0a5ff9d6ce9ff12ea007d SHA512 26e5b258261386437534b6b8748a69c7fb7e9332e67584de9723ff7cf9067d20e5cb6d4e86eaf0c611378be0bef9517dd563ca824499efc4f1a89056860ac856 WHIRLPOOL 3b4bd5894c4f65d638a070084267814f00819936c9e4cf7ca758eb04f5500280daf16caa36137700659c10717738d98558b9c5e090c4df82e2d9247308a1f1d3
 DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318bfe333cedd1fbd81a4c6b870e0025f9f4f3ea3d6926bc18cb1c SHA512 81af61f842b23dd51b5610d4c1f9a7113f82e4ceaee2af4a4f4392b56f38b9ec92655c1e413e9b58a808207b308dc68ea8b94c24ef636db8d8ea81275f867470 WHIRLPOOL 8cc8b87bbf8299ab97e24ee64b1d982dfb942cb60a8d8a110b38207807c05b8a7f1c2a2a4d5df52a80c12eaa9ae08440e8f7e333e6a519d83759d2b50c42d015
@@ -54,6 +55,7 @@ DIST netbeans-trunk-nightly-201610020002-src.zip 218005806 SHA256 3d0a3bfc28fa05
 DIST netbeans-trunk-nightly-201610030002-src.zip 218005806 SHA256 54f1b4f61b69379600dfa69adaee9457fd056548646d21e026dac1cb69719549 SHA512 0ae6c8ade2eeae51795d75d44394cdb1972e4113c07e5f573bdafef84ecfba76373e4f78ac1e1737a91d60c8eeb801c1c09f724a9fa99a3ab423b1f02df1e95d WHIRLPOOL ba04e61ec0d8d14aef1882aac28e0853ce0fea5ce42c3cb5ef388ae29e955634e4cdc88846836139d0e4074b87ee624c73f14cea463b706a224c706c991db044
 DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 DIST netbeans-trunk-nightly-201610070002-src.zip 218006580 SHA256 f8d583408b3219efec6b892090955f255bd087c46a05b863a2de9d341236ecf2 SHA512 aa0efd3bbdb4dc2af2570608e5e5c1dcccc1537dabf6d13f9cae9174a272da6b315e97dbfda4c63ff0ab5404be8167c41aa49dba98c9a7eadc8e09fcb2855d46 WHIRLPOOL 2b0f76c982f2badeca4889ec9326dd77f421f0de407fd28318f5ed99b99ed51a6335d49bc0e8d7ecce21f63a784adc6920fef3598caebff288ed634b50516d99
+DIST netbeans-trunk-nightly-201610130002-src.zip 218229380 SHA256 02482b39c317970c794a4eb8c331121e67aa338a278d024d2cae0dee8ede0cf3 SHA512 eb855690d48046d16a2eb22dc93de8ddbdabc2cfd3cd16901ca16a36a4071aafef9061411b32414639d4239bcbe4d609c7a935f8dd932b7c38354d283d99e0e7 WHIRLPOOL 7ec6a0f0518da70610bd762254db42b4bc60670e4ff4063e9b55f4d789ffa52d546c7f3d01d83b001cea0a5d88b9078c7699c2648e4a81b7f2cb9a56cf584157
 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
@@ -80,4 +82,5 @@ EBUILD netbeans-platform-9999_p20161002.ebuild 9520 SHA256 170156cad4785e928c35f
 EBUILD netbeans-platform-9999_p20161003.ebuild 9520 SHA256 258afc9daaa19607aa680d31bd662f4e629657a9c095f336dfe5fc0538681dbc SHA512 127dc440a8d4b09c6ff75c25fc768fafa1f2fc638db6390053aa4aab21cf34f349ebaf97a31af409067f2c697d18cfbd31ad3e271b8e3768a84276d86952bf50 WHIRLPOOL 1cd58451c2e667046fe9588f085d5f3d04c217f3b493632a1e39019a5e2f21ffb09512cfae215b386f79cce5e005329aa6ffdf18f4eabe4a89230383c4f36a1a
 EBUILD netbeans-platform-9999_p20161006.ebuild 9241 SHA256 6347d9914cbef5b608788f5d336ad8cf1a6994b8fa0f8eabe234ce455a20208e SHA512 2fd10a4a68fc4f2c96bf9a9415768764876a5a38be784f829a0d05cd5a752b8a84e0ed47d06ba0b828fd8302d7c191c68e122a343c243be9dace07b1544d40bb WHIRLPOOL e7f606c904b620093cf9f530322adb91723ea6eb3cdb987bc6830f7adebfd7e24a0da7211659eb6404decef9e476d37a516fb5c94a2a02ba21a05b415811359f
 EBUILD netbeans-platform-9999_p20161007.ebuild 9241 SHA256 af867477d69d69bf04e6d5b78ef73a777dd92c07782114d6c06f40e5e2d0f9ae SHA512 28d6d322976c8b955d395e305f282b57df12a0c7b9a3181735beb5b6f598eb8d8048c73796030774489849a0e0ef354cb1ca4bbc5dbfa867fcb7c6bdd2912182 WHIRLPOOL bf0482a959301feca4cc7e8d77374f3de06d582a0516c3cfe717c31e493d8b797f5040b9a5c82d07045d69cc25a4c03c223edeeb7b167a12515029c597b4cc08
+EBUILD netbeans-platform-9999_p20161013.ebuild 9278 SHA256 fb3cf887c946b8c75fd03c6252a0f59b9b6abbc526eb5f21fd089ddc1638be28 SHA512 c013e9976590823e5887c9cb766253d0a3238cdc1d66f84631919e783c87c32e4ff5480679fe25d2fb4ef9b4f30739d422c2c5d530165aaed3aca72bf33febc1 WHIRLPOOL ae5a36f64412b895e2af069ea7cad0beefe284e6906f6e3653349e600196f4d5a517cce10ee1458cefd1cc51fdf0ab1e9cc872b494b2618c29ad0ef809c91f0f
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20161013.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20161013.ebuild
new file mode 100644
index 0000000..6e9a885
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20161013.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+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-10-13_00-02-33/zip/netbeans-trunk-nightly-201610130002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r17-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:4
+	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 virtual/jdk:1.8 )
+	${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-r17-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-r17-build.xml.patch
+
+	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-4 jna.jar jna-4.2.2-stripped.jar
+	java-pkg_jar-from --into libs.jna.platform/external jna-4 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
+	default
+}
+
+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-stripped.jar && java-pkg_jar-from --into "${instdir}" jna-4 jna.jar jna-4.2.2-stripped.jar
+	rm jna-platform-4.2.2.jar && java-pkg_jar-from --into "${instdir}" jna-4 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 020f9f4..0fcee37 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -5,6 +5,7 @@ DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296
 DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde12073116a77c1844e4ca7a071d95930b7cd7d5ac SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7 WHIRLPOOL 378db0807a616205fee2623f1c1ada6284ecfc85badb06d68e56e91fbedbc4f73af3ce6e4e8eb8bdb9504d15cf20cdc2a30d5f9cad0c72329791f1a53803ca0e
 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-201609120002-src.zip 218010356 SHA256 265ec87ec62f15d8112229caf357bb081ad75359c131a4c47545f35563136641 SHA512 644685d3172272328048eb4cb91de128541cac95fbade58364f0d8841f0ed54a2578ef24be3749b960a39097c7849f6b553ae17e9cf9082b82deff93dfd5fee5 WHIRLPOOL 048bf90567bdd58598a4cecb78289b621a93736cd78c834cf329387b59fc645778bd610df1d8e403df26e2fee72c542e4f9cab54593208c81a5c6e9edc5e991b
 DIST netbeans-trunk-nightly-201609130002-src.zip 218011897 SHA256 40cb0d7c2dba73fa2d3dcddcbc1cf6a1bef06b551cf0a5ff9d6ce9ff12ea007d SHA512 26e5b258261386437534b6b8748a69c7fb7e9332e67584de9723ff7cf9067d20e5cb6d4e86eaf0c611378be0bef9517dd563ca824499efc4f1a89056860ac856 WHIRLPOOL 3b4bd5894c4f65d638a070084267814f00819936c9e4cf7ca758eb04f5500280daf16caa36137700659c10717738d98558b9c5e090c4df82e2d9247308a1f1d3
 DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318bfe333cedd1fbd81a4c6b870e0025f9f4f3ea3d6926bc18cb1c SHA512 81af61f842b23dd51b5610d4c1f9a7113f82e4ceaee2af4a4f4392b56f38b9ec92655c1e413e9b58a808207b308dc68ea8b94c24ef636db8d8ea81275f867470 WHIRLPOOL 8cc8b87bbf8299ab97e24ee64b1d982dfb942cb60a8d8a110b38207807c05b8a7f1c2a2a4d5df52a80c12eaa9ae08440e8f7e333e6a519d83759d2b50c42d015
@@ -28,6 +29,7 @@ DIST netbeans-trunk-nightly-201610020002-src.zip 218005806 SHA256 3d0a3bfc28fa05
 DIST netbeans-trunk-nightly-201610030002-src.zip 218005806 SHA256 54f1b4f61b69379600dfa69adaee9457fd056548646d21e026dac1cb69719549 SHA512 0ae6c8ade2eeae51795d75d44394cdb1972e4113c07e5f573bdafef84ecfba76373e4f78ac1e1737a91d60c8eeb801c1c09f724a9fa99a3ab423b1f02df1e95d WHIRLPOOL ba04e61ec0d8d14aef1882aac28e0853ce0fea5ce42c3cb5ef388ae29e955634e4cdc88846836139d0e4074b87ee624c73f14cea463b706a224c706c991db044
 DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 DIST netbeans-trunk-nightly-201610070002-src.zip 218006580 SHA256 f8d583408b3219efec6b892090955f255bd087c46a05b863a2de9d341236ecf2 SHA512 aa0efd3bbdb4dc2af2570608e5e5c1dcccc1537dabf6d13f9cae9174a272da6b315e97dbfda4c63ff0ab5404be8167c41aa49dba98c9a7eadc8e09fcb2855d46 WHIRLPOOL 2b0f76c982f2badeca4889ec9326dd77f421f0de407fd28318f5ed99b99ed51a6335d49bc0e8d7ecce21f63a784adc6920fef3598caebff288ed634b50516d99
+DIST netbeans-trunk-nightly-201610130002-src.zip 218229380 SHA256 02482b39c317970c794a4eb8c331121e67aa338a278d024d2cae0dee8ede0cf3 SHA512 eb855690d48046d16a2eb22dc93de8ddbdabc2cfd3cd16901ca16a36a4071aafef9061411b32414639d4239bcbe4d609c7a935f8dd932b7c38354d283d99e0e7 WHIRLPOOL 7ec6a0f0518da70610bd762254db42b4bc60670e4ff4063e9b55f4d789ffa52d546c7f3d01d83b001cea0a5d88b9078c7699c2648e4a81b7f2cb9a56cf584157
 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
@@ -54,4 +56,5 @@ EBUILD netbeans-profiler-9999_p20161002.ebuild 3472 SHA256 bdb0033ecb46109464cbb
 EBUILD netbeans-profiler-9999_p20161003.ebuild 3472 SHA256 1dda308aae21f2775b3f7d763a0b88151c1ed0b847560b0207f50064dda05a80 SHA512 af81de30375d4456e51b61ac3ae7cc53d371b3fdf0312c2d7250a960d6e75542f1db12f84f43b36be669fc16a3a66c99731277f60ee1ece99197cfadfabdd17e WHIRLPOOL 18bb788228d14a59330c23937c584dd3335d978aff0044cf23c277718b1aae0bb68a90353451a502b8d827978ac2c5056932ab4ddae13863cf6825dd20d0fab8
 EBUILD netbeans-profiler-9999_p20161006.ebuild 3193 SHA256 1c305129332f3058f83877a119e87a05d7a53e91daff0a38082153f70c91d06d SHA512 057d2c60959893f7ece4d9fceaf0875585759c887fa239d4623772227abffefa1b0a0937c546c51de0ca1e0e999393dc70dceba9432475d88e8d50894cf6e73b WHIRLPOOL d2a6a4acce503a808fef75678f6d5c5f35f8abbd72f49e3aed2be83ebef2642e53bf7b0456922cb0ecc8098d228095b22186ef984f70b500234be68a1e1a76ab
 EBUILD netbeans-profiler-9999_p20161007.ebuild 3193 SHA256 df901827120226577c77b17ccc6aace8e12f6fec78a44e428a25f21ec738d128 SHA512 de94102eaea306984e9e850c2ceb4a98d152aa82b7e4efb2192b2cca8cb552ac7adc1ef0a3c7142e2e8174fb54b3f6271d268e93ed72d605b087e353b7b7582b WHIRLPOOL 4b9a44048c270a52e8408dd4f7f4cf5643eb524893c0272caff064ebce832405b24d3fed91cab3793bdc789b3cdcdbba600b56257ff6b7b68fe9c8bbda6784f4
+EBUILD netbeans-profiler-9999_p20161013.ebuild 3193 SHA256 535f8abfc25551b015ce907709749642f81f42fe2a9dcd0d7d71e19a81f36be7 SHA512 76f4a78bedf24e96e3f85118702575e5b9b294039329ce49ffc389f303debbf128d2ad5a69c590130cf2338960f4205ff53c7cbcba0e1915d83e1fa4df8a3750 WHIRLPOOL 7c4b3ff670f7161418d17132d45d66270f738e5bd45e24bfa3a1b65f149256072001556faacd9bc2225be5656ccbfc90c4042346a6268fb27b6ab94800edcbc4
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20161013.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20161013.ebuild
new file mode 100644
index 0000000..18fa06d
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20161013.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+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-10-13_00-02-33/zip/netbeans-trunk-nightly-201610130002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r17-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 virtual/jdk:1.8 )
+	${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-r17-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r17-build.xml.patch
+
+	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
+	default
+}
+
+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 96090e3..f5eaac6 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296
 DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde12073116a77c1844e4ca7a071d95930b7cd7d5ac SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7 WHIRLPOOL 378db0807a616205fee2623f1c1ada6284ecfc85badb06d68e56e91fbedbc4f73af3ce6e4e8eb8bdb9504d15cf20cdc2a30d5f9cad0c72329791f1a53803ca0e
 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-201609120002-src.zip 218010356 SHA256 265ec87ec62f15d8112229caf357bb081ad75359c131a4c47545f35563136641 SHA512 644685d3172272328048eb4cb91de128541cac95fbade58364f0d8841f0ed54a2578ef24be3749b960a39097c7849f6b553ae17e9cf9082b82deff93dfd5fee5 WHIRLPOOL 048bf90567bdd58598a4cecb78289b621a93736cd78c834cf329387b59fc645778bd610df1d8e403df26e2fee72c542e4f9cab54593208c81a5c6e9edc5e991b
 DIST netbeans-trunk-nightly-201609130002-src.zip 218011897 SHA256 40cb0d7c2dba73fa2d3dcddcbc1cf6a1bef06b551cf0a5ff9d6ce9ff12ea007d SHA512 26e5b258261386437534b6b8748a69c7fb7e9332e67584de9723ff7cf9067d20e5cb6d4e86eaf0c611378be0bef9517dd563ca824499efc4f1a89056860ac856 WHIRLPOOL 3b4bd5894c4f65d638a070084267814f00819936c9e4cf7ca758eb04f5500280daf16caa36137700659c10717738d98558b9c5e090c4df82e2d9247308a1f1d3
 DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318bfe333cedd1fbd81a4c6b870e0025f9f4f3ea3d6926bc18cb1c SHA512 81af61f842b23dd51b5610d4c1f9a7113f82e4ceaee2af4a4f4392b56f38b9ec92655c1e413e9b58a808207b308dc68ea8b94c24ef636db8d8ea81275f867470 WHIRLPOOL 8cc8b87bbf8299ab97e24ee64b1d982dfb942cb60a8d8a110b38207807c05b8a7f1c2a2a4d5df52a80c12eaa9ae08440e8f7e333e6a519d83759d2b50c42d015
@@ -47,6 +48,7 @@ DIST netbeans-trunk-nightly-201610020002-src.zip 218005806 SHA256 3d0a3bfc28fa05
 DIST netbeans-trunk-nightly-201610030002-src.zip 218005806 SHA256 54f1b4f61b69379600dfa69adaee9457fd056548646d21e026dac1cb69719549 SHA512 0ae6c8ade2eeae51795d75d44394cdb1972e4113c07e5f573bdafef84ecfba76373e4f78ac1e1737a91d60c8eeb801c1c09f724a9fa99a3ab423b1f02df1e95d WHIRLPOOL ba04e61ec0d8d14aef1882aac28e0853ce0fea5ce42c3cb5ef388ae29e955634e4cdc88846836139d0e4074b87ee624c73f14cea463b706a224c706c991db044
 DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 DIST netbeans-trunk-nightly-201610070002-src.zip 218006580 SHA256 f8d583408b3219efec6b892090955f255bd087c46a05b863a2de9d341236ecf2 SHA512 aa0efd3bbdb4dc2af2570608e5e5c1dcccc1537dabf6d13f9cae9174a272da6b315e97dbfda4c63ff0ab5404be8167c41aa49dba98c9a7eadc8e09fcb2855d46 WHIRLPOOL 2b0f76c982f2badeca4889ec9326dd77f421f0de407fd28318f5ed99b99ed51a6335d49bc0e8d7ecce21f63a784adc6920fef3598caebff288ed634b50516d99
+DIST netbeans-trunk-nightly-201610130002-src.zip 218229380 SHA256 02482b39c317970c794a4eb8c331121e67aa338a278d024d2cae0dee8ede0cf3 SHA512 eb855690d48046d16a2eb22dc93de8ddbdabc2cfd3cd16901ca16a36a4071aafef9061411b32414639d4239bcbe4d609c7a935f8dd932b7c38354d283d99e0e7 WHIRLPOOL 7ec6a0f0518da70610bd762254db42b4bc60670e4ff4063e9b55f4d789ffa52d546c7f3d01d83b001cea0a5d88b9078c7699c2648e4a81b7f2cb9a56cf584157
 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
@@ -73,4 +75,5 @@ EBUILD netbeans-webcommon-9999_p20161002.ebuild 6242 SHA256 6f03ffb8d15de6c62a8f
 EBUILD netbeans-webcommon-9999_p20161003.ebuild 6242 SHA256 a2ded8a52535851721215782dabcfa59669ea2237a41d7705c9d09dab1645ba5 SHA512 1fa6b80640e2e083072758557a13ed5980b9f78bb9fb242ecdbecbe0f3d31be133e46c8388227337fae60a9932c2218308dcd442ae9e25b8752fd42151497238 WHIRLPOOL f1634ace58a84891e65d6fafba34158d7ccf9e86cc5d04fd1c02a4b732f9e1d64effe7e3878921499c23a1db23e0556fc8a0bf17d3526b94f36acf50e3d4abed
 EBUILD netbeans-webcommon-9999_p20161006.ebuild 5963 SHA256 e27a04bcde516695ce649e109fec386a84d0b214b112a011b7d013ee5ffe280f SHA512 a74abd50b15cf10eb4238133defcd0ab1b40ac1951f33dfc7d89f82a2f908cbef7a8eaa2ad574bb850f9d87c08fbc4d9010c86ec47cefe6794eed9ece5289ec6 WHIRLPOOL aee85e2369d28b40002612f64f24d84dc447c9b2d752a22a53d99b68ccf36024c5ae2fb7545ec1188085ed45dcdb3aeec42927933ccef8baa2ac72e5963a6b0a
 EBUILD netbeans-webcommon-9999_p20161007.ebuild 5963 SHA256 a698518b7659711df2e342b7c68e546acf5e6b97fac78da6f7ecd73a7842a677 SHA512 e266bc9038d1c5bd41132e7bd2d468fade90744d2c0e99793a1180d266b065f5629fee0e27dcbf7c7d289c7693892a47d8af26436dcc60e44cee8c1c53cd07d5 WHIRLPOOL b44fcb4ef9297e042c28df8902215356ce7668d1d964013dede186a5a59b12f4d9bee1eee74a38f31a72e9da05b6fdfb83291b9b30aa81b47d2d262097cbd1c0
+EBUILD netbeans-webcommon-9999_p20161013.ebuild 5974 SHA256 dbba9df833735655ac93a07cf73c90a1ecdcfa361132c25959408955535cd6a6 SHA512 73d0377b2ddc17baa301275789b375acb2bf228a164bb4124c17cb389fc19139c709e58c35a42e914382e5581f3ec4281338014024bd071086fb993ddc7b1d27 WHIRLPOOL 9704ff6c26b8d58f3d60ceef76eda6c3359e9636ab66e2f0b3cfd9c4733a79f1e1b0b7101fc296f31d5288fe5c82f056c96b9922755992e057bf3c913a2e4c78
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20161013.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20161013.ebuild
new file mode 100644
index 0000000..7d8b212
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20161013.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+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-10-13_00-02-33/zip/netbeans-trunk-nightly-201610130002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r17-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:4"
+RDEPEND="|| ( virtual/jdk:1.7 virtual/jdk:1.8 )
+	${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-r17-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-r17-build.xml.patch
+
+	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-4 jna.jar jna-4.2.2-stripped.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
+	default
+}
+
+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 0c10e8b..9192edb 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -5,6 +5,7 @@ DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296
 DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde12073116a77c1844e4ca7a071d95930b7cd7d5ac SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7 WHIRLPOOL 378db0807a616205fee2623f1c1ada6284ecfc85badb06d68e56e91fbedbc4f73af3ce6e4e8eb8bdb9504d15cf20cdc2a30d5f9cad0c72329791f1a53803ca0e
 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-201609120002-src.zip 218010356 SHA256 265ec87ec62f15d8112229caf357bb081ad75359c131a4c47545f35563136641 SHA512 644685d3172272328048eb4cb91de128541cac95fbade58364f0d8841f0ed54a2578ef24be3749b960a39097c7849f6b553ae17e9cf9082b82deff93dfd5fee5 WHIRLPOOL 048bf90567bdd58598a4cecb78289b621a93736cd78c834cf329387b59fc645778bd610df1d8e403df26e2fee72c542e4f9cab54593208c81a5c6e9edc5e991b
 DIST netbeans-trunk-nightly-201609130002-src.zip 218011897 SHA256 40cb0d7c2dba73fa2d3dcddcbc1cf6a1bef06b551cf0a5ff9d6ce9ff12ea007d SHA512 26e5b258261386437534b6b8748a69c7fb7e9332e67584de9723ff7cf9067d20e5cb6d4e86eaf0c611378be0bef9517dd563ca824499efc4f1a89056860ac856 WHIRLPOOL 3b4bd5894c4f65d638a070084267814f00819936c9e4cf7ca758eb04f5500280daf16caa36137700659c10717738d98558b9c5e090c4df82e2d9247308a1f1d3
 DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318bfe333cedd1fbd81a4c6b870e0025f9f4f3ea3d6926bc18cb1c SHA512 81af61f842b23dd51b5610d4c1f9a7113f82e4ceaee2af4a4f4392b56f38b9ec92655c1e413e9b58a808207b308dc68ea8b94c24ef636db8d8ea81275f867470 WHIRLPOOL 8cc8b87bbf8299ab97e24ee64b1d982dfb942cb60a8d8a110b38207807c05b8a7f1c2a2a4d5df52a80c12eaa9ae08440e8f7e333e6a519d83759d2b50c42d015
@@ -28,6 +29,7 @@ DIST netbeans-trunk-nightly-201610020002-src.zip 218005806 SHA256 3d0a3bfc28fa05
 DIST netbeans-trunk-nightly-201610030002-src.zip 218005806 SHA256 54f1b4f61b69379600dfa69adaee9457fd056548646d21e026dac1cb69719549 SHA512 0ae6c8ade2eeae51795d75d44394cdb1972e4113c07e5f573bdafef84ecfba76373e4f78ac1e1737a91d60c8eeb801c1c09f724a9fa99a3ab423b1f02df1e95d WHIRLPOOL ba04e61ec0d8d14aef1882aac28e0853ce0fea5ce42c3cb5ef388ae29e955634e4cdc88846836139d0e4074b87ee624c73f14cea463b706a224c706c991db044
 DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 DIST netbeans-trunk-nightly-201610070002-src.zip 218006580 SHA256 f8d583408b3219efec6b892090955f255bd087c46a05b863a2de9d341236ecf2 SHA512 aa0efd3bbdb4dc2af2570608e5e5c1dcccc1537dabf6d13f9cae9174a272da6b315e97dbfda4c63ff0ab5404be8167c41aa49dba98c9a7eadc8e09fcb2855d46 WHIRLPOOL 2b0f76c982f2badeca4889ec9326dd77f421f0de407fd28318f5ed99b99ed51a6335d49bc0e8d7ecce21f63a784adc6920fef3598caebff288ed634b50516d99
+DIST netbeans-trunk-nightly-201610130002-src.zip 218229380 SHA256 02482b39c317970c794a4eb8c331121e67aa338a278d024d2cae0dee8ede0cf3 SHA512 eb855690d48046d16a2eb22dc93de8ddbdabc2cfd3cd16901ca16a36a4071aafef9061411b32414639d4239bcbe4d609c7a935f8dd932b7c38354d283d99e0e7 WHIRLPOOL 7ec6a0f0518da70610bd762254db42b4bc60670e4ff4063e9b55f4d789ffa52d546c7f3d01d83b001cea0a5d88b9078c7699c2648e4a81b7f2cb9a56cf584157
 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
@@ -54,4 +56,5 @@ EBUILD netbeans-websvccommon-9999_p20161002.ebuild 2721 SHA256 511fec8cd9d91a5a8
 EBUILD netbeans-websvccommon-9999_p20161003.ebuild 2721 SHA256 a6648c57b6d0dd1916e28e7129205e1aa56459248260d7a72a948e90f638fa87 SHA512 6991c72ff79af229ed461e6a88ba8428c6c1d5ba40eab13d4c784914342bea2e1a631857c64e992751431e24f22ef1c0779a7cd8843aa509d8630c4fab5ec851 WHIRLPOOL 6569a5f815d440912c496b2ac7ab643bea3b997994eb6b958aba6479e1112d6ac4052825d32e11446ded4d50237fbcdc081556838fdea654bc2ef48dd1ca987e
 EBUILD netbeans-websvccommon-9999_p20161006.ebuild 2442 SHA256 3d28d9be054e5a74c324dff3c4b79780887c4f6bd05b24a99d25c8f0de7aaee2 SHA512 b1c4a836ede1b6e8bee947652e3b99713be9308525338d61d83adee5100558d670319ab0b9ec09c5a6ea436b994e5c8622893616a09c17b4865eda380191c830 WHIRLPOOL 380cb4c4750cca7d806320fac45a7684fb489a45934dbd5dcdcad89c3b565241720c6f2a0ff1f3943df93ebc63c3fba5b2004cb86ad83eb3e89d14b069e14169
 EBUILD netbeans-websvccommon-9999_p20161007.ebuild 2442 SHA256 cef64961377a259a45cb4f95c542a569a6966396c03530dd658fab1509678f07 SHA512 45370f8af74a40ce429717d53f01bbc43bff005c6f3f5108f9c38432f7591ec914fc8cb58001547531509dfdc9ad691d7e9134de7b398760cb62219f1d79c6a4 WHIRLPOOL c1caff1d6c8e324a6845321f5884f8d2f67d69a1b35de86e099e2774e99048d86ed9fbf5c21c541c65ac28a493f1524ba4fbfbb8a5f24bbf5cc7811e6377b2a6
+EBUILD netbeans-websvccommon-9999_p20161013.ebuild 2442 SHA256 41878ba19a2c4a5fc7884ef10c4af348fd1c70754c7e4831db71865d41ff60b7 SHA512 e8a120fb6be558828ea166df8c8b750b4ad43c2d6bb90b2cabd3c8cafe44b3fc674ec15d6783b04f6ae9e1677b87aaf409f1f20c0efd0a8fd56845559c6c798e WHIRLPOOL f8c325b0c57b98adc967c5e98af38af6ed724f85a304dca65315b513d0df405a803c5bb7cbc5c4d57495f19c42e325f91ec3db1df55b8954ad570197a521dbb7
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20161013.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20161013.ebuild
new file mode 100644
index 0000000..c5a1606
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20161013.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+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-10-13_00-02-33/zip/netbeans-trunk-nightly-201610130002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r17-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 virtual/jdk:1.8 )
+	${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-r17-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r17-build.xml.patch
+
+	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
+	default
+}
+
+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 596822e..b8dc19e 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -5,6 +5,7 @@ DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296
 DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde12073116a77c1844e4ca7a071d95930b7cd7d5ac SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7 WHIRLPOOL 378db0807a616205fee2623f1c1ada6284ecfc85badb06d68e56e91fbedbc4f73af3ce6e4e8eb8bdb9504d15cf20cdc2a30d5f9cad0c72329791f1a53803ca0e
 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-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-8.2-20160920.tar.bz2 12723797 SHA256 90d09843d2e0256f3196f4ea2fe9cdfd77d811f366a5d8cf13320cd813c7cc7a SHA512 4ac086e8189d89e7a0b91e7e03352f691f09edf208017062a8fc798e6f54906f1c85112dd2780feefa6a21c8fcb582b91bdd9758f5a90c05cbd2e3042d6c87c3 WHIRLPOOL 1002d7c6769eb9b4c0ae02e6c17ea91a064e7bbf99e151b720967f70a28bad3159fe5804f3c4ece62f7025da661bc717a098883995b0bebbdb7342b685cd475f
@@ -33,6 +34,7 @@ DIST netbeans-trunk-nightly-201610020002-src.zip 218005806 SHA256 3d0a3bfc28fa05
 DIST netbeans-trunk-nightly-201610030002-src.zip 218005806 SHA256 54f1b4f61b69379600dfa69adaee9457fd056548646d21e026dac1cb69719549 SHA512 0ae6c8ade2eeae51795d75d44394cdb1972e4113c07e5f573bdafef84ecfba76373e4f78ac1e1737a91d60c8eeb801c1c09f724a9fa99a3ab423b1f02df1e95d WHIRLPOOL ba04e61ec0d8d14aef1882aac28e0853ce0fea5ce42c3cb5ef388ae29e955634e4cdc88846836139d0e4074b87ee624c73f14cea463b706a224c706c991db044
 DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 DIST netbeans-trunk-nightly-201610070002-src.zip 218006580 SHA256 f8d583408b3219efec6b892090955f255bd087c46a05b863a2de9d341236ecf2 SHA512 aa0efd3bbdb4dc2af2570608e5e5c1dcccc1537dabf6d13f9cae9174a272da6b315e97dbfda4c63ff0ab5404be8167c41aa49dba98c9a7eadc8e09fcb2855d46 WHIRLPOOL 2b0f76c982f2badeca4889ec9326dd77f421f0de407fd28318f5ed99b99ed51a6335d49bc0e8d7ecce21f63a784adc6920fef3598caebff288ed634b50516d99
+DIST netbeans-trunk-nightly-201610130002-src.zip 218229380 SHA256 02482b39c317970c794a4eb8c331121e67aa338a278d024d2cae0dee8ede0cf3 SHA512 eb855690d48046d16a2eb22dc93de8ddbdabc2cfd3cd16901ca16a36a4071aafef9061411b32414639d4239bcbe4d609c7a935f8dd932b7c38354d283d99e0e7 WHIRLPOOL 7ec6a0f0518da70610bd762254db42b4bc60670e4ff4063e9b55f4d789ffa52d546c7f3d01d83b001cea0a5d88b9078c7699c2648e4a81b7f2cb9a56cf584157
 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
@@ -59,4 +61,5 @@ EBUILD netbeans-9999_p20161002.ebuild 6939 SHA256 cff7a29699ff709aedf8a05736eabf
 EBUILD netbeans-9999_p20161003.ebuild 6939 SHA256 8b9ca9ba7adaa5c451245a68a0cf6fdb6aabd327d84f95a16cad517c1de27b6c SHA512 278931546dd1600618f337f7f08c0b27f7b30dfbf978e4305308011f393b66eb02ddc5258ebef041f1f687c2c293d1477cf676596f27bb3210fe7d2696fa9937 WHIRLPOOL 496276e1b8c8fa386a43e204c44923c9194ba6d313ca1f7e4279664c6c46132c8fc796ac413eba8887a830caee2e3b4aedf16d6544cb7085b05b1ee20caf9543
 EBUILD netbeans-9999_p20161006.ebuild 6199 SHA256 e66c59f5b14b51f32e7324ee331278f1a42b85524c2b4d8044bd188b1c2cb05d SHA512 ce2fb3cf184897af145ce978f182472ab025987b8ac29417c588ce2169ea5f6f78fab53c899352d9f69ce6e44d3c06e2bb4c27d73d8f195de620562e73a72535 WHIRLPOOL 268c3e5ff43f7b49770895dbccad53908645be09e8d3d163b62b9080a391572d85aabb8f718ae93f576a464705cbda105e3986f01e10a2229e4115f7bad7eda2
 EBUILD netbeans-9999_p20161007.ebuild 6199 SHA256 278a3687d404a7bc79fc3ed3543744c1906f1326684cb78438c3233f1a670ac7 SHA512 cd27b896daf7ade1a953e1af11539813697df2095ba6f06091740e2e4ac7160ae701aa7afc7ce4b1d0810ead707729b1755f3a43fc6f3ad6c811812f5b5ba4d3 WHIRLPOOL e384e5150098b61cdca01fbf7b372aad9a8c50307cfb9c7de34ee37bb53b718e67fcaf0b9032de34ee320c6d76b562588a558e8919013989081e51c3932ef6e8
+EBUILD netbeans-9999_p20161013.ebuild 6199 SHA256 24f1a0b549a5c2d4a3d2a30702758341f19ac8b0616159b52175b91b596b530c SHA512 26868e16b863d8b246def0af97da80abb3e721ed005d8f7c4abaeacfd7034709c33e52d82ac532814220147652ea0fd22e1f62fefb77b1f4c83003c2bfe63a29 WHIRLPOOL 51f9cedd82ac9ab9e3550ae4bf52f869fe7a32a1c6ddeb60ecba7b97598d7103e1c5ebb8340e5d1ec290a336727a3d94ff632c96467351148ee135a9b44b49a4
 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834

diff --git a/dev-util/netbeans/netbeans-9999_p20161013.ebuild b/dev-util/netbeans/netbeans-9999_p20161013.ebuild
new file mode 100644
index 0000000..438bf76
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20161013.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+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-10-13_00-02-33/zip/netbeans-trunk-nightly-201610130002-src.zip"
+PATCHES_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r17-build.xml.patch.bz2"
+L10N_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-9999-20160920.tar.bz2"
+ALL_URLS="${SOURCE_URL} ${PATCHES_URL} ${L10N_URL}"
+SRC_URI="l10n_af? ( ${ALL_URLS} )
+	l10n_ar? ( ${ALL_URLS} )
+	l10n_bg? ( ${ALL_URLS} )
+	l10n_ca? ( ${ALL_URLS} )
+	l10n_cs? ( ${ALL_URLS} )
+	l10n_de? ( ${ALL_URLS} )
+	l10n_el? ( ${ALL_URLS} )
+	l10n_es? ( ${ALL_URLS} )
+	l10n_fil? ( ${ALL_URLS} )
+	l10n_fr? ( ${ALL_URLS} )
+	l10n_gl? ( ${ALL_URLS} )
+	l10n_hi? ( ${ALL_URLS} )
+	l10n_id? ( ${ALL_URLS} )
+	l10n_it? ( ${ALL_URLS} )
+	l10n_ja? ( ${ALL_URLS} )
+	l10n_ko? ( ${ALL_URLS} )
+	l10n_lt? ( ${ALL_URLS} )
+	l10n_nl? ( ${ALL_URLS} )
+	l10n_pl? ( ${ALL_URLS} )
+	l10n_pt-BR? ( ${ALL_URLS} )
+	l10n_pt-PT? ( ${ALL_URLS} )
+	l10n_ro? ( ${ALL_URLS} )
+	l10n_ru? ( ${ALL_URLS} )
+	l10n_si? ( ${ALL_URLS} )
+	l10n_sq? ( ${ALL_URLS} )
+	l10n_sr? ( ${ALL_URLS} )
+	l10n_sv? ( ${ALL_URLS} )
+	l10n_ta? ( ${ALL_URLS} )
+	l10n_tr? ( ${ALL_URLS} )
+	l10n_vi? ( ${ALL_URLS} )
+	l10n_zh-CN? ( ${ALL_URLS} )
+	l10n_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_L10N="
+	l10n_af
+	l10n_ar
+	l10n_bg
+	l10n_ca
+	l10n_cs
+	l10n_de
+	l10n_el
+	l10n_es
+	l10n_fil
+	l10n_fr
+	l10n_gl
+	l10n_hi
+	l10n_id
+	l10n_it
+	l10n_ja
+	l10n_ko
+	l10n_lt
+	l10n_nl
+	l10n_pl
+	l10n_pt-BR
+	l10n_pt-PT
+	l10n_ro
+	l10n_ru
+	l10n_si
+	l10n_sq
+	l10n_sr
+	l10n_sv
+	l10n_ta
+	l10n_tr
+	l10n_vi
+	l10n_zh-CN
+	l10n_zh-TW"
+IUSE="doc ${IUSE_NETBEANS_MODULES} ${IUSE_L10N}"
+S="${WORKDIR}"
+
+DEPEND=">=virtual/jdk-1.7
+	dev-java/javahelp:0"
+RDEPEND="|| ( virtual/jdk:1.7 virtual/jdk:1.8 )
+	~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_L10N} ; do
+		if use ${lingua} ; then
+			local lang=${lingua/l10n_/}
+			lang=${lang/-/_}
+
+			case ${lang} in
+				ar)  lang="ar_EG,ar_SA" ;;
+				es)  lang="es,es_CO"    ;;
+				fil) lang="fil_PH"	;;
+				gl)  lang="gl_ES"	;;
+				hi)  lang="hi_IN"	;;
+				id)  lang="in_ID"	;;
+				nl)  lang="nl_BE,nl_NL" ;;
+				ta)  lang="ta_IN"	;;
+			esac
+
+			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-r17-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-r17-build.xml.patch
+
+		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
+	default
+}
+
+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
+
+		make_desktop_entry "netbeans-${SLOT} --locale en" "Netbeans ${PV} en" netbeans-${SLOT} Development
+
+		for lingua in ${IUSE_L10N}; do
+			if use ${lingua} ; then
+				local locales=${lingua/l10n_/}
+				locales=${locales/-/:}
+
+				case ${locales} in
+					ar)  lang="ar:EG ar:SA" ;;
+					es)  lang="es es:CO"    ;;
+					fil) lang="fil:PH"	;;
+					gl)  lang="gl:ES"	;;
+					hi)  lang="hi:IN"	;;
+					id)  lang="in:ID"	;;
+					nl)  lang="nl:BE nl:NL" ;;
+					ta)  lang="ta:IN"	;;
+				esac
+
+				for locale in ${locales}; do
+					make_desktop_entry "netbeans-${SLOT} --locale ${locale}" "Netbeans ${PV} ${locale}" netbeans-${SLOT} Development
+				done
+			fi
+		done
+	fi
+}


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

end of thread, other threads:[~2016-10-13  9:47 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-29  8:06 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-websvccommon/, dev-java/netbeans-php/, Miroslav Šulc
  -- strict thread matches above, loose matches on Subject: below --
2016-10-13  9:47 Miroslav Šulc
2016-05-11  8:00 Miroslav Šulc
2015-03-24 10:17 Miroslav Šulc
2014-11-28 10:38 Miroslav Šulc

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