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

commit:     6c7d9c6a927ed4bf22b973b6e6ab3c4a7dabf52f
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  8 07:29:32 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Jun  8 07:29:32 2015 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=6c7d9c6a

netbeans: bumped to the latest sources

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

diff --git a/dev-java/netbeans-apisupport/ChangeLog b/dev-java/netbeans-apisupport/ChangeLog
index 015c88c..5cb2db3 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_p20150608 (08 Jun 2015)
+
+  08 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-apisupport-9999_p20150608.ebuild:
+  bumped to the latest sources
+
 *netbeans-apisupport-9999_p20150604 (04 Jun 2015)
 
   04 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 8c92087..6b62fd1 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201506010001-src.zip 207778965 SHA256 96bc8cca703517
 DIST netbeans-trunk-nightly-201506020001-src.zip 207781610 SHA256 ed7f2e851ed53dacd5e46091a091490fcf4afbac35b732335f054fc428978850 SHA512 ba5f09aadede76fd0659c3b190a3646a9b57ffda253cf24d1343bace9112c56d96bff7df158e71539a614d0d80041113da73590fe2f9bf9981cbbe9993f9ef3e WHIRLPOOL c9c938d405c92ef00d253a40723ca770aa41d401dd2de6c79652c5df949bb9a9f7c6a92ac4f3895c8d7135e0963f6779b6aff1c3f8251da2fbf9f0d348d724b3
 DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123489cf38c44213cd2de2606f71e6231ac40e6519eb8f5c71294 SHA512 59a40cd092399dc49057144b95c9d8399fd3284a69bece3ccb02e479994ef2dd55140de0d62a455538dce87b17bc10cf3e09b165109271c78af229d1b62cb074 WHIRLPOOL 5ccbd8842aab3d1e2b0141bacaed90605bed668e0f7912b0fdd8e2de091ec24a0a9264d35c536e10bc7b75f8a5c42a60832cc6a2c5dc5c98f955d908dd01886d
 DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9aea7ed9f8b11cbdcca02d11fc314c4ec32c015cbd605344644 SHA512 c69868f00a50d9d0f1744137a66c4944330d4c0f7a7b58f13d3e7c72fbd7d31fbe97d3d98cbb4011e4ddf5eaf637991d7a4fe1d32fb98a0627ed28012ebdafaa WHIRLPOOL 89e0b90e509f4771366e6baddb861f4c922f9d5f8f0c5561fcb89e78466cfba40e2d657743ed142d12e7778a796ce049a03703d661660a1d540ceb4798e51b61
+DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 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
@@ -64,5 +65,6 @@ EBUILD netbeans-apisupport-9999_p20150601.ebuild 3390 SHA256 2bed2f663d12ea1f277
 EBUILD netbeans-apisupport-9999_p20150602.ebuild 3390 SHA256 9aa35da13e20b5db579a5fa6e2503cdfdb612aec112163e8f644ae1468438dda SHA512 2d645834001b673c8c81796dad0da30ecb09d817c98afe48fb2912e5020bb2a08ed094636265ea16732c358fbc094052617e10655e5b5a4e118855db73119cee WHIRLPOOL ad3d69a543b46f5b8ae8ec38a2d66b6f77bc791534f6abd51e1c8751e51a44edf86250bafd5e14872db70b3a0377aa16de4b396d4b7ebf5742c7bd478b4cf8ad
 EBUILD netbeans-apisupport-9999_p20150603.ebuild 3390 SHA256 0cfcc8b9d4892fff7c48622d8465c638e65caf18bd1439f9977bae62213bfa45 SHA512 5108fa31549d5b923949b6422b7f3d52ecd7f0be11b4ee3d9f0981d6a1768113e7091bd736fc82a4cf9fe287cfda32c8c739dfcb996bfde2d39f3c8d0e20b149 WHIRLPOOL 07e268e97f8386a0092ba0cb3429f02ac4cac93a8b9901fd0a0a6fdc7fb66bd40149186a0054e06a026584cc5e2ca7b26bcc8c840deb68cb939cc3f7950e7f34
 EBUILD netbeans-apisupport-9999_p20150604.ebuild 3390 SHA256 2ce302d24287a7b24719bff16999435a73c16fdbe666b69321edd5fa12628852 SHA512 c0c58444d6619dbbbf1635f02410344f385d72b5a78b805645c1503a1d7a749e0c6cba325c5702be3e8524b5c5b2258208aa9d67c06382275fe54df447bb6baa WHIRLPOOL 41369acd7c88344cfc156f0919399610bd1ad719728c5aee2ff9b1a3854b12b7ea37cf164a65180c43ce591dc9f815308f3e3ab4db2ca3d48247024b25057717
-MISC ChangeLog 174284 SHA256 41b4b34df95ed5ea3bba6bef4c5778316a1e5825824aa118c5e94e456864d70e SHA512 0203a6d13e0ef9098a1c1eccf284f413e64187755901933b6c97110434b8f5d13be700bcb7951c687164d441ef5d28f9780b8052f627cd4a1ed5b2c897764a54 WHIRLPOOL 37495ee263cb7cb05208905dfef138d186d09965cce73f504ab3749c2a2fb52c1ab87ad6773793d8ed93a4bb246a7dcf39865bfa5d177eb09a88f33d8cd95c28
+EBUILD netbeans-apisupport-9999_p20150608.ebuild 3390 SHA256 42b521a5d1b7d478a4c8b23b7028161ce2695a8bdb4100200c02377eab9b0d77 SHA512 d81ad1554cf8d82af6b4239597e83e3a3e54ff9c6df542073f172fbd1716d4af7035490b37ea6d54eb26fbb483e6168296d6900258e788e2e142b7fa4b5a982c WHIRLPOOL 60b2257bad40562b6a9c9ad54126889761e1dd3faf13f25eb8df56f842c5083a63fe3f01da5f6536bf6627b95a96a4e4a6ef1ec3399369734e0e1c92bb146b4d
+MISC ChangeLog 174465 SHA256 0c7b332225c7b025972ac72391ede473a3a241f17169b127977a333b61375735 SHA512 30396c44f700bb79b5aee89b254c328c0f1a2dba0052d7221360defc756ce93976b8c91cfff7fecd68b89f063f3caa2f7b570a651c392fcecb31ac67e056c1d5 WHIRLPOOL 952277229ab71cecbcd0092225efd8898254bc0d14756946bfc757fffed151007a6e02f7622d6a468369559962a3d4ab9c76558d1843d573c4fe24466d030114
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150608.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150608.ebuild
new file mode 100644
index 0000000..694efaf
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150608.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-06-08_00-01-56/zip/netbeans-trunk-nightly-201506080001-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 0fa1696..204e685 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_p20150608 (08 Jun 2015)
+
+  08 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-cnd-9999_p20150608.ebuild:
+  bumped to the latest sources
+
 *netbeans-cnd-9999_p20150604 (04 Jun 2015)
 
   04 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index 1edaa14..dc0baae 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -53,6 +53,7 @@ DIST netbeans-trunk-nightly-201506010001-src.zip 207778965 SHA256 96bc8cca703517
 DIST netbeans-trunk-nightly-201506020001-src.zip 207781610 SHA256 ed7f2e851ed53dacd5e46091a091490fcf4afbac35b732335f054fc428978850 SHA512 ba5f09aadede76fd0659c3b190a3646a9b57ffda253cf24d1343bace9112c56d96bff7df158e71539a614d0d80041113da73590fe2f9bf9981cbbe9993f9ef3e WHIRLPOOL c9c938d405c92ef00d253a40723ca770aa41d401dd2de6c79652c5df949bb9a9f7c6a92ac4f3895c8d7135e0963f6779b6aff1c3f8251da2fbf9f0d348d724b3
 DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123489cf38c44213cd2de2606f71e6231ac40e6519eb8f5c71294 SHA512 59a40cd092399dc49057144b95c9d8399fd3284a69bece3ccb02e479994ef2dd55140de0d62a455538dce87b17bc10cf3e09b165109271c78af229d1b62cb074 WHIRLPOOL 5ccbd8842aab3d1e2b0141bacaed90605bed668e0f7912b0fdd8e2de091ec24a0a9264d35c536e10bc7b75f8a5c42a60832cc6a2c5dc5c98f955d908dd01886d
 DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9aea7ed9f8b11cbdcca02d11fc314c4ec32c015cbd605344644 SHA512 c69868f00a50d9d0f1744137a66c4944330d4c0f7a7b58f13d3e7c72fbd7d31fbe97d3d98cbb4011e4ddf5eaf637991d7a4fe1d32fb98a0627ed28012ebdafaa WHIRLPOOL 89e0b90e509f4771366e6baddb861f4c922f9d5f8f0c5561fcb89e78466cfba40e2d657743ed142d12e7778a796ce049a03703d661660a1d540ceb4798e51b61
+DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 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
@@ -82,5 +83,6 @@ EBUILD netbeans-cnd-9999_p20150601.ebuild 4796 SHA256 664e094a56f5f5660baca27483
 EBUILD netbeans-cnd-9999_p20150602.ebuild 4796 SHA256 25c36bf90f5626d2cfd2c51d240c746c06ba663da18c2306c10240cb0d51c6f6 SHA512 1e38592a9569c004434a202179a6a1b84a1bec62272015f83320f182f1b86aca8b103cedddadb46d25c7dfcd7ca8af69ab408e7bd3fc7e55162d2a20bd30fffc WHIRLPOOL abcbd6b8148bd5bc982deaff9d65d01feeeeb5fa8e4745726182773dd85fa398537bc4f8e2dfcdfc7bcc3df57b44eee142a1b1439aeb096ece95b42e7e6dd248
 EBUILD netbeans-cnd-9999_p20150603.ebuild 4796 SHA256 4fe09a855edbe499a2a07d42385051f7392dbeb662eb4586ae41ab9617b0caa3 SHA512 adf0bafe3d633d4594b1b57bc1c56cf7a9cfcff3bb187cf5331de80a12abe0e85a53c8004905d0408facd3216a4cb40d79d1d6862d24971185c585b01e6458c2 WHIRLPOOL e0f1ae9f831a5605ab90a73196c2315455c669d3cbc574bc733fa3e2b4dc1439e78d7446e5062705be4867c677792a8357016505892e92629991d5d780afd572
 EBUILD netbeans-cnd-9999_p20150604.ebuild 4796 SHA256 b5de94bf182c4a01c0f20efdb0bf633ad5a781fbafbb4acefd5cb3f3b8944fd7 SHA512 fb7516639d9a33a5121f2e3247cdda8181fe5ecaaeaaddc61765a7513138f354bc6dda6b7dc2bcac8dcd8cb709e3c0f3ead6f2660eaecabe4e162a53294699ff WHIRLPOOL df37822b8cd969548694d81e1ba82c599a4cb69a564e625dfc37aec21de0daa398b13993956a969c330f78ef8f72034df75705ceab11eeac87a0dc90bb59a737
-MISC ChangeLog 159065 SHA256 cb881e8d684dc1d7208483ba006e57799b502aa91f205f242647351288598b1f SHA512 0243489b05ef7a73a551366a6817a7c20bd1173880286cc90438c43e02db10ef87f78f5e8bd93c79d602a9e787c1583297f767c31a7433b3eaf5bcb0780ce07c WHIRLPOOL bcc7ad9595adfbf4988d6d63bfed6b05bdb935e0a8fbb53abdda4654622407f623dba605f55e7dc15e578354f7569ec2bd8512a3896ab166ff84f32fedc1e84e
+EBUILD netbeans-cnd-9999_p20150608.ebuild 4796 SHA256 32bd9168ea0fa02bb13c14b7457cdb45add30b4fd9e2d88cf2b2ab179b3ea5d7 SHA512 2345902d0153a6ea232c3c3fc7fcfbdd353bb4a350bb1a009fbd1a3d8c1c7bc82b62c011afe8e106c584b3e1eda5310d3e9ca876b9cff1a2b664cc687be3ad69 WHIRLPOOL 2e458f4ad1e51caf412333062b970e59015fda6e6b5ee72ec1e93719ca9e874b2caa2ed10082f278de541f31f769465c77dd43fecaab6c1b7571629e0ea1f299
+MISC ChangeLog 159232 SHA256 9e9a975978a6a3761f7b6496e84e6c25b7bebc98161de295448daeae74e1f5fb SHA512 ac17bf9f3038aa02c4b163cf074705ba1d4152294704f1830e48ae3c4ee6a2b6e6de6adf39514a1873fff4804cb7090a53f97c247fabddc64b876bbc3192bbb6 WHIRLPOOL ca562b7e66afaecaa09d5d4f7bc0a8980cce97b889f19a893f2afee2f9639fdc9b109f9803c75f55b015cbde95af97911a607856c89308ca9d57ff42ccd4e4a8
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150608.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150608.ebuild
new file mode 100644
index 0000000..6ed0fe8
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150608.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans CND Cluster"
+HOMEPAGE="http://netbeans.org/projects/cnd"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-06-08_00-01-56/zip/netbeans-trunk-nightly-201506080001-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/D4BF6B1BBE51F2D8EEC23CCB28C40BA587885B71-clank_0.3.6.zip
+	http://hg.netbeans.org/binaries/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip
+	http://hg.netbeans.org/binaries/547CFC4D4F7C877925CFB0732F303DC1797A58C1-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}"/D4BF6B1BBE51F2D8EEC23CCB28C40BA587885B71-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}"/547CFC4D4F7C877925CFB0732F303DC1797A58C1-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 5b545fd..cf2bea9 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_p20150608 (08 Jun 2015)
+
+  08 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-dlight-9999_p20150608.ebuild:
+  bumped to the latest sources
+
 *netbeans-dlight-9999_p20150604 (04 Jun 2015)
 
   04 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index f6b1e83..578d0bd 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -42,6 +42,7 @@ DIST netbeans-trunk-nightly-201506010001-src.zip 207778965 SHA256 96bc8cca703517
 DIST netbeans-trunk-nightly-201506020001-src.zip 207781610 SHA256 ed7f2e851ed53dacd5e46091a091490fcf4afbac35b732335f054fc428978850 SHA512 ba5f09aadede76fd0659c3b190a3646a9b57ffda253cf24d1343bace9112c56d96bff7df158e71539a614d0d80041113da73590fe2f9bf9981cbbe9993f9ef3e WHIRLPOOL c9c938d405c92ef00d253a40723ca770aa41d401dd2de6c79652c5df949bb9a9f7c6a92ac4f3895c8d7135e0963f6779b6aff1c3f8251da2fbf9f0d348d724b3
 DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123489cf38c44213cd2de2606f71e6231ac40e6519eb8f5c71294 SHA512 59a40cd092399dc49057144b95c9d8399fd3284a69bece3ccb02e479994ef2dd55140de0d62a455538dce87b17bc10cf3e09b165109271c78af229d1b62cb074 WHIRLPOOL 5ccbd8842aab3d1e2b0141bacaed90605bed668e0f7912b0fdd8e2de091ec24a0a9264d35c536e10bc7b75f8a5c42a60832cc6a2c5dc5c98f955d908dd01886d
 DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9aea7ed9f8b11cbdcca02d11fc314c4ec32c015cbd605344644 SHA512 c69868f00a50d9d0f1744137a66c4944330d4c0f7a7b58f13d3e7c72fbd7d31fbe97d3d98cbb4011e4ddf5eaf637991d7a4fe1d32fb98a0627ed28012ebdafaa WHIRLPOOL 89e0b90e509f4771366e6baddb861f4c922f9d5f8f0c5561fcb89e78466cfba40e2d657743ed142d12e7778a796ce049a03703d661660a1d540ceb4798e51b61
+DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 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
@@ -71,5 +72,6 @@ EBUILD netbeans-dlight-9999_p20150601.ebuild 2995 SHA256 35b68bea37227a327dd7aee
 EBUILD netbeans-dlight-9999_p20150602.ebuild 2995 SHA256 f041211291a1d289a812238222c501350e6d7706dbdfa3d2252cfeb7f792c843 SHA512 c412089b3a32c316a966272cd90f88225160d6e1cd8e3eca2d1edb9208c4bdca2c4dcea279641e8778d5eeffe4a0fd60b0cf2a8400250608667c110e56c49844 WHIRLPOOL 365efad84dac0109f8edeb9c379570675dfb0941753f4569d0bdf8d793056cb5acd72156ec978d0afb4f93b2d88043e6a4c98225e2b4757befd70b2aaa4365f9
 EBUILD netbeans-dlight-9999_p20150603.ebuild 2995 SHA256 caf277e178601f479bccf285242e6fc6a0f8e0231cf4bdc99e58cd9ff75aad24 SHA512 04a13631765c452c3fd046d3496903b460234dd67a23610080bbf5546b36482e36556cd8ddc28cb9457f722f04c7c9c037db0a4e95596862697ede4b96e4fa07 WHIRLPOOL b6ca9a3f0907567bce672dfc11ad7a2e971582b23e760512a17d9a3b04e3becd871abbba6d566a7e9f61e379ac4b26fe7cfbc3e00a08366a586e94e1dfe5f088
 EBUILD netbeans-dlight-9999_p20150604.ebuild 2995 SHA256 3a0be776b2ece68eb4ba8893d8ad94737e7828e72fc001d406249abae27b8921 SHA512 4ca4055e56ec4e886f1f1c5855629c4173089d48d8a3e41e9f35bdca06b5945580fd694817ec621e3c252ca6079dd2fd27da84d07fb5c3cbe4de1f487ea60051 WHIRLPOOL bfdaa2e3c28554494b05e3380d8d5dffc40b301217e44b752d407361bdce0ef320baaf0a2d0ffd1975c4bbc5be223afb0199ce4af1bc6dc8d6dcf32d5521e61e
-MISC ChangeLog 166021 SHA256 508a9c1b64b189304b1c07289eb18eac04dca519a69972d3a49cd404dabdc5fd SHA512 ed36d75bdc7b3eef1cd3c2ed46c9ac4107bb01a63542a3c441d0a2703d15f73598ac5ad46af7acb76fe8a4494806217ba1f5fd7197051dae6bea15b79819db16 WHIRLPOOL 6a8c63ae45f7f9509ef4dc74ff513faac8958f3a95fa77b23a9a8f9d2228d96b922c6e3869f0c846228765fbf97427e92258c35970796ac57a62dd8eace4506c
+EBUILD netbeans-dlight-9999_p20150608.ebuild 2995 SHA256 bde2ecb345e5605601a5dbf2f00c4ecbe9e63b6e76db811e258b014e3fe6a6a1 SHA512 41ed62a733ae786f500143ebe73a771219dbb666b019b46b370b046bd816d7dc3ceb7ca76c42fb506c0797cd36473d034dfcaf349184def301c2efb4edff7758 WHIRLPOOL d871dca265829ebc97a4a129bf6c64d03a0c79cfa3181615f9e49721b18edd9a83b6db5994612b1e1a23154651013bdaa3199a8779492aae30153790457fe028
+MISC ChangeLog 166194 SHA256 3f2f861ab291f15a5b84522409d5b87544488d869f0ecb7193a0e68da4fb87c1 SHA512 1e3a470cd55baf214730f02b83422e4561d4296f027e58004226bda6b65fecd6ed8e72e829d787a1e94490bd9adfb11bea674e03829ec377b0d7eb68ee59bedc WHIRLPOOL c3388ca297253563c3c5a7113c64025fdb1fb755831a7c7edf713262ce5818dc1340468de88311e6fe8c614af196de908284988cdbef17a8b7b59ce160311efb
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150608.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150608.ebuild
new file mode 100644
index 0000000..d5cc01a
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150608.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-06-08_00-01-56/zip/netbeans-trunk-nightly-201506080001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/DF1C6C0A0B03BC0147D215D01DA34F2E5DC13245-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}"/DF1C6C0A0B03BC0147D215D01DA34F2E5DC13245-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 41800e0..60d5d68 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_p20150608 (08 Jun 2015)
+
+  08 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-enterprise-9999_p20150608.ebuild:
+  bumped to the latest sources
+
 *netbeans-enterprise-9999_p20150604 (04 Jun 2015)
 
   04 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 005902f..2d0f47f 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -124,6 +124,7 @@ DIST netbeans-trunk-nightly-201506010001-src.zip 207778965 SHA256 96bc8cca703517
 DIST netbeans-trunk-nightly-201506020001-src.zip 207781610 SHA256 ed7f2e851ed53dacd5e46091a091490fcf4afbac35b732335f054fc428978850 SHA512 ba5f09aadede76fd0659c3b190a3646a9b57ffda253cf24d1343bace9112c56d96bff7df158e71539a614d0d80041113da73590fe2f9bf9981cbbe9993f9ef3e WHIRLPOOL c9c938d405c92ef00d253a40723ca770aa41d401dd2de6c79652c5df949bb9a9f7c6a92ac4f3895c8d7135e0963f6779b6aff1c3f8251da2fbf9f0d348d724b3
 DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123489cf38c44213cd2de2606f71e6231ac40e6519eb8f5c71294 SHA512 59a40cd092399dc49057144b95c9d8399fd3284a69bece3ccb02e479994ef2dd55140de0d62a455538dce87b17bc10cf3e09b165109271c78af229d1b62cb074 WHIRLPOOL 5ccbd8842aab3d1e2b0141bacaed90605bed668e0f7912b0fdd8e2de091ec24a0a9264d35c536e10bc7b75f8a5c42a60832cc6a2c5dc5c98f955d908dd01886d
 DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9aea7ed9f8b11cbdcca02d11fc314c4ec32c015cbd605344644 SHA512 c69868f00a50d9d0f1744137a66c4944330d4c0f7a7b58f13d3e7c72fbd7d31fbe97d3d98cbb4011e4ddf5eaf637991d7a4fe1d32fb98a0627ed28012ebdafaa WHIRLPOOL 89e0b90e509f4771366e6baddb861f4c922f9d5f8f0c5561fcb89e78466cfba40e2d657743ed142d12e7778a796ce049a03703d661660a1d540ceb4798e51b61
+DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 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
@@ -153,5 +154,6 @@ EBUILD netbeans-enterprise-9999_p20150601.ebuild 15937 SHA256 08c56d33f5c7ae2733
 EBUILD netbeans-enterprise-9999_p20150602.ebuild 15937 SHA256 c93bf8cae9a2b9bb7c48506104d7afc02aefc1e37c15bf32de957e5f55284823 SHA512 8a58df0fd507062cbfb5b27a8ca9989e17fe826b1164edcdf32c6797ae3b056413094a7a3239e1cfc210b65ea62f9c67d1f4c93ee346b071a6e430a750ec2451 WHIRLPOOL 8a1f96fe2f7fa178cfdbefe9b7673153015dc9dd470b18cc0bc54ad78af1db6e238d5f181f0eaa0ef7821cc2bb971466b34b421edd29376d72c28819125dce29
 EBUILD netbeans-enterprise-9999_p20150603.ebuild 15937 SHA256 4e53d7ec87269d1bbfddcc1784eaacedf35468e4da32a2754c9f2eb14ac09ddf SHA512 b24835f83b1db6c73eaef893a0cbce7095be97c2810cbcf99af87703088f9b20e08e181eec5800deef64e704c3670b5946fbafa312e942e772309bd948a1c869 WHIRLPOOL 70cd42d6cd4a43c9fc2589baae5b4feeffce3141fd4d39a5b097a28c4dada7f982f6c3044e7fdcb14cbf1a2b64507b2b5db631aa9608fe6a3a15a7fa1514bef9
 EBUILD netbeans-enterprise-9999_p20150604.ebuild 15937 SHA256 ab4c0ed4122c716ce905cbef27202e94e374ffa2681c1bac87557fe3c202e2e2 SHA512 22977c337c6d49fbe1c654ddcddba09f93ef6b8a79498124bec25677b899a5193003ba32c20079d84384bb04fdcb3299d37bc800e3a930402b069ff3d9be1946 WHIRLPOOL e058ddc7c230bb5288ee04ed85494cc1f0c4d75f295fb79e7b31bbf245174d4dde87e303d658cb93986337244d7c70a69004ab23698bc8471214d61616c42825
-MISC ChangeLog 174809 SHA256 cdbd71df977c06c07805aa8fed6494a9b0a12fe2b67ca178443a297ecb074a70 SHA512 351588e27af03e6dad48f3242dc8d4ca3bef3a82cac92ea7fa37c65452d4457ef2ee6f7700ee793bce3a3468bef5edd2eec1444cdc12ea97af130e1912912ef5 WHIRLPOOL 29dd8499354a6664042a156c198674a62956339de2521c5afeb502280d4f4c23a57ff4ff3f96b1b4a8ffe07325a52d9037c47a167990a7d6d735147ebb450147
+EBUILD netbeans-enterprise-9999_p20150608.ebuild 15937 SHA256 8c499723bc3c267164ec7518d5628de6e2f3b46af3af2ec02ac504d543e16f60 SHA512 b52a744aad67643bbb01824322bda14914f1f8c025b5699109a00b7fe5679c3fd3d5ac16e03285cf08968671faf3e2b5d3430177ae08dbd496938b596d71c80d WHIRLPOOL 470a27b88c68f8d4e1e7b2ce324e3676ea8f571861579ab4a02d811c909aee735dd884e1cb684b26596f7b758690dc613db3fd3ef90e92a6f11c98617d720086
+MISC ChangeLog 174990 SHA256 8561d7c3868055f4fae23314f9e353fe7668bda6a5d5732b90e35df2a6ef7574 SHA512 eaa9aa099326b5f1935c68392b604054bdb2dcb6815ad34019514adb78291e58bf97558a324754adcb55c6015c8bf6d5c96a928bd576e53ef9710691fe3c16ce WHIRLPOOL 2d43f2a9d5fd8bec6e2da4ed99260a5a14b4e32c20f5992ded27c1ff02c25841f835e2efeca7d5fa59387ca49c8372f8ce3a1e38c6f9ccf32640cec192f605fb
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-ergonomics/ChangeLog b/dev-java/netbeans-ergonomics/ChangeLog
index 3c23183..9da2451 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_p20150608 (08 Jun 2015)
+
+  08 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ergonomics-9999_p20150608.ebuild:
+  bumped to the latest sources
+
 *netbeans-ergonomics-9999_p20150604 (04 Jun 2015)
 
   04 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index ec83478..f11ecc1 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201506010001-src.zip 207778965 SHA256 96bc8cca703517
 DIST netbeans-trunk-nightly-201506020001-src.zip 207781610 SHA256 ed7f2e851ed53dacd5e46091a091490fcf4afbac35b732335f054fc428978850 SHA512 ba5f09aadede76fd0659c3b190a3646a9b57ffda253cf24d1343bace9112c56d96bff7df158e71539a614d0d80041113da73590fe2f9bf9981cbbe9993f9ef3e WHIRLPOOL c9c938d405c92ef00d253a40723ca770aa41d401dd2de6c79652c5df949bb9a9f7c6a92ac4f3895c8d7135e0963f6779b6aff1c3f8251da2fbf9f0d348d724b3
 DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123489cf38c44213cd2de2606f71e6231ac40e6519eb8f5c71294 SHA512 59a40cd092399dc49057144b95c9d8399fd3284a69bece3ccb02e479994ef2dd55140de0d62a455538dce87b17bc10cf3e09b165109271c78af229d1b62cb074 WHIRLPOOL 5ccbd8842aab3d1e2b0141bacaed90605bed668e0f7912b0fdd8e2de091ec24a0a9264d35c536e10bc7b75f8a5c42a60832cc6a2c5dc5c98f955d908dd01886d
 DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9aea7ed9f8b11cbdcca02d11fc314c4ec32c015cbd605344644 SHA512 c69868f00a50d9d0f1744137a66c4944330d4c0f7a7b58f13d3e7c72fbd7d31fbe97d3d98cbb4011e4ddf5eaf637991d7a4fe1d32fb98a0627ed28012ebdafaa WHIRLPOOL 89e0b90e509f4771366e6baddb861f4c922f9d5f8f0c5561fcb89e78466cfba40e2d657743ed142d12e7778a796ce049a03703d661660a1d540ceb4798e51b61
+DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 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
@@ -64,5 +65,6 @@ EBUILD netbeans-ergonomics-9999_p20150601.ebuild 2919 SHA256 f843642d11b528dcd6b
 EBUILD netbeans-ergonomics-9999_p20150602.ebuild 2919 SHA256 f7156f040794209850f3ea220b2545fd62a5c4e2d91d475884da127273585cb8 SHA512 c3732261e4fc519c39cbe61cc6a654194f47836994f0336dc3b6c79ab29cd92e60d71768e7d6c4f08445b862ef5184efa13464820ecba4a86cea70ebe64a2eda WHIRLPOOL fe8e10e38419660a3c84a050d9bbb0e65c6fb83b4df6e83b1ec98fb2005b3fb127b8aac74786f726d7346f97a092287837587e9fdb104b431e1fb0e7b039397f
 EBUILD netbeans-ergonomics-9999_p20150603.ebuild 2919 SHA256 950daf3955de8b4f620998cb82a660ba45b0b9b0f05016758c893e5e1b5ee4f8 SHA512 fa389d8734ee486d84e0a5dd461b570d9d67346526cd93db03de44257644a2b12d08642ab71c53bfb2a1546a58a14de20aa135c93969f568c34457b57e3bfd2a WHIRLPOOL 8a2641d2111287c5bdabec6a293683bcab071baa65ae674a091631ebcf16f09ebf1612697b8e0fd9fab16e72ecc5b208c42fe5e2292011ba25681fbb175c5168
 EBUILD netbeans-ergonomics-9999_p20150604.ebuild 2919 SHA256 6177e568d9df40438bec28e03fe46461667f51c65086fc05f09daa85950654f0 SHA512 500f6bfc1d5e0ab46c9d89a93082226b345184f46863c793ad0fab680c07e4d244acb5e0e7acb92843fe0f228911187f716bdcb8489c1047ed955bcd8573c7e3 WHIRLPOOL 023626b58ac67751154c3001989c0a299c8700dc32f179707376f3b94066e31fda5a4e4af3b527a3721b23396a833d684ac435c62d9889f73c95005507526724
-MISC ChangeLog 174284 SHA256 75725718033dc85d3e6db9a5c11f4aeda8e2914fca95e9fc3ecc0bcd9706bc54 SHA512 abf1b3f6a06494bb7b28a833263ccf12e375e40b85bdf2006e47ff22307d82c79587e16ea18523016ba3614dbf218df2beb5dd8cd0fc0a7e9eb29be6933a2bf9 WHIRLPOOL 6be6a5266d9b746c77619d574e83eacb883458a854d70ae3aa63b92cd1a2dc59cfde16dfe5a3b0a152a57efea17bef8d1826f3d4da24ae21fcd04d57d4481a0f
+EBUILD netbeans-ergonomics-9999_p20150608.ebuild 2919 SHA256 1732a4ca82269658893854f737c811c770c6a91663ef365c7416765e29e65846 SHA512 0e73873948418205860e8def34a9ed4c61036a2cd2492f6f19bb084d249f4152a471c12cf309743c7713c72a7511eb7f6443ecea0e2fbd99abdea95c0d35a8a0 WHIRLPOOL 7df46b5b4ed3904bc5abd55a53f7f68197b0397269170a6a6a58307fcc86e000982a89d31115432b69dd823c5f8badb1992ee976b08b7d8b4169eef47d2b6987
+MISC ChangeLog 174465 SHA256 9a45a47016f01c5c96bfdb72813c857ec9f3b7f841b6c2e21aadd778c8fb8a55 SHA512 f4c6d3fd537c3a7ce49e38dbbf65351db4adfcee502c3cb1d2971f11b21787e8587933614fdbf9669500d65f0af632c274aaf63364a3f7047761684d7505e4ff WHIRLPOOL 9aa3dcf8aab917b34c7d7c343fde0fb8b3fe809cb4964057037dabadedb732196220400da2778728e49231f6746d79cab8d40e35cae980b41dec2bfa0aafd037
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150608.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150608.ebuild
new file mode 100644
index 0000000..d4def3f
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150608.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-06-08_00-01-56/zip/netbeans-trunk-nightly-201506080001-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 d898448..fc6370f 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_p20150608 (08 Jun 2015)
+
+  08 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-extide-9999_p20150608.ebuild:
+  bumped to the latest sources
+
 *netbeans-extide-9999_p20150604 (04 Jun 2015)
 
   04 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index 3fa0fc0..8bf3b2e 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201506010001-src.zip 207778965 SHA256 96bc8cca703517
 DIST netbeans-trunk-nightly-201506020001-src.zip 207781610 SHA256 ed7f2e851ed53dacd5e46091a091490fcf4afbac35b732335f054fc428978850 SHA512 ba5f09aadede76fd0659c3b190a3646a9b57ffda253cf24d1343bace9112c56d96bff7df158e71539a614d0d80041113da73590fe2f9bf9981cbbe9993f9ef3e WHIRLPOOL c9c938d405c92ef00d253a40723ca770aa41d401dd2de6c79652c5df949bb9a9f7c6a92ac4f3895c8d7135e0963f6779b6aff1c3f8251da2fbf9f0d348d724b3
 DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123489cf38c44213cd2de2606f71e6231ac40e6519eb8f5c71294 SHA512 59a40cd092399dc49057144b95c9d8399fd3284a69bece3ccb02e479994ef2dd55140de0d62a455538dce87b17bc10cf3e09b165109271c78af229d1b62cb074 WHIRLPOOL 5ccbd8842aab3d1e2b0141bacaed90605bed668e0f7912b0fdd8e2de091ec24a0a9264d35c536e10bc7b75f8a5c42a60832cc6a2c5dc5c98f955d908dd01886d
 DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9aea7ed9f8b11cbdcca02d11fc314c4ec32c015cbd605344644 SHA512 c69868f00a50d9d0f1744137a66c4944330d4c0f7a7b58f13d3e7c72fbd7d31fbe97d3d98cbb4011e4ddf5eaf637991d7a4fe1d32fb98a0627ed28012ebdafaa WHIRLPOOL 89e0b90e509f4771366e6baddb861f4c922f9d5f8f0c5561fcb89e78466cfba40e2d657743ed142d12e7778a796ce049a03703d661660a1d540ceb4798e51b61
+DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 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
@@ -58,5 +59,6 @@ EBUILD netbeans-extide-9999_p20150601.ebuild 3383 SHA256 772bf49232284dc0336bcbe
 EBUILD netbeans-extide-9999_p20150602.ebuild 3383 SHA256 0e40f77805c0fc12621896b2861b0eaaf8b054579c7f00898273b6e163f8acdf SHA512 0c9bd56b40a49cb9812fd9b89db76c8b566f1baa7746a8777512f7d8d5521864771b24fd8286fff08a0d23c7f93227fa1add5e92cd48a94d01ed9a7ad493b986 WHIRLPOOL 75d7e71d3a636c59456b623e14ce940f07e3281383a55e4329e855ebfddff77e555bcd928195a3c523f1a905242ec629c6fd28056ddd5bec609cb917efd0818d
 EBUILD netbeans-extide-9999_p20150603.ebuild 3383 SHA256 d687a3adef11e7c36d9befb0eb254fe5ca882144c3f05978a5a3d1605cf280c2 SHA512 3e38a2be797baca60cc7005aa5388e6ea0513e261717af6021c8623305f45604853882be9e9103122ebc54732c6c3a89e26e334335d4ec2e2035df2f86bc99ea WHIRLPOOL 2016fadaa385e7131bf10665b17bd06a617c3fb09a4bdbb146dcc7f9012b0e3bf2e496cd894e7684bf4698b773cb31242907007fbc36d3fd0d5ab33f356588ea
 EBUILD netbeans-extide-9999_p20150604.ebuild 3383 SHA256 9c193b2bdb3db4adb09513efce27b3b941a432ee065e24b46d43ff49b8aa59a8 SHA512 bff6dadca8d70c44e592b883163be9df4f23a26c8278b463071bc03b45b746393efe2eb52e281589ff87256b9f82aab342d1bf7b09f212432c4d04de66c90b36 WHIRLPOOL cb46c881573d755d1733fbebd45196f01a4f473a2a943b579fe1abec578ba57810bc00029ac3826b87a365b572adc856e18c708c960a975b348011dd84f7719f
-MISC ChangeLog 97931 SHA256 235c8b6b4751a99c52d897d9c46c1d1334d1faac16540a15a4472fe516519386 SHA512 868afe5f6210371360b724d9c2f81a502e40fee2fcba3cc8c8aa7dfce9a1f3902e20b00505a0f8532061361124bf7867fdfd52479de543d47a779932ac1d6f4c WHIRLPOOL f377ca094edb0cbe5561504e09aadd74a4065b85069589e9ec22e65c2b8768ea79b9f7d60fe32eab836ba26e376a170ecfa6a3113c4706ae6865fd58861093a9
+EBUILD netbeans-extide-9999_p20150608.ebuild 3383 SHA256 dab40ad3b573060f0ff43d3f08e277f5dbc73f96d80890d7ed0f6a9ca6977e0c SHA512 e7079c349865d0174cdedc409eedfd8cd10591b35dac57782944b90c6a3f628d9f33e3aebd5544d2e5d3b053663f3fc84b7634474df7425998a99788b410b135 WHIRLPOOL 9e1d47f29d8d9b5d1068c539d02df1366885155ecce34de64c60a82b59c5d30e51b07bf6ae7e064c9dfa5b762259134624b0d50cedee4806772e30f0e97b202e
+MISC ChangeLog 98104 SHA256 afb06350313c2d099b8886c0ff3f7f019023a44b8a207fc4d6462e0d17340e0e SHA512 e952e5148d10d1cc4b8cba5180a48941eb9a768a0f279269e45a57967ee29f2aa7ec1311d1f71add8c6ffd6d9ed61bb3c602b885741a02aa9a1d43670be32506 WHIRLPOOL ffd78ab5245b20df3f0d71b8edec3a1dbe68e53784be5672692ec8cccf51345c2fa5ae5e9c98fe6f581ef6587dbcd2e6b66bc45cad519308671fd1a45a6e88e6
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20150608.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20150608.ebuild
new file mode 100644
index 0000000..fc16a02
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20150608.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-06-08_00-01-56/zip/netbeans-trunk-nightly-201506080001-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 7b14e84..8f1ebca 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_p20150608 (08 Jun 2015)
+
+  08 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-groovy-9999_p20150608.ebuild:
+  bumped to the latest sources
+
 *netbeans-groovy-9999_p20150604 (04 Jun 2015)
 
   04 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 45d51d2..8d03489 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201506010001-src.zip 207778965 SHA256 96bc8cca703517
 DIST netbeans-trunk-nightly-201506020001-src.zip 207781610 SHA256 ed7f2e851ed53dacd5e46091a091490fcf4afbac35b732335f054fc428978850 SHA512 ba5f09aadede76fd0659c3b190a3646a9b57ffda253cf24d1343bace9112c56d96bff7df158e71539a614d0d80041113da73590fe2f9bf9981cbbe9993f9ef3e WHIRLPOOL c9c938d405c92ef00d253a40723ca770aa41d401dd2de6c79652c5df949bb9a9f7c6a92ac4f3895c8d7135e0963f6779b6aff1c3f8251da2fbf9f0d348d724b3
 DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123489cf38c44213cd2de2606f71e6231ac40e6519eb8f5c71294 SHA512 59a40cd092399dc49057144b95c9d8399fd3284a69bece3ccb02e479994ef2dd55140de0d62a455538dce87b17bc10cf3e09b165109271c78af229d1b62cb074 WHIRLPOOL 5ccbd8842aab3d1e2b0141bacaed90605bed668e0f7912b0fdd8e2de091ec24a0a9264d35c536e10bc7b75f8a5c42a60832cc6a2c5dc5c98f955d908dd01886d
 DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9aea7ed9f8b11cbdcca02d11fc314c4ec32c015cbd605344644 SHA512 c69868f00a50d9d0f1744137a66c4944330d4c0f7a7b58f13d3e7c72fbd7d31fbe97d3d98cbb4011e4ddf5eaf637991d7a4fe1d32fb98a0627ed28012ebdafaa WHIRLPOOL 89e0b90e509f4771366e6baddb861f4c922f9d5f8f0c5561fcb89e78466cfba40e2d657743ed142d12e7778a796ce049a03703d661660a1d540ceb4798e51b61
+DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 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
@@ -68,5 +69,6 @@ EBUILD netbeans-groovy-9999_p20150601.ebuild 3422 SHA256 a91587febfb20c35b6cd521
 EBUILD netbeans-groovy-9999_p20150602.ebuild 3422 SHA256 d21c7b407d793bf6f80adc25f9ba77fc3424a1a9a6113f55a2744879e8686297 SHA512 a97c118b06976d3e67406f9274231a8f7d6604789412a06aec9dba8a4c6cc56c1f83ee9ac41ede98bca114f677b5158e481993aba19742fe1f2e9c3c0f03ffb3 WHIRLPOOL eaaacf887e88f1245173b3e5fdacc01ea37755b5c5fc76f13475b8c81e68a2cf86d2d899e1670a5ad00f07456210d3aec9d231d397604a44b56d21c99004c22a
 EBUILD netbeans-groovy-9999_p20150603.ebuild 3422 SHA256 7d272b5b2ada4a6f182d32439302222230e850f49b9f0a821a9d6e3ad2d04c71 SHA512 44b75861c70aa2db7995d138de88878a16726523c5c394846cbd125fabb967b5231497274c7a22db26bafa9e6d83a8f472303ab3d514cb6de0b912b6ed8a375b WHIRLPOOL 2e8ed945c4b9135b60deb7310156bb3d501d2e11e0042964905019c01fc9c4186827068714a23d0c85a6e133ecd7ac504231a1390fafc0ca69d3e14689a9a37c
 EBUILD netbeans-groovy-9999_p20150604.ebuild 3422 SHA256 eca2cef95c98febc6b7e7e42b77e28b5cd6a7d2494f96d9ea784a2117fcd4263 SHA512 3f2aafc1099b05d3e89da14329947b78d94960e81f1d294552ab19814bb2dbc1ea38a2b5a90f74f8e74efb5bc5b424940bacfa84c18496dc32edf2ed41be90d7 WHIRLPOOL 0e198bdfa530da0be06c562b1c069937364c52866dcb1f4de89ac0ade2d51fce18d5f4bfd1fb1558db6e44fdd109a7aa042a8c52fa94c302ea3d4bd374f45be4
-MISC ChangeLog 165911 SHA256 b64771da3dcf49e0e54b5ceafa8af48467d655369af795111e8f566a403341ca SHA512 1caa5abf8af9ce509ce9a29c7c31a39357748cc1bdff64d19d78d2c193fc5b89300120e9fe71ae31f2a32eece2e9f92d42d2e3af56f94e6635bd5a1506a723e0 WHIRLPOOL cbc773ebf16a96c277a68eaa49872d45cab6d51370b724d532cc585a8626b1931b15b5aa558601213e1e82ae761e290800533c4982718adbefc72c0eac9627e7
+EBUILD netbeans-groovy-9999_p20150608.ebuild 3422 SHA256 df8294d60d04b723c6e7456735c8ea473f6e2ed19f30ccee57024dc27673da98 SHA512 84f508d6e4c95ddecaf88dbd5530dd2d39d6f911aac92712fe46a85a2e1b9d4a0204225751367d9d0867170d8a726ff4e3766c651a756031d6bd2cae3de133fc WHIRLPOOL d27ae0caf732b7634ec350e1919018dd895ac2ef6c829fa43f1b7b3f4c5050773b5e32bd4eb1f9929b42cc0b1d0474e7d3e0418dda7aac680fe1afee010ab3f9
+MISC ChangeLog 166084 SHA256 940419ef0ae012a238f09822893cc2ac6e7118b1e63695f53f6dd859af5233ab SHA512 c3b81a21e56ca64a21bce72122d4e200a8a36306ae659c9cc2208e0f433b2bf1c61eb6fc150656b9f93a459b1de55235f687d2831a76f712cf913ba2ed4ba50f WHIRLPOOL 40900f72adc904321c098ecf50c27fa1815706dd04db1778e023458e145bd9c68d83f90d91c8f97a42f8922d6e2f1a7305aca552bac5261723884528cee2d1ca
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150608.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150608.ebuild
new file mode 100644
index 0000000..3e6f856
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150608.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-06-08_00-01-56/zip/netbeans-trunk-nightly-201506080001-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 3a970b6..9f31cbb 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_p20150608 (08 Jun 2015)
+
+  08 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-harness-9999_p20150608.ebuild:
+  bumped to the latest sources
+
 *netbeans-harness-9999_p20150604 (04 Jun 2015)
 
   04 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 1742502..912d875 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -41,6 +41,7 @@ DIST netbeans-trunk-nightly-201506010001-src.zip 207778965 SHA256 96bc8cca703517
 DIST netbeans-trunk-nightly-201506020001-src.zip 207781610 SHA256 ed7f2e851ed53dacd5e46091a091490fcf4afbac35b732335f054fc428978850 SHA512 ba5f09aadede76fd0659c3b190a3646a9b57ffda253cf24d1343bace9112c56d96bff7df158e71539a614d0d80041113da73590fe2f9bf9981cbbe9993f9ef3e WHIRLPOOL c9c938d405c92ef00d253a40723ca770aa41d401dd2de6c79652c5df949bb9a9f7c6a92ac4f3895c8d7135e0963f6779b6aff1c3f8251da2fbf9f0d348d724b3
 DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123489cf38c44213cd2de2606f71e6231ac40e6519eb8f5c71294 SHA512 59a40cd092399dc49057144b95c9d8399fd3284a69bece3ccb02e479994ef2dd55140de0d62a455538dce87b17bc10cf3e09b165109271c78af229d1b62cb074 WHIRLPOOL 5ccbd8842aab3d1e2b0141bacaed90605bed668e0f7912b0fdd8e2de091ec24a0a9264d35c536e10bc7b75f8a5c42a60832cc6a2c5dc5c98f955d908dd01886d
 DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9aea7ed9f8b11cbdcca02d11fc314c4ec32c015cbd605344644 SHA512 c69868f00a50d9d0f1744137a66c4944330d4c0f7a7b58f13d3e7c72fbd7d31fbe97d3d98cbb4011e4ddf5eaf637991d7a4fe1d32fb98a0627ed28012ebdafaa WHIRLPOOL 89e0b90e509f4771366e6baddb861f4c922f9d5f8f0c5561fcb89e78466cfba40e2d657743ed142d12e7778a796ce049a03703d661660a1d540ceb4798e51b61
+DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 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
@@ -70,5 +71,6 @@ EBUILD netbeans-harness-9999_p20150601.ebuild 4131 SHA256 287294cfc4d9b2f685370a
 EBUILD netbeans-harness-9999_p20150602.ebuild 4131 SHA256 2d6d1b03d6f70e02ec9ec733f38d0efc0ebfad7098087112c833fa2744a9927f SHA512 241debe4d1d2a25022d15de32c743d9a68f58826ea1a99e89161180e2c825a0f710208b34bd51214cca01eb3ebc7168884ec3c7e9e03802961ffc042c3c1f833 WHIRLPOOL b9eb65f0d699da31dc7f50bdc83204fc6533d1807e6c7eb1acd64d3a2e343e73c12faa202da593f81ff7ab74ed651c98d215d849bd597013d193a13bfdaae698
 EBUILD netbeans-harness-9999_p20150603.ebuild 4131 SHA256 6d11bc06afc57c6907b454a83997613a8e91ea4399d68601b91e1b4ead945143 SHA512 52c9287b85514f38ace5caef580b06b8495999520d10c37f3b2caaa475504702fa90586dfb9d412ef74890c56086fe85ba8d15abc962353823bea7d4fd94199c WHIRLPOOL 9453d9b2b8b707781f75e9fe5db32755d254d3bc2f3c7e5a3084bcd2b7be7c54413c601cf7f232cfecfb7f66dbed60e6bc82e37c846b68969a5fdfbb76b7e5c7
 EBUILD netbeans-harness-9999_p20150604.ebuild 4131 SHA256 4a162eed1c989fb10d80782db1d9b749b5f3132431b8748728e242ed6d1c2ba9 SHA512 e6d028ff418894c3322238bf67439f05518dd3d50e81a4e4a3d75a15ce5883c6cc2da876e1a9bebbcade2f3f1f2ede69a32b1fcec15d250a68960f1d652f780d WHIRLPOOL 0c6f9ca16ce5a278ff0541eabe19ab5f2ad4950ec0450b7ef55854ace56d332e008b6ef6e316180a003527d1a219d324acf1f8887fd46540a2d93b1ff7f732f8
-MISC ChangeLog 168033 SHA256 a15290d2a59533b2a50fed158e5a1c77e73a5fc3ec1ed928656bd4be134e37d4 SHA512 8569c70d6bbd4fe8e3ab90f9f78c97e5c61f7c62603ee011f071eec27d59d4144908591933c995350a184e635c65a46b7950eb024620d14f029fc56a19fcb5d5 WHIRLPOOL f5748cbc83a2e402882a18a4def380f099f0c2a057dc92dc71840a515043d7b94b4be6bf44fe24d0dfe8582ba8a883579a9e3bca44003a42abfdde252c239be4
+EBUILD netbeans-harness-9999_p20150608.ebuild 4131 SHA256 47f82ea467f026ee9dad193e6db46c73ad4d86da7f7d9bc2c5671881455f5efa SHA512 109a1093fd112516ef2630e7e98241655d1a705825f32eb8539ad99a33ee6449cfbcca2cbb0b3fd0d619cc7309827ae6e45fe183f07d30a960cb42421648d8d2 WHIRLPOOL 5a1d9663383b976507dfb2fa05bfca35c0b0047c6e698cd81e9fdc3a70f1c18c107afe71ae3c98aee3b2506ee106dc6dbb960261dac36467201f031bfe3c5739
+MISC ChangeLog 168208 SHA256 27cf6d9fe3bc6212a36a9d803f2f68a6cbe5965a92fda940d25c58c3f8f68bba SHA512 c9cf4431a699e0225f2112e8a7229037833ab308e1e4138bc0df60f4087ed3ac493c115efb5dc5dda2cfe945c2fecb527f90d19b3238ec3cf994290a9f0c830f WHIRLPOOL 6932fc6cd7fe12e657f462937e1e3c2b58be76c09ce378dc5e976134cd16085b65fb6dd5650f394438596bb710f511839449ef9466bca28e512e47d52ae5593c
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-ide/ChangeLog b/dev-java/netbeans-ide/ChangeLog
index ead830a..543249f 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_p20150608 (08 Jun 2015)
+
+  08 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ide-9999_p20150608.ebuild:
+  bumped to the latest sources
+
 *netbeans-ide-9999_p20150604 (04 Jun 2015)
 
   04 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 2e1a076..ee6179e 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -245,6 +245,7 @@ DIST netbeans-trunk-nightly-201506010001-src.zip 207778965 SHA256 96bc8cca703517
 DIST netbeans-trunk-nightly-201506020001-src.zip 207781610 SHA256 ed7f2e851ed53dacd5e46091a091490fcf4afbac35b732335f054fc428978850 SHA512 ba5f09aadede76fd0659c3b190a3646a9b57ffda253cf24d1343bace9112c56d96bff7df158e71539a614d0d80041113da73590fe2f9bf9981cbbe9993f9ef3e WHIRLPOOL c9c938d405c92ef00d253a40723ca770aa41d401dd2de6c79652c5df949bb9a9f7c6a92ac4f3895c8d7135e0963f6779b6aff1c3f8251da2fbf9f0d348d724b3
 DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123489cf38c44213cd2de2606f71e6231ac40e6519eb8f5c71294 SHA512 59a40cd092399dc49057144b95c9d8399fd3284a69bece3ccb02e479994ef2dd55140de0d62a455538dce87b17bc10cf3e09b165109271c78af229d1b62cb074 WHIRLPOOL 5ccbd8842aab3d1e2b0141bacaed90605bed668e0f7912b0fdd8e2de091ec24a0a9264d35c536e10bc7b75f8a5c42a60832cc6a2c5dc5c98f955d908dd01886d
 DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9aea7ed9f8b11cbdcca02d11fc314c4ec32c015cbd605344644 SHA512 c69868f00a50d9d0f1744137a66c4944330d4c0f7a7b58f13d3e7c72fbd7d31fbe97d3d98cbb4011e4ddf5eaf637991d7a4fe1d32fb98a0627ed28012ebdafaa WHIRLPOOL 89e0b90e509f4771366e6baddb861f4c922f9d5f8f0c5561fcb89e78466cfba40e2d657743ed142d12e7778a796ce049a03703d661660a1d540ceb4798e51b61
+DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 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
@@ -276,5 +277,6 @@ EBUILD netbeans-ide-9999_p20150601.ebuild 30352 SHA256 301de6419926472e19a586d1e
 EBUILD netbeans-ide-9999_p20150602.ebuild 30352 SHA256 04dd4bbd6534258e7dee19c02a7f557bd02b2a42d187b7fcdb19a4e0269b765f SHA512 bb6d22db2d315391eaa34001f6d1cf59dd192368209704ea820b04ec1adc16e00268e76ef92eb030263ce77201d78262c17742d99c0e44e3ae348c158a381271 WHIRLPOOL c4d36fdd5b41ad461e9d1bdb9ff7958e489abd0f1bd9c853badc828f7e99d9735808ee832cdde2d66300875076dcad8679fb93d7b8a7f11e5c7b68971472a3d5
 EBUILD netbeans-ide-9999_p20150603.ebuild 30352 SHA256 0e3da65867194e9ddfebfa794292616d5dc50063a7ebc6f2036d359a5b34a427 SHA512 bd38660630929edae836420ec2f4abd09f6dca2afda67d963c6aa7ceebe49c63f44de44e4051114fc128f831f920b6b56bdf23d3675bf43e900f6d6bf32c0a9c WHIRLPOOL 00167cc4fa4ebd07ca0b597e0ae623c6070ab6d8ee142e35427cd59f9910c9c842d7dbc586806a79ffee0fb77e631669b5f79571cf5f39d5c34ced7b30dca271
 EBUILD netbeans-ide-9999_p20150604.ebuild 30352 SHA256 f987f4da5399cde056dc8f9496b25e010576f706e79d9aa8a5b2dbead5b1f4ad SHA512 0e57468c18790b8513dd8094dceccb2dde5a2c7e6254647d79950dc828704dd5dfb0ee6ea5b9e24c702d53d08e184a463c9e592bd54f11193caf2783385c7e13 WHIRLPOOL e691c15f9a427be7121cf3dfadba936efa146ddbcc2731834966cf8d6eb38b51fe81947cd64a6739129a9582138c036a5f6d4945ab4c7a21751ea43e59422bf5
-MISC ChangeLog 159979 SHA256 40c6b8f6e06f474f55105364c7df5a38d7dc6c266052a20d0cce5fb2875823db SHA512 02ead21303caf27889d82383bf5dcd21b2289b058828b44a81c41962a529062456f6d4642ee470ff8f9ed7ea1911f9a854381f2b6629b9de33930f87e25edf8a WHIRLPOOL abdd493cc9fb7fa04969ee4f02ad5c979d3ea430ebacb5fa8df6c9470f53dda9e2a2977027a6d9a477e4e7577ceeeb6d6f970ad025a67072c0a7c0109fe5bd81
+EBUILD netbeans-ide-9999_p20150608.ebuild 30352 SHA256 1dc75e6d3fc2e22ac46f455f4daeb43d6c73c51fb296460c22453ca2d080e81b SHA512 6226ffee5280fbaca45e2ced2a2aab08a5452ad133a883ed481150905a33432d7d92cb7f33b3ff6820348ad51e8c3ead253775a27111e8da78ae92aa20e32057 WHIRLPOOL 9f6e8c6d6f339cb1d63cef29ec6b6b41ae0b61939ed3a96de628ef063621308d2e390c56fb2f9fe89a3a64429a3ad3cc107e9daddce46a304a0e3f3e8680826b
+MISC ChangeLog 160146 SHA256 70068361d9622943262249dc384e5fc3a36c3a0470709ac5c4649e69bbe1ebf9 SHA512 438dac7d0c7cdd0ce79c571419669bacb416aa1d78eecee64122d1dff40d8d31d5c9eac18e12c25b19ce086a6ab9bff3f745f8e1dc2896d12ff5b9e2e6449926 WHIRLPOOL 80406bb205c37bdf12b99db436e249ff74c51233a4c3a7bb4707631096792773636a0f9b3d5992665b719332b9be595e1be4815aacba4c98bfc1c91246016bd5
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20150608.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20150608.ebuild
new file mode 100644
index 0000000..15e443c
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20150608.ebuild
@@ -0,0 +1,377 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-06-08_00-01-56/zip/netbeans-trunk-nightly-201506080001-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/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip
+	http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar
+	http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
+	http://hg.netbeans.org/binaries/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar
+	http://hg.netbeans.org/binaries/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-html5doc.zip
+	http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar
+	http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar
+	http://hg.netbeans.org/binaries/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar
+	http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar
+	http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip
+	http://hg.netbeans.org/binaries/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar
+	http://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar
+	http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
+	http://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar
+	http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar
+	http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar
+	http://hg.netbeans.org/binaries/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar
+	http://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar
+	http://hg.netbeans.org/binaries/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip
+	http://hg.netbeans.org/binaries/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip
+	http://hg.netbeans.org/binaries/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip
+	http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar
+	http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar
+	http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar
+	http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar
+	http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
+	http://hg.netbeans.org/binaries/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar
+	http://hg.netbeans.org/binaries/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar
+	http://hg.netbeans.org/binaries/F27BF427BE72709F3094BF76ECA8C5A2B9AC6DA9-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar
+	http://hg.netbeans.org/binaries/9BC512C5BB9A9F5276B9E8672F6B30AD0BD97D88-org.eclipse.core.jobs-3.5.101_nosignature.jar
+	http://hg.netbeans.org/binaries/105DC9A1A93E6EA9A6CD368AD12897B1F247D6AE-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar
+	http://hg.netbeans.org/binaries/E99C3C29A90F8AB29078A38CF8EBC3860249640C-org.eclipse.core.runtime-3.7.0_nosignature.jar
+	http://hg.netbeans.org/binaries/84FC6D443CD0816FA87093B6B7AD6876ADFC4207-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar
+	http://hg.netbeans.org/binaries/74069BFD03B2C66A9EBB4370C0B8064E3F5B6594-org.eclipse.equinox.app-1.3.100_nosignature.jar
+	http://hg.netbeans.org/binaries/A7953EEE9D4D7CD896C7D0AD6D21902E6259979B-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar
+	http://hg.netbeans.org/binaries/3FB169C95F095B70F05B96BE9496DA63FAE7F707-org.eclipse.equinox.preferences-3.4.2_nosignature.jar
+	http://hg.netbeans.org/binaries/CD5919A707EB6B5C1FC29964C8EF5E2CF3F5A3D4-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar
+	http://hg.netbeans.org/binaries/A4634373DC60650C49CC98AEA2090889F7ADC68F-org.eclipse.equinox.security-1.1.1_nosignature.jar
+	http://hg.netbeans.org/binaries/278049664FFA5447191BD5FE96B0B62B0CFD15D1-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/9039A0C1FA0E56CB56A1A192908814478FA747C5-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/DAA45A7EE529A7532F5DC08625A5A3E81DB2D4CB-org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar
+	http://hg.netbeans.org/binaries/F5AC8FBA216A8C52F319EC2CB455B44FFD734B38-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar
+	http://hg.netbeans.org/binaries/B43E7CE55F0DECA3BE1A6E695A3E3ABC6D62567F-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar
+	http://hg.netbeans.org/binaries/1B9CBEC0FCB47C279519E52D360199C24EC99B01-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar
+	http://hg.netbeans.org/binaries/6B0A6E9F9179E314944E4ADB831A9D6FCADED3DC-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar
+	http://hg.netbeans.org/binaries/B28B8EE777232102471EA5334FD70E20851845DD-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar
+	http://hg.netbeans.org/binaries/24A15BD37950663933CC4975EE6E518BEB2C28A3-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar
+	http://hg.netbeans.org/binaries/01CD242F06F6F7E4E61C9E05ABBE07318E501D51-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar
+	http://hg.netbeans.org/binaries/75928E4368CA748131A6767BA1A97D9DA643C306-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar
+	http://hg.netbeans.org/binaries/934DCAB9534B8FE12FD9C90759B26B6B0D442837-org.tmatesoft.svnkit_1.8.7.r10376_v20141223_2131.jar
+	http://hg.netbeans.org/binaries/E90EF50215FFD23928B3308DC76A17B7DADE5F33-processtreekiller-1.0.5.jar
+	http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar
+	http://hg.netbeans.org/binaries/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar
+	http://hg.netbeans.org/binaries/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar
+	http://hg.netbeans.org/binaries/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar
+	http://hg.netbeans.org/binaries/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.jar
+	http://hg.netbeans.org/binaries/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar
+	http://hg.netbeans.org/binaries/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar
+	http://hg.netbeans.org/binaries/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar
+	http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar
+	http://hg.netbeans.org/binaries/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/jsch-0.1.46:0
+	>=dev-java/json-simple-1.1:0
+	dev-java/jsr173:0
+	dev-java/jzlib:0
+	dev-java/jvyamlb:0
+	dev-java/log4j:0
+	dev-java/lucene:3.5
+	dev-java/rhino:1.6
+	dev-java/saxon:9
+	dev-java/smack:2.2
+	dev-java/sun-jaf:0
+	dev-java/tomcat-servlet-api:2.2
+	dev-java/ws-commons-util:0
+	dev-java/xerces:2"
+#	dev-vcs/subversion>=1.8.4:0[java] missing from the tree
+#	app-text/jing:0 our version is probably too old
+#	dev-java/commons-io:1 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/freemarker:2.3
+#	dev-java/ini4j:0 our version is too old
+#	dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours
+#	dev-java/trilead-ssh2:0 in overlay
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	dev-java/commons-codec:0
+	${CDEPEND}
+	dev-java/javacc:0
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ide -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
+	ln -s "${DISTDIR}"/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar libs.nashorn/external/asm-all-4.0.jar || die
+	ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
+	ln -s "${DISTDIR}"/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}"/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip dlight.nativeexecution/external/exechlp-1.0.zip || die
+	ln -s "${DISTDIR}"/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar libs.freemarker/external/freemarker-2.3.19.jar || die
+	ln -s "${DISTDIR}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
+	ln -s "${DISTDIR}"/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar html.validation/external/html5-datatypes.jar || die
+	ln -s "${DISTDIR}"/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-html5doc.zip html.parser/external/html5doc.zip || die
+	ln -s "${DISTDIR}"/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar html.parser/external/htmlparser-1.2.1.jar || die
+	ln -s "${DISTDIR}"/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar libs.ini4j/external/ini4j-0.5.1.jar || die
+	ln -s "${DISTDIR}"/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar html.validation/external/io-xml-util.jar || die
+	ln -s "${DISTDIR}"/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar html.validation/external/iri.jar || die
+	ln -s "${DISTDIR}"/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip spellchecker.dictionary_en/external/ispell-enwl-3.1.20.zip || die
+	ln -s "${DISTDIR}"/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar c.googlecode.javaewah.JavaEWAH/external/JavaEWAH-0.7.9.jar || die
+	ln -s "${DISTDIR}"/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar xml.jaxb.api/external/jaxb-api.jar || die
+	ln -s "${DISTDIR}"/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip libs.jaxb/external/jaxb-api-doc.zip || die
+	ln -s "${DISTDIR}"/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar libs.jaxb/external/jaxb-impl.jar || die
+	ln -s "${DISTDIR}"/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar libs.jaxb/external/jaxb-xjc.jar || die
+	ln -s "${DISTDIR}"/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar libs.jaxb/external/jaxb1-impl.jar || die
+	ln -s "${DISTDIR}"/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar libs.javafx/external/jfxrt.jar || die
+	ln -s "${DISTDIR}"/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar html.validation/external/jing.jar || die
+	ln -s "${DISTDIR}"/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip javascript2.editor/external/js-corestubs.zip || die
+	ln -s "${DISTDIR}"/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip javascript2.editor/external/js-domstubs.zip || die
+	ln -s "${DISTDIR}"/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip javascript2.editor/external/js-reststubs.zip || die
+	ln -s "${DISTDIR}"/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.core-0.0.7.jar || die
+	ln -s "${DISTDIR}"/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.sshagent-0.0.7.jar || die
+	ln -s "${DISTDIR}"/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.pageant-0.0.7.jar || die
+	ln -s "${DISTDIR}"/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.usocket-jna-0.0.7.jar || die
+	ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.process/external/libpam4j-1.1.jar || die
+	ln -s "${DISTDIR}"/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar libs.nashorn/external/nashorn-02f810c26ff9-patched.jar || die
+	ln -s "${DISTDIR}"/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar html.validation/external/non-schema.jar || die
+	ln -s "${DISTDIR}"/F27BF427BE72709F3094BF76ECA8C5A2B9AC6DA9-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar o.eclipse.core.contenttype/external/org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar || die
+	ln -s "${DISTDIR}"/9BC512C5BB9A9F5276B9E8672F6B30AD0BD97D88-org.eclipse.core.jobs-3.5.101_nosignature.jar o.eclipse.core.jobs/external/org.eclipse.core.jobs-3.5.101_nosignature.jar || die
+	ln -s "${DISTDIR}"/105DC9A1A93E6EA9A6CD368AD12897B1F247D6AE-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar o.eclipse.core.net/external/org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar || die
+	ln -s "${DISTDIR}"/E99C3C29A90F8AB29078A38CF8EBC3860249640C-org.eclipse.core.runtime-3.7.0_nosignature.jar o.eclipse.core.runtime/external/org.eclipse.core.runtime-3.7.0_nosignature.jar || die
+	ln -s "${DISTDIR}"/84FC6D443CD0816FA87093B6B7AD6876ADFC4207-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar o.eclipse.core.runtime.compatibility.auth/external/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar || die
+	ln -s "${DISTDIR}"/74069BFD03B2C66A9EBB4370C0B8064E3F5B6594-org.eclipse.equinox.app-1.3.100_nosignature.jar o.eclipse.equinox.app/external/org.eclipse.equinox.app-1.3.100_nosignature.jar || die
+	ln -s "${DISTDIR}"/A7953EEE9D4D7CD896C7D0AD6D21902E6259979B-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar o.eclipse.equinox.common/external/org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar || die
+	ln -s "${DISTDIR}"/3FB169C95F095B70F05B96BE9496DA63FAE7F707-org.eclipse.equinox.preferences-3.4.2_nosignature.jar o.eclipse.equinox.preferences/external/org.eclipse.equinox.preferences-3.4.2_nosignature.jar || die
+	ln -s "${DISTDIR}"/CD5919A707EB6B5C1FC29964C8EF5E2CF3F5A3D4-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar o.eclipse.equinox.registry/external/org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar || die
+	ln -s "${DISTDIR}"/A4634373DC60650C49CC98AEA2090889F7ADC68F-org.eclipse.equinox.security-1.1.1_nosignature.jar o.eclipse.equinox.security/external/org.eclipse.equinox.security-1.1.1_nosignature.jar || die
+	ln -s "${DISTDIR}"/278049664FFA5447191BD5FE96B0B62B0CFD15D1-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit/external/org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar || die
+	ln -s "${DISTDIR}"/9039A0C1FA0E56CB56A1A192908814478FA747C5-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit.java7/external/org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar || die
+	ln -s "${DISTDIR}"/DAA45A7EE529A7532F5DC08625A5A3E81DB2D4CB-org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar || die
+	ln -s "${DISTDIR}"/F5AC8FBA216A8C52F319EC2CB455B44FFD734B38-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar || die
+	ln -s "${DISTDIR}"/B43E7CE55F0DECA3BE1A6E695A3E3ABC6D62567F-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar || die
+	ln -s "${DISTDIR}"/1B9CBEC0FCB47C279519E52D360199C24EC99B01-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar || die
+	ln -s "${DISTDIR}"/6B0A6E9F9179E314944E4ADB831A9D6FCADED3DC-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar || die
+	ln -s "${DISTDIR}"/B28B8EE777232102471EA5334FD70E20851845DD-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar || die
+	ln -s "${DISTDIR}"/24A15BD37950663933CC4975EE6E518BEB2C28A3-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar || die
+	ln -s "${DISTDIR}"/01CD242F06F6F7E4E61C9E05ABBE07318E501D51-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar || die
+	ln -s "${DISTDIR}"/75928E4368CA748131A6767BA1A97D9DA643C306-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar  || die
+	ln -s "${DISTDIR}"/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}"/E90EF50215FFD23928B3308DC76A17B7DADE5F33-processtreekiller-1.0.5.jar extexecution.process/external/processtreekiller-1.0.5.jar || die
+	ln -s "${DISTDIR}"/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar libs.svnClientAdapter.svnkit/external/svnkit_1.7.8.r9538_v20130107_2001.jar || die
+	ln -s "${DISTDIR}"/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar o.apache.xml.resolver/external/resolver-1.2.jar || die
+	ln -s "${DISTDIR}"/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar libs.svnClientAdapter.svnkit/external/sqljet-1.1.10.jar || die
+	ln -s "${DISTDIR}"/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.10.3.jar || die
+	ln -s "${DISTDIR}"/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.10.3.jar || die
+	ln -s "${DISTDIR}"/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.10.3.jar || die
+	ln -s "${DISTDIR}"/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.jar libs.svnClientAdapter.javahl/external/svnjavahl-1.8.4.jar || die
+	ln -s "${DISTDIR}"/3B91269E9055504778F57744D24F505856698602-svnkit-1.7.0-beta4-20120316.233307-1.jar libs.svnClientAdapter.svnkit/external/svnkit-1.7.0-beta4-20120316.233307-1.jar || die
+	ln -s "${DISTDIR}"/015525209A02BD74254930FF844C7C13498B7FB9-svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar libs.svnClientAdapter.svnkit/external/svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar || die
+	ln -s "${DISTDIR}"/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar libs.swingx/external/swingx-all-1.6.4.jar || die
+	ln -s "${DISTDIR}"/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar httpserver/external/tomcat-webserver-3.2.jar || die
+	ln -s "${DISTDIR}"/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 --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.51.jar
+	java-pkg_jar-from --into c.jcraft.jzlib/external jzlib jzlib.jar jzlib-1.0.7.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
+	java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar
+	java-pkg_jar-from --into html.parser/external icu4j-4.4 icu4j.jar icu4j-4_4_2.jar
+	java-pkg_jar-from --into html.validation/external iso-relax isorelax.jar isorelax.jar
+	java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
+	java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
+	# java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.19.jar
+	java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
+	java-pkg_jar-from --into libs.lucene/external lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smack.jar smack.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smackx.jar smackx.jar
+	# java-pkg_jar-from --into libs.svnClientAdapter.javahl/external subversion svn-javahl.jar svnjavahl-1.8.4.jar
+	java-pkg_jar-from --into libs.xerces/external xerces-2 xercesImpl.jar xerces-2.8.0.jar
+	java-pkg_jar-from --build-only --into o.apache.commons.codec/external commons-codec commons-codec.jar apache-commons-codec-1.3.jar
+	java-pkg_jar-from --into o.apache.commons.httpclient/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.1.jar
+	java-pkg_jar-from --into o.apache.commons.lang/external commons-lang-2.1 commons-lang.jar commons-lang-2.4.jar
+	java-pkg_jar-from --into o.apache.commons.logging/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
+	java-pkg_jar-from --into o.apache.ws.commons.util/external ws-commons-util ws-commons-util.jar ws-commons-util-1.0.1.jar
+	java-pkg_jar-from --into servletapi/external tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
+	java-pkg_jar-from --into xml.jaxb.api/external sun-jaf activation.jar activation.jar
+	java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_1.0_api.jar
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	unset DISPLAY
+	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+	pushd nbbuild/netbeans/ide >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/ide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	rm -fr "${D}"/${INSTALL_DIR}/bin/nativeexecution || die
+	rm -fr "${D}"/${INSTALL_DIR}/modules/lib || die
+
+	insinto ${INSTALL_DIR}/bin/nativeexecution
+	doins bin/nativeexecution/*
+
+	pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution >/dev/null || die
+	for file in *.sh ; do
+		fperms 755 ${file}
+	done
+	popd >/dev/null || die
+
+	if use x86 ; then
+		doins -r bin/nativeexecution/Linux-x86
+		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86 >/dev/null || die
+		for file in * ; do
+			fperms 755 ${file}
+		done
+		popd >/dev/null || die
+	elif use amd64 ; then
+		doins -r bin/nativeexecution/Linux-x86_64
+		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86_64 >/dev/null || die
+		for file in * ; do
+			fperms 755 ${file}
+		done
+		popd >/dev/null || die
+	fi
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm com-jcraft-jsch.jar && dosym /usr/share/jsch/lib/jsch.jar ${instdir}/com-jcraft-jsch.jar || die
+	rm com-jcraft-jzlib.jar && dosym /usr/share/jzlib/lib/jzlib.jar ${instdir}/com-jcraft-jzlib.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	# rm freemarker-2.3.19.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.19.jar || die
+	rm icu4j-4_4_2.jar && dosym /usr/share/icu4j-4.4/lib/icu4j.jar ${instdir}/icu4j-4_4_2.jar || die
+	rm isorelax.jar && dosym /usr/share/iso-relax/lib/isorelax.jar ${instdir}/isorelax.jar || die
+	rm json-simple-1.1.1.jar && dosym /usr/share/json-simple/lib/json-simple.jar ${instdir}/json-simple-1.1.1.jar || die
+	rm jvyamlb-0.2.7.jar && dosym /usr/share/jvyamlb/lib/jvyamlb.jar ${instdir}/jvyamlb-0.2.7.jar || die
+	rm log4j-1.2.15.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.15.jar || die
+	rm lucene-core-3.5.0.jar && dosym /usr/share/lucene-3.5/lib/lucene-core.jar ${instdir}/lucene-core-3.5.0.jar || die
+	rm mysql-connector-java-5.1.23-bin.jar && dosym /usr/share/jdbc-mysql/lib/jdbc-mysql.jar ${instdir}/mysql-connector-java-5.1.23-bin.jar || die
+	rm postgresql-9.2-1002.jdbc4.jar && dosym /usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar ${instdir}/postgresql-9.2-1002.jdbc4.jar || die
+	rm saxon9B.jar && dosym /usr/share/saxon-9/lib/saxon.jar ${instdir}/saxon9B.jar || die
+	rm servlet-2.2.jar && dosym /usr/share/tomcat-servlet-api-2.2/lib/servlet.jar ${instdir}/servlet-2.2.jar || die
+	rm smack.jar && dosym /usr/share/smack-2.2/lib/smack.jar ${instdir}/smack.jar || die
+	rm smackx.jar && dosym /usr/share/smack-2.2/lib/smackx.jar ${instdir}/smackx.jar || die
+	# rm svnjavahl.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl.jar || die
+	rm xerces-2.8.0.jar && dosym /usr/share/xerces-2/lib/xercesImpl.jar ${instdir}/xerces-2.8.0.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxb
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm activation.jar && dosym /usr/share/sun-jaf/lib/activation.jar ${instdir}/activation.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxb/api
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsr173_1.0_api.jar && dosym /usr/share/jsr173/lib/jsr173.jar ${instdir}/jsr173_1.0_api.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ide
+}

diff --git a/dev-java/netbeans-java/ChangeLog b/dev-java/netbeans-java/ChangeLog
index 24d3dad..1cdb869 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_p20150608 (08 Jun 2015)
+
+  08 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-java-9999_p20150608.ebuild:
+  bumped to the latest sources
+
 *netbeans-java-9999_p20150604 (04 Jun 2015)
 
   04 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 72fc839..a64b038 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -116,6 +116,7 @@ DIST netbeans-trunk-nightly-201506010001-src.zip 207778965 SHA256 96bc8cca703517
 DIST netbeans-trunk-nightly-201506020001-src.zip 207781610 SHA256 ed7f2e851ed53dacd5e46091a091490fcf4afbac35b732335f054fc428978850 SHA512 ba5f09aadede76fd0659c3b190a3646a9b57ffda253cf24d1343bace9112c56d96bff7df158e71539a614d0d80041113da73590fe2f9bf9981cbbe9993f9ef3e WHIRLPOOL c9c938d405c92ef00d253a40723ca770aa41d401dd2de6c79652c5df949bb9a9f7c6a92ac4f3895c8d7135e0963f6779b6aff1c3f8251da2fbf9f0d348d724b3
 DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123489cf38c44213cd2de2606f71e6231ac40e6519eb8f5c71294 SHA512 59a40cd092399dc49057144b95c9d8399fd3284a69bece3ccb02e479994ef2dd55140de0d62a455538dce87b17bc10cf3e09b165109271c78af229d1b62cb074 WHIRLPOOL 5ccbd8842aab3d1e2b0141bacaed90605bed668e0f7912b0fdd8e2de091ec24a0a9264d35c536e10bc7b75f8a5c42a60832cc6a2c5dc5c98f955d908dd01886d
 DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9aea7ed9f8b11cbdcca02d11fc314c4ec32c015cbd605344644 SHA512 c69868f00a50d9d0f1744137a66c4944330d4c0f7a7b58f13d3e7c72fbd7d31fbe97d3d98cbb4011e4ddf5eaf637991d7a4fe1d32fb98a0627ed28012ebdafaa WHIRLPOOL 89e0b90e509f4771366e6baddb861f4c922f9d5f8f0c5561fcb89e78466cfba40e2d657743ed142d12e7778a796ce049a03703d661660a1d540ceb4798e51b61
+DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 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
@@ -147,5 +148,6 @@ EBUILD netbeans-java-9999_p20150601.ebuild 14590 SHA256 066382cd72ac39b6c6c1b339
 EBUILD netbeans-java-9999_p20150602.ebuild 14590 SHA256 24e7f6bc16b17dedfe705d02ab7b5ceadc27dd45e47ba6d8c9180181fced3d05 SHA512 57e6b11cd41865d51ad808043a1dcfb4ab325a255081cadbed41d51d41ccc086a1548cbd97c03d9a7ccbf13651dd1c1fed98ead69fe0d77bdd13759691acaf4d WHIRLPOOL ff14de84808ab5bf135ca3250e7752e42a59942e6ceacd4ac1e06044680f72aedcacfcaf6444a99d3a8375bd4f96c9b0fb584f86e770caca7221977b7744a26e
 EBUILD netbeans-java-9999_p20150603.ebuild 14590 SHA256 26047a0c118360cd6aaa11c82ec741778f3d6b366a908dbeba0aa53fcbc3e816 SHA512 213f9307e7a20d22380dfc19257dbdeba154ba35a594c80fa9b713a367d6c634eb9b685673c3a85c608a641edf5843bceed7b0870b6eae9623222b2089334aab WHIRLPOOL 6e3eff7142313075ecf2afdd54e1cb607fbaf46e9e39ee6b4bfc2d123ef28bbf705bd0ed55a62c366b329f32fc0b879b838cf0ccb2580deee3fd5754abb6c81e
 EBUILD netbeans-java-9999_p20150604.ebuild 14590 SHA256 5df785c849a644e93a68215202f391afcaf0ba2db75fdfb9d9ea08fca4a9b81f SHA512 8a29e17cdfa6c33091a3cfb3afaf12f5756dde8a32cd466ee477d2c24fbe82f8a45211907f6e4d620a538b7b37f0a25817f10091cb9386f47bac5985454db2f9 WHIRLPOOL d17a87527e29952ff430bcb576ddd59f753e074d2c757c7f2614b80ecea7702986cac67505f96a6aab9f07468c0d30c0887ce062f8da614ed56318b4a58a6d68
-MISC ChangeLog 163203 SHA256 0b0d58e358d65b8a75788aa2f818e2ad53bf769dc240c0ed733d62b6e47123bf SHA512 16f5653322a52d321ea80ce498fd122e5b013aff9efcfc7dfea37df2dbcf00bf5fdbd6cf2c3ea9e50cf08661ffa8d05ea7c2fe5a4261c4ea9f4947ea9a3079a0 WHIRLPOOL 595636fbdffe4052c86afc14468d8c4339dba69ae226abfd3abeb8905e2c2129aa2d50ea58fc0d31eff83d9ddff0f193f359e4e81010f0e28a64505dfbf55062
+EBUILD netbeans-java-9999_p20150608.ebuild 14590 SHA256 50c2cd985701ff57f7ca1144a01cb52da625e56b41ca7321b7915ac3394704bb SHA512 c8b440e8e2c9646bf26a742abb5e2e302f74b4360cd9c285b85202955b3150c01ea40229c5f4e7682de7ea038068ccaed1811debbf189bce1842463f1e689a53 WHIRLPOOL 007749552d73056283b3d699a693b5200a65546a63e1a0d7d698c4de7b07dcdb4b859696da4c78760725cbeeb647dfb03b27e7301e06a4b1abea1c455610303e
+MISC ChangeLog 163372 SHA256 78574510fb5acbd48ba6a1f61d5043ef4112015b65d468c79c2cb197657f58ae SHA512 b403a8fa40d2fee9b01c29ac0be2deffd893db118bec49ea265337ac5a005b77d2b2cb6e67ce4f331f9bce3faf4cac45651b921039ceb88ead7b6110076c0965 WHIRLPOOL 091d1858645bb3d645b6749ce85892c09fc2b6456f0e87649037ba985472064907289f5f28482115822084d3a8838444d398757d3cd2bfac106556d2e9182504
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20150608.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20150608.ebuild
new file mode 100644
index 0000000..b6c8f4d
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20150608.ebuild
@@ -0,0 +1,271 @@
+# 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-06-08_00-01-56/zip/netbeans-trunk-nightly-201506080001-src.zip"
+# jarjar-1.4 contains also asm libraries
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip
+	http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
+	http://hg.netbeans.org/binaries/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar
+	http://hg.netbeans.org/binaries/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip
+	http://hg.netbeans.org/binaries/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar
+	http://hg.netbeans.org/binaries/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar
+	http://hg.netbeans.org/binaries/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar
+	http://hg.netbeans.org/binaries/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar
+	http://hg.netbeans.org/binaries/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip
+	http://hg.netbeans.org/binaries/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip
+	http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip
+	http://hg.netbeans.org/binaries/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip
+	http://hg.netbeans.org/binaries/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar
+	http://hg.netbeans.org/binaries/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar
+	http://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar
+	http://hg.netbeans.org/binaries/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar
+	http://hg.netbeans.org/binaries/7E6F9D542174220D44E7488907BA5073D330ED18-nb-javac-impl.jar
+	http://hg.netbeans.org/binaries/CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.jar
+	http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
+	http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar
+	http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip
+	http://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip"
+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: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/commons-cli:1
+	dev-java/commons-collections:0
+	dev-java/dom4j:1
+	dev-java/fastinfoset:0
+	dev-java/glassfish-transaction-api:0
+	dev-java/javassist:3
+	dev-java/jboss-logging:0
+	dev-java/jsr67:0
+	dev-java/jsr181:0
+	dev-java/jtidy:0
+	dev-java/log4j:0
+	dev-java/mimepull:0
+	dev-java/oracle-javamail:0
+	dev-java/saaj:0
+	dev-java/slf4j-api:0
+	dev-java/slf4j-log4j12:0
+	dev-java/slf4j-simple:0
+	dev-java/stax-ex:0
+	dev-java/stax2-api:0
+	dev-java/xmlstreambuffer:0"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.java -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+pkg_pretend() {
+	local die_now=""
+
+	if [ -d /usr/share/netbeans-java-${SLOT}/ant ]; then
+		if [ -n "$(find /usr/share/netbeans-java-${SLOT}/ant -type l)" ]; then
+			eerror "Please remove following symlinks and run emerge again:"
+			find /usr/share/netbeans-java-${SLOT}/ant -type l
+			die_now="1"
+		fi
+	fi
+
+	if [ -L /usr/share/netbeans-java-${SLOT}/maven ]; then
+		if [ -z "${die_now}" ]; then
+			eerror "Please remove following symlinks and run emerge again:"
+		fi
+
+		echo "/usr/share/netbeans-java-${SLOT}/maven"
+		die_now="1"
+	fi
+
+	if [ -n "${die_now}" ]; then
+		die "Symlinks exist"
+	fi
+}
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip maven.embedder/external/apache-maven-3.0.5-bin.zip || die
+	ln -s "${DISTDIR}"/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip o.jdesktop.beansbinding/external/beansbinding-1.2.1-doc.zip || die
+	ln -s "${DISTDIR}"/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar j2ee.eclipselink/external/eclipselink.jar || die
+	ln -s "${DISTDIR}"/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip hibernate4lib/external/hibernate-release-4.3.1-lib.zip || die
+	ln -s "${DISTDIR}"/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar maven.indexer/external/indexer-artifact-5.1.1.jar || die
+	ln -s "${DISTDIR}"/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar maven.indexer/external/indexer-core-5.1.1-patched.jar || die
+	ln -s "${DISTDIR}"/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar maven/external/jarjar-1.4.jar || die
+	ln -s "${DISTDIR}"/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar j2ee.eclipselink/external/javax.persistence_2.1.0.v201304241213.jar || die
+	ln -s "${DISTDIR}"/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip websvc.jaxws21/external/jaxws-2.2.6.zip || die
+	ln -s "${DISTDIR}"/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip websvc.jaxws21api/external/jaxws-2.2.6-api.zip || die
+	ln -s "${DISTDIR}"/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip websvc.jaxws21/external/jaxws-api-doc.zip || die
+	ln -s "${DISTDIR}"/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip j2ee.eclipselink/external/JPAjavadocs04032013.zip || die
+	ln -s "${DISTDIR}"/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar maven.indexer/external/lucene-core-3.6.2.jar || die
+	ln -s "${DISTDIR}"/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar maven.indexer/external/lucene-highlighter-3.6.2.jar || die
+	ln -s "${DISTDIR}"/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar maven.embedder/external/maven-dependency-tree-2.0.jar || die
+	ln -s "${DISTDIR}"/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
+	ln -s "${DISTDIR}"/7E6F9D542174220D44E7488907BA5073D330ED18-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
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.cglib/external cglib-3 cglib.jar cglib-2.2.jar
+	java-pkg_jar-from --build-only --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+	java-pkg_jar-from --into maven.embedder/external jdom-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}/maven/lib
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-cli-1.2.jar && dosym /usr/share/commons-cli-1/lib/commons-cli.jar ${instdir}/commons-cli-1.2.jar || die
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm AbsoluteLayout.jar  && dosym /usr/share/absolutelayout/lib/absolutelayout.jar ${instdir}/AbsoluteLayout.jar || die
+	rm beansbinding-1.2.1.jar && dosym /usr/share/beansbinding/lib/beansbinding.jar ${instdir}/beansbinding-1.2.1.jar || die
+	rm cglib-2.2.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/hibernate4
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm antlr-2.7.7.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.7.jar || die
+	rm c3p0-0.9.2.1.jar && dosym /usr/share/c3p0/lib/c3p0.jar ${instdir}/c3p0-0.9.2.1.jar || die
+	rm cglib-2.2.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
+	rm commons-collections-3.2.1.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections-3.2.1.jar || die
+	rm dom4j-1.6.1.jar && dosym /usr/share/dom4j-1/lib/dom4j.jar ${instdir}/dom4j-1.6.1.jar || die
+	rm javassist-3.18.1-GA.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist-3.18.1-GA.jar || die
+	rm jboss-logging-3.1.3.GA.jar && dosym /usr/share/jboss-logging/lib/jboss-logging.jar ${instdir}/jboss-logging-3.1.3.GA.jar || die
+	rm jboss-transaction-api_1.2_spec-1.0.0.Final.jar && dosym /usr/share/glassfish-transaction-api/lib/jta.jar ${instdir}/jboss-transaction-api_1.2_spec-1.0.0.Final.jar || die
+	rm jtidy-r8-20060801.jar && dosym /usr/share/jtidy/lib/Tidy.jar ${instdir}/jtidy-r8-20060801.jar || die
+	rm log4j-1.2.12.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.12.jar || die
+	rm slf4j-api-1.6.1.jar && dosym /usr/share/slf4j-api/lib/slf4j-api.jar ${instdir}/slf4j-api-1.6.1.jar || die
+	rm slf4j-log4j12-1.6.1.jar && dosym /usr/share/slf4j-log4j12/lib/slf4j-log4j12.jar ${instdir}/slf4j-log4j12-1.6.1.jar || die
+	rm slf4j-simple-1.6.1.jar && dosym /usr/share/slf4j-simple/lib/slf4j-simple.jar ${instdir}/slf4j-simple-1.6.1.jar || die
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext/jaxws22
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm FastInfoset.jar && dosym /usr/share/fastinfoset/lib/fastinfoset.jar ${instdir}/FastInfoset.jar || die
+	rm javax.mail_1.4.jar && dosym /usr/share/oracle-javamail/lib/mail.jar ${instdir}/javax.mail_1.4.jar || die
+	rm mimepull.jar && dosym /usr/share/mimepull/lib/mimepull.jar ${instdir}/mimepull.jar || die
+	rm saaj-impl.jar && dosym /usr/share/saaj/lib/saaj.jar ${instdir}/saaj-impl.jar || die
+	rm stax-ex.jar && dosym /usr/share/stax-ex/lib/stax-ex.jar ${instdir}/stax-ex.jar || die
+	rm stax2-api.jar && dosym /usr/share/stax2-api/lib/stax2-api.jar ${instdir}/stax2-api.jar || die
+	rm streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/xmlstreambuffer.jar ${instdir}/streambuffer.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxws22/api
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
+	rm saaj-api.jar && dosym /usr/share/jsr67/lib/jsr67.jar ${instdir}/saaj-api.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/maven
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jdom-1.0.jar && dosym /usr/share/jdom-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 50a0ee5..16f56a7 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_p20150608 (08 Jun 2015)
+
+  08 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javacard-9999_p20150608.ebuild:
+  bumped to the latest sources
+
 *netbeans-javacard-9999_p20150604 (04 Jun 2015)
 
   04 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 7af2d3b..d3615ea 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201506010001-src.zip 207778965 SHA256 96bc8cca703517
 DIST netbeans-trunk-nightly-201506020001-src.zip 207781610 SHA256 ed7f2e851ed53dacd5e46091a091490fcf4afbac35b732335f054fc428978850 SHA512 ba5f09aadede76fd0659c3b190a3646a9b57ffda253cf24d1343bace9112c56d96bff7df158e71539a614d0d80041113da73590fe2f9bf9981cbbe9993f9ef3e WHIRLPOOL c9c938d405c92ef00d253a40723ca770aa41d401dd2de6c79652c5df949bb9a9f7c6a92ac4f3895c8d7135e0963f6779b6aff1c3f8251da2fbf9f0d348d724b3
 DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123489cf38c44213cd2de2606f71e6231ac40e6519eb8f5c71294 SHA512 59a40cd092399dc49057144b95c9d8399fd3284a69bece3ccb02e479994ef2dd55140de0d62a455538dce87b17bc10cf3e09b165109271c78af229d1b62cb074 WHIRLPOOL 5ccbd8842aab3d1e2b0141bacaed90605bed668e0f7912b0fdd8e2de091ec24a0a9264d35c536e10bc7b75f8a5c42a60832cc6a2c5dc5c98f955d908dd01886d
 DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9aea7ed9f8b11cbdcca02d11fc314c4ec32c015cbd605344644 SHA512 c69868f00a50d9d0f1744137a66c4944330d4c0f7a7b58f13d3e7c72fbd7d31fbe97d3d98cbb4011e4ddf5eaf637991d7a4fe1d32fb98a0627ed28012ebdafaa WHIRLPOOL 89e0b90e509f4771366e6baddb861f4c922f9d5f8f0c5561fcb89e78466cfba40e2d657743ed142d12e7778a796ce049a03703d661660a1d540ceb4798e51b61
+DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 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
@@ -67,5 +68,6 @@ EBUILD netbeans-javacard-9999_p20150601.ebuild 4982 SHA256 66f8d215ecbef16358f0b
 EBUILD netbeans-javacard-9999_p20150602.ebuild 4982 SHA256 041c83a674a0058109814847236c229f5b64feb2b2ee44503dc1b6a5a078eac1 SHA512 7a15b93fc514a7c926dec90d3b5ee05bf873187c08614d2fe5f4c1135583b89efdaecd1c118953dc8f64010e43247e63bdd88ddd05189a9f697a800f4be1b07e WHIRLPOOL e3abced37d933696c2b8af7f67d538b431ecefd1d071df3da4e931415fe3a2c669dd718ec9c9cb32067331d8867f717109a409991deaf8936cc517886b05e949
 EBUILD netbeans-javacard-9999_p20150603.ebuild 4982 SHA256 6ee39d39fe18b37fc6e03b2834cff46d82390b1499a81d8595aecf1eb83fcb33 SHA512 d59c64b42607f77fa52cfc46766c07eb37a6a87697c43074eb99b348df220fa55ae9b9422f046f1a870863dfdff7d5df046175c5073c658a772302a879b71bb7 WHIRLPOOL 7652b33df2763ac08d93bf5c8ca132d329c6ea2103bd9940ce9b6015c347a79b7e13d5e6855c9c6575a3aa24dbe8c5150956754a4de48d8000ecd455c04dd52b
 EBUILD netbeans-javacard-9999_p20150604.ebuild 4982 SHA256 0b085fe452879f737d76512949d14af2f806172b949341b986be2bb0e49ef8d7 SHA512 781aca4752c3a5358eb0c7cc67c49da616a010cdb03b1175f57706010d6749c190e2b27727bad3af01b8f8e9045e52862c649c723a55e3225f9008a03784e40b WHIRLPOOL 592a8dd2be69a1a3d6a447070863fc00ecd366dd45ea053bf32545e024672dced8f87cdb025f2a510e4e629bde2e37c99bdbf7afd6e12f477136bf301709b276
-MISC ChangeLog 170155 SHA256 fc6ce4b34436e367556d8a634fe3b00f7cf58980f603669a3b15d9b72f905e38 SHA512 063dece82fbad1d52c1834869aa95bf88c98c083f02966efe8d63a561aa77024ade25df774a4f6de42de7b361f7cef2c28b4a6ce1514b00f39a84ee2d1dc2d96 WHIRLPOOL 9d2cf1da56d19cc4d50a63c2e53424bc5c839efffca7125ba3102e0d65048d925da2a98e13d0ac6e9298b85dd309c02978e2d60ccd7f66f35641906f791ecea7
+EBUILD netbeans-javacard-9999_p20150608.ebuild 4982 SHA256 bd493a5bd267593768778615a5a45e34235c4713f6efcc10e09ed22ad5154427 SHA512 c161dda42ae739e6a5e422efe684f0f7ecc62c92c3a5d9f768d4b240b7c04d1a83a2142b1e27283411601c9b60a4527cf9708a95dabe01178fd520c7b2e1e4bd WHIRLPOOL 7206b2e6371e6e4cdae7e5c34859e2336e79d5913593fd30c30aa0ca7c889792f0a14fa2251b25cb0678b9ae981f7c26e4a3858359d1b46e104947cc05aa315a
+MISC ChangeLog 170332 SHA256 35f11e1aabe5aca3f81b9d34b319bc25acf6d1585414688c9d4912479b51f709 SHA512 8f97afa825b5d10ee5377162fb14f768f6720989e05e681b02fbe1b49cca5c4696a1146b73ec1312989aeb70019c1f85a2f3f59d2bf284a0e9f6ec70afca9284 WHIRLPOOL 5fde9d86416e46c0968e1e39eec87ebd7626c555e8b286db0694c6c205df91670fd2c264a20573d085942618a6c27cafc76b693e5018b49b21e78c956cc2e3cd
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150608.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150608.ebuild
new file mode 100644
index 0000000..8791349
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150608.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-06-08_00-01-56/zip/netbeans-trunk-nightly-201506080001-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 46b533a..1ae00b7 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_p20150608 (08 Jun 2015)
+
+  08 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javadoc-9999_p20150608.ebuild:
+  bumped to the latest sources
+
 *netbeans-javadoc-9999_p20150604 (04 Jun 2015)
 
   04 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index aadc3b2..ae2a329 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -41,6 +41,7 @@ DIST netbeans-trunk-nightly-201506010001-src.zip 207778965 SHA256 96bc8cca703517
 DIST netbeans-trunk-nightly-201506020001-src.zip 207781610 SHA256 ed7f2e851ed53dacd5e46091a091490fcf4afbac35b732335f054fc428978850 SHA512 ba5f09aadede76fd0659c3b190a3646a9b57ffda253cf24d1343bace9112c56d96bff7df158e71539a614d0d80041113da73590fe2f9bf9981cbbe9993f9ef3e WHIRLPOOL c9c938d405c92ef00d253a40723ca770aa41d401dd2de6c79652c5df949bb9a9f7c6a92ac4f3895c8d7135e0963f6779b6aff1c3f8251da2fbf9f0d348d724b3
 DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123489cf38c44213cd2de2606f71e6231ac40e6519eb8f5c71294 SHA512 59a40cd092399dc49057144b95c9d8399fd3284a69bece3ccb02e479994ef2dd55140de0d62a455538dce87b17bc10cf3e09b165109271c78af229d1b62cb074 WHIRLPOOL 5ccbd8842aab3d1e2b0141bacaed90605bed668e0f7912b0fdd8e2de091ec24a0a9264d35c536e10bc7b75f8a5c42a60832cc6a2c5dc5c98f955d908dd01886d
 DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9aea7ed9f8b11cbdcca02d11fc314c4ec32c015cbd605344644 SHA512 c69868f00a50d9d0f1744137a66c4944330d4c0f7a7b58f13d3e7c72fbd7d31fbe97d3d98cbb4011e4ddf5eaf637991d7a4fe1d32fb98a0627ed28012ebdafaa WHIRLPOOL 89e0b90e509f4771366e6baddb861f4c922f9d5f8f0c5561fcb89e78466cfba40e2d657743ed142d12e7778a796ce049a03703d661660a1d540ceb4798e51b61
+DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 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
@@ -70,5 +71,6 @@ EBUILD netbeans-javadoc-9999_p20150601.ebuild 6234 SHA256 6986033fdb91b373c57ac9
 EBUILD netbeans-javadoc-9999_p20150602.ebuild 6234 SHA256 59a9132cb267091b084941817518bc49d963db3957e4c9c9626d1b64fcbc771f SHA512 cbe7934f8448dd80b897f824495cc5ecaa8eda657f7a7384de52d61c9d22bb091c1fabf09fc31b77b656cdab5bee2797d03833e2d39694cb6209489e1fc5260c WHIRLPOOL 85ab1597a451918a1145b2cdbbe7eb2fc11e2710cf9b8233e455ae462a562a1b450fd10ae8a55674c9fd104d2ca518d035e71fb937b224ccf6b65a539c1c2857
 EBUILD netbeans-javadoc-9999_p20150603.ebuild 6234 SHA256 62f387d00d3696c71c0d7d68ad4cb957ee186d8c43cbf9c718cf2de5995e8faf SHA512 8823be10c119958fb0007f8f751824441fbb811dfd381049ac579eaae68d89b7fb927924204319c4289a09f96899e9482f878931e23e86c525f88f574d1372f1 WHIRLPOOL 9cdd46658ddc130c57ec6357389378742489361f6f7dda410e7e55392934480c1ecbecec77fe56e66289f1f29aa3c7724d3d2d7cce66a7970ec466a870108e66
 EBUILD netbeans-javadoc-9999_p20150604.ebuild 6234 SHA256 457be63312f0a84436df3d45ee844414e139591115b76344c1a5598bd9481da8 SHA512 f5cd534851cdd20281f59e813f409986bfd2be855a67f42117c6c0a030b1b744b9f2d3053e7abcceea8d1d7886bb8af55f4f11497f67ea5efc31c3f7569938ba WHIRLPOOL a158af29713fdc0aafe6d65da79d3cb72a811c44ddca5d035f75304f92b8d8b7e66e9914aba8644e2566e1f25908cba8fbf05bd5825c7b385c7466644b558492
-MISC ChangeLog 167859 SHA256 55ec5dea9210dbd9e4091e0dfe3253dcd9f9862406d330b8395ae4e3ec19b44f SHA512 ec4d85ebdd3d17a1b90f9353e75a4a18f65c5e21b693a6df05f35cfbba247b259f6c7d5bcd52363f37702ab685776fe4446bb457d460a24a1e12213b17621071 WHIRLPOOL 6df2c5bb31281a2c04abfb839cc6b85a7f41c8b86ca73837b2c6d6d3a877620ad2e45c3af0283f67dc0051d3c146724437755f60c4d87352e9aaf72f1112addb
+EBUILD netbeans-javadoc-9999_p20150608.ebuild 6234 SHA256 2cb2d2bb193a613f0e799d7df8e138130ba55e2bf17907f1549505502164cd8c SHA512 a64893f14f9af258fe9a22ad9f89b2c7a678906b34903377a8c0a616f75a1d598b69c255a8070f5a32ba908e7fd82db4672bae3c5da07140a307dc7cc61ffc92 WHIRLPOOL c088e4082cb672c6c3b82142dd6fa09c0216df9f6b33ce469b4074d60efb5dd950443c12bc271cf10a94d194bcdf9a9b72e45f997c9f769159f02a0c0dbb6e09
+MISC ChangeLog 168034 SHA256 a91fd7a9f5f51831e6664797f2a57976d1935fb37b64c895a87939dadc7eab2f SHA512 9a2b055e25d53e7994a88cc42af08119c7725029c4f4e14ab82c62029e3b21c579851f7a39001ace2a894e7980aa8b1646d92b46fc11a57f8e9076fa5d8339d8 WHIRLPOOL c2d19a9312689f6c8d89d62935330b094da01331fa37bc36715289483f9840b8073ef1eb2d65ecf0ceb5d77b6f2da4bec10ce3e27a2b5daaeedbbb039562fa50
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-javafx/ChangeLog b/dev-java/netbeans-javafx/ChangeLog
index 6b34c96..2c2a523 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_p20150608 (08 Jun 2015)
+
+  08 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javafx-9999_p20150608.ebuild:
+  bumped to the latest sources
+
 *netbeans-javafx-9999_p20150604 (04 Jun 2015)
 
   04 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 585a7f6..63c843c 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -41,6 +41,7 @@ DIST netbeans-trunk-nightly-201506010001-src.zip 207778965 SHA256 96bc8cca703517
 DIST netbeans-trunk-nightly-201506020001-src.zip 207781610 SHA256 ed7f2e851ed53dacd5e46091a091490fcf4afbac35b732335f054fc428978850 SHA512 ba5f09aadede76fd0659c3b190a3646a9b57ffda253cf24d1343bace9112c56d96bff7df158e71539a614d0d80041113da73590fe2f9bf9981cbbe9993f9ef3e WHIRLPOOL c9c938d405c92ef00d253a40723ca770aa41d401dd2de6c79652c5df949bb9a9f7c6a92ac4f3895c8d7135e0963f6779b6aff1c3f8251da2fbf9f0d348d724b3
 DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123489cf38c44213cd2de2606f71e6231ac40e6519eb8f5c71294 SHA512 59a40cd092399dc49057144b95c9d8399fd3284a69bece3ccb02e479994ef2dd55140de0d62a455538dce87b17bc10cf3e09b165109271c78af229d1b62cb074 WHIRLPOOL 5ccbd8842aab3d1e2b0141bacaed90605bed668e0f7912b0fdd8e2de091ec24a0a9264d35c536e10bc7b75f8a5c42a60832cc6a2c5dc5c98f955d908dd01886d
 DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9aea7ed9f8b11cbdcca02d11fc314c4ec32c015cbd605344644 SHA512 c69868f00a50d9d0f1744137a66c4944330d4c0f7a7b58f13d3e7c72fbd7d31fbe97d3d98cbb4011e4ddf5eaf637991d7a4fe1d32fb98a0627ed28012ebdafaa WHIRLPOOL 89e0b90e509f4771366e6baddb861f4c922f9d5f8f0c5561fcb89e78466cfba40e2d657743ed142d12e7778a796ce049a03703d661660a1d540ceb4798e51b61
+DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 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
@@ -69,5 +70,6 @@ EBUILD netbeans-javafx-9999_p20150601.ebuild 4723 SHA256 e19d173c00f127c2fcf5dc2
 EBUILD netbeans-javafx-9999_p20150602.ebuild 4723 SHA256 ac25af74b95164fd3172b7981be0b8359f0bdaeb3576e38545d01e87397c3046 SHA512 8b22e0ce9b56df108e5562e8a590a939413c7a593282130a2909794c1d203a52b09a691409a66c21603de203b940217e9cc75ca67014d868c5dc2a554b92cd72 WHIRLPOOL 306ddefed4850d5f94983458c68ecfb1f0fd30a8691bc446262409382706cf0d124ad0f0fa7d937e4748a44c7ca62afe8631b3121b35fda6fa03e150dbae751e
 EBUILD netbeans-javafx-9999_p20150603.ebuild 4723 SHA256 f8609e52f1a824ca2e7d4719e9835cfd5f5a1b5f4ae3af3ce1450251ca0caa89 SHA512 00495abdd9bbf0cc4ce3d179d91e51bda594a9ceb76c14ed008c6f6453fb120ed6a5b5d551abf79b9dbd889d45f26c11292d78b7d4fd75e4a17f775866ceeabf WHIRLPOOL deac0e0f9085e9f66b1cbbe3c4907d028a5e540e8b2f87e9f8442af497a06762a4fd17e8521e66098a0abbf5ebee26246cc107b2741995e0b74b81179b17c7dc
 EBUILD netbeans-javafx-9999_p20150604.ebuild 4723 SHA256 6cd0605bac8888cb74de12c872c35f4d51892a93eca3aa35fe4035a152480ee5 SHA512 af2da58a7931db354b5fb3143f57ba1767bb2f3bbf2595fa25fa781ef2067bdc0c6acc782cd327d632c800472aa1fb37a7f8c4f2875c6947f711bed12b85f2e0 WHIRLPOOL 4236f3a96b0fe4f2bb3efbad5ab27792e88a4284f0dc49299780176b555bbe987bfa71939a37bbc0f500f24699ffe561000906bbeeb59bb282070b69ace11bef
-MISC ChangeLog 152430 SHA256 42c2ba0befb8f5bfd1f6232b57c97f5e0a0cc8519c62addcf7e47430960eeca2 SHA512 c910d87bbff782396f1c558f73e74dc15d1e8fb3e56ee7cc3e026927bd3776cfc0bc1c22a9a80d8dea2974f8dedbadea500b5f00724712ae0d573b7067b5058a WHIRLPOOL d685cbbf0a2b7a3fcc767236d45a2df071f84feb0b34979a4cd9bdf1fb0d306c55a64551eb200c473c06b3be93246c0dd111be5d3f6f1b2a8a13431e16575175
+EBUILD netbeans-javafx-9999_p20150608.ebuild 4723 SHA256 8f0b8c624aca3928eb99f67fec66d08bcc3b40b8464a067e7ffec56b9e4fe5a7 SHA512 bf8b14a87956e0f6eebbd2c9f1799cf01a1ff2746a2e99e324002bafe4072cdc675fcc7b2b0beba6f56fd7acffcec9e414371fb5e09008bf08098a3bb3d5d1da WHIRLPOOL 45150f4b4e6403e3dd581a23e0394a80add97a85f55352083c089dc70fa8c97d7b8094d6649848ee58c3c88bbfe5af17a9fa911bad0834339a7555c445e61766
+MISC ChangeLog 152603 SHA256 133184c3e8ba812b57c0cf821e827b09fde876617ee815705d09844b9cd39579 SHA512 1e4a1142b91fb29494c3814db4497e3c0cd955a7dc9180e014937bff5423baef2c7b400c5f0e9cb9a34c6e30c02b00b93ff919ea9c52d397b5639e90809f3dc5 WHIRLPOOL ce52620676f1d3ae0702964c96837cbd0f87e894e93d0d4dd1e506dabc3449a2c7a7b2354026df72ba3133fa76c067a3d02c0681df13fcd467745d9882926680
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-mobility/ChangeLog b/dev-java/netbeans-mobility/ChangeLog
index da32b4b..2765739 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_p20150608 (08 Jun 2015)
+
+  08 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-mobility-9999_p20150608.ebuild:
+  bumped to the latest sources
+
 *netbeans-mobility-9999_p20150604 (04 Jun 2015)
 
   04 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 75e4a98..e2bace0 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -44,6 +44,7 @@ DIST netbeans-trunk-nightly-201506010001-src.zip 207778965 SHA256 96bc8cca703517
 DIST netbeans-trunk-nightly-201506020001-src.zip 207781610 SHA256 ed7f2e851ed53dacd5e46091a091490fcf4afbac35b732335f054fc428978850 SHA512 ba5f09aadede76fd0659c3b190a3646a9b57ffda253cf24d1343bace9112c56d96bff7df158e71539a614d0d80041113da73590fe2f9bf9981cbbe9993f9ef3e WHIRLPOOL c9c938d405c92ef00d253a40723ca770aa41d401dd2de6c79652c5df949bb9a9f7c6a92ac4f3895c8d7135e0963f6779b6aff1c3f8251da2fbf9f0d348d724b3
 DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123489cf38c44213cd2de2606f71e6231ac40e6519eb8f5c71294 SHA512 59a40cd092399dc49057144b95c9d8399fd3284a69bece3ccb02e479994ef2dd55140de0d62a455538dce87b17bc10cf3e09b165109271c78af229d1b62cb074 WHIRLPOOL 5ccbd8842aab3d1e2b0141bacaed90605bed668e0f7912b0fdd8e2de091ec24a0a9264d35c536e10bc7b75f8a5c42a60832cc6a2c5dc5c98f955d908dd01886d
 DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9aea7ed9f8b11cbdcca02d11fc314c4ec32c015cbd605344644 SHA512 c69868f00a50d9d0f1744137a66c4944330d4c0f7a7b58f13d3e7c72fbd7d31fbe97d3d98cbb4011e4ddf5eaf637991d7a4fe1d32fb98a0627ed28012ebdafaa WHIRLPOOL 89e0b90e509f4771366e6baddb861f4c922f9d5f8f0c5561fcb89e78466cfba40e2d657743ed142d12e7778a796ce049a03703d661660a1d540ceb4798e51b61
+DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 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
@@ -73,5 +74,6 @@ EBUILD netbeans-mobility-9999_p20150601.ebuild 4418 SHA256 db644a8daa422ac5ba4a1
 EBUILD netbeans-mobility-9999_p20150602.ebuild 4418 SHA256 e5cd2d087dcb85ea967a5358bd76d94ad1a1df9804a664b154084db9febf9f46 SHA512 6daa7c386bb7e4bfbe25d11427cc46df7d262ed20d1845d49475ecd8fc786b9e97b5c80953051ca5ad8e9423be89c3c7285e3c50506333bd892c9d87a09b1c33 WHIRLPOOL 3e2572b1bd3ffc2706038fcce1fdbfdd193c56171f3699068b494d651c2a72b30b1d955b0107bcb7cfb501ad0c7de085e0856a1b16eae314a8a9f8154c513389
 EBUILD netbeans-mobility-9999_p20150603.ebuild 4418 SHA256 a8867b930129feed269ee91974828350f5413d93a1820d7169eab7fa298dc0df SHA512 2cbdd21c16c454c25b9b16651160dc9149759ad6e3aac84a8e7345cecd2cfa508b7063788f6a7d72c1b9f30a3945c3d53f75c9cf49436a84e5b873cec2aac4ba WHIRLPOOL 85c438ba7128429178ece97ba437766b7d7993e16398264ce3215aaae18da801a29c8f1ffd33135e5cbd2431a4a5eb7f5f065d1f236833519a6d4405f0599641
 EBUILD netbeans-mobility-9999_p20150604.ebuild 4418 SHA256 2563246d9db894af2f5ba064c3bc55903e94de96a6524657f64adaef28a7aae3 SHA512 99997d476dd701c67bf55fe6146a1c39fb98cdf10cc10a880e909b313aacc16d978040066763fa041295d7f101ecf0d49679ece6fe7c20a0d6f0b27e3b6a8be3 WHIRLPOOL bfa1547fc5a4b015ebc928bce3a81974f2af5b7a070e4b0dc06e78ad8aeb82d88fff55144da62779ebac114d1db0cffbb78aec497e3f995dec9bca1f4b810731
-MISC ChangeLog 170296 SHA256 7e7214d3190fd5b2e3d4835c3ed76ef0c0ce9542e48adf9217e99f39fd442774 SHA512 4127961e1a3f7a9cdf3f0184b916c1a23acbc6b1037a3ba6a73cb15e7e2c37520e93146e570b9067f3f70ed73b78f01f02c47199d3791ba855b56bbe3066f094 WHIRLPOOL 8fc5908f68699579507f96a5e12f32c50215450fb581be2324e7045491555d34bc402c0956518f8530262959b41c891c3808d42e9f824364559ec3ee49169f5d
+EBUILD netbeans-mobility-9999_p20150608.ebuild 4418 SHA256 e92b80bd7851a29dbb8fca839c63889d01fd3a691b3369dd27d6edc837b3c01d SHA512 600dff56b344b749ba2b6bcb4672864ed503e3117fdf9bb63e540d5c0d77c087a2c04847545929ac3410e6651d1ecb098ebe1568b10da91f5c997e17402eb159 WHIRLPOOL be7f1ed87e998d1626a75a71d199c128978ebed7cf5db79dd4bb9f482f1495e96796b5a34b0626130171819ba7685a3ba7943a4aac7feee6d7b3e85c122be43e
+MISC ChangeLog 170473 SHA256 05a586f949eaf24ed6e97011e769c5fb130be4cd2bdb9ca43e46d83ff99f2e02 SHA512 9b744a6595657b19830de43a5c3e0a6d3baf3cc0568531e84675b6183c96558790f3ecd7f81cfc3b9b9b7328b122526c2162c0b3e5d80478a1b7ec80e77e15c7 WHIRLPOOL 4ba7e437fa509f1bf6fb2eed4d8a991d081421548a587b70b4fcd2413199bfa3da758234d7d3a5ded29f74c1218facbe1911625881604bce111ff3fbbf9435e9
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150608.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150608.ebuild
new file mode 100644
index 0000000..b1db574
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150608.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-06-08_00-01-56/zip/netbeans-trunk-nightly-201506080001-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 4d0f376..9bba511 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_p20150608 (08 Jun 2015)
+
+  08 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-nb-9999_p20150608.ebuild:
+  bumped to the latest sources
+
 *netbeans-nb-9999_p20150604 (04 Jun 2015)
 
   04 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index de24c23..087f43e 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -43,6 +43,7 @@ DIST netbeans-trunk-nightly-201506010001-src.zip 207778965 SHA256 96bc8cca703517
 DIST netbeans-trunk-nightly-201506020001-src.zip 207781610 SHA256 ed7f2e851ed53dacd5e46091a091490fcf4afbac35b732335f054fc428978850 SHA512 ba5f09aadede76fd0659c3b190a3646a9b57ffda253cf24d1343bace9112c56d96bff7df158e71539a614d0d80041113da73590fe2f9bf9981cbbe9993f9ef3e WHIRLPOOL c9c938d405c92ef00d253a40723ca770aa41d401dd2de6c79652c5df949bb9a9f7c6a92ac4f3895c8d7135e0963f6779b6aff1c3f8251da2fbf9f0d348d724b3
 DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123489cf38c44213cd2de2606f71e6231ac40e6519eb8f5c71294 SHA512 59a40cd092399dc49057144b95c9d8399fd3284a69bece3ccb02e479994ef2dd55140de0d62a455538dce87b17bc10cf3e09b165109271c78af229d1b62cb074 WHIRLPOOL 5ccbd8842aab3d1e2b0141bacaed90605bed668e0f7912b0fdd8e2de091ec24a0a9264d35c536e10bc7b75f8a5c42a60832cc6a2c5dc5c98f955d908dd01886d
 DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9aea7ed9f8b11cbdcca02d11fc314c4ec32c015cbd605344644 SHA512 c69868f00a50d9d0f1744137a66c4944330d4c0f7a7b58f13d3e7c72fbd7d31fbe97d3d98cbb4011e4ddf5eaf637991d7a4fe1d32fb98a0627ed28012ebdafaa WHIRLPOOL 89e0b90e509f4771366e6baddb861f4c922f9d5f8f0c5561fcb89e78466cfba40e2d657743ed142d12e7778a796ce049a03703d661660a1d540ceb4798e51b61
+DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 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
@@ -72,5 +73,6 @@ EBUILD netbeans-nb-9999_p20150601.ebuild 5003 SHA256 4f7e5314d52a37644806e28ca09
 EBUILD netbeans-nb-9999_p20150602.ebuild 5003 SHA256 585a35d212e77d0813c60b678974db1e55d8d98244e79ac5794a53b1604fce30 SHA512 ca0f80bca3d619e202d7aef224382aa9ebaf545dfc0609666961a95fcfbaa4b8335bde44d2bc5beaf6d773e444ab65811ce35860cb2b19bb4fe2e9f9cd25fe22 WHIRLPOOL 9b749aeab52b56e1b80f99d5a94cbb0f7bf57336a20125fd057da547bbecd9b2b17e64902fb0f8de67179cc31ea5f3adc9504c4d55fef2bec416c58ea79f70a5
 EBUILD netbeans-nb-9999_p20150603.ebuild 5003 SHA256 fd6f9a1c75356ee0e8dccdc8b948ba82387299f96a322debebd5dc76dabc1c11 SHA512 fafe8d854e5fb35420c9b875be4e768159307c4f6c2a2b795cfd1989113c5fc45d27ed0783dc7e1d606f549964dfea3a44e284f8a26031c180c7fafcb597c732 WHIRLPOOL 1e6850f2921576b7eff35f1254ac3679df2bba134f598e3133d680e863555cb6a816f80f1fb96dabf12a2fe1a8feaf7eb42be1491ccc978d4f767d424f528fb4
 EBUILD netbeans-nb-9999_p20150604.ebuild 5003 SHA256 211c996e360e5d6097eeb932b4230eeb397f45ce851b9dbac466d94b18ae1b84 SHA512 e116752c7228dfce6c033d1ec1282c9fe156822e7baa58772e3b6908fc443e17fbf9bde147c7099813b7246e94d2c7f8c4da6e9c093fbbd5aed5ab3e5d1931fa WHIRLPOOL d2f51f82b88f98414956bbef13ce28084cf66ae3f6957ebefbd197e8f25b1aedf6c124c8a7f33b6250db74f44e77398533ec7a5ea03dc5908ff4686b7508378c
-MISC ChangeLog 159054 SHA256 40191166a6cc98697fcc713faf10a6cd855226e05b02ce6dd923876fb2a57f96 SHA512 d4a97a366625a25a5bd0bfa0a499b15f05fbae500ac64d882ecb4e8192f27ca3a574018b0969b7cd80746f9e051b952dba20d7aa4e161d478e4b4340d99f000d WHIRLPOOL 3a6816965d0159de8eeb7866fab3915d319cf83d4085615e6c27870b514806f9753961ea5127038f0de6a5037597daadf069578a899fbc981f15a7c427c422f5
+EBUILD netbeans-nb-9999_p20150608.ebuild 5003 SHA256 038667681b9fa30d57c7c200a906e7d1237629c4c4c439459062cbf5d08a63cf SHA512 1e030704f86f5632599d0ae91000d5cc954919f7e4a1cf98a628e1a4103b1cddb1d2b4d8215d390b1912cb7c95058342d4dedf5339a59770aec55b178761fe65 WHIRLPOOL 3bff022dfa9726d3fe010f7911fc0b9ffc77a3875273033cdb5c087abe49cfc9e889f3b3a1c5cfef1bd03651a51ace8591d873d0065eeb253335d9c3ec7c2d7a
+MISC ChangeLog 159219 SHA256 7ec4fdd2513b9de074b5379972ed2dba24453f91737f87db14daea054d7c2d59 SHA512 1cf860a85507fbd88e751866312f25ae2132c5596b5df1b89fe378db7ba28bd74f922ccad954687b3583078cac2df66efdb34b0855ed954c6311094c5d5ad8b0 WHIRLPOOL 8523d56409c8d6f426241bb44cfecf12a71382823fd5442cb85ff557560499d46fff1aa8c3b9da6453ab8ac57dccd21ee5cc11daf1010ddee7d9ebecfcde8b28
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20150608.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20150608.ebuild
new file mode 100644
index 0000000..9215f53
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20150608.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-06-08_00-01-56/zip/netbeans-trunk-nightly-201506080001-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 eb59227..05b5f6b 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_p20150608 (08 Jun 2015)
+
+  08 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-php-9999_p20150608.ebuild:
+  bumped to the latest sources
+
 *netbeans-php-9999_p20150604 (04 Jun 2015)
 
   04 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index d56e01f..ba146b0 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -48,6 +48,7 @@ DIST netbeans-trunk-nightly-201506010001-src.zip 207778965 SHA256 96bc8cca703517
 DIST netbeans-trunk-nightly-201506020001-src.zip 207781610 SHA256 ed7f2e851ed53dacd5e46091a091490fcf4afbac35b732335f054fc428978850 SHA512 ba5f09aadede76fd0659c3b190a3646a9b57ffda253cf24d1343bace9112c56d96bff7df158e71539a614d0d80041113da73590fe2f9bf9981cbbe9993f9ef3e WHIRLPOOL c9c938d405c92ef00d253a40723ca770aa41d401dd2de6c79652c5df949bb9a9f7c6a92ac4f3895c8d7135e0963f6779b6aff1c3f8251da2fbf9f0d348d724b3
 DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123489cf38c44213cd2de2606f71e6231ac40e6519eb8f5c71294 SHA512 59a40cd092399dc49057144b95c9d8399fd3284a69bece3ccb02e479994ef2dd55140de0d62a455538dce87b17bc10cf3e09b165109271c78af229d1b62cb074 WHIRLPOOL 5ccbd8842aab3d1e2b0141bacaed90605bed668e0f7912b0fdd8e2de091ec24a0a9264d35c536e10bc7b75f8a5c42a60832cc6a2c5dc5c98f955d908dd01886d
 DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9aea7ed9f8b11cbdcca02d11fc314c4ec32c015cbd605344644 SHA512 c69868f00a50d9d0f1744137a66c4944330d4c0f7a7b58f13d3e7c72fbd7d31fbe97d3d98cbb4011e4ddf5eaf637991d7a4fe1d32fb98a0627ed28012ebdafaa WHIRLPOOL 89e0b90e509f4771366e6baddb861f4c922f9d5f8f0c5561fcb89e78466cfba40e2d657743ed142d12e7778a796ce049a03703d661660a1d540ceb4798e51b61
+DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 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
@@ -77,5 +78,6 @@ EBUILD netbeans-php-9999_p20150601.ebuild 4423 SHA256 587dd538f6c412edc946ecbee2
 EBUILD netbeans-php-9999_p20150602.ebuild 4423 SHA256 90613c4883f94d2fd2c731460ca94430e34e9ca2b6e7378bf2a6509727e82d73 SHA512 e363a16a33b1598f5ec32de14ab2c280762b99b10068a10cf692b77442dc2ca93df3d9d49907769ffd12ec19db6c5662b82ba35925b99d455bc45656f9c7c921 WHIRLPOOL 4c76cf5c2ae724a3aadb6475e873ef92be0f22e8f127250bdd481a7a93bdabef7f1142a0d10df996bf6531b53d171ff44adca9d2e6642ce56df0b4ef15cafcc4
 EBUILD netbeans-php-9999_p20150603.ebuild 4423 SHA256 97370ca944836c20a10c43028b9570d4b00189db870419aa211b3bba49e0eb34 SHA512 d77dfe7c8b73cbe3558864c2a764fb3ba463a964bffeb83a9e2d7517bfd0b5dabec2b40bf0f58d5498f40fb4aef810b278cd04afa86f19180a40c12947348c23 WHIRLPOOL 8da049be0e3a6073d8c2cfe573f0b125cfa514b0b33110aec2b1a6399452bb17a1d7e5626090ad65b5aacfbe69276939b2c4ef0575d804a52f3665ef1bf5b3a9
 EBUILD netbeans-php-9999_p20150604.ebuild 4423 SHA256 489ad7dfe954dd589134d78aa57a233c4e74f5c4df26a456546f4c44977e4b88 SHA512 5cf92d507053bc405adcdb9003e6e951f189b3c6306b17de34193a9b4a097f2e2ace21f5cc8b4edcf469a17cc2716b8ccc0e7f5ebc5a86eb21949657c9aacc4a WHIRLPOOL 893b5eb0c34c74e5c1924c1e586e1bd413eee6518bdd4521f039e353853b3927885ce903602d5a469621216185ee073e5180d8986ecc3204ff20b5120fe16a15
-MISC ChangeLog 158808 SHA256 97b962f883353e905cf58ae8fe691e7f6f3b89ceb7e93a234d46601f5060a2a6 SHA512 fe571f0073cfe2b3141c06271712200ef327d0df3e8d05b618a4aa76a9786e9f7ebdc306500c55818354949805dbd38ed59f99a344bf6876c16ec8ff571acf22 WHIRLPOOL 36bcc4122ef829ee47fce66bf8f63188f036f71a1547d032ef81f3a939e813741cf8a1a78c1db63c5815616f29cd22dd44b28e91fa70632fbef2d57f66564a18
+EBUILD netbeans-php-9999_p20150608.ebuild 4423 SHA256 a5c2a4c5c7366a650cf2771b7b4a81ea3ddb9e2fcab5bab54e658d49e77fda28 SHA512 83cd4e9b9cafef85782cbef5c88783fa9a5651e9c176376b6814daad6cfbda409b57d42d786991fb2e60dc2e34ca42164072ec8ede3fa06c48660be021fe0642 WHIRLPOOL 0089d2a15da9c3e875c5b5ccf3fb9250f2185fc2a8fe7824dad0dcaac9f1102ae76fde539b95c7f2f7673a14c0d5eaac84673f382d0a01a0f7b8a439d389b583
+MISC ChangeLog 158975 SHA256 5f2b9db28bc4ca3e11bbd378e3d7c8c54937fab41ce3bf742af6bc77343dfe24 SHA512 64997dab95bea3db0f29a628c841523ae65a3bda012e1ba4417c313ffc3eedda1d0d3870dc085e29cbbf4efecf8d008b521fbee57e39b2c4487b9bb1eef2a41a WHIRLPOOL b986f02467caa527aad7fe5ae66701288994deff3bf550b6fc0f672461917217d0c889f77eadfaea2ccde99db5b84eb4848e582e75225b6dd800abf3e2f7e39b
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-platform/ChangeLog b/dev-java/netbeans-platform/ChangeLog
index 8599d18..0aacbbe 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_p20150608 (08 Jun 2015)
+
+  08 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-platform-9999_p20150608.ebuild:
+  bumped to the latest sources
+
 *netbeans-platform-9999_p20150604 (04 Jun 2015)
 
   04 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index a6df76c..67d7aeb 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -62,6 +62,7 @@ DIST netbeans-trunk-nightly-201506010001-src.zip 207778965 SHA256 96bc8cca703517
 DIST netbeans-trunk-nightly-201506020001-src.zip 207781610 SHA256 ed7f2e851ed53dacd5e46091a091490fcf4afbac35b732335f054fc428978850 SHA512 ba5f09aadede76fd0659c3b190a3646a9b57ffda253cf24d1343bace9112c56d96bff7df158e71539a614d0d80041113da73590fe2f9bf9981cbbe9993f9ef3e WHIRLPOOL c9c938d405c92ef00d253a40723ca770aa41d401dd2de6c79652c5df949bb9a9f7c6a92ac4f3895c8d7135e0963f6779b6aff1c3f8251da2fbf9f0d348d724b3
 DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123489cf38c44213cd2de2606f71e6231ac40e6519eb8f5c71294 SHA512 59a40cd092399dc49057144b95c9d8399fd3284a69bece3ccb02e479994ef2dd55140de0d62a455538dce87b17bc10cf3e09b165109271c78af229d1b62cb074 WHIRLPOOL 5ccbd8842aab3d1e2b0141bacaed90605bed668e0f7912b0fdd8e2de091ec24a0a9264d35c536e10bc7b75f8a5c42a60832cc6a2c5dc5c98f955d908dd01886d
 DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9aea7ed9f8b11cbdcca02d11fc314c4ec32c015cbd605344644 SHA512 c69868f00a50d9d0f1744137a66c4944330d4c0f7a7b58f13d3e7c72fbd7d31fbe97d3d98cbb4011e4ddf5eaf637991d7a4fe1d32fb98a0627ed28012ebdafaa WHIRLPOOL 89e0b90e509f4771366e6baddb861f4c922f9d5f8f0c5561fcb89e78466cfba40e2d657743ed142d12e7778a796ce049a03703d661660a1d540ceb4798e51b61
+DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 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
@@ -91,5 +92,6 @@ EBUILD netbeans-platform-9999_p20150601.ebuild 9244 SHA256 7689acbd3e51b59677801
 EBUILD netbeans-platform-9999_p20150602.ebuild 9244 SHA256 ade9d5a043d5e49f2e2900677b87111f9d5a12197cd8cf32bffa25b55bd42aef SHA512 9a5499620c62d6b5e073f3bca046004615d71a210fe79a8e4d37e6d9e7306172268dfa5c68c1c756f9075e1f582939b076f77f91a232fb5c00d1f5de349abc6a WHIRLPOOL 08a13296b469562d565791f7d4d56d49bb8ce3c42776548bc9ae01f25ec6102464951e640ad6914fbf054e3518ad600994724e802d2a69154c2154993a547f70
 EBUILD netbeans-platform-9999_p20150603.ebuild 9244 SHA256 b7029a431e47639f8e6707ad315afbcdc5eeef5c02b63608f45cda1f4ac5c667 SHA512 daf71b2294c58828e04b8b45bb56c209df88a2f5e417f1d7149f9f9f99891c856804f04e386c936bb8dca7893e0eac201e88e66df58cb30a67a73dec840ab33f WHIRLPOOL afc5ee4a9d9e7bdc74a8e90f326f11eab949966523451f07b11c4171e0a62717bff18bb5e2c2007e2d9bc0be2fccb42224d10137ade341eacbb19e47bc8a9f96
 EBUILD netbeans-platform-9999_p20150604.ebuild 9244 SHA256 5ea34a955267886224c7ccce8d1195b92231cccae2a51352b321acf5015eb828 SHA512 049ea26c154975bc30e095834c5e4fc4ef283a9a5027ae132dfb3eca6a7167ed52d20c5e9544851274d3f741b242a8c1e9bbd4b705cb560cd98d4be1fe74d997 WHIRLPOOL 19e2a5cb3ffde213a4f53151f187b9c5516f7edaf1ae59b53c35c579dcf5a68f08510501879b0734b06bd3dafd90597fc05d024776d1ddc7dc075b5ca8d88396
-MISC ChangeLog 170892 SHA256 79cbc86bcb6011de7dd7b7d41ea6b7fb11edff1f7b1f9d62d0a0ca8c24493505 SHA512 8d75ba3a0eafacf952febc2f5daccca22d4f147d3beb36092f2e1cb952f77e754019f391e2d745546c357524e11dacff11dce0ffc89935f0eb6ffe92cc278287 WHIRLPOOL b07931bb6de845e3314ec43dd65530209698cfac41aa39b84d7f999239c2c7d221c5bfcff1e56e703059aa20cb0da5bf7d2ced38b3cb66bbda1071bf003d546d
+EBUILD netbeans-platform-9999_p20150608.ebuild 9244 SHA256 73a79f9d69488dcf1ec402bd6944cfcd6b0925e78587b9796c675cde13a659c4 SHA512 5792edf278a0704feb9e038f269e627839dc27558cc02513eada5bf1455d907e3d53de947ca2242c0c989c85a8cf629d1039209d316ede50c9e451f8e96e019b WHIRLPOOL 7bdffecd036a6f9137ed4d2d43b07afbc0409d34be4c2a40a066b036b5339fdb0d3031932f557ffe9b558ebfea4c708c14711424dcd586111b1b16d174dfd933
+MISC ChangeLog 171069 SHA256 3c221bdfa6084b308acbba9dffc8663a0ba2e9470744cdd9c7db28d5d138c377 SHA512 432d82037aa0a68af64cefeb96b2634ed1a083530f1934332eb718f2c155cc8530e9e71c236bfe1564c0399ce9711cfd243ab1041f3049cac1b1f13cd7e0d3eb WHIRLPOOL f64c92a129bfcd34f6971e62bddf9e88d94de960f55a2e0867e64b1a15b484a883bbd0b0f6c8bbb2f2ff5440e4f4898d781d42c0f3ca4683a0bea89b4c7570bb
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-profiler/ChangeLog b/dev-java/netbeans-profiler/ChangeLog
index 52eca5f..dc82162 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_p20150608 (08 Jun 2015)
+
+  08 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-profiler-9999_p20150608.ebuild:
+  bumped to the latest sources
+
 *netbeans-profiler-9999_p20150604 (04 Jun 2015)
 
   04 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 5481064..4e964e0 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201506010001-src.zip 207778965 SHA256 96bc8cca703517
 DIST netbeans-trunk-nightly-201506020001-src.zip 207781610 SHA256 ed7f2e851ed53dacd5e46091a091490fcf4afbac35b732335f054fc428978850 SHA512 ba5f09aadede76fd0659c3b190a3646a9b57ffda253cf24d1343bace9112c56d96bff7df158e71539a614d0d80041113da73590fe2f9bf9981cbbe9993f9ef3e WHIRLPOOL c9c938d405c92ef00d253a40723ca770aa41d401dd2de6c79652c5df949bb9a9f7c6a92ac4f3895c8d7135e0963f6779b6aff1c3f8251da2fbf9f0d348d724b3
 DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123489cf38c44213cd2de2606f71e6231ac40e6519eb8f5c71294 SHA512 59a40cd092399dc49057144b95c9d8399fd3284a69bece3ccb02e479994ef2dd55140de0d62a455538dce87b17bc10cf3e09b165109271c78af229d1b62cb074 WHIRLPOOL 5ccbd8842aab3d1e2b0141bacaed90605bed668e0f7912b0fdd8e2de091ec24a0a9264d35c536e10bc7b75f8a5c42a60832cc6a2c5dc5c98f955d908dd01886d
 DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9aea7ed9f8b11cbdcca02d11fc314c4ec32c015cbd605344644 SHA512 c69868f00a50d9d0f1744137a66c4944330d4c0f7a7b58f13d3e7c72fbd7d31fbe97d3d98cbb4011e4ddf5eaf637991d7a4fe1d32fb98a0627ed28012ebdafaa WHIRLPOOL 89e0b90e509f4771366e6baddb861f4c922f9d5f8f0c5561fcb89e78466cfba40e2d657743ed142d12e7778a796ce049a03703d661660a1d540ceb4798e51b61
+DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 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
@@ -64,5 +65,6 @@ EBUILD netbeans-profiler-9999_p20150601.ebuild 3478 SHA256 27e2d4e6635b31c110cfe
 EBUILD netbeans-profiler-9999_p20150602.ebuild 3478 SHA256 9f3b4ed5e3666cd371c571331d4f153f1cf145ae3fdc868722b837d4479a7f95 SHA512 247544424e6818f606cdcbcf3743b130d7a3e7cffdd45ff8ca2ab89857d8efc87446516e8b9379c13757e0303ef940c20dd7be2b4ead6361b1f56acf5b887abd WHIRLPOOL f0295a001ad36484d93153446a810d33a1309689384ac981ced24896c4647e342c0c24dbd0d9610f47bba6b817de42093ebe0e9ef37d7300e09beea586fc379b
 EBUILD netbeans-profiler-9999_p20150603.ebuild 3478 SHA256 ce39e74cc381dd78c7163084ebf6b47482220efaf04113bd17a05d8fa51e336a SHA512 5bf1aaa3a277efaddcf021f78137cef02b919965f0cc5f5d8c88a9ef5836848f9d041b4279ae52030136fe5cdc8895f7d257d1098eaf0e28cb5f76504f3b8de0 WHIRLPOOL ab01ac7f21e224fd19f9dac889c7ce8c5a523113b29a0d64959816739a1b041ebc6cd83ac7f5976e02f6023efad862048b357ec0454f43d6b461a6929880c0a9
 EBUILD netbeans-profiler-9999_p20150604.ebuild 3478 SHA256 4b1ce387effb3c87747d941793546126996bb969ef4576b7bde52799e059b58c SHA512 58e654a791b22da498920e455b58aa6738fac43ffe2ec51f2f948e9c33980c8abacbdc89b56d4a546cddaa532048159cb07955900ee7821eb15bae48049a71d7 WHIRLPOOL 5ff07910b825bb386b6a81defc36783571c95e975b68d684a0f534d294902d8aefbfdbab83c72a28237c8b2f509a97127c3eee5d8044357f985e5c9a9b77bbe4
-MISC ChangeLog 170353 SHA256 f9720e9544a74aa3d83a4540fa74732eaaee855a5e6469416229368cf3972ad4 SHA512 7954dc609964c57c1a3ddc53eff94302b78e77c023027836e0f80f3c44e6a1a8ea6fe8af4142ef7c77023277bd86e6d02d613a9bcb087ce2fb1fc69636643d55 WHIRLPOOL 02c8d75d4596825150bbe655d4fdc45806588f36aa02284adb87f8b43631f7b8e07a0530d7df1c1ec0a932d4f4d3ca795d05503cf7524e01cb4f69b650a4e7d4
+EBUILD netbeans-profiler-9999_p20150608.ebuild 3478 SHA256 d1b533b348106f61218ec72b99fe9073b57f412bd0cd1a5d94beabaefd0df8d1 SHA512 2b84841a66192ad3baa4651051846a6a06c1c5501339e206ada82a5211539d4cd0a180ae326e0e3223278176164d7d099e8038d4228733eddbcde30f2edd3ff8 WHIRLPOOL c898d2ad0bc573cc445c22b78cd9a047d602f11add25472b21b6080586634d0cd733a29e762e132f1e048a53a930ff224d812371b59d5c7793b7479f053be81b
+MISC ChangeLog 170530 SHA256 8987d75a619215099feceb70baeb23b2ec5138d1db85a6378ff5f5966714cd60 SHA512 05d272b06f68904f016e22ddcead76a34839ad1f8345556d1350caee3c79ba725e433bfbd8f7b1cfb5c544aa037e5316adffc661a73234f45195d954e20bc72a WHIRLPOOL 043d27214e6d158a88b7f35884dddb3a5681bc1e367d9604b9b8dafd82c916011cb92e5a82286336cec96a28e63be62139b685f83a85bb751d97a32108641d66
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150608.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150608.ebuild
new file mode 100644
index 0000000..3bbfc0f
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150608.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-06-08_00-01-56/zip/netbeans-trunk-nightly-201506080001-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 b2887ca..7413fe6 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_p20150608 (08 Jun 2015)
+
+  08 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-webcommon-9999_p20150608.ebuild:
+  bumped to the latest sources
+
 *netbeans-webcommon-9999_p20150604 (04 Jun 2015)
 
   04 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index f538b08..387a5cc 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -41,6 +41,7 @@ DIST netbeans-trunk-nightly-201506010001-src.zip 207778965 SHA256 96bc8cca703517
 DIST netbeans-trunk-nightly-201506020001-src.zip 207781610 SHA256 ed7f2e851ed53dacd5e46091a091490fcf4afbac35b732335f054fc428978850 SHA512 ba5f09aadede76fd0659c3b190a3646a9b57ffda253cf24d1343bace9112c56d96bff7df158e71539a614d0d80041113da73590fe2f9bf9981cbbe9993f9ef3e WHIRLPOOL c9c938d405c92ef00d253a40723ca770aa41d401dd2de6c79652c5df949bb9a9f7c6a92ac4f3895c8d7135e0963f6779b6aff1c3f8251da2fbf9f0d348d724b3
 DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123489cf38c44213cd2de2606f71e6231ac40e6519eb8f5c71294 SHA512 59a40cd092399dc49057144b95c9d8399fd3284a69bece3ccb02e479994ef2dd55140de0d62a455538dce87b17bc10cf3e09b165109271c78af229d1b62cb074 WHIRLPOOL 5ccbd8842aab3d1e2b0141bacaed90605bed668e0f7912b0fdd8e2de091ec24a0a9264d35c536e10bc7b75f8a5c42a60832cc6a2c5dc5c98f955d908dd01886d
 DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9aea7ed9f8b11cbdcca02d11fc314c4ec32c015cbd605344644 SHA512 c69868f00a50d9d0f1744137a66c4944330d4c0f7a7b58f13d3e7c72fbd7d31fbe97d3d98cbb4011e4ddf5eaf637991d7a4fe1d32fb98a0627ed28012ebdafaa WHIRLPOOL 89e0b90e509f4771366e6baddb861f4c922f9d5f8f0c5561fcb89e78466cfba40e2d657743ed142d12e7778a796ce049a03703d661660a1d540ceb4798e51b61
+DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 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
@@ -68,5 +69,6 @@ EBUILD netbeans-webcommon-9999_p20150601.ebuild 4997 SHA256 17bd45659ab65a9b6d06
 EBUILD netbeans-webcommon-9999_p20150602.ebuild 4997 SHA256 778feea37abbb98888785d48977bfafe6b433358ce5dad10523bffb53a22b2dc SHA512 3dd97dc3f906167bbea96a1e4b2c8543991b9eab4c7aa130cd10ca1fa52a5626e5b298801fb760c97da41624a093699767caeb1bb21ab7ce4d79eabf4b929060 WHIRLPOOL 853f5ec7b64ce57d694bd07c2fcbc57d08ff424668f2666e90a48e1ff2ac1e104bebf159f1d1e8407dca952d0344b736e10402bc15799c51208867519f6445f4
 EBUILD netbeans-webcommon-9999_p20150603.ebuild 4997 SHA256 737abbad2db0969800e19b03eb199a78c490a275d724b67578a595875ab581a2 SHA512 1c6624288a50655da03bb12e2aee5483d4240ecd200149a9a09e4f544d67e1f6991d35c2d7094f7a03f32fc8f32d9226a8f973385d4dfd2cdc129aea90495f35 WHIRLPOOL 6d4d887ea6f14803b4fd84f04ab9ab913bb68793140f3b671dd865a816b76474549eec3cd92f5fca768e45ccae546519cd86b81f3193667fe822afe3fc9db7d9
 EBUILD netbeans-webcommon-9999_p20150604.ebuild 4997 SHA256 9156b46ccc1937d0671d8558cb6e25f82655ca2f0bc8298aaf8fa8db47f27a9d SHA512 e5c863306951ce35d5a7a790d1f6a5591177907c8a316c8cee78e7f51223ed37b020644905ac4493d8b4a8ae3699bd5f70568406ce610b70ec3032a8cfd1b0ff WHIRLPOOL 25575267c3833b6de29eba263faf4c36f8ac5a08795be66c872e9a5237f8a6dc144fb084c826e1cc406caf35c5ab130dfc8fb467224a062628c52b88db474792
-MISC ChangeLog 143462 SHA256 75c2877066623614b24f98c14680e862cc66b2bda8175819e289c3aec71b2027 SHA512 6366b074c5a9cbbf7b0981fe465cff969be42d87a10d56d4358fb0bba3c9d98dbe7eb4e44b093f2d23766cc99652dbfc05a7d0947ca33de04552af257de044e9 WHIRLPOOL a2809219ee5bf2de02e2b2eba63ad977475b42ffa3c90c075f9eda9abbb54235a7d71afe540af9a8287564861158706b2868873a76367da111abbd75f959f3ae
+EBUILD netbeans-webcommon-9999_p20150608.ebuild 4997 SHA256 f470f52b2580da76df36ff2836d3b345eee45b30588c0c842aa96939774872ce SHA512 8b7e4a3931b65857b88944f762bbc8f0043108e37a7fd35be5ac76bd5482a3a358d53c5cef19534b3b159a7944db6818bf0affdc4a2b4bfce76094626bd8805f WHIRLPOOL 90d18b1491df605fe664de57c6626968d09ee7c9740aea94e2dae7fd68203ea52411d21a70e5f8156293e5afe4c729aa9ae5e76520ad9bd018fbfde789c1c122
+MISC ChangeLog 143641 SHA256 9526a8d2ebda5bb60fbee1a9381e58a2bd602cb5ebae8ac2f00fec20fa984fb4 SHA512 754aefcdcecd3c0850ca78544c28f0b7b0d98437c9dc9d29125d5966259ceacd256d729fd441cd94068a6ee87e7525418bf9087f40ddd996caee3be536568087 WHIRLPOOL 88c8dcf84b101f56bc12b1c3d33173468d83ecd56a62b9d6112ca3d9e47bbc0e5388c7a57a364fc94a79955aa8cb78a2159d1b7fb328a53479dbc1383248ccb3
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150608.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150608.ebuild
new file mode 100644
index 0000000..be5e2b0
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150608.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-06-08_00-01-56/zip/netbeans-trunk-nightly-201506080001-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 fcdc3d2..c2e199d 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_p20150608 (08 Jun 2015)
+
+  08 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-websvccommon-9999_p20150608.ebuild:
+  bumped to the latest sources
+
 *netbeans-websvccommon-9999_p20150604 (04 Jun 2015)
 
   04 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 9ac5f63..c89928c 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201506010001-src.zip 207778965 SHA256 96bc8cca703517
 DIST netbeans-trunk-nightly-201506020001-src.zip 207781610 SHA256 ed7f2e851ed53dacd5e46091a091490fcf4afbac35b732335f054fc428978850 SHA512 ba5f09aadede76fd0659c3b190a3646a9b57ffda253cf24d1343bace9112c56d96bff7df158e71539a614d0d80041113da73590fe2f9bf9981cbbe9993f9ef3e WHIRLPOOL c9c938d405c92ef00d253a40723ca770aa41d401dd2de6c79652c5df949bb9a9f7c6a92ac4f3895c8d7135e0963f6779b6aff1c3f8251da2fbf9f0d348d724b3
 DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123489cf38c44213cd2de2606f71e6231ac40e6519eb8f5c71294 SHA512 59a40cd092399dc49057144b95c9d8399fd3284a69bece3ccb02e479994ef2dd55140de0d62a455538dce87b17bc10cf3e09b165109271c78af229d1b62cb074 WHIRLPOOL 5ccbd8842aab3d1e2b0141bacaed90605bed668e0f7912b0fdd8e2de091ec24a0a9264d35c536e10bc7b75f8a5c42a60832cc6a2c5dc5c98f955d908dd01886d
 DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9aea7ed9f8b11cbdcca02d11fc314c4ec32c015cbd605344644 SHA512 c69868f00a50d9d0f1744137a66c4944330d4c0f7a7b58f13d3e7c72fbd7d31fbe97d3d98cbb4011e4ddf5eaf637991d7a4fe1d32fb98a0627ed28012ebdafaa WHIRLPOOL 89e0b90e509f4771366e6baddb861f4c922f9d5f8f0c5561fcb89e78466cfba40e2d657743ed142d12e7778a796ce049a03703d661660a1d540ceb4798e51b61
+DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 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
@@ -64,5 +65,6 @@ EBUILD netbeans-websvccommon-9999_p20150601.ebuild 2727 SHA256 3ab4e9da0d917bff4
 EBUILD netbeans-websvccommon-9999_p20150602.ebuild 2727 SHA256 397f5d80ee8aa96fae2b4084223d0028c748d530001d418035534622a5ad6bfe SHA512 36c345ac5cbaa707824b9aadebc020f0e998da02c53034cb96cf89c6a72d846e63442066712192d5c9316c4661ece7d5ff521cee3584a00d3c59c4e31fb6f7f2 WHIRLPOOL 92756af1905238c0b63187603179fb2ae689bc22e684f9f285c700088d03faa0efda95cece3fe871bf5f78500198bd7cbed94b0171232cf241fdd1eec5717c53
 EBUILD netbeans-websvccommon-9999_p20150603.ebuild 2727 SHA256 a9755a774d305ba7df97f6bf5c31d30b6221291d8c74b1a512b3ca0d899b706f SHA512 e2382456c4a5d5e6d5a804890da52b760f1e94790fb1057bc5298518f9f3c8c8956ec82c4d0d3c7a5daaa63c541cf1b185719b32be121bf787dd248a3485bb79 WHIRLPOOL c39391efe3146cd4fd688ba5d4001d130bf8a3ef6704e532258f5d60da4b00a289cde7ee7d5e19efca3c52c66ba9ff614e8084c474645f9379bfcfaa005debf5
 EBUILD netbeans-websvccommon-9999_p20150604.ebuild 2727 SHA256 279e6e26da36760323730eb935aa5acf60a4cd9eb6fff1361d1bc7a7bef71f19 SHA512 bea24aa43bdedca2122bdeabbccf7c33700fccea438deb8a3110c00026c429f3098a0c1b4a09077db3706326e144c52e7f8c16aeba9595cb1411dcff3a0c4a64 WHIRLPOOL 0cba8be12b4fa5c1076555e6372f292981a3f97d3e16d6a15d150ae7837618a3912847e7d8b8b4add3018d52cb5d1df70b28096bde4814d60d82a99a42af4c22
-MISC ChangeLog 178530 SHA256 4706ed285bfd8dbd745150dcb947d4d309bf3e596e11ad5604df479a470c0fb3 SHA512 ae5ac33588b9920d95e04aa7b0f86d61b50db73137d151d240c729c605959d9b5a26039ab9d4397f050253e68df1ac4ac70f7d93255b09e544eef5d6371df414 WHIRLPOOL 869f177795882937120ece5b454860b3f89a66ed0a2e8aaa1472adbcde50f9707f85110ef184abfb37b987d4edc278b579352b3dbec0a6a870117a0bae28de4f
+EBUILD netbeans-websvccommon-9999_p20150608.ebuild 2727 SHA256 7bc4ecc4478b440d3a8988ba0737d1f6f3eaeae276a04e466ede6ee83674c7f9 SHA512 634ca980e020854c5bf8940e4d11c6ecf62932186f20af5cc946bd36cf621989b2359eea534c49817aa715a3d064bb9f5587fb6b8d1708b996d4fc00b65a9f8e WHIRLPOOL 26c0b79318137999a80305180b17be026ee7e22a7787f74b2fa98930bfd759afab9696512153b32fc54accc7c0c138d8d60f0b4ddfe9c0fb0c151a12d5483a00
+MISC ChangeLog 178715 SHA256 5737683649070e303bb99ff03f80def65770605c5e441d12d8d4599580adc139 SHA512 b51f0104f3156aa712bf91527cff55ed67203bd47f7cb1d4b0a6f28b9d50229068b29c7b70b8b502ce506705e75d9c85e9cce02d952bbd6223d05e43af2f7e58 WHIRLPOOL c8cf4c592ec0f1603a02b81516d79971f2c664ae618056094bb78b9ab5f6ac6488704ad04c3604de1832f756be92cf2920d98d50766bf2a959136499ff5e62d6
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150608.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150608.ebuild
new file mode 100644
index 0000000..401b40c
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150608.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-06-08_00-01-56/zip/netbeans-trunk-nightly-201506080001-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 d6d13cf..ab0ca45 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_p20150608 (08 Jun 2015)
+
+  08 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-9999_p20150608.ebuild:
+  bumped to the latest sources
+
 *netbeans-9999_p20150604 (04 Jun 2015)
 
   04 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 317a94c..2cbeda8 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -43,6 +43,7 @@ DIST netbeans-trunk-nightly-201506010001-src.zip 207778965 SHA256 96bc8cca703517
 DIST netbeans-trunk-nightly-201506020001-src.zip 207781610 SHA256 ed7f2e851ed53dacd5e46091a091490fcf4afbac35b732335f054fc428978850 SHA512 ba5f09aadede76fd0659c3b190a3646a9b57ffda253cf24d1343bace9112c56d96bff7df158e71539a614d0d80041113da73590fe2f9bf9981cbbe9993f9ef3e WHIRLPOOL c9c938d405c92ef00d253a40723ca770aa41d401dd2de6c79652c5df949bb9a9f7c6a92ac4f3895c8d7135e0963f6779b6aff1c3f8251da2fbf9f0d348d724b3
 DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123489cf38c44213cd2de2606f71e6231ac40e6519eb8f5c71294 SHA512 59a40cd092399dc49057144b95c9d8399fd3284a69bece3ccb02e479994ef2dd55140de0d62a455538dce87b17bc10cf3e09b165109271c78af229d1b62cb074 WHIRLPOOL 5ccbd8842aab3d1e2b0141bacaed90605bed668e0f7912b0fdd8e2de091ec24a0a9264d35c536e10bc7b75f8a5c42a60832cc6a2c5dc5c98f955d908dd01886d
 DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9aea7ed9f8b11cbdcca02d11fc314c4ec32c015cbd605344644 SHA512 c69868f00a50d9d0f1744137a66c4944330d4c0f7a7b58f13d3e7c72fbd7d31fbe97d3d98cbb4011e4ddf5eaf637991d7a4fe1d32fb98a0627ed28012ebdafaa WHIRLPOOL 89e0b90e509f4771366e6baddb861f4c922f9d5f8f0c5561fcb89e78466cfba40e2d657743ed142d12e7778a796ce049a03703d661660a1d540ceb4798e51b61
+DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 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
@@ -72,5 +73,6 @@ EBUILD netbeans-9999_p20150601.ebuild 7216 SHA256 744d3a946ec58931611acfd440c459
 EBUILD netbeans-9999_p20150602.ebuild 7216 SHA256 2f89c318da5bb463b1d9b31c943ac0e6c6e4b032bbdf0b49c89c8580c9b7377a SHA512 d79f2e694c5229ac3e116e13d861786228fbe951ee17fa1494041b012574a1c079facbb29d4d7d27ad2a013c99352a69a5e415ebd0f66e6c4b520f1dceb1ca7d WHIRLPOOL b2affb1935d2b5fc91d14f5172c0824e41309c70daa3b097a50915acb9c68c3723941d348bf3ac24c986f27f3d6a6d6143bbf3cb95a29696749f31da0b181070
 EBUILD netbeans-9999_p20150603.ebuild 7216 SHA256 46251a2ff40cfb411973cc76556f3b2597252d26a615eb2feafc0a5fd8c0b229 SHA512 fe907cc16cbb746b10abe5e8d1a5f7225e914b31fcb9d1ffd1ec0ce4d13e213cfb18b61b6d34ff66a5ff22d40d9fcb73b98633fd748954abef558cf401e7c2b6 WHIRLPOOL 7fa4f1e15e3c4372f71c08e8b29c666893602d544bc75a2b9544e13f44679c59ed4e2133683ca20a32a9ddb9ad9bf4855240a80251a42a06cd23562b133640e5
 EBUILD netbeans-9999_p20150604.ebuild 7216 SHA256 06a59be2e208bc610695eb3a27c6bc662eb12796c1c21587ab37f0299999ae71 SHA512 e1c37b1a71b7e9fe115103238937d4a421fae8eb78b4f4dcc71b71ea86bb931a71cf26790ae5938525ba233b5e630adb8c71eaf04e2d0cc7298987d1110981ea WHIRLPOOL b825a68c2f73218a2eae7e6fb3b526deeef9d30bcd5c7410d7253b0950f6e3fb876d616cc29b12f8780f111fe47d6f9d03ca441c8975590c74186edddc091518
-MISC ChangeLog 151705 SHA256 36e25ee1252edde5284d173098ed19d8822bf4819b789d421b04ad00d4bf432f SHA512 60c256bc16ae33679153a579409e2df7e66f1e5d72c40c30ff634b6aed348bfa916756f068d92f094d56d2043c54f65ae23b31c3d569aa80abcf3e22f7e2128e WHIRLPOOL d7a7e375ef111be817c25861dd9df6b081210e76cec538beda80bdd16531970eb0e6734701153fdc3790fa0e662f6d2a9b050609a724ebf5e6856446e20eae84
+EBUILD netbeans-9999_p20150608.ebuild 7216 SHA256 e8fceb97a55aea7179726636c49b018eefc62ed0b2f8798e5391760383afbe71 SHA512 bac3f10ed7edfb9b7700c227c93189cb2f96f6b9d741bdfde5c62fd076c87cfac471053a3f0c5d6ec2e4040c8f8d18788ab44955a8208914b96a062c13ebdd87 WHIRLPOOL f9151e1b34f100dcd7b92ca1e9a8e812f0d7fed0e6e84f2f6cb6a85c92077e493f98e036e79a5e8a6460eea7c19a605d187698f27a5b108365432ac3b0f0530e
+MISC ChangeLog 151864 SHA256 fa48ee5bb9c948c75a92f6ed86f2fea9cfb1c9a072078689ecb0966aeebff7ee SHA512 6d7fb48c56c1fa634ef21cca1d6c714eb75a2bd4107cd37ab92575606ced152d0bb4cde913b1a05d61210e5dca261000aaf011a67183bf80d1ec264530e9a438 WHIRLPOOL e5d30dfa885eafa0f9a8c9ac0d1c88d3ad4d7b0b3dfbc681e3995e5260abd4b9e6cc3e3c9e09090ec5a61744a530dbe16b3e0640a62fef4b92be7eafd812d42b
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

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


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

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

commit:     6ec4505605dfe1c6dd6056945a796cd8d82687b0
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 29 11:44:16 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Jan 29 11:44:16 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=6ec45056

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.2.27

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 9ea32cc..4919971 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -17,6 +17,7 @@ DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818c
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 DIST netbeans-trunk-nightly-201601270002-src.zip 209531425 SHA256 368e7f65afd280d20a26b31be55a46dd03eb2ec10bc10a6126ce782b855372a2 SHA512 633671e83592c1016efcd91226b46d957435c8d55066339dc712f30a17821638b20bc617373d715914087dcb3498fa68817373f63e0489b0a35dcb9a47e382e5 WHIRLPOOL 3d5b403e4cdf89382e47c3bc471047162081a2403689484afb3b08ef764d3f38932f5dd057240840a5cf9fd6b64919ded7b08d4fc81e75352aef4ff61065c6da
 DIST netbeans-trunk-nightly-201601280002-src.zip 209553372 SHA256 ccbc7eb7f1317a14111bc06b7f35089ade220aed0d91e5aa91d774eed602c7cf SHA512 aeeebe3500207a3a4b63d775fec0119980bdf19dfa7e7bd4436c75f4d6b542c3ee6d0a2955165ff50b8d3e4f27acdbf93a5bee29e1f1b4ce0b16c0f4c85cbae1 WHIRLPOOL 08957d670b1816869be8ac6d6de3a67ca3cbe8ffb3c4c92c681355f0fd98016d76de29a49f039b6d333291f5dbe9c2e601f3c80bd4f8fefdd37bdf095c72ef51
+DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b4317e2cb4cac3810a1ad2ef0267f0ce546438e1ef8ad7a97870d6 SHA512 be81d583e4f78c66f67037917188f189ebd13615c61b1afe373a9a39d7d0bcc33e70495c2ca3642b8e224e52ea214b80f3b2cb7fe6fa2868885af061c978add5 WHIRLPOOL 2ce1abe1c1f6043eea13c4432ffa72143b335bcececf2df63b2ef18f9700fc42d69bbfec9d4895912dea17283abe451dab3de2665bfb4cfef9a9790919523eba
 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_p20151227.ebuild 3384 SHA256 f4d0807734340891e1b6c2c06189687041d80e698f357524b7db280581414194 SHA512 95cbdec3cee2c2f1e24988ed89c996ebbc6d6290b77157898f754e03bda1e1e64332af6ccdbd325e60ad1922a4d5c037a4fb4493868bde92530de26aaf5f0496 WHIRLPOOL 21db809b3100306762c70c7d8590cf01b95b1709db1ff33e2cec26ea1346cbafa04a0453bc7c470c34d7e374526bb392fd3a26271b67cae712d166072c95a34b
@@ -33,4 +34,5 @@ EBUILD netbeans-apisupport-9999_p20160121.ebuild 3384 SHA256 9c75578c0131b5bafb1
 EBUILD netbeans-apisupport-9999_p20160125.ebuild 3384 SHA256 026b4dacef92126af0149ccada098af1b10426486e00897e4d5a26a0d93a1649 SHA512 d187affb6e68ed2fb7b2a329071c3d0306ac21e8de5f6c16686e31f26f9e678eac5f32e09572cd2c4e6bccc2094ab91bd2fafe93ac8e9b4f7abf686c4effc6d4 WHIRLPOOL 6fd16327b807c2f0883faad195093368ae4586e9be8029c85a4eef05210869036aeea7faac8b36d60ecadbc7b43baf6de357c3f2c6dd9f252ba4436735cbe85f
 EBUILD netbeans-apisupport-9999_p20160127.ebuild 3384 SHA256 ebe398d51659b89da5184ade85ebab6f80aafa29a4787390c86f97c411e97adb SHA512 64c2ca899841ebb20456d4457251aa2e1e591db2c2eb6867039b8c04d7bdbbe61d2af48e0a17d2af45763ed320bc02f5379ec60114ad52ddb17ff6d058f8e7d4 WHIRLPOOL de17de704b6f37bb7d282b18c7d28ea1e9b02f6361005b3f9bbcd82612921e20c1c047398b2b66d54b03b7f74ce078fb1bcc738342a948293eaa8b3b55a2d67c
 EBUILD netbeans-apisupport-9999_p20160128.ebuild 3384 SHA256 8b644f55bf5f5136ee9f45e12756275983275847f0124641026053006ef2792d SHA512 268e02b9615c69f1ba63505b56effd917c737e3b08cbea628ef21c10218006698691a3fe84e68fd8c7823238a3f7eeb0cbc3fcd15f8ec13d2f269d0b06fcd3ff WHIRLPOOL f623cef513bda37e016bf62025bec76e18980d8927c623b18f1cfd2998d0b96cd579f37135258da597331dae6864555c68e799ae8f747037001c1248cb774b1d
+EBUILD netbeans-apisupport-9999_p20160129.ebuild 3384 SHA256 9890b1fb66a753a27a0a9b074b96312919ad16c9e9723d730022093648f4c5f2 SHA512 492d280abed8fdda1439921da9e8e9a7debe1be4d2166b778d411aa0bdd5160f6be82e6b3d2f70937d60ad37ed4e99b7a06aa421daf8c98e33c065e96dd06c5b WHIRLPOOL d2334241c23fdcd54fb9e436b9fa0f2eb4adf94fdd8ee1c7f52a55340913f762bdef385c74d0040794dc8064ace86cd8262b867fd906b0f2952458f1e1ad425d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index c170c85..9c3cfd7 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -1,3 +1,4 @@
+DIST 147687C3E91A8E448305A946A9D585F0DB544465-clank_0.3.6.zip 7873752 SHA256 84b5633994ef5b3ea8ba0e6ec5d13457fe2c09fce33259e8d0d47a4d090ce9b6 SHA512 6980756ce21dce8483d719c71b7b2a440469ceebad8c27acb20387fd7a8d65882d3191c12ae30c7a22579e4033872c70d0e74503d3de5750d73675a467f02310 WHIRLPOOL dc0364a45116ab64a254018468ffb6f1ec8eeaa017b1a8afe6260af5101d0f314a5799c10ab1f2d653ca9745b9f8f12124f6dfd529dc1586760896b899d187ec
 DIST 24C58A1D3C410AD3E23CD828871630C17068B238-cnd-build-trace-1.0.zip 28980 SHA256 205a14a41fb7232c2a20779278ee1e303e6d3dedb3c84496b370ae397a7767b5 SHA512 0e570745cfb163cb54ac8b6b0f6feb6c76e3c414f03eab213f93637dc84471c0bb5b786af096acdd6265383474bf26db763ebda066add398efe601e5749a51b9 WHIRLPOOL 2d0042e180eba66269d4ccdf6279dcd166b4a34947406b5f7279b0017ebed27b2ea95f1565e57908e3567b303fb69d2cb5ca6504653126611ced84f103650a0c
 DIST 2BCF2047382FB68A2F275677745C80E79B4046AB-cnd-rfs-1.0.zip 152701 SHA256 ee454c52dab7af01a0c292bbbd9bd5fa62e07480d4284a34e38746aba4bb501b SHA512 222ae7d6fc8a1f5610a107264fd249180a7a865094979dd5426fb266b94e1d24ef421199cdcb923ab58577c292a183863c45a1434b4dcb35bd67dbdcde945e54 WHIRLPOOL 821c0e5e9534955ee9b4200476fa1fe65b453520551cb71a71a225bb96ac69ba6c408e9d59b5df7008ec1b8d173035e76358172cf3ebafbbd50d0971db3a8983
 DIST 4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar 164365 SHA256 8633aa79a2566f51a089195e09a4581af3ee71bfc13eb234af5e0cf6383078b4 SHA512 f1300e2d1e47659f6113a0a3dcc953766b5a8ab32f13bedf4d6ac652ffcf828c17474d47edec08d7ad9039d7abb8570770b48fa53b8ff6b47a028836490777bc WHIRLPOOL 765c87803d9cf622ae7936cb922ad9bff8823a09baf01a6c8b4a81df8ba5fd7cd17b513b36da9910b75349de45185f4641680f35be8335e08b9c30283b6d3345
@@ -30,6 +31,7 @@ DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818c
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 DIST netbeans-trunk-nightly-201601270002-src.zip 209531425 SHA256 368e7f65afd280d20a26b31be55a46dd03eb2ec10bc10a6126ce782b855372a2 SHA512 633671e83592c1016efcd91226b46d957435c8d55066339dc712f30a17821638b20bc617373d715914087dcb3498fa68817373f63e0489b0a35dcb9a47e382e5 WHIRLPOOL 3d5b403e4cdf89382e47c3bc471047162081a2403689484afb3b08ef764d3f38932f5dd057240840a5cf9fd6b64919ded7b08d4fc81e75352aef4ff61065c6da
 DIST netbeans-trunk-nightly-201601280002-src.zip 209553372 SHA256 ccbc7eb7f1317a14111bc06b7f35089ade220aed0d91e5aa91d774eed602c7cf SHA512 aeeebe3500207a3a4b63d775fec0119980bdf19dfa7e7bd4436c75f4d6b542c3ee6d0a2955165ff50b8d3e4f27acdbf93a5bee29e1f1b4ce0b16c0f4c85cbae1 WHIRLPOOL 08957d670b1816869be8ac6d6de3a67ca3cbe8ffb3c4c92c681355f0fd98016d76de29a49f039b6d333291f5dbe9c2e601f3c80bd4f8fefdd37bdf095c72ef51
+DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b4317e2cb4cac3810a1ad2ef0267f0ce546438e1ef8ad7a97870d6 SHA512 be81d583e4f78c66f67037917188f189ebd13615c61b1afe373a9a39d7d0bcc33e70495c2ca3642b8e224e52ea214b80f3b2cb7fe6fa2868885af061c978add5 WHIRLPOOL 2ce1abe1c1f6043eea13c4432ffa72143b335bcececf2df63b2ef18f9700fc42d69bbfec9d4895912dea17283abe451dab3de2665bfb4cfef9a9790919523eba
 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_p20151227.ebuild 4790 SHA256 e60757cf9e8f608e86ec7a1c278359055b9a5d2dfe89b4de13c1c2ad5b7fa44a SHA512 8470efe6b862946fab6b45a0fa34298cc23774d3b7f163817a56ab1557816042f94b4779059b5eeccb445bd41918af9e907ec1d57b9635c3aa9c8876e752418e WHIRLPOOL 121a7d5d706ad54861f1d01fead09a02ff8a4c1c40dfe20dc611ba5a82c3b59a337c0e4a28ae72c17ad45db11c30037085dc91c6500ad0078368f80e352c8635
@@ -46,4 +48,5 @@ EBUILD netbeans-cnd-9999_p20160121.ebuild 4790 SHA256 41c4fc5b64465ccb2722388c65
 EBUILD netbeans-cnd-9999_p20160125.ebuild 4790 SHA256 329612eb3c00acad47ba0b76ebe582d8bc741224ca0b0d98b6f3d7ae0d1ca744 SHA512 98b37e66fb7e6b90d1e2ea80e52df5d1dd922daf7fc6fd930f82c70ce860b46724912b077bd28ee8ab1aa8e2c307205cebe41bf6eb0fbe84801bf7c9f295d37b WHIRLPOOL 2dae8cbd262156efbdc716580dcc610af3a57fcccbce1c2d00f467ad561519fd05e0d2ff6b27f760b4099b76947beed33c589e7909e1a9032e76f439e761e739
 EBUILD netbeans-cnd-9999_p20160127.ebuild 4790 SHA256 ef97f5648fb7e4c62ca46a05745dac7523d4286892ffc13e3fbc0f3301586071 SHA512 ccd6e138f940a3d17cab39c1206f54f161b9fa6267bc895f7bed9ef600abe94b37372c311c745738bc3857468f99e4b9d8db956b6f617c42f5b331c207d2176a WHIRLPOOL 96461880dc3076ec6c6069e7c850e42d66476217f4f385555b7aa1b874222eac1b3b87a6263e48d2d0eb3a06f8196038b8ff47fbf838d8edbb221fd14d7a7dee
 EBUILD netbeans-cnd-9999_p20160128.ebuild 4790 SHA256 a03039f09241763376fc87452e9f6b928d915e56e2ea9bd47297a3630a3dac71 SHA512 05ef01cf018da426f538b7b8f2c0feb7da3e980ef54afec2b7daaad850f4dbac0c319a6b2b04bc7cec8bb3f10e0ce98f684223178b0d002e5ece6e7cfb0e1552 WHIRLPOOL 1f68d1a02f4454b447f8ba7334f631f5fc7f851c173c7b4687a466a8e3bdb921e2c000a33d010837e225d17102cfd273f4ad3c67c5eaf0563cb97539a7a3eecc
+EBUILD netbeans-cnd-9999_p20160129.ebuild 4790 SHA256 bde95da79ff2390d97a08cacd904acb99d86308259a8fdd6f5b26838f6c8568d SHA512 76d117b16bf36a22633b6ff9949a83b71dd2fb60010ecc994404c2bcbc5c2547833bb65f42f3d8cf182e9ffa8ce8aa743e2f5c00a1ce8522aa3909364f0d38dd WHIRLPOOL c41e0350be94b9cf48928a75365ed17718d369c61c5fecdeda04b83fc4b7f0f1d6bc6a222cfc3b48f1c8966def5bd427738bb72679724886aa2a9b019cfe1941
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160129.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160129.ebuild
new file mode 100644
index 0000000..79ad691
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160129.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-01-29_00-02-15/zip/netbeans-trunk-nightly-201601290002-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/147687C3E91A8E448305A946A9D585F0DB544465-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-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}"/147687C3E91A8E448305A946A9D585F0DB544465-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-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.jna/external jna jna.jar jna-4.1.0.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-dlight-${SLOT} dlight || die
+	cat /usr/share/netbeans-dlight-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.dlight.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/cnd >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/cnd$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	fperms 755 bin/dorun.sh
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/cnd
+}

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 81afdd2..ad01089 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -1,3 +1,4 @@
+DIST 0F89C62CA701D20BA9A9A526D4D017888C3B5A65-fs_server-1.0.zip 469579 SHA256 2673ebd340ac69ad5dfed6f63376394cab2cfb094f249552092c0bb46e093367 SHA512 0a73753c62b44b5f1af14d9e25086fd3420129b4ce31bab0c3786a91ac180af23dbe93e13ed3368e968076933a9a4e5d242ac7a911a7b39da3f3e4da40876b2c WHIRLPOOL bc74461dac822bfbc947b9ea3cb8e4183f026954d9f82d7b38feb8bd24c5302784d567373871a72d4177f6e9ec84018624e9069c9b49105eae848e1eb2eb5375
 DIST 457A4C66AE33D1D5887BB1F359EEA41A10EBB2AB-fs_server-1.0.zip 283369 SHA256 2da5ca58d9960bb19f3b573709c0f73a408cbd94a19e89abfcc261b85decf9d2 SHA512 60a742dad5967c2eb5350d62cfc39925a4413fc4dc904ebdf1e6a04849a4f659dc75ff6166189957854d1241badc0bc0925aa868509d96495f41f4d91565a545 WHIRLPOOL 27e8e1219ee65f87b4cf0a24ac9955bbf65e33d4cd2315bfc9c157b170b6b9eba1d703a72a4a1a2ae05462b6c8c99b82b1e908362d65bfc36685e2c1ccb75b5f
 DIST 51AC4960C19CF4C2CCA636765BFBC09A5029BFC5-fs_server-1.0.zip 453773 SHA256 9b339678aac261dd2353a4938be897eebff43c34a532263cc0c827743cd4c1b9 SHA512 ea965ed488fabe8bcb93e4b95d3c7e6f546cd8a30ec57b0268645e8270097308be9eaabeb524c4401baa78922d6a782021b46042bd44236e19ae8c94ae2e3a02 WHIRLPOOL 9044f2eb2cca1205266b065f6bf086140a33acc33b833b9e367b5f888952fa786a58bb29cf0947a863caf3c00b60fe418b8a248a06064197703d230c2374b358
 DIST AE86A01A66ADBA4126F61A340A97B093FDFC1F47-fs_server-1.0.zip 468271 SHA256 f8d7c89f465144775a2c9c44ffc3e56884f533fb53f3ed0191c9287c28042d4d SHA512 fe41daebdfff5079dc020563ae2e83ff49f868065cf60cfd50e5daac402bf38b31c33661eab3bc0aa5f07a1435fa8fec3447fbbcafee9798837203650594f7b9 WHIRLPOOL 87150771f5fb53b702cf8208fef6df1dc2e25efd6c2310b90ca0f6c188acf88ed153f4a3876cc3f54764768168f1c7dd6f6ef79282c973338af56a44c63780f2
@@ -22,6 +23,7 @@ DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818c
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 DIST netbeans-trunk-nightly-201601270002-src.zip 209531425 SHA256 368e7f65afd280d20a26b31be55a46dd03eb2ec10bc10a6126ce782b855372a2 SHA512 633671e83592c1016efcd91226b46d957435c8d55066339dc712f30a17821638b20bc617373d715914087dcb3498fa68817373f63e0489b0a35dcb9a47e382e5 WHIRLPOOL 3d5b403e4cdf89382e47c3bc471047162081a2403689484afb3b08ef764d3f38932f5dd057240840a5cf9fd6b64919ded7b08d4fc81e75352aef4ff61065c6da
 DIST netbeans-trunk-nightly-201601280002-src.zip 209553372 SHA256 ccbc7eb7f1317a14111bc06b7f35089ade220aed0d91e5aa91d774eed602c7cf SHA512 aeeebe3500207a3a4b63d775fec0119980bdf19dfa7e7bd4436c75f4d6b542c3ee6d0a2955165ff50b8d3e4f27acdbf93a5bee29e1f1b4ce0b16c0f4c85cbae1 WHIRLPOOL 08957d670b1816869be8ac6d6de3a67ca3cbe8ffb3c4c92c681355f0fd98016d76de29a49f039b6d333291f5dbe9c2e601f3c80bd4f8fefdd37bdf095c72ef51
+DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b4317e2cb4cac3810a1ad2ef0267f0ce546438e1ef8ad7a97870d6 SHA512 be81d583e4f78c66f67037917188f189ebd13615c61b1afe373a9a39d7d0bcc33e70495c2ca3642b8e224e52ea214b80f3b2cb7fe6fa2868885af061c978add5 WHIRLPOOL 2ce1abe1c1f6043eea13c4432ffa72143b335bcececf2df63b2ef18f9700fc42d69bbfec9d4895912dea17283abe451dab3de2665bfb4cfef9a9790919523eba
 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_p20151227.ebuild 2968 SHA256 7e2117dc503c270bdf2676e014fab49ffdda344b45b7c63b6599aafc9e97ce85 SHA512 76269acac2489de4fef6f017c1c4367e3e31c995f4f0f2f1b5d298b012549a71252e79edf07c5cc7509654d8d6a53e032e3ae3232cfbfc96c202c41975c5b81f WHIRLPOOL d295f98efd1520ade381a3e157d420de0e213ca42b7099601964dfac84b49f63d23d2b144ea5a8b83e3990753f2b380d08dd58813687f909ad433ec88bd067ea
@@ -38,4 +40,5 @@ EBUILD netbeans-dlight-9999_p20160121.ebuild 2968 SHA256 6a9ec7a28a5bd924827a94c
 EBUILD netbeans-dlight-9999_p20160125.ebuild 2968 SHA256 fdbc13f390dc1d752e9aaa75f091afbf632c2da18a9a2cb15247d6333f8ce3cd SHA512 d6690b604c302de92d99ab1eeaf589a7556930d3109fcfe01d4ce5e3cd660b9a7849cd15d0ecaff716d7dfbec0a63fbe5710fc27903130143f8cb9ee39e7d524 WHIRLPOOL e2ef49127bae13d19ec4ee3c5ca8df258cca536c58453bf10ce446cf1190eb477435178a991a59b9995c28afcf2c824c97097468ee14a312fa60368a19056c76
 EBUILD netbeans-dlight-9999_p20160127.ebuild 2968 SHA256 94c777096574b90c00e795b157014e56f20f101be5ea66db92bdd9f71ee22167 SHA512 a2ab661a2b7dcbd4845b8d790bd64b1f6f75dabfcee466ab90d7859e008f19d9606c891576d01563d02eb25e20ac581c36b9748b1db67229582c61bce1b4031d WHIRLPOOL 5b960d602009e2c7fa613545d8e5442646368bc90c514c0abb05c2436d1a96a7d8c0c634f8dc4e877244b7e23b09763b4641e3b888f9ef85f8adde33be394188
 EBUILD netbeans-dlight-9999_p20160128.ebuild 2968 SHA256 b7b27bbe3eafac9d5d5586092b1479aed8e0209467885a12fd4ebe17e77daf7c SHA512 2c6d6778e247fac4671e0a7ec926232a5088959442e819e03d31984b10c02dfc173698af7b8cbdc2ec759e907428fc3ecc1f1c9ab2f0e2f91ab9f3a1719b7969 WHIRLPOOL 455c842a59a9ed0f7c1e6d8f20a592fedb16de3e51dabac148a510e5297af702ba29d4c21dd70448ee3d3039c59a16eac499846b1958a319565b769438f742e7
+EBUILD netbeans-dlight-9999_p20160129.ebuild 2968 SHA256 cde3f9619c4a8083df8bc61014023d0e18f21676ae27dbd4a5f554930f4c69ea SHA512 1a47deed637e81a65f3deb2bd596693dafe97b128ef32ea410f95660fea5a3a9cd6eb8339c42411baee73014d45ffeb7e7108d39ba8419e2c34d36d300a7ee19 WHIRLPOOL 8e8ca7ed81a569ef438604899fcf2d70a47277dccde854c06001214a21494a1d38f8047e908f4382ed3a519b37d566ba88faf71cc7b3e3acad19147681d764c6
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160129.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160129.ebuild
new file mode 100644
index 0000000..6ec80e7
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160129.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-01-29_00-02-15/zip/netbeans-trunk-nightly-201601290002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-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-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/dlight >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/dlight$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/dlight
+}

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 2c118d1..5246196 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -49,6 +49,7 @@ DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818c
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 DIST netbeans-trunk-nightly-201601270002-src.zip 209531425 SHA256 368e7f65afd280d20a26b31be55a46dd03eb2ec10bc10a6126ce782b855372a2 SHA512 633671e83592c1016efcd91226b46d957435c8d55066339dc712f30a17821638b20bc617373d715914087dcb3498fa68817373f63e0489b0a35dcb9a47e382e5 WHIRLPOOL 3d5b403e4cdf89382e47c3bc471047162081a2403689484afb3b08ef764d3f38932f5dd057240840a5cf9fd6b64919ded7b08d4fc81e75352aef4ff61065c6da
 DIST netbeans-trunk-nightly-201601280002-src.zip 209553372 SHA256 ccbc7eb7f1317a14111bc06b7f35089ade220aed0d91e5aa91d774eed602c7cf SHA512 aeeebe3500207a3a4b63d775fec0119980bdf19dfa7e7bd4436c75f4d6b542c3ee6d0a2955165ff50b8d3e4f27acdbf93a5bee29e1f1b4ce0b16c0f4c85cbae1 WHIRLPOOL 08957d670b1816869be8ac6d6de3a67ca3cbe8ffb3c4c92c681355f0fd98016d76de29a49f039b6d333291f5dbe9c2e601f3c80bd4f8fefdd37bdf095c72ef51
+DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b4317e2cb4cac3810a1ad2ef0267f0ce546438e1ef8ad7a97870d6 SHA512 be81d583e4f78c66f67037917188f189ebd13615c61b1afe373a9a39d7d0bcc33e70495c2ca3642b8e224e52ea214b80f3b2cb7fe6fa2868885af061c978add5 WHIRLPOOL 2ce1abe1c1f6043eea13c4432ffa72143b335bcececf2df63b2ef18f9700fc42d69bbfec9d4895912dea17283abe451dab3de2665bfb4cfef9a9790919523eba
 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_p20151227.ebuild 15825 SHA256 50322f40f59e6123d80978638957c11fdadca2b5513d895359701ebf2c084159 SHA512 321eba517f3295f05162603c3735efe36f0b54e38b6aa0860a40ac68e93657b1b0965aab4739a56fc939fd1293ad55f903404b54718bfa83c8666a0819edd9b6 WHIRLPOOL 6d1e8f3ea996ecabcc6f29000e71e706e866eb7961a9bfd65d266c9674b044ad019f0fdee39521a54eeaa25c6d8cbfa37101c4dc5adf5e8f3c9158f59d3cf26e
@@ -65,4 +66,5 @@ EBUILD netbeans-enterprise-9999_p20160121.ebuild 15825 SHA256 0182ce742ecb59b481
 EBUILD netbeans-enterprise-9999_p20160125.ebuild 15825 SHA256 16f2c8bf66e344129385753b11dfb0d8a5752105e172cb593f6a1a6f52c7c68a SHA512 cae8547d52e376b6b35a7c8895f361f0ccfcf78ce3d1527c78ecc48813ad8d0d465cfba09ba58f407c45bae2b1ed3ce1a75ddbfa9dab555985faf7111d8c5e8b WHIRLPOOL b91e3a8d4efd1c4440e4eb2cd08f51fd15996de10104a930e56daf7d63c061bfba8b16ff4636eca00d5a85d225008d9c1a922353dbb89a7234cd43b06ba9ff2c
 EBUILD netbeans-enterprise-9999_p20160127.ebuild 15825 SHA256 fda016ce13996815dc1a97776d8ae4fca321fdf31926633afbc1f17f9427cdb1 SHA512 24ae4e8bbbab5cfe3fc74e3e730db4e5d66d26a04ae7fefe72e51e87d6207c18619907fe01affa7a66b9efe7ccb250be9920b9b916c7c1f0101cd2d83037a8bc WHIRLPOOL 0f6397e92aae46bd81e548dadd6491c1a7cb0032b4848b72bc4f45c652a8271e3878d1fca14cfa844799109afb7f5b5e700d6917a8c5b1bfa1eae6b3e095b7a5
 EBUILD netbeans-enterprise-9999_p20160128.ebuild 15825 SHA256 08265ef2cf841e6ebe18dd26a227f2fd45061437bae1359e237b1c693519972e SHA512 4ee3c28bdf0b6e04ad09c89d90da0d119e3d434d0cb648704c8f53696d6dee876b5e66bcc844665296f9adb53ee618f21ea3c53bf74554d18265fe35597f248c WHIRLPOOL afb5821c4950c773eac22ec2a601ef25ca036f961360a19781ac52e8f71a9363973e168003e7b0ddc1dff4ee364f84077e157cbc5437c570a0ac7c90a38bb496
+EBUILD netbeans-enterprise-9999_p20160129.ebuild 15825 SHA256 11ac5af569d12ae7a164e2aa4c0eb0652215b1e209bee5b94f8b8de409b8d9ad SHA512 a7048b99b1e5d612ca0d112305a487db887ad326894b58b95be57fda80abf8992b9ec562cf28183699129cf87ccdef3c7b51f7ba3fde4c39f7708ca98ee4a153 WHIRLPOOL 0e3a8e58007ab8e966396a49bb44ebadb08f08d935a1b7a690feb8748fd1368986b6967b570460bcdd3d686dc5eb19a7ee20005db7416a3e9fb5c3187a2e235e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index eca5dbc..e9f402f 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -17,6 +17,7 @@ DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818c
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 DIST netbeans-trunk-nightly-201601270002-src.zip 209531425 SHA256 368e7f65afd280d20a26b31be55a46dd03eb2ec10bc10a6126ce782b855372a2 SHA512 633671e83592c1016efcd91226b46d957435c8d55066339dc712f30a17821638b20bc617373d715914087dcb3498fa68817373f63e0489b0a35dcb9a47e382e5 WHIRLPOOL 3d5b403e4cdf89382e47c3bc471047162081a2403689484afb3b08ef764d3f38932f5dd057240840a5cf9fd6b64919ded7b08d4fc81e75352aef4ff61065c6da
 DIST netbeans-trunk-nightly-201601280002-src.zip 209553372 SHA256 ccbc7eb7f1317a14111bc06b7f35089ade220aed0d91e5aa91d774eed602c7cf SHA512 aeeebe3500207a3a4b63d775fec0119980bdf19dfa7e7bd4436c75f4d6b542c3ee6d0a2955165ff50b8d3e4f27acdbf93a5bee29e1f1b4ce0b16c0f4c85cbae1 WHIRLPOOL 08957d670b1816869be8ac6d6de3a67ca3cbe8ffb3c4c92c681355f0fd98016d76de29a49f039b6d333291f5dbe9c2e601f3c80bd4f8fefdd37bdf095c72ef51
+DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b4317e2cb4cac3810a1ad2ef0267f0ce546438e1ef8ad7a97870d6 SHA512 be81d583e4f78c66f67037917188f189ebd13615c61b1afe373a9a39d7d0bcc33e70495c2ca3642b8e224e52ea214b80f3b2cb7fe6fa2868885af061c978add5 WHIRLPOOL 2ce1abe1c1f6043eea13c4432ffa72143b335bcececf2df63b2ef18f9700fc42d69bbfec9d4895912dea17283abe451dab3de2665bfb4cfef9a9790919523eba
 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_p20151227.ebuild 2913 SHA256 72c88f64698c17caea459e10cf4749d07fb5a221c6f60b249b39c21e65ccd240 SHA512 1beec8b54cf0ccf4695e414155210a21269e062b9dbb332b3564691434f448e1cb795d4309cc50cd7c7c8e6e1c60f6d376fca512bfe271839c40e38b6cb36dcf WHIRLPOOL 528b0cb78c2e4eefd3c78fc740150253208879a58de656106e580340523cc6a5ca9401e335e9c42b171b61a1220724dd32e51a730efbb3918c8268a1acc001e3
@@ -33,4 +34,5 @@ EBUILD netbeans-ergonomics-9999_p20160121.ebuild 2913 SHA256 ee6f268018a8991ab73
 EBUILD netbeans-ergonomics-9999_p20160125.ebuild 2913 SHA256 cd41ca354ba9ad3e801fae43f5023af962d31a7dd0da997b40c37bf36acdd1b0 SHA512 7153dbef75dc90439c600f65cc2937c2534db17f110c8783a3a6b2e05fe8ab5150cdcd8b39c13ff8a4fb9852b1e4f68988623efc9d42e5d1afea936ae8aa2792 WHIRLPOOL 652c87cdee900888e140969c5c8b826e3a88d052ef373c55840b6c1aa43d3703f0d17207fd9d7e8f63f1a939dcfb29c3a527be628fb97b16e8eeed4cf90eeb99
 EBUILD netbeans-ergonomics-9999_p20160127.ebuild 2913 SHA256 3ff7d0ca56a47b907c8eb59fdda44013347653ac74216ae56d14217cf3961ced SHA512 028471dd3fd49a160fa212bd3dcca9a5c3724efb119ea939553f3e11174f27729c0282b844a3a7080e0bca622f8fb2680d6461d5c95f7abeb393aad2d19cdbc5 WHIRLPOOL 0b3a2d2435cabf0aabb57f6941f8db8d0f27106aa2ff47694b89653057aa25183fc586b3fa1c63c1aeb399fa8e754c9e112c8c7ffe04f031a1ee4befb3e767ec
 EBUILD netbeans-ergonomics-9999_p20160128.ebuild 2913 SHA256 8f1d28834af6ac8a0877afd2925a579dfd50f96a002b35a7ef49559d198810c0 SHA512 ee5ca206224837e32124f57cd6d1c04158e3bb479e2db2e093705e271cd36531c7d8308bf8b415d4dc29baa57bc201b8d2ba7106277f216c96fb0894897efcef WHIRLPOOL dc2a6ebfc6797d56f607310c28964bf9ebf77c5cd11311bbe2c0bf49676f26e71b32672e21d9422aba8e05b99827a433b82557133c7807237d8a83a930a23820
+EBUILD netbeans-ergonomics-9999_p20160129.ebuild 2913 SHA256 69365d476dc57889d9bedeacd496e9d9eaff09788b022c7aaec8625b4bc85939 SHA512 bbbc2946db4e95374cabeef608d31454261143422e7910ac44eb837b1365cda9c9a0205d791a15f660a123f28a9b721db608cf2fa86be1bf2d86ad4e8d160d08 WHIRLPOOL 47ef0a7188b0697e8be4a6a41d394afa9b048b4a31b3bbd369dec63de9294bbf08e1baaad6c4254c106e057de8b2dea3b4606b39f144b2ac4c8ef84613d50144
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index 5d6b7f9..1a4cb14 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -19,6 +19,7 @@ DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818c
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 DIST netbeans-trunk-nightly-201601270002-src.zip 209531425 SHA256 368e7f65afd280d20a26b31be55a46dd03eb2ec10bc10a6126ce782b855372a2 SHA512 633671e83592c1016efcd91226b46d957435c8d55066339dc712f30a17821638b20bc617373d715914087dcb3498fa68817373f63e0489b0a35dcb9a47e382e5 WHIRLPOOL 3d5b403e4cdf89382e47c3bc471047162081a2403689484afb3b08ef764d3f38932f5dd057240840a5cf9fd6b64919ded7b08d4fc81e75352aef4ff61065c6da
 DIST netbeans-trunk-nightly-201601280002-src.zip 209553372 SHA256 ccbc7eb7f1317a14111bc06b7f35089ade220aed0d91e5aa91d774eed602c7cf SHA512 aeeebe3500207a3a4b63d775fec0119980bdf19dfa7e7bd4436c75f4d6b542c3ee6d0a2955165ff50b8d3e4f27acdbf93a5bee29e1f1b4ce0b16c0f4c85cbae1 WHIRLPOOL 08957d670b1816869be8ac6d6de3a67ca3cbe8ffb3c4c92c681355f0fd98016d76de29a49f039b6d333291f5dbe9c2e601f3c80bd4f8fefdd37bdf095c72ef51
+DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b4317e2cb4cac3810a1ad2ef0267f0ce546438e1ef8ad7a97870d6 SHA512 be81d583e4f78c66f67037917188f189ebd13615c61b1afe373a9a39d7d0bcc33e70495c2ca3642b8e224e52ea214b80f3b2cb7fe6fa2868885af061c978add5 WHIRLPOOL 2ce1abe1c1f6043eea13c4432ffa72143b335bcececf2df63b2ef18f9700fc42d69bbfec9d4895912dea17283abe451dab3de2665bfb4cfef9a9790919523eba
 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_p20151227.ebuild 3377 SHA256 dbfefdcce029ac7fa3580aca47e768b5630d37352395d025544426d6fba27d1f SHA512 1dda4727ac1d4a2dfa0112058c4a89afd7a2bbfd98cedf44cd4d00a473e8250cd8e38adcb47e9e81d3c9a7c861edde9fb990fffbaa0c715e624eb082880df6cb WHIRLPOOL 02413c9c70cf8f06433ff3eb4bde10e6794b052ec2c02e9d71d9d1a0d13e8bf138badb81dba327a3e75a0647fb189c403c146dc9956d240c27b634e252c114d8
@@ -35,4 +36,5 @@ EBUILD netbeans-extide-9999_p20160121.ebuild 3377 SHA256 1171b89b0eb78d27cc98e2c
 EBUILD netbeans-extide-9999_p20160125.ebuild 3377 SHA256 7f0642abe32741ef7b2bc58e569044e69c904a544e29a54d1f954e988e533930 SHA512 d90866d6d526d74d43ac2d24730173fdb17a9183fe7b7a0745b83310215a108899557d8827dfc83a6f86cd46a648b95867d87e3feeaeea4435ca4e0595538c6c WHIRLPOOL 678e3b652eee8e3eae19feae4c6a186454bfa9410f23429cf25b360743eac4c7e60891f4ee93caf57671519f1e7d9e20fe35a7f1bfdf9eaf52e6d4e375239e82
 EBUILD netbeans-extide-9999_p20160127.ebuild 3377 SHA256 3a46903906bf4438183e94e6105f15fa5967e228bcfd91b3fd5c0208bc0e09b1 SHA512 ef9978b48f38e1c5f68e73873c214b70c5a7ab46af81562e25cf6756189c09b771dd4d57daff41f7e71161421a5490dd13bf474c7de930f2ed4b607766de4892 WHIRLPOOL d510712c6351e7833bd19081a976925d93c0096e0b5b70efc9e7659810ebf9312c7d4077368b454ebdaa3f8b2f56fa366352cf16057c69a5644e8f67d8d58867
 EBUILD netbeans-extide-9999_p20160128.ebuild 3377 SHA256 29909a5e82ef010cc75d9b69b4365a3e2631717d14dbadd332a88624330de213 SHA512 ced60b098bfb035c4711c44406f7410d024fb2e4a50f8a596ff5e913e16f6dde590054d6e67976dc310b0a53df571eb5bcce24bd6c9503e70f639ab5a9e1f0b5 WHIRLPOOL b80af6355f5ee6a7f532b72bb98e76ff78f39592f2fa3368c1813d00ee1d0b531790c7566ed9ed5e20aa8031013ec4d4d2e5e7cfbb738906b877581e8cd02f26
+EBUILD netbeans-extide-9999_p20160129.ebuild 3377 SHA256 444f74315b5c815af87442a43d6e20ceb2ca03114525c6834bbbffca339d4004 SHA512 802147deee41e61d1298eb4c9c39a867853d22d5e6d8837dc36780261c14b9546cf391a26cb9d8443ed0b4233c61cd8a36ce636a79ddf73c88216024c9ab69e4 WHIRLPOOL 0cf78cf59ec428af8d76f3ff4bfbd883683e77cc01869e539144c4b4f40f6f5a589ce61fba09e27383effee8e0f1e5e9e5eeb1730cfb9122c2fa94d824bcbfeb
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 23f770d..ae22403 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -19,6 +19,7 @@ DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818c
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 DIST netbeans-trunk-nightly-201601270002-src.zip 209531425 SHA256 368e7f65afd280d20a26b31be55a46dd03eb2ec10bc10a6126ce782b855372a2 SHA512 633671e83592c1016efcd91226b46d957435c8d55066339dc712f30a17821638b20bc617373d715914087dcb3498fa68817373f63e0489b0a35dcb9a47e382e5 WHIRLPOOL 3d5b403e4cdf89382e47c3bc471047162081a2403689484afb3b08ef764d3f38932f5dd057240840a5cf9fd6b64919ded7b08d4fc81e75352aef4ff61065c6da
 DIST netbeans-trunk-nightly-201601280002-src.zip 209553372 SHA256 ccbc7eb7f1317a14111bc06b7f35089ade220aed0d91e5aa91d774eed602c7cf SHA512 aeeebe3500207a3a4b63d775fec0119980bdf19dfa7e7bd4436c75f4d6b542c3ee6d0a2955165ff50b8d3e4f27acdbf93a5bee29e1f1b4ce0b16c0f4c85cbae1 WHIRLPOOL 08957d670b1816869be8ac6d6de3a67ca3cbe8ffb3c4c92c681355f0fd98016d76de29a49f039b6d333291f5dbe9c2e601f3c80bd4f8fefdd37bdf095c72ef51
+DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b4317e2cb4cac3810a1ad2ef0267f0ce546438e1ef8ad7a97870d6 SHA512 be81d583e4f78c66f67037917188f189ebd13615c61b1afe373a9a39d7d0bcc33e70495c2ca3642b8e224e52ea214b80f3b2cb7fe6fa2868885af061c978add5 WHIRLPOOL 2ce1abe1c1f6043eea13c4432ffa72143b335bcececf2df63b2ef18f9700fc42d69bbfec9d4895912dea17283abe451dab3de2665bfb4cfef9a9790919523eba
 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_p20151227.ebuild 3416 SHA256 dcaa3b66511c6d688a5c3a5e4cd81910e5abe1d843af07e654fe19cc550f3b96 SHA512 f0e2442f659acb00476e4abfc08a98104cc19d3192fe9621232194a74f9af967647107b708154721ab9c517f9c3541ae974a7ed0ba1ffa1cde0fdb8e8a4d33ff WHIRLPOOL 3246ba95639a74d3a6dc077d0023ad4fff8d205f03e6e444533bdff6a149c5a50447787b9911c5aec9e8b0e44055b63f336a9b4ce805f2ba422ff01be3b49707
@@ -35,4 +36,5 @@ EBUILD netbeans-groovy-9999_p20160121.ebuild 3416 SHA256 12c591901df8e14dbab8b32
 EBUILD netbeans-groovy-9999_p20160125.ebuild 3416 SHA256 4c294320f9f8c97c64c04f0a47f2b0d673efed3d489eaee78093353644e8b210 SHA512 9c8349252f862ca11c2af7a0de35eb208dbfcc4d228c312771f86b0e24a7dc28fbf1f224f89f6c4dd0e8c761e2266ef5ba68a9aa58ed5a05030e4e6e7bad7260 WHIRLPOOL 96e65af55f677ccf44b0150bc1c07dea41e41a6cad9be549ba0bf577c774d49368e18e618d9b3ca00a5f11a63de46da9d3b85d00c1ca8f0716e7707af2313fdb
 EBUILD netbeans-groovy-9999_p20160127.ebuild 3416 SHA256 18ec3e56910a46236867084529a3985fa55cf6f4c15652fa60d68d91e07c313d SHA512 2919ec033c55c235b4e2f20285b205045a80dfced74b482fda0943a904b5c98e51763bd67b9502afd794b3884523800fe27789a88f6906d35cfbd8f5e6e155e5 WHIRLPOOL 9679c5174ebf41d2c8046e0651dca4ed8ff8b210cd68fbad3a1ab5babb60be68fff0f7b722bc6f435a84ecec628bb5d52dbe2923d1ef1996aa2759c42a2ed1fb
 EBUILD netbeans-groovy-9999_p20160128.ebuild 3416 SHA256 d2204bbe6dfdbe3a68bde48288a5f323f0c458449971c475857e43f348ea5f79 SHA512 c21d72c1e65630494662946d1d595539b65ff651a5924e122bbd37df8152cdb1652434c099007c3f92393f5ae1b89e63904357a64f6eee598787b5fb87b75cf1 WHIRLPOOL 3c1273b457393610f5b27511674718da132168e4c5b4cb10b46807fb20f17af11a0105f3675c8d6103029f1c6166d1fddaa41f866218525b4fadfeeeb8695b23
+EBUILD netbeans-groovy-9999_p20160129.ebuild 3416 SHA256 6e2e45cd825c6f334e848a862a765f18efe7355d3eee27cfc6a886e83bea5db2 SHA512 b400a4c6b0a8ef603316971f6307b926d12963cc40f8227c1f3e9c407ef461becd6204554fdf94417d05d0ab00bd603b62d19edcc7e4399945f22fa8543a7958 WHIRLPOOL 1edf622031799dc8796325c3be952d099f549423aba76d968e6fc12b4c47ae332015692a89686e2ca3e834c1d6137aca481a075856e6589b98e501ef1b5fd688
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160129.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160129.ebuild
new file mode 100644
index 0000000..d2ebf56
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160129.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-01-29_00-02-15/zip/netbeans-trunk-nightly-201601290002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-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-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/groovy >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/groovy$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/groovy
+}

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index bd3ad33..2ac0cf1 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -22,6 +22,7 @@ DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818c
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 DIST netbeans-trunk-nightly-201601270002-src.zip 209531425 SHA256 368e7f65afd280d20a26b31be55a46dd03eb2ec10bc10a6126ce782b855372a2 SHA512 633671e83592c1016efcd91226b46d957435c8d55066339dc712f30a17821638b20bc617373d715914087dcb3498fa68817373f63e0489b0a35dcb9a47e382e5 WHIRLPOOL 3d5b403e4cdf89382e47c3bc471047162081a2403689484afb3b08ef764d3f38932f5dd057240840a5cf9fd6b64919ded7b08d4fc81e75352aef4ff61065c6da
 DIST netbeans-trunk-nightly-201601280002-src.zip 209553372 SHA256 ccbc7eb7f1317a14111bc06b7f35089ade220aed0d91e5aa91d774eed602c7cf SHA512 aeeebe3500207a3a4b63d775fec0119980bdf19dfa7e7bd4436c75f4d6b542c3ee6d0a2955165ff50b8d3e4f27acdbf93a5bee29e1f1b4ce0b16c0f4c85cbae1 WHIRLPOOL 08957d670b1816869be8ac6d6de3a67ca3cbe8ffb3c4c92c681355f0fd98016d76de29a49f039b6d333291f5dbe9c2e601f3c80bd4f8fefdd37bdf095c72ef51
+DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b4317e2cb4cac3810a1ad2ef0267f0ce546438e1ef8ad7a97870d6 SHA512 be81d583e4f78c66f67037917188f189ebd13615c61b1afe373a9a39d7d0bcc33e70495c2ca3642b8e224e52ea214b80f3b2cb7fe6fa2868885af061c978add5 WHIRLPOOL 2ce1abe1c1f6043eea13c4432ffa72143b335bcececf2df63b2ef18f9700fc42d69bbfec9d4895912dea17283abe451dab3de2665bfb4cfef9a9790919523eba
 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_p20151227.ebuild 4126 SHA256 3c082015e8bf472ee3c978e7f2311e06be0c847b7c86831bb0adf1cb88168bcf SHA512 8eca6857ae5864bfb4830c24f29dfba2dcb7e612bf211f37972a6ddb7894056604015bc32a3f4a25286eb593973e8ec76ae90a9750684d8728195e1df3c04019 WHIRLPOOL eac3f06af19c919ce8140610b246554c4c23e2c927fccacf626201118e54505953721f6f32ff98ca5394353e3fea7838c1021f9ce74725f8a256d20b117a7ffb
@@ -38,4 +39,5 @@ EBUILD netbeans-harness-9999_p20160121.ebuild 4126 SHA256 138c8796c0af90a99da206
 EBUILD netbeans-harness-9999_p20160125.ebuild 4126 SHA256 05524991bd73909391ce4ab66d5d2567895f63e8863d1e11177d6617f2ce3f80 SHA512 80039f45fb33807621fd816320967a01d4f3c2ed9155837bb3eaaea31412357e421efffebd7434880d3456f3a235183175a23a4f79dfa94d382066e3da254e2b WHIRLPOOL 584c74a02d1beed52b07bc9e10432eb0ac9ada42b9c38a6115435e511545df31dd80f1acb454603a3a0845bd4a0f0d02eff3763db565c1075b81cefa251f8800
 EBUILD netbeans-harness-9999_p20160127.ebuild 4126 SHA256 186c45c90a58b47beb8fa339948f775c1635725688e8c7857fc0ece213fc26c8 SHA512 73e34bfc24482b7c8a056e54f4457acce99111c118a80cf579caa12dfea338318042a9066b5e1151020ae696174033e8174f4394c6ec331eea3326551f0d5183 WHIRLPOOL 4374ea0243c7ec94345815136bac0665cfab71405212b6c60be46ea5e626432a6f320e94577ef4d9827e8f0009db1f8a18a5e5c98162e5bcb05659f895cd0b4a
 EBUILD netbeans-harness-9999_p20160128.ebuild 4126 SHA256 c545646cc1df0dbb28a0a409848d4a40309fea711524636ecaa46c916cba9bf7 SHA512 66d3884d3513366abad1b69bf2abf5d9b8d35e70117ff5b58bfe55d1271949d60dd503f90e6b1e382d26c6d85df58fa9240abb0ebea41a71d852762d5d32e7e0 WHIRLPOOL 05a9a1c862c800de14f466705b1c7e1b0f7591d1bd566c3443379500ccdfb5751671f0d1bc4eaddce32bfe3128d93c0d4709a59691df02b80aac8e52c2eb0301
+EBUILD netbeans-harness-9999_p20160129.ebuild 4126 SHA256 bfb690f231d6d06959ecf694bfc7c45b202c9be0ff08c430e3b2003e21680d6f SHA512 0de734d9e7acba11539ae2dc00ba34e9ea09f59e8897a49ee4aa1fe336343b844713d5df25cf472ec6ef9af698de0674a9cd21189d25ee2ce0ebba705366c0a3 WHIRLPOOL b6e86e710904426bd6b5d38cfb4020eee5abd9df8dd7b68c90cd26d5285ccacc31ebf98f599517404e503b3d7ff738c5a0d471536b5de1ced817b196574a3e8c
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index bf98c57..998bf4e 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -150,6 +150,7 @@ DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818c
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 DIST netbeans-trunk-nightly-201601270002-src.zip 209531425 SHA256 368e7f65afd280d20a26b31be55a46dd03eb2ec10bc10a6126ce782b855372a2 SHA512 633671e83592c1016efcd91226b46d957435c8d55066339dc712f30a17821638b20bc617373d715914087dcb3498fa68817373f63e0489b0a35dcb9a47e382e5 WHIRLPOOL 3d5b403e4cdf89382e47c3bc471047162081a2403689484afb3b08ef764d3f38932f5dd057240840a5cf9fd6b64919ded7b08d4fc81e75352aef4ff61065c6da
 DIST netbeans-trunk-nightly-201601280002-src.zip 209553372 SHA256 ccbc7eb7f1317a14111bc06b7f35089ade220aed0d91e5aa91d774eed602c7cf SHA512 aeeebe3500207a3a4b63d775fec0119980bdf19dfa7e7bd4436c75f4d6b542c3ee6d0a2955165ff50b8d3e4f27acdbf93a5bee29e1f1b4ce0b16c0f4c85cbae1 WHIRLPOOL 08957d670b1816869be8ac6d6de3a67ca3cbe8ffb3c4c92c681355f0fd98016d76de29a49f039b6d333291f5dbe9c2e601f3c80bd4f8fefdd37bdf095c72ef51
+DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b4317e2cb4cac3810a1ad2ef0267f0ce546438e1ef8ad7a97870d6 SHA512 be81d583e4f78c66f67037917188f189ebd13615c61b1afe373a9a39d7d0bcc33e70495c2ca3642b8e224e52ea214b80f3b2cb7fe6fa2868885af061c978add5 WHIRLPOOL 2ce1abe1c1f6043eea13c4432ffa72143b335bcececf2df63b2ef18f9700fc42d69bbfec9d4895912dea17283abe451dab3de2665bfb4cfef9a9790919523eba
 EBUILD netbeans-ide-8.0.2.ebuild 29317 SHA256 42218788ab0fc7c7cd1bb42a8b0c72a66543a3260b752aa55365833c355bcc63 SHA512 c712b66b6bee654390a45e5c616479df2be624bb770f3838d4fcce875f71a8d165703dffd55c4fd7d30e19c392784203e5fe01e2404907d88c935d439efaf578 WHIRLPOOL 67763e4a36215ac002fd321556ce2269affc15ba48ad5069d7ccc746d918179994f174e09305a9d9ddadddbea690778c2769e0ea1993eafc09e01580485e2292
 EBUILD netbeans-ide-8.1.ebuild 30288 SHA256 783332022c33a787ededc22d5250e30e1a91676508076fddc69ec64bbe5a6e7c SHA512 402d72f8b1a4e849dfe86054d466afeb0ab3987cd5ee747d3173874cd875fe3572be9e3ccd639fadf9e329db92e7543fd68dffc497805aa4d40b1d008c4a79ad WHIRLPOOL fd2cd798a1763af3fae44bb0eef0a4c4d932ffead6427e27d3483639348d969598b9c81d8949a3950ace1e68d3dfa0e08fe0c787b201b0cc9a95ea0040d156bf
 EBUILD netbeans-ide-9999_p20151227.ebuild 30832 SHA256 22ad021df23b7fbb66b091d1601a5afe56c65b8bb8f4fdbc378af68368339459 SHA512 2947268782f167bc22e823637a44244d0a849316efbd831fd8813541a7cbf01ef6095594837e7526b3735858264938ba9a35f98541618ae668f96e15406f4939 WHIRLPOOL 63897bd19b8d5372e1c5b812223fd991e9e0594c241bace28d4fb045c04c8c62f47213173d648b69b6bd05cd3085ca21c4d2dae460bf70d291f09c6cd57fe67b
@@ -166,4 +167,5 @@ EBUILD netbeans-ide-9999_p20160121.ebuild 30178 SHA256 52f21738d45b020a58541973d
 EBUILD netbeans-ide-9999_p20160125.ebuild 30238 SHA256 11b1d7b04d8b14a750a7a987072c7eb213f7ec34eb639bac7762dd1c76447a26 SHA512 6a2f946bffcc398fa4a101f1a6a769f86fc03615ac7c50b98c899158ade3af5105e0cd283646b9d56f2f812ca25695ffca8b5ba6ccae649c73741d383a69e2b7 WHIRLPOOL 9e8b7cadeb4d105f7ca74aea95bc513579a89aaf874ad682f317da141a5a668495ff2a1e2b476eb12d796a54a2deed3fc09da6d4b8630dd6cb142bd68692ed89
 EBUILD netbeans-ide-9999_p20160127.ebuild 30238 SHA256 efc40dd5a874dde7deeadc823f2f9805419095d49e9a49f954b3816ad8fd6487 SHA512 231a335d3b1b2aa202b4f3b9faf6b33e5047f5ac61f68d87acc047b2ce702ce2702ab6cd2ec48feffd8a55179518a9ceaef526a148c75a9ef48f8c645a3342a7 WHIRLPOOL 9d1eb9adb85233a0bbf45e48950791aef088f5c4041d5467ccd5d6c1b7d6583377e1286ba4d22323861a9ca4a19ff7e2d7e3b216b6b1d9c4a32bd497af44b674
 EBUILD netbeans-ide-9999_p20160128.ebuild 30238 SHA256 dba6d87835fed749a8fdf6dae4c10cb0ad7a2333802b9b5eaf91ab757650014c SHA512 b558467b1199d81b4b09f1a7cd81b86059e41778ef26098cc2740d172a9832d3d90d97a6833eca86ade7aa2de76d492eba469123fb52734d441c112bdcd84623 WHIRLPOOL a381c7d6dfd15cdf44008c28374b8212924478c6ec7b364b8ac51510d1bac47dfd830da73f0d6bc763a3614a373661e9537e5f8e5cca9da852642b1fb1ee7c90
+EBUILD netbeans-ide-9999_p20160129.ebuild 30238 SHA256 52ee72461891f54998b175db329c274d3de3c01d000a2b5197a2274ff00a8475 SHA512 8bc7b091db09a6f4cd625de0c10710addefc76b77780a60b8d1287641a663ff56ee35c22aec0437b27e3b6e4f112c397e3e7c195a1f9e4682a1b0d6e3ac68953 WHIRLPOOL dc63e87a596e9f0b420bcb1e90abc9716c9bbd1db65522dec2880ae14b0274cf00ef32d4c66603f7d4646db0a876a47ef60370b65573819b44d97c74c0d12e5d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160129.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160129.ebuild
new file mode 100644
index 0000000..424b542
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20160129.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-01-29_00-02-15/zip/netbeans-trunk-nightly-201601290002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
+	http://hg.netbeans.org/binaries/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar
+	http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
+	http://hg.netbeans.org/binaries/ACAB7C860DF78C4A528FD8A64F2C62A0A96639E5-com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar
+	http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar
+	http://hg.netbeans.org/binaries/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar
+	http://hg.netbeans.org/binaries/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar
+	http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip
+	http://hg.netbeans.org/binaries/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip
+	http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
+	http://hg.netbeans.org/binaries/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip
+	http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar
+	http://hg.netbeans.org/binaries/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar
+	http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
+	http://hg.netbeans.org/binaries/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:4.4
+	dev-java/iso-relax:0
+	dev-java/jdbc-mysql:0
+	dev-java/jdbc-postgresql:0
+	>=dev-java/jsch-0.1.46:0
+	>=dev-java/json-simple-1.1:0
+	dev-java/jsr173:0
+	dev-java/jvyamlb:0
+	dev-java/log4j:0
+	dev-java/lucene:3.5
+	dev-java/rhino:1.6
+	dev-java/saxon:9
+	dev-java/smack:2.2
+	dev-java/sun-jaf:0
+	dev-java/tomcat-servlet-api:2.2
+	dev-java/ws-commons-util:0
+	dev-java/xerces:2"
+#	dev-vcs/subversion>=1.8.4:0[java] missing from the tree
+#	app-text/jing:0 our version is probably too old
+#	dev-java/commons-io:1 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/commons-lang:2.1 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/freemarker:2.3
+#	dev-java/guava:15 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/ini4j:0 our version is too old
+#	dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours
+#	dev-java/jzlib:0 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/trilead-ssh2:0 in overlay
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	dev-java/commons-codec:0
+	${CDEPEND}
+	dev-java/javacc:0
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ide -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
+	ln -s "${DISTDIR}"/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar libs.nashorn/external/asm-all-4.0.jar || die
+	ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
+	ln -s "${DISTDIR}"/ACAB7C860DF78C4A528FD8A64F2C62A0A96639E5-com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar || die
+	ln -s "${DISTDIR}"/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar o.apache.commons.io/external/commons-io-1.4.jar || die
+	ln -s "${DISTDIR}"/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar o.apache.commons.lang/external/commons-lang-2.6.jar || die
+	ln -s "${DISTDIR}"/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar libs.commons_net/external/commons-net-3.3.jar || die
+	ln -s "${DISTDIR}"/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip css.editor/external/css21-spec.zip || die
+	ln -s "${DISTDIR}"/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip css.editor/external/css3-spec.zip || die
+	ln -s "${DISTDIR}"/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip derby/external/derbysampledb.zip || die
+	ln -s "${DISTDIR}"/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip dlight.nativeexecution/external/exechlp-1.0.zip || die
+	ln -s "${DISTDIR}"/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar libs.freemarker/external/freemarker-2.3.19.jar || die
+	ln -s "${DISTDIR}"/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar c.google.guava/external/guava-15.0.jar || die
+	ln -s "${DISTDIR}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
+	ln -s "${DISTDIR}"/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-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	popd >/dev/null || die
+
+	java-pkg_jar-from --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.53.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
+	java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar
+	java-pkg_jar-from --into html.parser/external icu4j-4.4 icu4j.jar icu4j-4_4_2.jar
+	java-pkg_jar-from --into html.validation/external iso-relax isorelax.jar isorelax.jar
+	java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
+	java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
+	java-pkg_jar-from --into libs.commons_compress/external commons-compress commons-compress.jar commons-compress-1.8.1.jar
+	# java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.19.jar
+	java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
+	java-pkg_jar-from --into libs.lucene/external lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smack.jar smack.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smackx.jar smackx.jar
+	# java-pkg_jar-from --into libs.svnClientAdapter.javahl/external subversion svn-javahl.jar svnjavahl-1.8.4.jar
+	java-pkg_jar-from --into libs.xerces/external xerces-2 xercesImpl.jar xerces-2.8.0.jar
+	java-pkg_jar-from --build-only --into o.apache.commons.codec/external commons-codec commons-codec.jar apache-commons-codec-1.3.jar
+	java-pkg_jar-from --into o.apache.commons.httpclient/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.1.jar
+	java-pkg_jar-from --into o.apache.commons.logging/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
+	java-pkg_jar-from --into o.apache.ws.commons.util/external ws-commons-util ws-commons-util.jar ws-commons-util-1.0.1.jar
+	java-pkg_jar-from --into servletapi/external tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
+	java-pkg_jar-from --into xml.jaxb.api/external sun-jaf activation.jar activation.jar
+	java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_1.0_api.jar
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	unset DISPLAY
+	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+	pushd nbbuild/netbeans/ide >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/ide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	rm -fr "${D}"/${INSTALL_DIR}/bin/nativeexecution || die
+	rm -fr "${D}"/${INSTALL_DIR}/modules/lib || die
+
+	insinto ${INSTALL_DIR}/bin/nativeexecution
+	doins bin/nativeexecution/*
+
+	pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution >/dev/null || die
+	for file in *.sh ; do
+		fperms 755 ${file}
+	done
+	popd >/dev/null || die
+
+	if use x86 ; then
+		doins -r bin/nativeexecution/Linux-x86
+		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86 >/dev/null || die
+		for file in * ; do
+			fperms 755 ${file}
+		done
+		popd >/dev/null || die
+	elif use amd64 ; then
+		doins -r bin/nativeexecution/Linux-x86_64
+		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86_64 >/dev/null || die
+		for file in * ; do
+			fperms 755 ${file}
+		done
+		popd >/dev/null || die
+	fi
+
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules
+	pushd "${instdir}" >/dev/null || die
+	rm com-jcraft-jsch.jar && java-pkg_jar-from --into "${instdir}" jsch jsch.jar com-jcraft-jsch.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext
+	pushd "${instdir}" >/dev/null || die
+	rm commons-compress-1.8.1.jar && java-pkg_jar-from --into "${instdir}" commons-compress commons-compress.jar commons-compress-1.8.1.jar
+	# rm freemarker-2.3.19.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.19.jar || die
+	rm icu4j-4_4_2.jar && java-pkg_jar-from --into "${instdir}" icu4j-4.4 icu4j.jar icu4j-4_4_2.jar
+	rm isorelax.jar && java-pkg_jar-from --into "${instdir}" iso-relax isorelax.jar
+	rm json-simple-1.1.1.jar && java-pkg_jar-from --into "${instdir}" json-simple json-simple.jar json-simple-1.1.1.jar
+	rm jvyamlb-0.2.7.jar && java-pkg_jar-from --into "${instdir}" jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
+	rm log4j-1.2.15.jar && java-pkg_jar-from --into "${instdir}" log4j log4j.jar log4j-1.2.15.jar
+	rm lucene-core-3.5.0.jar && java-pkg_jar-from --into "${instdir}" lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
+	rm mysql-connector-java-5.1.23-bin.jar && java-pkg_jar-from --into "${instdir}" jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
+	rm postgresql-9.2-1002.jdbc4.jar && java-pkg_jar-from --into "${instdir}" jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
+	rm saxon9B.jar && java-pkg_jar-from --into "${instdir}" saxon-9 saxon.jar saxon9B.jar
+	rm servlet-2.2.jar && java-pkg_jar-from --into "${instdir}" tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
+	rm smack.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smack.jar
+	rm smackx.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smackx.jar
+	# rm svnjavahl.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl.jar || die
+	rm xerces-2.8.0.jar && java-pkg_jar-from --into "${instdir}" xerces-2 xercesImpl.jar xerces-2.8.0.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb
+	pushd "${instdir}" >/dev/null || die
+	rm activation.jar && java-pkg_jar-from --into "${instdir}" sun-jaf activation.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb/api
+	pushd "${instdir}" >/dev/null || die
+	rm jsr173_1.0_api.jar && java-pkg_jar-from --into "${instdir}" jsr173 jsr173.jar jsr173_1.0_api.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ide
+}

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 3e1b0ab..6229bbf 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -47,6 +47,7 @@ DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818c
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 DIST netbeans-trunk-nightly-201601270002-src.zip 209531425 SHA256 368e7f65afd280d20a26b31be55a46dd03eb2ec10bc10a6126ce782b855372a2 SHA512 633671e83592c1016efcd91226b46d957435c8d55066339dc712f30a17821638b20bc617373d715914087dcb3498fa68817373f63e0489b0a35dcb9a47e382e5 WHIRLPOOL 3d5b403e4cdf89382e47c3bc471047162081a2403689484afb3b08ef764d3f38932f5dd057240840a5cf9fd6b64919ded7b08d4fc81e75352aef4ff61065c6da
 DIST netbeans-trunk-nightly-201601280002-src.zip 209553372 SHA256 ccbc7eb7f1317a14111bc06b7f35089ade220aed0d91e5aa91d774eed602c7cf SHA512 aeeebe3500207a3a4b63d775fec0119980bdf19dfa7e7bd4436c75f4d6b542c3ee6d0a2955165ff50b8d3e4f27acdbf93a5bee29e1f1b4ce0b16c0f4c85cbae1 WHIRLPOOL 08957d670b1816869be8ac6d6de3a67ca3cbe8ffb3c4c92c681355f0fd98016d76de29a49f039b6d333291f5dbe9c2e601f3c80bd4f8fefdd37bdf095c72ef51
+DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b4317e2cb4cac3810a1ad2ef0267f0ce546438e1ef8ad7a97870d6 SHA512 be81d583e4f78c66f67037917188f189ebd13615c61b1afe373a9a39d7d0bcc33e70495c2ca3642b8e224e52ea214b80f3b2cb7fe6fa2868885af061c978add5 WHIRLPOOL 2ce1abe1c1f6043eea13c4432ffa72143b335bcececf2df63b2ef18f9700fc42d69bbfec9d4895912dea17283abe451dab3de2665bfb4cfef9a9790919523eba
 EBUILD netbeans-java-8.0.2-r4.ebuild 13298 SHA256 d4172dfdec5afecb1cd099e18a21aa872c7822bff40b192b5f4ec4d35e6e0ef8 SHA512 48ae6f7141117fbf58123ded750d76f2e7311211a6be3b62bd491349817460da11f781ec5694da91584315547c32008f568fac3bfb406dbdb5ed7fd825ff694e WHIRLPOOL 73fb68aec003707c14b2b390c2de80f24e1e5413cf7e16cf7e661af47c908e2d559214580379e45e21d316767987ac906b5a119a61ae39f03c3d01dafad49b7c
 EBUILD netbeans-java-8.1-r1.ebuild 14775 SHA256 1bbcc19358e42931f2ebcffbc234ba4f903506bb255142f5dc8a6a3dfaac621a SHA512 9578fbd4732edfeca9d6abc6da147af8fe5bae2f740405b28bf82d403f7952a4f9302605dab07f4ad1e42b525d1562579d0b84de0b0a73c06113eaa8a617924e WHIRLPOOL 77e4d2a188b2aafb2506cc47abf98619edc783cd82c19d1c89c6278a4a3136c3f157e164354588fe6b6cc5889934380353b59e68cbe28f3e49d2c5989a7e4628
 EBUILD netbeans-java-8.1-r2.ebuild 14814 SHA256 1f49212c90fcaa9a6483f19bb60c963520f20aa08c2a509aa19cc7fda12e4564 SHA512 2d6b225f5d32f0ce1801124808b0cc2101f16a703540877c4818be06694742cfa262c3a2e7018761254f9244a7992eb7fe9bc15cdb20f6f4cb83958789c0ef42 WHIRLPOOL 8557163a46ea91a47efec3c272b8a8a0f2acbf9eaa8f6c280d0ddaac6dd8b2185f06716ab12ebf76fb87fe6c05ab1a14bfd281875ebef586f1304d2162e5f2dc
@@ -64,4 +65,5 @@ EBUILD netbeans-java-9999_p20160121.ebuild 14930 SHA256 13d5b8e7020b0116cf68bc13
 EBUILD netbeans-java-9999_p20160125.ebuild 14930 SHA256 6b36dc8417d870f0b5df2820e53150b1ded820274814e58bf4b20e73caefb468 SHA512 6286865e757c8f389a0c0672fe14cf6789c052d12829f3c613e96e19bd0132ce9a272a9ef43e9d5bfd4b47ab2ad7b56ed998a8f062cecda0c9400dc0745ba279 WHIRLPOOL 7bef24c8f67dc5e1bfc1bed71d04095ce6188a5dc6aa5c7cc168a7fac45eddbf65273afa857ced7f8cee892692d907d7648b61d6492e60d130e2a269a5b3d329
 EBUILD netbeans-java-9999_p20160127.ebuild 14930 SHA256 500c2591d6e6eebd50e188703cd1275c81a31f6971129e4ad7c80a4afcfdec00 SHA512 eef1903403bfe2f482d28d7637b9554b893dcc28a432c524c2a13f213079ecf76a8b8a0b387370cb25c15ac609575c3d89801b133c462adb428250c7e21047a4 WHIRLPOOL 6cb411cd7c1df1c8e1d2eabe2959518fcefdfc0faf429a7c49e4489c75c7e0f51d6abb9f12f9a81b8811b65c64f0d6ba8f4e7dcc918a6805c4a4bd086bff9808
 EBUILD netbeans-java-9999_p20160128.ebuild 14930 SHA256 74acab37411bc60aefdb6c1b02638ba6bd6a2817c4a22f4b691dfe986003f5d8 SHA512 e8fd018bd8e9fe1eb3c2d2552c212f67f48987b0ee42b079735c8c77acaf269503a9436a4cf8c26e96f6ff68451afe170fd742e9b243a9d24ca4e179ec45f801 WHIRLPOOL 0dac873e104d540770a8ddece5cfe1c83bf2949a02f738fab7fec2b12e5d843be43ce4b5d5c1442be765a5d94d6f50bf38b338f2b656176a5c15775941502472
+EBUILD netbeans-java-9999_p20160129.ebuild 14930 SHA256 067f7168197ccce48c3f005ce9709450e7d93ec4141fbc38ecf03f37a935fdf9 SHA512 1975c14bf537b80d6bb93f1a54c4fb3d54fd2988c1ef438ec39a62db8ea4ae004c29b8b108baa0d08bd81cf562881b49da68e2537391a60643e28c39723ca389 WHIRLPOOL 0a8abfde7fb1b0f0d785da0d0ffdb4839a26271b83f53e954d6b5ad465d37aeaeb3a49c546d72885451fb98514416b392ac1b990f84d8189444a68f8ae7222c8
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index a81bc4b..ddd2055 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -20,6 +20,7 @@ DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818c
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 DIST netbeans-trunk-nightly-201601270002-src.zip 209531425 SHA256 368e7f65afd280d20a26b31be55a46dd03eb2ec10bc10a6126ce782b855372a2 SHA512 633671e83592c1016efcd91226b46d957435c8d55066339dc712f30a17821638b20bc617373d715914087dcb3498fa68817373f63e0489b0a35dcb9a47e382e5 WHIRLPOOL 3d5b403e4cdf89382e47c3bc471047162081a2403689484afb3b08ef764d3f38932f5dd057240840a5cf9fd6b64919ded7b08d4fc81e75352aef4ff61065c6da
 DIST netbeans-trunk-nightly-201601280002-src.zip 209553372 SHA256 ccbc7eb7f1317a14111bc06b7f35089ade220aed0d91e5aa91d774eed602c7cf SHA512 aeeebe3500207a3a4b63d775fec0119980bdf19dfa7e7bd4436c75f4d6b542c3ee6d0a2955165ff50b8d3e4f27acdbf93a5bee29e1f1b4ce0b16c0f4c85cbae1 WHIRLPOOL 08957d670b1816869be8ac6d6de3a67ca3cbe8ffb3c4c92c681355f0fd98016d76de29a49f039b6d333291f5dbe9c2e601f3c80bd4f8fefdd37bdf095c72ef51
+DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b4317e2cb4cac3810a1ad2ef0267f0ce546438e1ef8ad7a97870d6 SHA512 be81d583e4f78c66f67037917188f189ebd13615c61b1afe373a9a39d7d0bcc33e70495c2ca3642b8e224e52ea214b80f3b2cb7fe6fa2868885af061c978add5 WHIRLPOOL 2ce1abe1c1f6043eea13c4432ffa72143b335bcececf2df63b2ef18f9700fc42d69bbfec9d4895912dea17283abe451dab3de2665bfb4cfef9a9790919523eba
 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_p20151227.ebuild 4971 SHA256 e8fd11e68ed1f801709c76c1f81f4262af595ef19840107466ce60ce9fd068f5 SHA512 27e79a346c4519a3b0516de05899f0be9284ae83655ec6719baee3f69efa5208fdb0e22314e80291203204ff1e218fdb69f511d00f899d4afa8219b22d179a00 WHIRLPOOL 30201f253b215b8bca4db3e020cce6c1da78ad90e7a8feb87727699c01c4adb42642401de40fd2f360cf078355c5e29a415e83415589f2bfcdc524edb16699c0
@@ -36,4 +37,5 @@ EBUILD netbeans-javacard-9999_p20160121.ebuild 4971 SHA256 aa122e17c159ff2ceacc4
 EBUILD netbeans-javacard-9999_p20160125.ebuild 4971 SHA256 6bfe1dd55ca236c21f0b48383860acc1399b27680c9513bca5179558106e8044 SHA512 33571365d86a8b2032bd5e344236c5da7f647fddc604903e437720b98f4ca71c7ca4c273eb074a71c38af7b38e1bf60845f45f42c91b345b35add74d422456c7 WHIRLPOOL 7b7a0076ad5cee4893e289d66884c897b462e56e9b743e1dccdb425f00f6a692e1e33af8af1ee9102000a5ffc361e1c64cef9890bf6fb43595d3acbed08a461b
 EBUILD netbeans-javacard-9999_p20160127.ebuild 4971 SHA256 76fb1c7ceaec8fb8989ed21cd3d09df4451b1db2112ce9fe61411104a26afd75 SHA512 4bd73b9de8718f986641ecb6256b25d71d090e5e2dd789be5103d0b9ef5b996e6ce3a0bf53640be07b6a3397eaa9c66682b4de2ad626d056c010744c63ab84be WHIRLPOOL ee3568c0fac0b7eba0ebb713b392f58661200b0c80115a5357323f2b8a514296e6d31a7b5dbe1e97d3b542ccd529da0f71bae5fef72ae3adb02d8a2741e3c889
 EBUILD netbeans-javacard-9999_p20160128.ebuild 4971 SHA256 e290ef5b9a91733256278122cd3296e8f05f2d029c38f0214e9426f60cb69458 SHA512 d0e79d70442be21061790edd55893de03bc94596b03918af3b24a30e9fb36ff3fbe0681ee3a24c52e6275f84e53a0af3ef2de5f0596ce8e867f926df5a85657d WHIRLPOOL 8c90580feb8b021a947d856df1d470605a52c8478ac36c38dc24b0e5efbb388c1f35a5b0128170581961383c026a85827b8900a28714b01b346da22168a81241
+EBUILD netbeans-javacard-9999_p20160129.ebuild 4971 SHA256 210fcdbef8c1124a203608de6cd3396f43469dbf1904aa02901e16cfbe676422 SHA512 b9e992483af23ff78bf131398b00b26d34781000f643632df0f1f24410163a771ca59655970c2fd1ecfd71b3a120015231365c2edc93dfdf0310b7d73e72df6e WHIRLPOOL cb42f24122635a4f6686cfa87a85b5e7c23c0d31636dde12a01c7506ea8410ee557689751631a574fb36eb5674943068cf9371d265cc317ee2577de17cb00b32
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index 37d19ab..9a1f8c4 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -18,6 +18,7 @@ DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818c
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 DIST netbeans-trunk-nightly-201601270002-src.zip 209531425 SHA256 368e7f65afd280d20a26b31be55a46dd03eb2ec10bc10a6126ce782b855372a2 SHA512 633671e83592c1016efcd91226b46d957435c8d55066339dc712f30a17821638b20bc617373d715914087dcb3498fa68817373f63e0489b0a35dcb9a47e382e5 WHIRLPOOL 3d5b403e4cdf89382e47c3bc471047162081a2403689484afb3b08ef764d3f38932f5dd057240840a5cf9fd6b64919ded7b08d4fc81e75352aef4ff61065c6da
 DIST netbeans-trunk-nightly-201601280002-src.zip 209553372 SHA256 ccbc7eb7f1317a14111bc06b7f35089ade220aed0d91e5aa91d774eed602c7cf SHA512 aeeebe3500207a3a4b63d775fec0119980bdf19dfa7e7bd4436c75f4d6b542c3ee6d0a2955165ff50b8d3e4f27acdbf93a5bee29e1f1b4ce0b16c0f4c85cbae1 WHIRLPOOL 08957d670b1816869be8ac6d6de3a67ca3cbe8ffb3c4c92c681355f0fd98016d76de29a49f039b6d333291f5dbe9c2e601f3c80bd4f8fefdd37bdf095c72ef51
+DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b4317e2cb4cac3810a1ad2ef0267f0ce546438e1ef8ad7a97870d6 SHA512 be81d583e4f78c66f67037917188f189ebd13615c61b1afe373a9a39d7d0bcc33e70495c2ca3642b8e224e52ea214b80f3b2cb7fe6fa2868885af061c978add5 WHIRLPOOL 2ce1abe1c1f6043eea13c4432ffa72143b335bcececf2df63b2ef18f9700fc42d69bbfec9d4895912dea17283abe451dab3de2665bfb4cfef9a9790919523eba
 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_p20151227.ebuild 6293 SHA256 410d802b17d32ad0cda8c7ffab492ee3081755a458592fc984498f4abaf26772 SHA512 73437fdd3e1ddf83f877fbb9308dd6aa0dcd07593c8172b4e6c7db9a3d916c73ad11556a9d01f7158beb1dee952e59e4cf28879fdc4aff799522ba404b8e6383 WHIRLPOOL d3b6baa98db88c84e7e043e4a49d34ffe50bfd6136dbdf1c13e229e54e1b0f005a020dbd78bfae21141b4142e75a4da26850fbfe2c3ba3150ac872291de1a043
@@ -34,4 +35,5 @@ EBUILD netbeans-javadoc-9999_p20160121.ebuild 6293 SHA256 38bddc2ae0d8c91664d561
 EBUILD netbeans-javadoc-9999_p20160125.ebuild 6293 SHA256 18e5af8739780b5213abe4e2c10d983572825976da1bf4eb5fbf6d750cb5d260 SHA512 d8fba73e3af16900952c8420fd820ce18d70bc05735087408ff40b26885050d87f4121f6e700de4989260b4acdf45a4f50f9c3d71f2302d46d2fd7e0dcb89ca8 WHIRLPOOL b0f4c6fff7da7ee5d2745b03d6a069dd632e857f3f6314a0928c20fde0ed86a8231927f9c8ac5c26b179587deb617fbdf8a061c1bcf5b4497c5aaa9b64f57502
 EBUILD netbeans-javadoc-9999_p20160127.ebuild 6293 SHA256 486c1718998065afc210628e78055a6b94d8a31b2b73cf1f3dd708f55b1e9f88 SHA512 bafecb1d0525c5ea7198998c5fe0eb39a6d19a9c14b744dea09dbf983ccfe8f5be962f404446d3c620c4b8f576a873e4ff499b1a45aeca6835a88aacc1089aa6 WHIRLPOOL 4e5479d6ea7df97a37217b7407cd1e50690f3e4b0265e0a232b45d72143838d10b5dda25d71fa496d324ea1fc14e97ba97ef310d283ceedee39b6ca1e4edee1a
 EBUILD netbeans-javadoc-9999_p20160128.ebuild 6293 SHA256 41fe67bc125ecffb34986a20064a4255976f6196e2877c22dafdad695886ccf6 SHA512 aecddc75ac6d801c305064c84d84ccbad49ccee6d114807a1cee62b4bb4d8cd130b7fed23de6d923fa1da3f488aef032ee7875894bf288e0b2c7478e4944bc63 WHIRLPOOL 61782be26556c8443ddd5ae0ac620daa887b1e08258f54df81d97324267b227b9ebe2d3abf0d14856aa5598d9c2412da96c1cd98eba2b2f9268b670c750aacee
+EBUILD netbeans-javadoc-9999_p20160129.ebuild 6293 SHA256 d60cd6e35e3a86f772f1b4ea7bb0fd329dd6eb4d903143c77d2470e3eed42d49 SHA512 11b191aa53331558c1d992b993214ca716e15d9e8753ee109508878dea9979baa024011733bd0091848ecc3aadf46e437a75c006e488f4724c232e72c5373f34 WHIRLPOOL 32ea16e15282396e8657b9a0410ad669d2a8d2afa684928e81ef90774b97e40078882bf2066ac9e4cdf4880c83c479dbe47bf26b102846b97d2a79fd00abc643
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 5b3acab..3f02e52 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818c
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 DIST netbeans-trunk-nightly-201601270002-src.zip 209531425 SHA256 368e7f65afd280d20a26b31be55a46dd03eb2ec10bc10a6126ce782b855372a2 SHA512 633671e83592c1016efcd91226b46d957435c8d55066339dc712f30a17821638b20bc617373d715914087dcb3498fa68817373f63e0489b0a35dcb9a47e382e5 WHIRLPOOL 3d5b403e4cdf89382e47c3bc471047162081a2403689484afb3b08ef764d3f38932f5dd057240840a5cf9fd6b64919ded7b08d4fc81e75352aef4ff61065c6da
 DIST netbeans-trunk-nightly-201601280002-src.zip 209553372 SHA256 ccbc7eb7f1317a14111bc06b7f35089ade220aed0d91e5aa91d774eed602c7cf SHA512 aeeebe3500207a3a4b63d775fec0119980bdf19dfa7e7bd4436c75f4d6b542c3ee6d0a2955165ff50b8d3e4f27acdbf93a5bee29e1f1b4ce0b16c0f4c85cbae1 WHIRLPOOL 08957d670b1816869be8ac6d6de3a67ca3cbe8ffb3c4c92c681355f0fd98016d76de29a49f039b6d333291f5dbe9c2e601f3c80bd4f8fefdd37bdf095c72ef51
+DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b4317e2cb4cac3810a1ad2ef0267f0ce546438e1ef8ad7a97870d6 SHA512 be81d583e4f78c66f67037917188f189ebd13615c61b1afe373a9a39d7d0bcc33e70495c2ca3642b8e224e52ea214b80f3b2cb7fe6fa2868885af061c978add5 WHIRLPOOL 2ce1abe1c1f6043eea13c4432ffa72143b335bcececf2df63b2ef18f9700fc42d69bbfec9d4895912dea17283abe451dab3de2665bfb4cfef9a9790919523eba
 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_p20151227.ebuild 4717 SHA256 a11dfa5caa201e06a43c41b9fc46db4d307cd917a491027e7cdec86da76d52e6 SHA512 75b23ba48f6b55476e81234f3111a94678d54629e948ddb2dd775cc993d3be0c7e556f37b35e5795292aa774954aeaf800d1f2794084aa534c7fb3f064b52e70 WHIRLPOOL 54997139380c1dcebd32fa38474407060c132b5a8aba6e56425c138fc186980fc59f2a5212c4c8845a9f1e47a0b317b7586586167ce1bf4f616ed1274c7dbba9
@@ -41,4 +42,5 @@ EBUILD netbeans-javafx-9999_p20160121.ebuild 4717 SHA256 29790345f540788bc0f5f14
 EBUILD netbeans-javafx-9999_p20160125.ebuild 4717 SHA256 5004b2950f3b38e04bcd74adf1cf0bee928f6aee9fb5fa3e441263203ce256fc SHA512 f34bfd597b59c50c93e814d2025e0381fea56da83ac0ffd3997d50176abc8d9446528e1607faceb59ea016ced0ca5bf79a9c218293d116e311a1e6987e9443a6 WHIRLPOOL ffa89dd30c772f4606ca18d025c12ef2877c1b5110b3715547deab6ccee06128d64221c3deb2025dabba95f2fea556ad0f2f2817974893e01b38092b4e9e2508
 EBUILD netbeans-javafx-9999_p20160127.ebuild 4717 SHA256 01a9226fb3c2da59cb88f8001c7598fd379b566a55fd4e89215e4150d81292b5 SHA512 3c5833a8ef4d15c19018852dab3c6db1f4716d056df26caa5cfe8e2e9830432535064b3291ba53e2193eb27d15fc25669717891e5678cf36555f599bfed1c3c0 WHIRLPOOL e1f62a2cc00f9d18b096ff2eb189beadeb032d4f7401deefc9902009ee6d06710796526ee74d1d697bb3e8be5b1b1f5b8acd44ea62e9603dd7ca19e72a146ff8
 EBUILD netbeans-javafx-9999_p20160128.ebuild 4717 SHA256 4e085f89c66cb74c0382f7f2d93e1e0dea0357e5238a9451dc6fa5aa0c061883 SHA512 533472813715a38472ee74ed457c4d67aac07d34b67f4628b0fda2e7df9223359f553c023236e9ca9cbd31084940de8769b42c141b924d06651ac3b5d5cb177d WHIRLPOOL 6cde9b01808f84aa250d02a63df6afa42700ffb2c20a021591a6927dda9385346740052ac8ae6d202d0f5ca560edf95f04be9bdcbe6d8ab1d5c160bb69349495
+EBUILD netbeans-javafx-9999_p20160129.ebuild 4717 SHA256 977b401552e3ff424a6256a98de6dce278f3e5bc0d96111998ac46159aed79c6 SHA512 d12821bbe6bbe7835b9ce4b043b7d31993d66b040bf694bd9f2695e46716701614a2d4fcbdfaac8d2f4f13d154e988c08861244b3445cf498ea0691355ca32fa WHIRLPOOL 75d0353b0a8cfeef8c0aa8dd3190d3499a86b56550b9e13ea751cc7742e88c8592ea34158609b667dc4e1c3940e0c8c0c21cc96e115e8e3357fb88d89cd3051d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 5bcea3f..e392147 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -17,6 +17,7 @@ DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818c
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 DIST netbeans-trunk-nightly-201601270002-src.zip 209531425 SHA256 368e7f65afd280d20a26b31be55a46dd03eb2ec10bc10a6126ce782b855372a2 SHA512 633671e83592c1016efcd91226b46d957435c8d55066339dc712f30a17821638b20bc617373d715914087dcb3498fa68817373f63e0489b0a35dcb9a47e382e5 WHIRLPOOL 3d5b403e4cdf89382e47c3bc471047162081a2403689484afb3b08ef764d3f38932f5dd057240840a5cf9fd6b64919ded7b08d4fc81e75352aef4ff61065c6da
 DIST netbeans-trunk-nightly-201601280002-src.zip 209553372 SHA256 ccbc7eb7f1317a14111bc06b7f35089ade220aed0d91e5aa91d774eed602c7cf SHA512 aeeebe3500207a3a4b63d775fec0119980bdf19dfa7e7bd4436c75f4d6b542c3ee6d0a2955165ff50b8d3e4f27acdbf93a5bee29e1f1b4ce0b16c0f4c85cbae1 WHIRLPOOL 08957d670b1816869be8ac6d6de3a67ca3cbe8ffb3c4c92c681355f0fd98016d76de29a49f039b6d333291f5dbe9c2e601f3c80bd4f8fefdd37bdf095c72ef51
+DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b4317e2cb4cac3810a1ad2ef0267f0ce546438e1ef8ad7a97870d6 SHA512 be81d583e4f78c66f67037917188f189ebd13615c61b1afe373a9a39d7d0bcc33e70495c2ca3642b8e224e52ea214b80f3b2cb7fe6fa2868885af061c978add5 WHIRLPOOL 2ce1abe1c1f6043eea13c4432ffa72143b335bcececf2df63b2ef18f9700fc42d69bbfec9d4895912dea17283abe451dab3de2665bfb4cfef9a9790919523eba
 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_p20151227.ebuild 4412 SHA256 1efa30408bc2c80dc4a1e436ef79138216617d70520769ccbe39cb27f9ea331e SHA512 2fafa80c31f5225be41971528b5483ee92155733799c39d604f6a2b72b947563e18ea863b5c22b486cedcc950fbbde0b971cefa6f639774bc4980d01345d1c15 WHIRLPOOL 51db13f48661039c0c678762c6c113fcef7249f9caf1f881bd243b79172df85077b07fba9013bcafa938e3a1583d36e530dbf8218d6bfc088b0942f496f61a7a
@@ -33,4 +34,5 @@ EBUILD netbeans-mobility-9999_p20160121.ebuild 4412 SHA256 9381b6fb1a9f3960480d5
 EBUILD netbeans-mobility-9999_p20160125.ebuild 4412 SHA256 f63c849148ae893fd8e3c3c2f7d4e0026cfa42ea3c635b44fcd129b0a9b818b2 SHA512 1984c37a01c026ce32e8c1768641f6dda86c60c9bab569f07400340f27d04aa10c51bb37a2e4e078f968349e9119406316d7062602aa67648d2046a1240e57b8 WHIRLPOOL 1beefdab4cd9e82691de59e12accfbff8e63b2ebe2462055aa970c7544df19e03f447220a053577fbbd624686b521af1d4bdc8599d6e9a2527057ec97980c4ff
 EBUILD netbeans-mobility-9999_p20160127.ebuild 4412 SHA256 5c3d8395ff4a353d459a33db6445d6d35d2edaa85b862d4853328c3f8f46c3fe SHA512 0209d5a60418a404ea4953944eb207698f015b027ad192c8326825bfc97a802da481f68bc3159e026fba028a1aa1cac4c06ac0eb6e4e9d97e06ebded27a5d84d WHIRLPOOL 42679b7e2d21d314346c88e11a8abe53e3b5f206f73c64936d92d4c2a226091fa70d8fcf59be53fd1a64d7524c9a1d4169b0d3bce095b4eec94770ec2bfe8217
 EBUILD netbeans-mobility-9999_p20160128.ebuild 4412 SHA256 80187228527b6610e845b1f3f18e78dd543ee0074299366f8fd7acae3b380ce6 SHA512 d4ece59b28fff3121e45a9ef12b5e23585490a0687da01de78030159a2add66e7add7b503809e571a1ccbb24b6a990f0d6f6ea9d129f7fc99cb310be7a444c9a WHIRLPOOL b26bd961c4a81e1e1aedb4b9b104ca09b05f8b3ad19a40a132b73fbf03783fadbdc324ed42737e3dd20f238058570582f147a1e503b8516f99621dae292647ea
+EBUILD netbeans-mobility-9999_p20160129.ebuild 4412 SHA256 cc73307539e6630196425bbdc2f019ade2f35351458b73d051505132d201a74d SHA512 da8fcde42d65d34f77f8c8d5c51ef616d735b2fd5386bf91bcbdd190b8b9cd35093b95bb550ecc58dd0222c31fce69b52f5cbb244cc016c1ec0eb304723ac2d6 WHIRLPOOL 3c2262b85d9f92b8f93b84e4de621aa50cf991dbcd6f112c5911812589e9d4e48b0f8b696a5b981453451e05c216a9fd3a83757c27d0b385fc130be1d6243207
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index fbebd85..6b9ea64 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -20,6 +20,7 @@ DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818c
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 DIST netbeans-trunk-nightly-201601270002-src.zip 209531425 SHA256 368e7f65afd280d20a26b31be55a46dd03eb2ec10bc10a6126ce782b855372a2 SHA512 633671e83592c1016efcd91226b46d957435c8d55066339dc712f30a17821638b20bc617373d715914087dcb3498fa68817373f63e0489b0a35dcb9a47e382e5 WHIRLPOOL 3d5b403e4cdf89382e47c3bc471047162081a2403689484afb3b08ef764d3f38932f5dd057240840a5cf9fd6b64919ded7b08d4fc81e75352aef4ff61065c6da
 DIST netbeans-trunk-nightly-201601280002-src.zip 209553372 SHA256 ccbc7eb7f1317a14111bc06b7f35089ade220aed0d91e5aa91d774eed602c7cf SHA512 aeeebe3500207a3a4b63d775fec0119980bdf19dfa7e7bd4436c75f4d6b542c3ee6d0a2955165ff50b8d3e4f27acdbf93a5bee29e1f1b4ce0b16c0f4c85cbae1 WHIRLPOOL 08957d670b1816869be8ac6d6de3a67ca3cbe8ffb3c4c92c681355f0fd98016d76de29a49f039b6d333291f5dbe9c2e601f3c80bd4f8fefdd37bdf095c72ef51
+DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b4317e2cb4cac3810a1ad2ef0267f0ce546438e1ef8ad7a97870d6 SHA512 be81d583e4f78c66f67037917188f189ebd13615c61b1afe373a9a39d7d0bcc33e70495c2ca3642b8e224e52ea214b80f3b2cb7fe6fa2868885af061c978add5 WHIRLPOOL 2ce1abe1c1f6043eea13c4432ffa72143b335bcececf2df63b2ef18f9700fc42d69bbfec9d4895912dea17283abe451dab3de2665bfb4cfef9a9790919523eba
 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_p20151227.ebuild 4111 SHA256 fc3d123e7b9e88fc2c107f230fadedaaedabfcde7db08f2a441d71e7191cda2f SHA512 eb435285a0065337041d860fe49af9f462302d740e4da1519885e80d156f213b4b031508d8167d47289d77cd8bc1e6f7e46357bf91c988c35543ce66017dcebf WHIRLPOOL 3f44b98c0ce3e80ffe54ad602b6c636968f7af42e249e5ece8dfdc0067f6399d93efc9d38d0e92e3ac729b9b2c9ba42f4dcc4b35789bcc539d757f38fe0b92e7
@@ -36,4 +37,5 @@ EBUILD netbeans-nb-9999_p20160121.ebuild 4111 SHA256 5cbec8b7d6a5ce65e8bf445e8a2
 EBUILD netbeans-nb-9999_p20160125.ebuild 4111 SHA256 b3964a32dcba536c8867f5fafc33bd8525d2028d0cbf7543f9e67cc5b6924fd2 SHA512 ab91c4221728488e03903b0773fe7800d09d79f74760a05173c09d0049fd5e50e9f5365160a3e079aa5c2ad6c8283860ea74100c694ad8d754e66624a599c06b WHIRLPOOL cfac9d97ec8a0339c325012e556c7b8354028dd0b41daf6a12a047049a3d7566cf676521c85256bf0c541eade7ef065ff5bd2397f9dcf035195ae43ea22ffce0
 EBUILD netbeans-nb-9999_p20160127.ebuild 4111 SHA256 ce157e576dd46447d07117004ea9d28863e02c9ffe5158690a79d82c4c30ec95 SHA512 0b559a54db875da07f338b8c247c23e03ad894c27bd7cad6a20beb5d66fad132cb4c0db9706e2e5051692e37b8d5d2320ba3c7ce02c3a35579423d11e57a66e1 WHIRLPOOL 84e30c09c49ac3ce1c6cb3d30366c56352fa9ca827dc93b17c2031624fc19cc8182e1cef75f69efc0010da5202b8e0f05f707323e3effef6cdc1c882728a6882
 EBUILD netbeans-nb-9999_p20160128.ebuild 4111 SHA256 37a80cd7aa618832c4ff8baa2af373e10473de6ab3287694e6f3843a89d26f2e SHA512 e6a14ab351263c3b2c9013a7f94207c48cedb059449de3bdcde1bd6ae355ad3e381c7df1e1d2e7aa59e39d9b3df49f26c2684e4e5a959b8be2d8ab5417f5df48 WHIRLPOOL 7264e716c4f34302ccd2c939bc4d9115208a8e4f705c4cca68a20f85597b0aeb33d924c6304d96a9aa0f2ab8129508781986728f38f8142eea570ca7c9511443
+EBUILD netbeans-nb-9999_p20160129.ebuild 4111 SHA256 03eb8e599d256249d56bdbc2d4dc7ef83b1b36a1e8a147325c10b0758e5aa9e5 SHA512 7c1197c621c83695eb195e0ed840dcd64e89bbc0cc3e647a723af761d3558a32e9b878a99349022511902ee22b20442cc13f396656c411da0a13f2b1ba8b2146 WHIRLPOOL e99fea179c269515d6dad75f20d57e99232057833edc3cf95f57afe08ea05c68c073fc410744171b389a8d331521365edd189826b17c843718c487e98e46374e
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

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

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index a2c34b2..9f983ac 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -21,6 +21,7 @@ DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818c
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 DIST netbeans-trunk-nightly-201601270002-src.zip 209531425 SHA256 368e7f65afd280d20a26b31be55a46dd03eb2ec10bc10a6126ce782b855372a2 SHA512 633671e83592c1016efcd91226b46d957435c8d55066339dc712f30a17821638b20bc617373d715914087dcb3498fa68817373f63e0489b0a35dcb9a47e382e5 WHIRLPOOL 3d5b403e4cdf89382e47c3bc471047162081a2403689484afb3b08ef764d3f38932f5dd057240840a5cf9fd6b64919ded7b08d4fc81e75352aef4ff61065c6da
 DIST netbeans-trunk-nightly-201601280002-src.zip 209553372 SHA256 ccbc7eb7f1317a14111bc06b7f35089ade220aed0d91e5aa91d774eed602c7cf SHA512 aeeebe3500207a3a4b63d775fec0119980bdf19dfa7e7bd4436c75f4d6b542c3ee6d0a2955165ff50b8d3e4f27acdbf93a5bee29e1f1b4ce0b16c0f4c85cbae1 WHIRLPOOL 08957d670b1816869be8ac6d6de3a67ca3cbe8ffb3c4c92c681355f0fd98016d76de29a49f039b6d333291f5dbe9c2e601f3c80bd4f8fefdd37bdf095c72ef51
+DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b4317e2cb4cac3810a1ad2ef0267f0ce546438e1ef8ad7a97870d6 SHA512 be81d583e4f78c66f67037917188f189ebd13615c61b1afe373a9a39d7d0bcc33e70495c2ca3642b8e224e52ea214b80f3b2cb7fe6fa2868885af061c978add5 WHIRLPOOL 2ce1abe1c1f6043eea13c4432ffa72143b335bcececf2df63b2ef18f9700fc42d69bbfec9d4895912dea17283abe451dab3de2665bfb4cfef9a9790919523eba
 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_p20151227.ebuild 4418 SHA256 36c60d7b180b7b266619f2019d52a61c73cb496bb4181e4440dadb71a87a9780 SHA512 a95ac69f8b54c14f2c7b123cf9f0b2b8b4b96acaa85e85c2b9e735b23b0eb1078a19d805327d73905805e31c252af8f4236bd90cde1c7e14effbac8f2de1899d WHIRLPOOL c0c9c382e8290999b56080d2de5ce055482e89c2d7cdcae3e4fbe8ead6ddc1c0e97cd0a552dfbed11ac46ba92392728c12307d8eb610e8d8ec10442142969df2
@@ -37,4 +38,5 @@ EBUILD netbeans-php-9999_p20160121.ebuild 4418 SHA256 e9320841ed82feca422c1279b7
 EBUILD netbeans-php-9999_p20160125.ebuild 4418 SHA256 9c7f4504e4d037de58bf456c7365f90e3cc456f07c85e15c36b11493e6c70c7c SHA512 901327079700e78027ae56758872d3c288453a6ad94527b95721cbd1cb63187c6e6fcb9facf73fe467b3533722f063d87f9a6b4c61a507beb91f63c44341704a WHIRLPOOL fa7f914bb1663b284320d528cdea3d19035b11c4a129c28c8adf21bee2a77f021c7f720cc59c695718455adf0fec88eda2137e910b158fdce35483da00cf8c92
 EBUILD netbeans-php-9999_p20160127.ebuild 4418 SHA256 2719e0dfe3f27fc5030f4be2116d6d854cd862dc5ca329fa90c8489774f13acf SHA512 b91ad8b25e707989d9810284e33088d872f16ccad54d097a7af7e247d575f56d5826ac7736edd90e4883052f72ad5fe8a287b0d463b155facce24243e6e0b231 WHIRLPOOL f6d178ced3274ca624e4ffa296974c3fe99a645a0f93949d9c36f64ca98dfc4754c8531fd22ea196a97197e476a69494c7edc4a76caac1acb009455b917d99bb
 EBUILD netbeans-php-9999_p20160128.ebuild 4418 SHA256 2dacb8e81072084bec8697b60176d495a04afca510fb20f5afd31a2e8c888620 SHA512 bb4b24e5d7f94b12b03be207299c4fb1b81bdc18f50e9fa91213367bbd8a38af1dc2b341487571f1fd5213c36a7b9020212f8260e5a7acecd660479a04b91d93 WHIRLPOOL e82decd6c2780b911912e8c3c6944ea32561663cef1bd39be2120f3fd0784819db14dedd4ffc8bd9be29e449df587bc5851262b6eb1e542833b14f1fb16846e8
+EBUILD netbeans-php-9999_p20160129.ebuild 4418 SHA256 302d16d9851c39f872be18301dd10b74a015a13088ba754828e93a0735556144 SHA512 fc9dc6b3f043ea1407c6c054839926ff56b6894f1627c227abaaa3f26a8c7a4d139ffc65fbfd2739e5733aef6fbdf03b45e96fae6abdffa760f332b4b5026d3b WHIRLPOOL e1802f2521f4c5b3a4f6c437d67d99ecfd306156acabce996e9eb8f1e7e7ff0878f08c92e527902601bc2ede5ee30e8a8d9f43e2dd3b73705e257b87fe9229ef
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 4bc9d74..f52f0f1 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818c
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 DIST netbeans-trunk-nightly-201601270002-src.zip 209531425 SHA256 368e7f65afd280d20a26b31be55a46dd03eb2ec10bc10a6126ce782b855372a2 SHA512 633671e83592c1016efcd91226b46d957435c8d55066339dc712f30a17821638b20bc617373d715914087dcb3498fa68817373f63e0489b0a35dcb9a47e382e5 WHIRLPOOL 3d5b403e4cdf89382e47c3bc471047162081a2403689484afb3b08ef764d3f38932f5dd057240840a5cf9fd6b64919ded7b08d4fc81e75352aef4ff61065c6da
 DIST netbeans-trunk-nightly-201601280002-src.zip 209553372 SHA256 ccbc7eb7f1317a14111bc06b7f35089ade220aed0d91e5aa91d774eed602c7cf SHA512 aeeebe3500207a3a4b63d775fec0119980bdf19dfa7e7bd4436c75f4d6b542c3ee6d0a2955165ff50b8d3e4f27acdbf93a5bee29e1f1b4ce0b16c0f4c85cbae1 WHIRLPOOL 08957d670b1816869be8ac6d6de3a67ca3cbe8ffb3c4c92c681355f0fd98016d76de29a49f039b6d333291f5dbe9c2e601f3c80bd4f8fefdd37bdf095c72ef51
+DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b4317e2cb4cac3810a1ad2ef0267f0ce546438e1ef8ad7a97870d6 SHA512 be81d583e4f78c66f67037917188f189ebd13615c61b1afe373a9a39d7d0bcc33e70495c2ca3642b8e224e52ea214b80f3b2cb7fe6fa2868885af061c978add5 WHIRLPOOL 2ce1abe1c1f6043eea13c4432ffa72143b335bcececf2df63b2ef18f9700fc42d69bbfec9d4895912dea17283abe451dab3de2665bfb4cfef9a9790919523eba
 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_p20151227.ebuild 9360 SHA256 176a494fc85646e58b413b9e05a826550b327fba6654ab6d544ef2d76eca9bf7 SHA512 559c49ff94f0a2eac1e8d061761fae76cee55e46426d266a6b169eac6f794789e2a7a982d5fb3ddd89b48f63fe1bba0852f1f7e71f2f3fafee0154c3aa60e423 WHIRLPOOL 8b9437c420b0bb8237c593490034938c5d70b43b3834d2db9f3387f1661ea1fe1bb4a254766125028fabf7b11b1ce8e70ba47d0df702b17f5f7110f9d7ab8a7f
@@ -50,4 +51,5 @@ EBUILD netbeans-platform-9999_p20160121.ebuild 9360 SHA256 0133633a35e3810694d48
 EBUILD netbeans-platform-9999_p20160125.ebuild 9360 SHA256 2f6e5113bbf662b72c4f348be0563088733b49d619f5efdd9fb91c48a5861569 SHA512 5f438f9a72f64db4239b0ffbb733f2804b50cb0bd29137892e0461d1bd2d5c08154adae26149221cbcbc8e70a535e0e5160f888fd27f4b274add90caf2819e11 WHIRLPOOL 6bb4733093308c0e01df5d95c1d2079c2bdadffe2720d014456e692dc09df31f39bcb744d91910273093e14c5a6edf5219260ba2517fc87a835f48f3f9a9073f
 EBUILD netbeans-platform-9999_p20160127.ebuild 9360 SHA256 5486f4e750e866b20f984767b6ca3bb43a1eab0e19f604348e269228a5b46630 SHA512 022c982650474d9f017b90217620ec33a5c11d98019965698f1c2e35c6cbbcadba7f14922c0d66676f398be652092b6db9e7a4ed3dbb2389f72bc102aab04f15 WHIRLPOOL 791bd245f93025cb2299e3410c68e79f1577dca644e91d74634a2a4e2780d371f2bc0de099409c09b25ac5b061402d54315f3b0e64bd2f043ceebea78eaa6992
 EBUILD netbeans-platform-9999_p20160128.ebuild 9360 SHA256 0d36267f0fa1a1e43a8359ea97ce5218b0c45cc8ca18b17732d70a47810e555a SHA512 46ec34fddb2bb364d249bc023b36250df0e895123101bdffd06bb99fa57c404dd8cd830bbe0b0dfedbe69e6cc4b466fdca9b66950d97dc7b50e3e421405e45b1 WHIRLPOOL 9571f02d3435160d77b990145b0b0379b43d956e5427db08eeee25fe43d644746385049847d41378ac0970a6a4d5541d1516a6e47ba9493430efe057dbdea42a
+EBUILD netbeans-platform-9999_p20160129.ebuild 9360 SHA256 d76978cafa723f41383c7bf58e697249f96e876d3d8ef384010f3bd15e79e18c SHA512 9f4138852d200c4449b7caa29e7916c7262f94558a92e6865be407c13b8f4db68c923e758890dcf9be237610b3ce611352cde5ea3d64a5c7e17d4a60f2054c7d WHIRLPOOL 6204751ae7dee75ff21542e5aaca95be9b38c4a883f8cc1b537a7912e77dc5b628e9df0e78c11495f8b21085625d5b11b45a0d23570f6a0bc2984823af6436bf
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 262201e..65c320a 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -17,6 +17,7 @@ DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818c
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 DIST netbeans-trunk-nightly-201601270002-src.zip 209531425 SHA256 368e7f65afd280d20a26b31be55a46dd03eb2ec10bc10a6126ce782b855372a2 SHA512 633671e83592c1016efcd91226b46d957435c8d55066339dc712f30a17821638b20bc617373d715914087dcb3498fa68817373f63e0489b0a35dcb9a47e382e5 WHIRLPOOL 3d5b403e4cdf89382e47c3bc471047162081a2403689484afb3b08ef764d3f38932f5dd057240840a5cf9fd6b64919ded7b08d4fc81e75352aef4ff61065c6da
 DIST netbeans-trunk-nightly-201601280002-src.zip 209553372 SHA256 ccbc7eb7f1317a14111bc06b7f35089ade220aed0d91e5aa91d774eed602c7cf SHA512 aeeebe3500207a3a4b63d775fec0119980bdf19dfa7e7bd4436c75f4d6b542c3ee6d0a2955165ff50b8d3e4f27acdbf93a5bee29e1f1b4ce0b16c0f4c85cbae1 WHIRLPOOL 08957d670b1816869be8ac6d6de3a67ca3cbe8ffb3c4c92c681355f0fd98016d76de29a49f039b6d333291f5dbe9c2e601f3c80bd4f8fefdd37bdf095c72ef51
+DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b4317e2cb4cac3810a1ad2ef0267f0ce546438e1ef8ad7a97870d6 SHA512 be81d583e4f78c66f67037917188f189ebd13615c61b1afe373a9a39d7d0bcc33e70495c2ca3642b8e224e52ea214b80f3b2cb7fe6fa2868885af061c978add5 WHIRLPOOL 2ce1abe1c1f6043eea13c4432ffa72143b335bcececf2df63b2ef18f9700fc42d69bbfec9d4895912dea17283abe451dab3de2665bfb4cfef9a9790919523eba
 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_p20151227.ebuild 3472 SHA256 1fed370f526e8a9f72cf619864c585ee74f3bf47167d9334938b18c3a018258a SHA512 608ee819f01e1a43d0b29d7de48bdf05c7766863270a9897e9d660662d7b46defecc7ade47477085772936354baf60453bdccc878dcb9ff90cb7bb4513b13561 WHIRLPOOL 451218c78630ecc4b8ec55a37b1ba8d5d16a9d2f76db5187b30135b061eca7dfa31aec078e237ed4e6633d6024cd0185ed5bc8c1909ad8b418a7dcf33f683b0f
@@ -33,4 +34,5 @@ EBUILD netbeans-profiler-9999_p20160121.ebuild 3472 SHA256 42aed204a88d1798c4a38
 EBUILD netbeans-profiler-9999_p20160125.ebuild 3472 SHA256 39ad69bfd9154588edbe9adb76ef886739c5d1fbc20c371090129610c33fc0be SHA512 c9fa91c3e41cf8e3487199ed922f49293f0d1048e1fe6ff4ebe4fc0741278298c25266efb9da56e99fef6aa4efd70646829279cc18045a21f0d91388b9a274f5 WHIRLPOOL 12207ddeebec847e95bc00e33c511451c75c69b20c7f3f64741334eb7ebee953ef60a08d2646bc4de7a933aeb0d6e0088fe9adc355d62febc51114ffb2761e55
 EBUILD netbeans-profiler-9999_p20160127.ebuild 3472 SHA256 bb315fc5faaf2de8e982c475d6096473871a01ae1f3b338bc7e3543208898793 SHA512 889d98e6f0f264a74c580a051455f990461395259951b3c0c428741fb42ec0d4c09e163bc773781e7ea2d7819f672597b55ad8db37bbae1190dede96e496b5b8 WHIRLPOOL be0d38b9a1557888c4012eda401eeebd70b04a4be26dfcef2eb0703dc515881480c5e2c552d8837bb50293943736f014e81dad3a5955af2d5d4e40f2df772ea5
 EBUILD netbeans-profiler-9999_p20160128.ebuild 3472 SHA256 6c134db461fe942ae8fefc77b2b710f01fa9d4bc4abbc2837c9c192852bf7ab1 SHA512 432b5630b6df790b8764c3cb9b8d43db00b9687266e7ebdeb22769fda61418d1b0a6d3fa9a782a2cb1dd53109a2b12d20076abc5f376fe13f73dd90c80992c5a WHIRLPOOL a229de1c38c7af908bdc7d7b22e1d14efa43588fef9095df0883fa91497b9decbe75738e79dafadd501fa16332ef3bebdf0cb84fb91499df48de21844f68a8a2
+EBUILD netbeans-profiler-9999_p20160129.ebuild 3472 SHA256 0df50d640f1fd0a9185daa500488e0f8a1d1a9206baf747cbd392a3eb17dc24f SHA512 1835d77967e4069d36d7958daf78afe02f4810d4fe975ba4af610cd9366ac2096092daf107d8574a2aeda80b52b1f5fdb4615e751aa129b018e480f47bdfc505 WHIRLPOOL f9366d98ab835381428768ac222401abd65c9e73d189ce89dddeb901581786074b90a4638610466aed4013032b6598baafcef73d0af25cc72a02a301fd9862a7
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index 7226b22..79d5ca9 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818c
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 DIST netbeans-trunk-nightly-201601270002-src.zip 209531425 SHA256 368e7f65afd280d20a26b31be55a46dd03eb2ec10bc10a6126ce782b855372a2 SHA512 633671e83592c1016efcd91226b46d957435c8d55066339dc712f30a17821638b20bc617373d715914087dcb3498fa68817373f63e0489b0a35dcb9a47e382e5 WHIRLPOOL 3d5b403e4cdf89382e47c3bc471047162081a2403689484afb3b08ef764d3f38932f5dd057240840a5cf9fd6b64919ded7b08d4fc81e75352aef4ff61065c6da
 DIST netbeans-trunk-nightly-201601280002-src.zip 209553372 SHA256 ccbc7eb7f1317a14111bc06b7f35089ade220aed0d91e5aa91d774eed602c7cf SHA512 aeeebe3500207a3a4b63d775fec0119980bdf19dfa7e7bd4436c75f4d6b542c3ee6d0a2955165ff50b8d3e4f27acdbf93a5bee29e1f1b4ce0b16c0f4c85cbae1 WHIRLPOOL 08957d670b1816869be8ac6d6de3a67ca3cbe8ffb3c4c92c681355f0fd98016d76de29a49f039b6d333291f5dbe9c2e601f3c80bd4f8fefdd37bdf095c72ef51
+DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b4317e2cb4cac3810a1ad2ef0267f0ce546438e1ef8ad7a97870d6 SHA512 be81d583e4f78c66f67037917188f189ebd13615c61b1afe373a9a39d7d0bcc33e70495c2ca3642b8e224e52ea214b80f3b2cb7fe6fa2868885af061c978add5 WHIRLPOOL 2ce1abe1c1f6043eea13c4432ffa72143b335bcececf2df63b2ef18f9700fc42d69bbfec9d4895912dea17283abe451dab3de2665bfb4cfef9a9790919523eba
 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_p20151227.ebuild 5280 SHA256 ad7b0e5911b24bff85bb9ef9f96ca3b38969bed8daf8494d4ab54952668457f2 SHA512 95bf419ad99408b00687733c230e0c80c367be68a646304f204b0653e33e02d1a960cf4b74d4100dd7b675c69d18fbe4ef0a449c6e4b42f200d4b4476dafa357 WHIRLPOOL e35f5bcd5f200799a2b18e546b354fc88f0bbc6ee9c6830511d30e6f88899ccc804c450621d77b0fd455a28093ee5311d4c54998f6f06b98ad845e365fbbc98f
@@ -48,4 +49,5 @@ EBUILD netbeans-webcommon-9999_p20160121.ebuild 5280 SHA256 b307d7f99148f077993b
 EBUILD netbeans-webcommon-9999_p20160125.ebuild 5280 SHA256 32cac5377afb2e2625f926577667b147131b1b6f6de01881a80fd2429cb6ac2b SHA512 eaf4d04f0b5795c0ccab7d91d7b663690cb40d25f2b6f913ef9c490a55313b93ad1df2b8d18446f4f1284de195a471fedda51f2bedd3c04ed00d7a4f14e9adec WHIRLPOOL d7aa94a8c4d567013ff816c8a3622143969f53d446b18865f4414781e18c92e8e49f4a992227b0f4e51e98177766ca7855dba2e84be9ae1c26687e24a3a0f7d0
 EBUILD netbeans-webcommon-9999_p20160127.ebuild 5280 SHA256 612fab564b5d2f1bedda004ca7994b7c3978894b4da087c79fb81e5faf1c1d38 SHA512 30c9335487f4d9ae8bd2569271fb3222d37974035d27aa02e6f9ec7cdb52dc6cf0a0e37e8dbe866adc9d522e5a27e4a4e0dcb453396070380d9a4e64869e0d48 WHIRLPOOL 7764d5ae9d89774aa129918d937359aaeb03731bd1dee4cab70e26febb38e3bd8f0b47d8e20e3e75e8e06f00ad61c6a4e4c59f82a24ac0fedde18cf0c5f30e8e
 EBUILD netbeans-webcommon-9999_p20160128.ebuild 5280 SHA256 96b03f211ff1321f408c7302c7eaaf449ecd1c8c9afd9c7262466f1a2e77bf65 SHA512 66a8969181804e2ddaf2905d614ffad9c69ca5cea1ff1dde1ee94c388eb947eae8fe13578381b7e4258fa6bbc4d20668f4dabf72e83239fbae48090dc9d681fa WHIRLPOOL 9e598ca4d6827c4690f045665d3fc1e82d626820d1aede3c23ecf085127cd948dba415cb168001d48a75a2a0c7dc51b2e052c87209c612c5035a6ed8cc6ad07e
+EBUILD netbeans-webcommon-9999_p20160129.ebuild 5280 SHA256 7b5230211a95ba0ae2d6a12b0dc4971ff757d69e1ebd3f30ccee23b8e53d2329 SHA512 ad134f7bdea7ee60dcdf25e1b554e83e39ecade3b83caed134ddc16b3a5633f57f8733f93cef3f34f08bfadc5746a1cbc2a09d2689b39d0d4dedba8481c8f749 WHIRLPOOL e347a10ff1168fc9243f718cf9818bb45737ab69ea6daa0a47057397a62138638961668f304d53a5e61a3722d68a22dcc5f4914eee9a391b45c5c1b280a2585e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 64095ca..1af44d5 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -17,6 +17,7 @@ DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818c
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 DIST netbeans-trunk-nightly-201601270002-src.zip 209531425 SHA256 368e7f65afd280d20a26b31be55a46dd03eb2ec10bc10a6126ce782b855372a2 SHA512 633671e83592c1016efcd91226b46d957435c8d55066339dc712f30a17821638b20bc617373d715914087dcb3498fa68817373f63e0489b0a35dcb9a47e382e5 WHIRLPOOL 3d5b403e4cdf89382e47c3bc471047162081a2403689484afb3b08ef764d3f38932f5dd057240840a5cf9fd6b64919ded7b08d4fc81e75352aef4ff61065c6da
 DIST netbeans-trunk-nightly-201601280002-src.zip 209553372 SHA256 ccbc7eb7f1317a14111bc06b7f35089ade220aed0d91e5aa91d774eed602c7cf SHA512 aeeebe3500207a3a4b63d775fec0119980bdf19dfa7e7bd4436c75f4d6b542c3ee6d0a2955165ff50b8d3e4f27acdbf93a5bee29e1f1b4ce0b16c0f4c85cbae1 WHIRLPOOL 08957d670b1816869be8ac6d6de3a67ca3cbe8ffb3c4c92c681355f0fd98016d76de29a49f039b6d333291f5dbe9c2e601f3c80bd4f8fefdd37bdf095c72ef51
+DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b4317e2cb4cac3810a1ad2ef0267f0ce546438e1ef8ad7a97870d6 SHA512 be81d583e4f78c66f67037917188f189ebd13615c61b1afe373a9a39d7d0bcc33e70495c2ca3642b8e224e52ea214b80f3b2cb7fe6fa2868885af061c978add5 WHIRLPOOL 2ce1abe1c1f6043eea13c4432ffa72143b335bcececf2df63b2ef18f9700fc42d69bbfec9d4895912dea17283abe451dab3de2665bfb4cfef9a9790919523eba
 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_p20151227.ebuild 2721 SHA256 8dbde4d7e95fa7e02a140db3b3d27a68456e6dd660b5da0efc072551f9262eec SHA512 5af48fa2d97cbbda79e1be891ea704c89abed3dfd66572c921174f561f4a534e9e46d48aeb84cc74b92d2ec2d021b86d7e116e9823c95aaf3fc16273d2bf99cd WHIRLPOOL 43cc9db56e92136bf59a3acaf90e16d87fb986347453761712377fc05968a86e38f0493749cd291d7026f062638ebe8f96b0c0edfb8bd6d635bdfe4384e2f6ce
@@ -33,4 +34,5 @@ EBUILD netbeans-websvccommon-9999_p20160121.ebuild 2721 SHA256 67589289094b23e5b
 EBUILD netbeans-websvccommon-9999_p20160125.ebuild 2721 SHA256 b47db4469fbcbbc9d50b2f4d33a023b1153f746e2e12851672ce743bc628c788 SHA512 4b87eea915c12a711b97812e99b1d57a87e72ef87df649bbebdcab6960638c970faa572462e8703cf9a537561b191bae5d126cfc06a4a0bb718e72964ce32e8e WHIRLPOOL 2f394abf3cf522e86d84dcd9448cc998e0f6914c0171c0b539c2b4fa1c489065e4b5770238a3331d864f6299a068773d0f6e192f035c3cc5e764a593196645cc
 EBUILD netbeans-websvccommon-9999_p20160127.ebuild 2721 SHA256 35426db523390957555b9e3a6b61b918b2084ec910d9b1ee606e8aa6728b8e3c SHA512 f3a9fdf8233ee0a10eabb593e78a6b06fffee7b009b53a858f7bd66e5c3c23283aa12c6681e61657863d1fe3b6623e69c28e3f16cb611497c6c5080f69378266 WHIRLPOOL 9bba1616a170fd5179c0605643c05ccfa00eabb05965e1e0f8f8c1dbe4de059e641474fe17f4231dc9ca8964b7e0b9d3da208bad57261480824a5bc309c3718e
 EBUILD netbeans-websvccommon-9999_p20160128.ebuild 2721 SHA256 40ca21c62398724d59e20f7bdecdec56b46e5a2f9d5ee203ce6b9e2ebd9a9fa6 SHA512 b24dbab669a5ac22fba78fd35f791b86f9658e9396e5f566c95dddfdefb8f15e1dfbfa1ddcd0a5393718a6c1393db3496aa46e0475a98847c6e90978ed277849 WHIRLPOOL 2d5a1993d1fd48007f590dff46c376fdcd96270c8dbd15d5a62171fdb2cda77337c390592bf4006777aaf6c03505292527e9c456123d055a69272cb4052718a1
+EBUILD netbeans-websvccommon-9999_p20160129.ebuild 2721 SHA256 b62f8ab2ebb4db8e62eb569fb1693b8e91f021cfebfd1ceaeaa59ab48610788b SHA512 bd626018daf04172c27fb75a01247a077ffbd8ad96b1305e4af561cb2e546a801e726244d47ae95a197dd2d90ec4b799b090dc7a2dbf28b276426c6aee4b78e8 WHIRLPOOL 3d06c1ffd8cd6082c4b8f315f3961170f4d06749cc398add1e00d7a7795b5e0c853e93d5ef50aae8bbc57b6dd35bfe841df0f1ec0537404a74f7648040b7b281
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index e400c84..fc0e582 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -20,6 +20,7 @@ DIST netbeans-trunk-nightly-201601210002-src.zip 209506648 SHA256 b84fdf8553818c
 DIST netbeans-trunk-nightly-201601250002-src.zip 209516727 SHA256 0b3d3b53319671bd3958ccee854ca6900adea4ae9afa42cb87c6f77297369b51 SHA512 d018f157608fb4ae01cde7bf10c7c33061f0f36b90ca606d8a6a9c3f9ea4f5c88f02755f9453b819a0e59c9882ae2b5eb676bad770b79c61215b9f554f20fff3 WHIRLPOOL ce7c3c2c2e0089872e04981be7aafc7f2f18048ff6b3606920f1e9b6054a8ecc01b24b45cbf73776a7b3937c46b73b9379d8a6612f71c37c942605537ed21413
 DIST netbeans-trunk-nightly-201601270002-src.zip 209531425 SHA256 368e7f65afd280d20a26b31be55a46dd03eb2ec10bc10a6126ce782b855372a2 SHA512 633671e83592c1016efcd91226b46d957435c8d55066339dc712f30a17821638b20bc617373d715914087dcb3498fa68817373f63e0489b0a35dcb9a47e382e5 WHIRLPOOL 3d5b403e4cdf89382e47c3bc471047162081a2403689484afb3b08ef764d3f38932f5dd057240840a5cf9fd6b64919ded7b08d4fc81e75352aef4ff61065c6da
 DIST netbeans-trunk-nightly-201601280002-src.zip 209553372 SHA256 ccbc7eb7f1317a14111bc06b7f35089ade220aed0d91e5aa91d774eed602c7cf SHA512 aeeebe3500207a3a4b63d775fec0119980bdf19dfa7e7bd4436c75f4d6b542c3ee6d0a2955165ff50b8d3e4f27acdbf93a5bee29e1f1b4ce0b16c0f4c85cbae1 WHIRLPOOL 08957d670b1816869be8ac6d6de3a67ca3cbe8ffb3c4c92c681355f0fd98016d76de29a49f039b6d333291f5dbe9c2e601f3c80bd4f8fefdd37bdf095c72ef51
+DIST netbeans-trunk-nightly-201601290002-src.zip 209572474 SHA256 aecbabf995b4317e2cb4cac3810a1ad2ef0267f0ce546438e1ef8ad7a97870d6 SHA512 be81d583e4f78c66f67037917188f189ebd13615c61b1afe373a9a39d7d0bcc33e70495c2ca3642b8e224e52ea214b80f3b2cb7fe6fa2868885af061c978add5 WHIRLPOOL 2ce1abe1c1f6043eea13c4432ffa72143b335bcececf2df63b2ef18f9700fc42d69bbfec9d4895912dea17283abe451dab3de2665bfb4cfef9a9790919523eba
 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_p20151227.ebuild 6938 SHA256 cb3df7e642b1002a72c8c3c2ce804c598b225e833dfa74077c15ded20d2b3771 SHA512 d7595ac56b9f6a87d06aab09589393ef3d1d6ff7103792c679e81516f98d13b6e073b695bb4ffc1f88c00e9293824012d37ec215c63965f685a395254c58d1fa WHIRLPOOL f239fe06c7c7254a23cb3d909dd67c6d50b28448aafd6e1a9eabf5e0dd1ab839e1567e1d29b9c986d01e04c9a4bd07a76e0e12a28e1a270d4ee15fb2e9c6e8f3
@@ -36,4 +37,5 @@ EBUILD netbeans-9999_p20160121.ebuild 6938 SHA256 c84fd6f7f762e15bd9f7b7f651ca72
 EBUILD netbeans-9999_p20160125.ebuild 6938 SHA256 2111252d6adc9305b2bf08704893ecd0e4927705ae51de47fecb1b3fdf572656 SHA512 8c587525d1786a3f9932c296f66a2299f76003bd07926d3801391fe5c9b0b27378f56dc0dcd8d5727ef04ad952b357c9f13e57de053c401520e7bcfb817f6dfb WHIRLPOOL 4fc9171d5ff63bc6aae6efc5b11880d6d1954f9af6e52517854267096558b139659ab8358d23836bd06574d47220d21a547cd751de089b0a8a6d4159e0e533f5
 EBUILD netbeans-9999_p20160127.ebuild 6938 SHA256 0ba9f3863fb853a9611a9f8f06fb5d041f6c3f802e336046c72364409d81800c SHA512 bf163db5182369e9412b3985275f47275e8023a3695a71e6012d3bf3dbd4e6738f079009bdf778695113f638a93b1665989001a5db8ee02129b3e09389e182cf WHIRLPOOL 1917bdf9759e03d27726f3228f7d333d2004ada0d936430cabe0c17f6760cc760c374286bf8422166a09fc8a531e545d89dbb851cd3fe026a1bea1485594eb8f
 EBUILD netbeans-9999_p20160128.ebuild 6938 SHA256 321e9cecf0a08f93e83bc3d2af6f0ad37881332677d29037a323098cd2df5030 SHA512 68e8c94e350b64ddb780c89cf2ac577912ee4165f9f4a5d2f83c2a120730cf2e23e30d598e3ff514bd83b210b1ba2c0570a4f507cd33f17242a592426161213e WHIRLPOOL 6945144d2b18e22410e504bb8d914d2b80bd510a488fbfe4b7969e27b4277eb6b61c806d3e18914e9de950e4f28072633aeffb08f6be1b667e8417504c2a4237
+EBUILD netbeans-9999_p20160129.ebuild 6938 SHA256 39bf449ae0a9d02dbd6529eb9f6801dbd01c85bd5e0c1ca7642bba0e9867a918 SHA512 a07198a37c408ab0f8a2a7a9fca779f53bdd91c895329b51b90159a084e4707ca09bfe2f08252f6c2fbc59c75620e9f2f4e0ad012c8e6b71058ff764cf20bf65 WHIRLPOOL 70a1cae05909f5109c5f315a5e86c5a835707886a6da0a13323e1d2ef771b3d210a05b35d482fc703bb691ee0fe3d187f402805f922d3704abd3739b32d5c5f6
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

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


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

end of thread, other threads:[~2016-01-29 11:44 UTC | newest]

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

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