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

commit:     01072ea75a50d32a913ff9673eea990737dc410b
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 11 08:40:09 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Jun 11 08:40:09 2015 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=01072ea7

netbeans: bumped to the latest sources

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

diff --git a/dev-java/netbeans-apisupport/ChangeLog b/dev-java/netbeans-apisupport/ChangeLog
index 34e7083..c2f95af 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_p20150611 (11 Jun 2015)
+
+  11 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-apisupport-9999_p20150611.ebuild:
+  bumped to the latest sources
+
 *netbeans-apisupport-9999_p20150610 (10 Jun 2015)
 
   10 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 4712b67..db8d397 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9
 DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 DIST netbeans-trunk-nightly-201506090001-src.zip 207886954 SHA256 ae0945f940a854d3314f1be40e4f915788eaa7902a71ca7ca645456236230f71 SHA512 61b3be2bba95f4a08ed4fa340d441c3f01ac9de230c8125b94a61adb47b0c09e312e0c75eba3ff4eb446468d00982edf66b7fa709263f50cae6690da85d9ac66 WHIRLPOOL 16a5f826bfafcf74c32fa3e6620825fb0287b904d9cc9ad76aa24001731c83029d641ec658559d6ad479b1169e49512906e5aa2c8df806d6e695da6af41f141f
 DIST netbeans-trunk-nightly-201506100001-src.zip 207888598 SHA256 ffbd120304de4f26f654fb22f4eb73ab9778b7795204002270a69eef6be1ab55 SHA512 c238bbc661698ca4b143aec8677f64a26191703175f1096d4e662e533e59dc13f08ef85d81e70e2ee104563cde8b026befb192b660604230cd53ac4cc23a2c9c WHIRLPOOL f8682cb4006efebe7f1a750a6a76734e95e4ceb5529b3cd47c01b6ffd4e4d3594e25a043ed8b21d510655192f85f88dbaefe85fcbe4d42e5123bda3c81c7ecf7
+DIST netbeans-trunk-nightly-201506110001-src.zip 207909918 SHA256 830b6a1c8aa25b5c6b16f5192ad5a9677f5ea14e227d635be8da0fadc85bde76 SHA512 b9274f0d4e7a9f16b6870b85202a9a8e660dfe80c2145b42f8826e53ae4a53b1faaf8fe3c6cdcf1b22785b7008b91f5b370ba0ca9375377f31257d0aec999476 WHIRLPOOL d7fb89342079dc27208dd6d8376770758ec48acf25297189f44dfcf9b53d5333898928f56e1d68b737d70816c9cc5936b01cbaf7aa4d04794c8ac4ffd0cf9319
 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
@@ -62,5 +63,6 @@ EBUILD netbeans-apisupport-9999_p20150604.ebuild 3390 SHA256 2ce302d24287a7b2471
 EBUILD netbeans-apisupport-9999_p20150608.ebuild 3390 SHA256 42b521a5d1b7d478a4c8b23b7028161ce2695a8bdb4100200c02377eab9b0d77 SHA512 d81ad1554cf8d82af6b4239597e83e3a3e54ff9c6df542073f172fbd1716d4af7035490b37ea6d54eb26fbb483e6168296d6900258e788e2e142b7fa4b5a982c WHIRLPOOL 60b2257bad40562b6a9c9ad54126889761e1dd3faf13f25eb8df56f842c5083a63fe3f01da5f6536bf6627b95a96a4e4a6ef1ec3399369734e0e1c92bb146b4d
 EBUILD netbeans-apisupport-9999_p20150609.ebuild 3390 SHA256 8b0c7ccd68c66ca64ebbe2497cb636799b01fe27bc4367729b54d96be054e6d6 SHA512 5d843c46914ab5f2ca74e5d0ef386f4250fce3eea4c87257c3096ab1c97cd1e058ad6011c6596250b7062e223c440ec161ee2cfa3fb722d9000506425aa6a054 WHIRLPOOL f284d2d93ed7fd3ef69429bb904fcb2b9caeb33e7459f9aacf2754ff3d249b2d9ca5d84ded9b14e2c436de56c480df5109c17f35d8cf12a42d6576fbb1a84dce
 EBUILD netbeans-apisupport-9999_p20150610.ebuild 3390 SHA256 c143277ba5cddebd3f82469b98ef7c00693217b7db6565f6aff056f71d866c15 SHA512 d40520fb2c4365a23455e38e6aefaafa200e035f2690587a4d4cb40c4463bcabd84d654528b1cc65663b3a445450628c297ea75a3697245e68cc2e9c37d271e5 WHIRLPOOL 5335dbcbff8a4afb24d7edbd5dfaa5aeaf6aecfbb3f6b14c4d1f03ad507f4e52661e16dd09f53c08834b84a7af6032f076ab342150e2d9eaa048190a57652085
-MISC ChangeLog 175091 SHA256 2c1fbd69ffdd7ae69dcc3a4e4985c1be3322c0ac33a996994b0390ecf1807a0a SHA512 06545d1ba69b7502ac864eb529a50c79844f6d95ad5d67cdc344ab7b526beb4ca6b2c7ff9fd6a010305da576893f57edf387db200042a132e87c18e92fbe432a WHIRLPOOL 51e2bb0ee2fbfe7aa87477be169d7af83cce7d4edadd52f18a0aa8902f977132c7be0a1d5e25f09107c097711ac16ae6b9617689f179bb058579572b032b302e
+EBUILD netbeans-apisupport-9999_p20150611.ebuild 3390 SHA256 d730816452be0929a5d25d09492fbfb21a93e7965845830579b1e535d4b6c6b8 SHA512 ff557a1f8c86b12e567813e5450aefcf2112bbfe306d696ff1c18ba067735f6e8c6d5e4f9b443e92ec278b0011ba5f5c72bfb7b8c0ad3123dfa6abb358c0b58c WHIRLPOOL ebf4e9472ced90c08b19f47bdaf595fef613ba82088b401c44dce765202189dc41c266f7b7d03d4a3a26110bab9c20d5c7c2996f73437390bf5227cf969f5c10
+MISC ChangeLog 175272 SHA256 6829ce05e7164b8cb41a08893a20a7dc51ad4150aaee1704d57058da17a1351a SHA512 664dd825df284f2acc3ff1af2a1e38c98844719605557990969f5cc85af9d5787f116d35c6622a86cf3bd272a1ce02d132012140b2831511020c45d0dc410f5e WHIRLPOOL 0e13e5bdaf2cd2ed2c6c25da48f8d3d8921c832b0d941308374dc02d6e2c6c1261a49c3a51404f920e5433d2b79c5bb4d12b16e10b4f0ae537d744d5da2ed69a
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150611.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150611.ebuild
new file mode 100644
index 0000000..b508e42
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150611.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-11_00-01-56/zip/netbeans-trunk-nightly-201506110001-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 6a871db..c84dc47 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_p20150611 (11 Jun 2015)
+
+  11 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-cnd-9999_p20150611.ebuild:
+  bumped to the latest sources
+
 *netbeans-cnd-9999_p20150610 (10 Jun 2015)
 
   10 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index 7353e77..4a5e86d 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -52,6 +52,7 @@ DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9
 DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 DIST netbeans-trunk-nightly-201506090001-src.zip 207886954 SHA256 ae0945f940a854d3314f1be40e4f915788eaa7902a71ca7ca645456236230f71 SHA512 61b3be2bba95f4a08ed4fa340d441c3f01ac9de230c8125b94a61adb47b0c09e312e0c75eba3ff4eb446468d00982edf66b7fa709263f50cae6690da85d9ac66 WHIRLPOOL 16a5f826bfafcf74c32fa3e6620825fb0287b904d9cc9ad76aa24001731c83029d641ec658559d6ad479b1169e49512906e5aa2c8df806d6e695da6af41f141f
 DIST netbeans-trunk-nightly-201506100001-src.zip 207888598 SHA256 ffbd120304de4f26f654fb22f4eb73ab9778b7795204002270a69eef6be1ab55 SHA512 c238bbc661698ca4b143aec8677f64a26191703175f1096d4e662e533e59dc13f08ef85d81e70e2ee104563cde8b026befb192b660604230cd53ac4cc23a2c9c WHIRLPOOL f8682cb4006efebe7f1a750a6a76734e95e4ceb5529b3cd47c01b6ffd4e4d3594e25a043ed8b21d510655192f85f88dbaefe85fcbe4d42e5123bda3c81c7ecf7
+DIST netbeans-trunk-nightly-201506110001-src.zip 207909918 SHA256 830b6a1c8aa25b5c6b16f5192ad5a9677f5ea14e227d635be8da0fadc85bde76 SHA512 b9274f0d4e7a9f16b6870b85202a9a8e660dfe80c2145b42f8826e53ae4a53b1faaf8fe3c6cdcf1b22785b7008b91f5b370ba0ca9375377f31257d0aec999476 WHIRLPOOL d7fb89342079dc27208dd6d8376770758ec48acf25297189f44dfcf9b53d5333898928f56e1d68b737d70816c9cc5936b01cbaf7aa4d04794c8ac4ffd0cf9319
 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
@@ -80,5 +81,6 @@ EBUILD netbeans-cnd-9999_p20150604.ebuild 4796 SHA256 b5de94bf182c4a01c0f20efdb0
 EBUILD netbeans-cnd-9999_p20150608.ebuild 4796 SHA256 32bd9168ea0fa02bb13c14b7457cdb45add30b4fd9e2d88cf2b2ab179b3ea5d7 SHA512 2345902d0153a6ea232c3c3fc7fcfbdd353bb4a350bb1a009fbd1a3d8c1c7bc82b62c011afe8e106c584b3e1eda5310d3e9ca876b9cff1a2b664cc687be3ad69 WHIRLPOOL 2e458f4ad1e51caf412333062b970e59015fda6e6b5ee72ec1e93719ca9e874b2caa2ed10082f278de541f31f769465c77dd43fecaab6c1b7571629e0ea1f299
 EBUILD netbeans-cnd-9999_p20150609.ebuild 4796 SHA256 902fd686ea72a8809f5ea9ccc9972149d8eec5a665620b42555308cf8ff01859 SHA512 e2f7cb2fc0d93ea0a68fbd3d46954ee165b9cd3f47e7899f5d208926f89400881a119a59d56ac2eed414f3c864fd85ac6223493b5946b097fd9defa90810c4c4 WHIRLPOOL 1db54be590a7a9329ac324fd1ab269f49b6f3d51f88374e9cb3d2b0288a46ee1dd6720a886fea2cb34bc9da261c876e6f970699a0f400d92ba31b273d0db145c
 EBUILD netbeans-cnd-9999_p20150610.ebuild 4796 SHA256 309b75036865c69240c59b309e7059e14d7f324e6bf7a804649d7454401c063b SHA512 a4a722b6b9f265c40542b31d96d0824af8a85b3a17735924d08078428edb769a6798bf1e2b281bf858bcf64549dffedb9efbb4a8872a875faed8c22698f19f71 WHIRLPOOL af5a0ddedbe641597cfba99a2fc98cb19e0d266c3eb2059b916677e907b82c8ed96cd4b64dbfff08ffd98a35f7789b5874cb85caca71a966944fcc789ca731f7
-MISC ChangeLog 159798 SHA256 f77d235e0c822eb8e0f5bed6ee463a7b54335b47b7bff13875afb212fd3d77ba SHA512 795a593dbd9647de7151bbfa91a4e590278ca2a0f73a597c1e7e5fb12f95afbfd0101394b7453b17fc1bf974d0004ec4d99d70e9af4630fb221463a504ddee29 WHIRLPOOL 0358f02ace85201ca6b61da5a6cbfc6137bac881d81108b35cb51c75642cd4ee6861708be6fa755177bfdf8885cd7b99f51948b50ca2db82e2f0e0e36386a0df
+EBUILD netbeans-cnd-9999_p20150611.ebuild 4796 SHA256 458e7ed7e4ecaa56d115ee8ba56a1616e2fbf1577b86976ccbb940325df0ea5a SHA512 1665cd593efd23338e052481245fc252e3fed2cd9672423bd06cdd3c85e14bb5cf21f2aad5242ee5ec1853db7990aebdf48f228c752c545803703b1526d0ca14 WHIRLPOOL e9322221271fb6060a14508aba8473671858171fcf031ddda7a6a1cb7a40eed456e8bd6c39f1ee5ff3abf4d2e05846fc974746b0321deab71510caa4ee442330
+MISC ChangeLog 159965 SHA256 46b98519ac6a61040851d3aaab4629507c822982b4711d653d0fbb382a5bcd25 SHA512 b3ed8073c728fab5e32191cc1a4b31adf407e274dd4729695a61bf3d8c19835fccee249598c0d727562c70e08125f1559e8ae7df347d8baa5e5f73b751be50b2 WHIRLPOOL 13856a77f954bf875cce9297946e8b5395acf67a880080b3e83d07a2560401814e90194562646a83a4d5bd96aee27f9ad52f45a39c3ca62c0b1c4dab693f28fd
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150611.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150611.ebuild
new file mode 100644
index 0000000..4272283
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150611.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-11_00-01-56/zip/netbeans-trunk-nightly-201506110001-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 fe61984..76b625a 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_p20150611 (11 Jun 2015)
+
+  11 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-dlight-9999_p20150611.ebuild:
+  bumped to the latest sources
+
 *netbeans-dlight-9999_p20150610 (10 Jun 2015)
 
   10 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index bbbaeaf..d3e60ab 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -40,6 +40,7 @@ DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9
 DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 DIST netbeans-trunk-nightly-201506090001-src.zip 207886954 SHA256 ae0945f940a854d3314f1be40e4f915788eaa7902a71ca7ca645456236230f71 SHA512 61b3be2bba95f4a08ed4fa340d441c3f01ac9de230c8125b94a61adb47b0c09e312e0c75eba3ff4eb446468d00982edf66b7fa709263f50cae6690da85d9ac66 WHIRLPOOL 16a5f826bfafcf74c32fa3e6620825fb0287b904d9cc9ad76aa24001731c83029d641ec658559d6ad479b1169e49512906e5aa2c8df806d6e695da6af41f141f
 DIST netbeans-trunk-nightly-201506100001-src.zip 207888598 SHA256 ffbd120304de4f26f654fb22f4eb73ab9778b7795204002270a69eef6be1ab55 SHA512 c238bbc661698ca4b143aec8677f64a26191703175f1096d4e662e533e59dc13f08ef85d81e70e2ee104563cde8b026befb192b660604230cd53ac4cc23a2c9c WHIRLPOOL f8682cb4006efebe7f1a750a6a76734e95e4ceb5529b3cd47c01b6ffd4e4d3594e25a043ed8b21d510655192f85f88dbaefe85fcbe4d42e5123bda3c81c7ecf7
+DIST netbeans-trunk-nightly-201506110001-src.zip 207909918 SHA256 830b6a1c8aa25b5c6b16f5192ad5a9677f5ea14e227d635be8da0fadc85bde76 SHA512 b9274f0d4e7a9f16b6870b85202a9a8e660dfe80c2145b42f8826e53ae4a53b1faaf8fe3c6cdcf1b22785b7008b91f5b370ba0ca9375377f31257d0aec999476 WHIRLPOOL d7fb89342079dc27208dd6d8376770758ec48acf25297189f44dfcf9b53d5333898928f56e1d68b737d70816c9cc5936b01cbaf7aa4d04794c8ac4ffd0cf9319
 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
@@ -68,5 +69,6 @@ EBUILD netbeans-dlight-9999_p20150604.ebuild 2995 SHA256 3a0be776b2ece68eb4ba889
 EBUILD netbeans-dlight-9999_p20150608.ebuild 2995 SHA256 bde2ecb345e5605601a5dbf2f00c4ecbe9e63b6e76db811e258b014e3fe6a6a1 SHA512 41ed62a733ae786f500143ebe73a771219dbb666b019b46b370b046bd816d7dc3ceb7ca76c42fb506c0797cd36473d034dfcaf349184def301c2efb4edff7758 WHIRLPOOL d871dca265829ebc97a4a129bf6c64d03a0c79cfa3181615f9e49721b18edd9a83b6db5994612b1e1a23154651013bdaa3199a8779492aae30153790457fe028
 EBUILD netbeans-dlight-9999_p20150609.ebuild 2995 SHA256 f9b4cda2bf9ce9435839986fe26263464ab99f552dbb62313920bb239bcd75be SHA512 7cf4217786bcd3320634329218b0225847a8871a0ce44d9b9be621be76b54dcf7fcc151f784d6bfd0d384f0353f839c6819ad41b09e06764ceb2e70a179ce18b WHIRLPOOL 26c9cb420e29e9f4480f8884ea8fb44c7742d11255751ac6fa19a8d8b42b84f918739957ae370173710761e593573b504b4cc6cfffa4874aa11331b54973f4ac
 EBUILD netbeans-dlight-9999_p20150610.ebuild 2995 SHA256 1d7eb32911c50b1bfd6157c6a88a43474c2df88a8644ab4fc767687176c78683 SHA512 9afb018098d5516bc3f8bb56b7d33a3179c697d6c32a14aae088261e612b04bb3c7e3c135f4eb423790532caa18968677fd8a3f2eafe0cc224a87a783e974662 WHIRLPOOL 180ddaa5a280ee97341810ba37481c0116f162993fa779b87ade47935a90386ac3a15312896656af079acc942350eb1f2985c6dc8806eb16e466592627ea3c49
-MISC ChangeLog 166788 SHA256 ca57cc0b077eb8e0b5417d43fc1a088d69ef85c12681bb566894990c6c6b81ce SHA512 6d3adf6e2735a39fc4c2ebd8df72562ca1505e080e3687f710c349fed6ace61b203c06474a8463301b6b253b13d0d37e8eb55c97c451ee9dbc0009d918ca0e2c WHIRLPOOL 1091a162ac31b7baedef8348fb36cc9a460520aba1b99ad6f592d8d94735acf50285266366a97baf44c95965aba080292c040c6698170981bffab1643bd53d3c
+EBUILD netbeans-dlight-9999_p20150611.ebuild 2995 SHA256 b211ff73cc50e02600f84b77513492621e00e98e68efdaa4ade7f50b9a98b550 SHA512 561d0c6b2944f7429e20bb2f1fd5fb4f96947c7f56ac5d2589e12017ae0164b77b9449b1e622eb96cb4745b3eeeda271202adc22c43e010b12d02cc67fc8f1a6 WHIRLPOOL 59c21e8a1f26bbe097232a5e8f1c027df2d8ad131d0937a72e510f33b3e208efb590069afee01826cdc31bebfe7e2df7acee2afdb022b7bbbe15704edf9dbe54
+MISC ChangeLog 166961 SHA256 b9c9a27f1bb1499c35b8acef4657f6342aeb441d6140d59b3ef523d8011b0dcd SHA512 dfefb605c01a5010b5926da78e7ab411b24e2e239b35690c3abb86cbd434a09493d0f24efc016ee937d7fde298dee408a44d0c6c35f8d786dbd7e7f70bd5cdd2 WHIRLPOOL c80adc1a35ef37f4e388209a0a708f64a0b5a05aa53936e82717ab45f5a4bf0a241fb0762075b031fee60ae064cbd8e51fe5aeb40669f97d0b1e2129d66d8fd9
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150611.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150611.ebuild
new file mode 100644
index 0000000..435feba
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150611.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-11_00-01-56/zip/netbeans-trunk-nightly-201506110001-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 1843414..2510adb 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_p20150611 (11 Jun 2015)
+
+  11 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-enterprise-9999_p20150611.ebuild:
+  bumped to the latest sources
+
 *netbeans-enterprise-9999_p20150610 (10 Jun 2015)
 
   10 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index b8d3376..53f53cc 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -123,6 +123,7 @@ DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9
 DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 DIST netbeans-trunk-nightly-201506090001-src.zip 207886954 SHA256 ae0945f940a854d3314f1be40e4f915788eaa7902a71ca7ca645456236230f71 SHA512 61b3be2bba95f4a08ed4fa340d441c3f01ac9de230c8125b94a61adb47b0c09e312e0c75eba3ff4eb446468d00982edf66b7fa709263f50cae6690da85d9ac66 WHIRLPOOL 16a5f826bfafcf74c32fa3e6620825fb0287b904d9cc9ad76aa24001731c83029d641ec658559d6ad479b1169e49512906e5aa2c8df806d6e695da6af41f141f
 DIST netbeans-trunk-nightly-201506100001-src.zip 207888598 SHA256 ffbd120304de4f26f654fb22f4eb73ab9778b7795204002270a69eef6be1ab55 SHA512 c238bbc661698ca4b143aec8677f64a26191703175f1096d4e662e533e59dc13f08ef85d81e70e2ee104563cde8b026befb192b660604230cd53ac4cc23a2c9c WHIRLPOOL f8682cb4006efebe7f1a750a6a76734e95e4ceb5529b3cd47c01b6ffd4e4d3594e25a043ed8b21d510655192f85f88dbaefe85fcbe4d42e5123bda3c81c7ecf7
+DIST netbeans-trunk-nightly-201506110001-src.zip 207909918 SHA256 830b6a1c8aa25b5c6b16f5192ad5a9677f5ea14e227d635be8da0fadc85bde76 SHA512 b9274f0d4e7a9f16b6870b85202a9a8e660dfe80c2145b42f8826e53ae4a53b1faaf8fe3c6cdcf1b22785b7008b91f5b370ba0ca9375377f31257d0aec999476 WHIRLPOOL d7fb89342079dc27208dd6d8376770758ec48acf25297189f44dfcf9b53d5333898928f56e1d68b737d70816c9cc5936b01cbaf7aa4d04794c8ac4ffd0cf9319
 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
@@ -151,5 +152,6 @@ EBUILD netbeans-enterprise-9999_p20150604.ebuild 15937 SHA256 ab4c0ed4122c716ce9
 EBUILD netbeans-enterprise-9999_p20150608.ebuild 15937 SHA256 8c499723bc3c267164ec7518d5628de6e2f3b46af3af2ec02ac504d543e16f60 SHA512 b52a744aad67643bbb01824322bda14914f1f8c025b5699109a00b7fe5679c3fd3d5ac16e03285cf08968671faf3e2b5d3430177ae08dbd496938b596d71c80d WHIRLPOOL 470a27b88c68f8d4e1e7b2ce324e3676ea8f571861579ab4a02d811c909aee735dd884e1cb684b26596f7b758690dc613db3fd3ef90e92a6f11c98617d720086
 EBUILD netbeans-enterprise-9999_p20150609.ebuild 15937 SHA256 6fa51d9104b26a97da9a4465b05a7e41d01ea8c0f948a9e1d65018afd3a09b40 SHA512 c2d102270178d8847c84d524139ada2cf1507a06d0a6c9e73e51708431303ffed64fc3120c1325ade03cb95684f0b808dc97c45712070f7178bc19c3c0d54129 WHIRLPOOL 3e141d35ffac1edf8243f9c8778319d58a5a3acc732807628111877f79ac2575293869995a209444d90b0f7833b21d65e0e8146d7248e9982bbebcb115afd778
 EBUILD netbeans-enterprise-9999_p20150610.ebuild 15937 SHA256 f5a66cb22da8ff8e49c2fe5751e82bc07564a363f8303d525497253c66aa749b SHA512 4136b70f60b528270b6b28a2ce5ee68659ce0d85fb30bf7c6c1d395ff7116e890d5ce355357ed4b033687ced3ef141577dac97e00c34373e4db57ab78752fec6 WHIRLPOOL 395b26b01b770d76374c7e83ea927c8f7e33b30fdd8fea64015bf27a27a3210d4cce859787680494f39993abb08547a5de9de8415624791b26cc573006cff62c
-MISC ChangeLog 175616 SHA256 f502e135a0da616dc84b55ef28ee7f8b9cef01649375b0c42f50182974302d65 SHA512 fba3bbda7ae36ae461037070124dd4fa38851be6f007014aaf11940ba434dca53f3c116c6fb6563e1d45b3606e39b39cc67b4391c071ba3190f4d81297b66240 WHIRLPOOL babdc79940fbc26fffae539f6d6786a0eb67132bf5e74b0134235adb3647c9d6bed086ba3493c5421844c891728342cf23b08b8d95031bbd8c320dc7ec1e7ede
+EBUILD netbeans-enterprise-9999_p20150611.ebuild 15937 SHA256 efb3027e3870e4ef5d1a69d6b2cb62d4768c0c128f3888da2281d8078d90c20c SHA512 cfe838e7f4929a74f30aaf56e8ba73d9cdf9cc0892575bec401696ecaa39fba7cc019a2418058809894e47fd3993c24a2f023d5e49abcdf60da5986d9cc452f2 WHIRLPOOL e40a9bac69a39c48a43e3faf160fd88b5db8a8cdfa22ceb91316b331feb9f14fd2cd6da9c161e5dbfbfab513b5b668a2324060bb09b09b58098234cac8984774
+MISC ChangeLog 175797 SHA256 12c727c7e62fbcb8dd80a378dcef72ce447c80751c1b6cb78dba5ba7c93ed292 SHA512 bc4d38c10508f16b33c689b7d7df448cb4cad6278ed7223ec7c20d1bab199b8ea488c7e3796cfa88481a15cbd4c847becaa291259d985f2e31f2d163d094ab13 WHIRLPOOL 14f48b00afb2295b04f76909558fdcb7ab2ea76a4bdcf29b63361f0411174f535c3c15028b1ccaa8fcd7e64c1747b3047edac67bcb0b9e4e62b1975e39c604c1
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150611.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150611.ebuild
new file mode 100644
index 0000000..7e64b3b
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150611.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-11_00-01-56/zip/netbeans-trunk-nightly-201506110001-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 431c476..31ad744 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_p20150611 (11 Jun 2015)
+
+  11 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ergonomics-9999_p20150611.ebuild:
+  bumped to the latest sources
+
 *netbeans-ergonomics-9999_p20150610 (10 Jun 2015)
 
   10 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 9b27495..f991b84 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9
 DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 DIST netbeans-trunk-nightly-201506090001-src.zip 207886954 SHA256 ae0945f940a854d3314f1be40e4f915788eaa7902a71ca7ca645456236230f71 SHA512 61b3be2bba95f4a08ed4fa340d441c3f01ac9de230c8125b94a61adb47b0c09e312e0c75eba3ff4eb446468d00982edf66b7fa709263f50cae6690da85d9ac66 WHIRLPOOL 16a5f826bfafcf74c32fa3e6620825fb0287b904d9cc9ad76aa24001731c83029d641ec658559d6ad479b1169e49512906e5aa2c8df806d6e695da6af41f141f
 DIST netbeans-trunk-nightly-201506100001-src.zip 207888598 SHA256 ffbd120304de4f26f654fb22f4eb73ab9778b7795204002270a69eef6be1ab55 SHA512 c238bbc661698ca4b143aec8677f64a26191703175f1096d4e662e533e59dc13f08ef85d81e70e2ee104563cde8b026befb192b660604230cd53ac4cc23a2c9c WHIRLPOOL f8682cb4006efebe7f1a750a6a76734e95e4ceb5529b3cd47c01b6ffd4e4d3594e25a043ed8b21d510655192f85f88dbaefe85fcbe4d42e5123bda3c81c7ecf7
+DIST netbeans-trunk-nightly-201506110001-src.zip 207909918 SHA256 830b6a1c8aa25b5c6b16f5192ad5a9677f5ea14e227d635be8da0fadc85bde76 SHA512 b9274f0d4e7a9f16b6870b85202a9a8e660dfe80c2145b42f8826e53ae4a53b1faaf8fe3c6cdcf1b22785b7008b91f5b370ba0ca9375377f31257d0aec999476 WHIRLPOOL d7fb89342079dc27208dd6d8376770758ec48acf25297189f44dfcf9b53d5333898928f56e1d68b737d70816c9cc5936b01cbaf7aa4d04794c8ac4ffd0cf9319
 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
@@ -62,5 +63,6 @@ EBUILD netbeans-ergonomics-9999_p20150604.ebuild 2919 SHA256 6177e568d9df40438be
 EBUILD netbeans-ergonomics-9999_p20150608.ebuild 2919 SHA256 1732a4ca82269658893854f737c811c770c6a91663ef365c7416765e29e65846 SHA512 0e73873948418205860e8def34a9ed4c61036a2cd2492f6f19bb084d249f4152a471c12cf309743c7713c72a7511eb7f6443ecea0e2fbd99abdea95c0d35a8a0 WHIRLPOOL 7df46b5b4ed3904bc5abd55a53f7f68197b0397269170a6a6a58307fcc86e000982a89d31115432b69dd823c5f8badb1992ee976b08b7d8b4169eef47d2b6987
 EBUILD netbeans-ergonomics-9999_p20150609.ebuild 2919 SHA256 18bffba43421353a6081d94d3a78d363b7f9170bc929295a6bbbf73a6d71a957 SHA512 ec482920aa85a28e98208073f5c01ca7eb762e226d0a5e7e3e94dc289fc116ca323787863cc7bcf469880310a2d4879fc5aec129353ecebd2546e665ee93f983 WHIRLPOOL c07489d3ae3086888a23b89ad8447ebe7da53cd3e45aa160fae3d3fd7327e5bd235495d446d437acc04b046d3b9f1ecb7fdab00e9bb47074ad661e8f461d2ca2
 EBUILD netbeans-ergonomics-9999_p20150610.ebuild 2919 SHA256 0c9413d27db22170d596c8273baa862ddcbd5b77889c0d60ac1597ccedc0e763 SHA512 5b2c7a23a37963efd8c93264d3b31daa9925cd3708336c25bae10e05de802fb951e3bb4bf5e12ad5787d09f08219994ad42e301ca19e65d06edaa3172635045a WHIRLPOOL 434dfd660c9414e4ab5f486ebf2c1cea577022f06cf6588b27a6f31d987a690758d9f6a785e4082c670b49629aa9a8dba5eebe8bd0d47d31afbcc3f4a9343b08
-MISC ChangeLog 175091 SHA256 2094a850a6e649e2fab62332d9354b28f34c4d05657e6ad466e7cbaf967d308d SHA512 3f817999e92b4c492316054699efcc5bee33f19d14950b332da5b89c6dceb5584701d2c181005b2f06f9f5808492ec557214651c9e0c1e7e0f4427915d863c56 WHIRLPOOL ac591dc671ef0996414348b768ad8cb4a1ad50295cba214ff41026472f70b2001d126837dc6d86b04193991f87a0cee18f4d64d502ffa17c3edd18811b4f1c79
+EBUILD netbeans-ergonomics-9999_p20150611.ebuild 2919 SHA256 0817768aa7104c6a80071178f30cd1c1495a538fe8de4738d0dd0d220704d67d SHA512 0cab440ad3a3aa0b377cb3adaa5887e2914587bb5b452f12d94892c37225febf32fd44e500c926a4f699f22c071ca71b31dc9b027e490dbf3e2ee1cbe91c8a26 WHIRLPOOL 569f880cfc6d033d439c9d5154573d9162b60b4f9573dcd98371c240e7434fc4e15c547d3d3e37c2c9e90772b33356166d6ce7948103f60709d6d12dae36ccba
+MISC ChangeLog 175272 SHA256 78cb841de1301f28fa962b9655e54af89876be2f541d53f1dfb6e5f058f0502d SHA512 4d723ff436d3ca279e7e951dd11bfb7873bbcc21b6d9292c95c9edabfb247d87a05bc21d2881c40a8b4706b0802bf366ccdeb8960f1a934543e158b66bb4b880 WHIRLPOOL 6bf764aa5ac9ba60bc787f15a8bb98745119734772576ac663e9708aece85a7ed13306c3149754230aa6e3103fbfa4ebf5daaa6bc5b0be6c0be0250a57e7e26d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150611.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150611.ebuild
new file mode 100644
index 0000000..7d1c6d3
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150611.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-11_00-01-56/zip/netbeans-trunk-nightly-201506110001-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 90b57d2..0494491 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_p20150611 (11 Jun 2015)
+
+  11 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-extide-9999_p20150611.ebuild:
+  bumped to the latest sources
+
 *netbeans-extide-9999_p20150610 (10 Jun 2015)
 
   10 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index 4206036..55a50e8 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9
 DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 DIST netbeans-trunk-nightly-201506090001-src.zip 207886954 SHA256 ae0945f940a854d3314f1be40e4f915788eaa7902a71ca7ca645456236230f71 SHA512 61b3be2bba95f4a08ed4fa340d441c3f01ac9de230c8125b94a61adb47b0c09e312e0c75eba3ff4eb446468d00982edf66b7fa709263f50cae6690da85d9ac66 WHIRLPOOL 16a5f826bfafcf74c32fa3e6620825fb0287b904d9cc9ad76aa24001731c83029d641ec658559d6ad479b1169e49512906e5aa2c8df806d6e695da6af41f141f
 DIST netbeans-trunk-nightly-201506100001-src.zip 207888598 SHA256 ffbd120304de4f26f654fb22f4eb73ab9778b7795204002270a69eef6be1ab55 SHA512 c238bbc661698ca4b143aec8677f64a26191703175f1096d4e662e533e59dc13f08ef85d81e70e2ee104563cde8b026befb192b660604230cd53ac4cc23a2c9c WHIRLPOOL f8682cb4006efebe7f1a750a6a76734e95e4ceb5529b3cd47c01b6ffd4e4d3594e25a043ed8b21d510655192f85f88dbaefe85fcbe4d42e5123bda3c81c7ecf7
+DIST netbeans-trunk-nightly-201506110001-src.zip 207909918 SHA256 830b6a1c8aa25b5c6b16f5192ad5a9677f5ea14e227d635be8da0fadc85bde76 SHA512 b9274f0d4e7a9f16b6870b85202a9a8e660dfe80c2145b42f8826e53ae4a53b1faaf8fe3c6cdcf1b22785b7008b91f5b370ba0ca9375377f31257d0aec999476 WHIRLPOOL d7fb89342079dc27208dd6d8376770758ec48acf25297189f44dfcf9b53d5333898928f56e1d68b737d70816c9cc5936b01cbaf7aa4d04794c8ac4ffd0cf9319
 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
@@ -56,5 +57,6 @@ EBUILD netbeans-extide-9999_p20150604.ebuild 3383 SHA256 9c193b2bdb3db4adb09513e
 EBUILD netbeans-extide-9999_p20150608.ebuild 3383 SHA256 dab40ad3b573060f0ff43d3f08e277f5dbc73f96d80890d7ed0f6a9ca6977e0c SHA512 e7079c349865d0174cdedc409eedfd8cd10591b35dac57782944b90c6a3f628d9f33e3aebd5544d2e5d3b053663f3fc84b7634474df7425998a99788b410b135 WHIRLPOOL 9e1d47f29d8d9b5d1068c539d02df1366885155ecce34de64c60a82b59c5d30e51b07bf6ae7e064c9dfa5b762259134624b0d50cedee4806772e30f0e97b202e
 EBUILD netbeans-extide-9999_p20150609.ebuild 3383 SHA256 94014522db266e45d9a7be7afe3993a8480d8706247d9a3b197601e31b44e5ee SHA512 de972db50a141a58eeb9b51d69705e6bbdf9c5737d05bbca450c347398874e4f62d99903ef1e59796f636e9aaa95ba354c30ed410cc28d2ac3201fd75ec1fe03 WHIRLPOOL 205d3a9fa443268066ac6f33aa1c30fd9503505454e22a9ea1935f141c8ef25f32a0e5729323afdfccb3f47d15811846ce17548e0044f9f3fe95192bd603c553
 EBUILD netbeans-extide-9999_p20150610.ebuild 3383 SHA256 3f718eccf59ca8645ece6414ff50c6423c8ef814d785fd2db5a0a59a7496b3d1 SHA512 728a988e2db3d7c0a68ee682c9257e375ce4eccdab60f8875d1ee00d37061cf8ab8dfcec05950327593bc6041c8fb7965ad02000c0d6bca29d71772c5b983a63 WHIRLPOOL c525f912670927cdcb3083be622ec61c26de2b4b2309b573f3f77d3e99c7c9ce2404b4d9e759228a1a27ae1167debf52fe6ad7acd8470b64fea70ae909124516
-MISC ChangeLog 98698 SHA256 51926a27dc605acac4347714b6004fa677fc5e8b4a97cccb64a2086d1d8a7bc5 SHA512 3314ca3edb6fddcb63dea90aed2d26179eac6ce198961c9a6b7687e143420713d89e1ea4dd041c53781e635ef53539bcb178ad341b9f17db37daafeedd5c7c0a WHIRLPOOL 5622291443556c65257e8e45d3d23e7197f0a7234b362d633f5a1e1d8dd8c36107e8ccefbeffc083283dc1a9462208dafd20a6e3be19fd4d484ec91cd3f55c61
+EBUILD netbeans-extide-9999_p20150611.ebuild 3383 SHA256 e659a9ebbe81f722906a73f30db15d6d2f4fac970a6db8210e821af93bade450 SHA512 9e9d5427b608856d1424d8847c2d9f52794bad7c2a5cde8e5df07ea5bf3b049ae8cff41471c9a81cee81d6656c7dfb5903520f741ad064a62a1228fb83e09b4f WHIRLPOOL d2968d889e988b662b741654472148f6191d1f9a3d4f2ca419a480cecb836e72bc8cc672864b7b25761b370198ad766b5b7d3af51d055ce053ae154326e43fec
+MISC ChangeLog 98871 SHA256 00cd2256d8044ced104ce469d268c12f2c40fd0db2107fc5ad15650eb069ec64 SHA512 0cb2232f6c94f9358e7dc0dfc606d8c7ec4a5abd3e5fd67a2c74ac67b57483dd8c589a53d89fa13233fd965725ab5df58b652915e4bd91dbed99009968f74764 WHIRLPOOL 2b91d6cf46410e30010e954faeb78d61b5bb8d2f78cd417b62dc8db70457f38ace2f340bd89532f470e900e217437482c63d76ccf15b71c3a676e5b884ccd97b
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20150611.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20150611.ebuild
new file mode 100644
index 0000000..93c52e4
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20150611.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-11_00-01-56/zip/netbeans-trunk-nightly-201506110001-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 7d19685..3b9d4b9 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_p20150611 (11 Jun 2015)
+
+  11 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-groovy-9999_p20150611.ebuild:
+  bumped to the latest sources
+
 *netbeans-groovy-9999_p20150610 (10 Jun 2015)
 
   10 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index a0d209e..0d335fd 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9
 DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 DIST netbeans-trunk-nightly-201506090001-src.zip 207886954 SHA256 ae0945f940a854d3314f1be40e4f915788eaa7902a71ca7ca645456236230f71 SHA512 61b3be2bba95f4a08ed4fa340d441c3f01ac9de230c8125b94a61adb47b0c09e312e0c75eba3ff4eb446468d00982edf66b7fa709263f50cae6690da85d9ac66 WHIRLPOOL 16a5f826bfafcf74c32fa3e6620825fb0287b904d9cc9ad76aa24001731c83029d641ec658559d6ad479b1169e49512906e5aa2c8df806d6e695da6af41f141f
 DIST netbeans-trunk-nightly-201506100001-src.zip 207888598 SHA256 ffbd120304de4f26f654fb22f4eb73ab9778b7795204002270a69eef6be1ab55 SHA512 c238bbc661698ca4b143aec8677f64a26191703175f1096d4e662e533e59dc13f08ef85d81e70e2ee104563cde8b026befb192b660604230cd53ac4cc23a2c9c WHIRLPOOL f8682cb4006efebe7f1a750a6a76734e95e4ceb5529b3cd47c01b6ffd4e4d3594e25a043ed8b21d510655192f85f88dbaefe85fcbe4d42e5123bda3c81c7ecf7
+DIST netbeans-trunk-nightly-201506110001-src.zip 207909918 SHA256 830b6a1c8aa25b5c6b16f5192ad5a9677f5ea14e227d635be8da0fadc85bde76 SHA512 b9274f0d4e7a9f16b6870b85202a9a8e660dfe80c2145b42f8826e53ae4a53b1faaf8fe3c6cdcf1b22785b7008b91f5b370ba0ca9375377f31257d0aec999476 WHIRLPOOL d7fb89342079dc27208dd6d8376770758ec48acf25297189f44dfcf9b53d5333898928f56e1d68b737d70816c9cc5936b01cbaf7aa4d04794c8ac4ffd0cf9319
 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
@@ -66,5 +67,6 @@ EBUILD netbeans-groovy-9999_p20150604.ebuild 3422 SHA256 eca2cef95c98febc6b7e7e4
 EBUILD netbeans-groovy-9999_p20150608.ebuild 3422 SHA256 df8294d60d04b723c6e7456735c8ea473f6e2ed19f30ccee57024dc27673da98 SHA512 84f508d6e4c95ddecaf88dbd5530dd2d39d6f911aac92712fe46a85a2e1b9d4a0204225751367d9d0867170d8a726ff4e3766c651a756031d6bd2cae3de133fc WHIRLPOOL d27ae0caf732b7634ec350e1919018dd895ac2ef6c829fa43f1b7b3f4c5050773b5e32bd4eb1f9929b42cc0b1d0474e7d3e0418dda7aac680fe1afee010ab3f9
 EBUILD netbeans-groovy-9999_p20150609.ebuild 3422 SHA256 8fa59d6718ee79806c957035a537205f336be29e292641374cb545e0b83c4a1a SHA512 cc882741991d90e364e701cf40f65fa0babab8601d3453c7fbeb3948e08388b46d1e36ea55b7b66101a30553efc1d7f6b5b5173a37ff7c8a74bfbbc86d9320b0 WHIRLPOOL 9adc86583e53e965133ececa32bdf6a01c53f199c44be4cd17cc9fef45e0cda7c4a84801a026dd12cbf1b4dc161ae40d6469a9292c2daffde788037794bc23ab
 EBUILD netbeans-groovy-9999_p20150610.ebuild 3422 SHA256 6fb4076d1216094c25d2fc4c22aad35592797e700265d4664f384608966a883a SHA512 8c01cd8819a14b6c82b624180e9cf1eb66f78da37a2780d6d0988961dbcb3569a549d15c4822cebb0f982df4defa05525a41cc561b29d973b361aee8452b4557 WHIRLPOOL 7e583d2867f1f571dd8d87261e0401a46ee2762f22fbc777ced5eff67015ae73f749119541336846be9eb747e671511511dd06b7bf5bc021b05a234d7dd8942e
-MISC ChangeLog 166678 SHA256 de82018f0a4bc6b81f9f1b65439ab7d1e09b42cda2ed14398a17b2d6d281fcb0 SHA512 43f0d6d08388b4bbf0ad6f883a2d54511f30ed6591c987d2decbc2d715c02a0d1900e4adc0b74a73e29d85840998ba25120e017779b7009f1e88a40d6a820ba7 WHIRLPOOL e9f668c974b47e9f5f105cdbd9947d2f0d1eefb35e4e2748535dbcb057bacc28ab73b3e247ec89d44d094f9a49a616d466a3d70785a2ef5ecfb2a1e5e7dd70de
+EBUILD netbeans-groovy-9999_p20150611.ebuild 3422 SHA256 7ade4f1b9836c39285199c5acc56e39a99e6bf8ee1669f276819563e5ede5b96 SHA512 f8b4229782cd8da4830674284104261ad01c0eda69062cd88770ed81221499dbab7441cef3a68d764c12240b8f98bbea742978a492484dde4f1b6644a9540122 WHIRLPOOL d6591fdb248549277ea14e149b07274ce1608d5c8cdb334e76118a4cea19c277ae44904aa081b861623387402ea6f4cefb1f986a0850ac77220daa8edc22199c
+MISC ChangeLog 166851 SHA256 bcbb4ec105d5a31ea12676a68f91272228c687cccb313158c0e12aecd95f9ce5 SHA512 394770fcb47af026982aace7a3e26f040185728e9854250973a4f9f8e20f6be35ce74cf990e7eeb6f45dacec29d60ed67520915ef88ea7be48d3307d3c278253 WHIRLPOOL 3804d1359dabd9bdd3554f5bdcfbd12b294284adbe11419f071445b15ed34794d2996f201d5dc91e369bb78cd763c2a4d1b9070bd6dd62ec2224385ad4f91a5f
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150611.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150611.ebuild
new file mode 100644
index 0000000..0c7c688
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150611.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-11_00-01-56/zip/netbeans-trunk-nightly-201506110001-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 4e495c6..ed29722 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_p20150611 (11 Jun 2015)
+
+  11 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-harness-9999_p20150611.ebuild:
+  bumped to the latest sources
+
 *netbeans-harness-9999_p20150610 (10 Jun 2015)
 
   10 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 1f5cdca..8d8c203 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -40,6 +40,7 @@ DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9
 DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 DIST netbeans-trunk-nightly-201506090001-src.zip 207886954 SHA256 ae0945f940a854d3314f1be40e4f915788eaa7902a71ca7ca645456236230f71 SHA512 61b3be2bba95f4a08ed4fa340d441c3f01ac9de230c8125b94a61adb47b0c09e312e0c75eba3ff4eb446468d00982edf66b7fa709263f50cae6690da85d9ac66 WHIRLPOOL 16a5f826bfafcf74c32fa3e6620825fb0287b904d9cc9ad76aa24001731c83029d641ec658559d6ad479b1169e49512906e5aa2c8df806d6e695da6af41f141f
 DIST netbeans-trunk-nightly-201506100001-src.zip 207888598 SHA256 ffbd120304de4f26f654fb22f4eb73ab9778b7795204002270a69eef6be1ab55 SHA512 c238bbc661698ca4b143aec8677f64a26191703175f1096d4e662e533e59dc13f08ef85d81e70e2ee104563cde8b026befb192b660604230cd53ac4cc23a2c9c WHIRLPOOL f8682cb4006efebe7f1a750a6a76734e95e4ceb5529b3cd47c01b6ffd4e4d3594e25a043ed8b21d510655192f85f88dbaefe85fcbe4d42e5123bda3c81c7ecf7
+DIST netbeans-trunk-nightly-201506110001-src.zip 207909918 SHA256 830b6a1c8aa25b5c6b16f5192ad5a9677f5ea14e227d635be8da0fadc85bde76 SHA512 b9274f0d4e7a9f16b6870b85202a9a8e660dfe80c2145b42f8826e53ae4a53b1faaf8fe3c6cdcf1b22785b7008b91f5b370ba0ca9375377f31257d0aec999476 WHIRLPOOL d7fb89342079dc27208dd6d8376770758ec48acf25297189f44dfcf9b53d5333898928f56e1d68b737d70816c9cc5936b01cbaf7aa4d04794c8ac4ffd0cf9319
 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
@@ -68,5 +69,6 @@ EBUILD netbeans-harness-9999_p20150604.ebuild 4131 SHA256 4a162eed1c989fb10d8078
 EBUILD netbeans-harness-9999_p20150608.ebuild 4131 SHA256 47f82ea467f026ee9dad193e6db46c73ad4d86da7f7d9bc2c5671881455f5efa SHA512 109a1093fd112516ef2630e7e98241655d1a705825f32eb8539ad99a33ee6449cfbcca2cbb0b3fd0d619cc7309827ae6e45fe183f07d30a960cb42421648d8d2 WHIRLPOOL 5a1d9663383b976507dfb2fa05bfca35c0b0047c6e698cd81e9fdc3a70f1c18c107afe71ae3c98aee3b2506ee106dc6dbb960261dac36467201f031bfe3c5739
 EBUILD netbeans-harness-9999_p20150609.ebuild 4131 SHA256 1c129d94cc72654eb5d00c5ec2788ae8855595002c8d9840ede0288f35782342 SHA512 308589b57eb442110b81f5ddf3bb5139c52e92b6adcc7f410e40f745b6dea60ff0f53e08c6b56340a37111380f4da34887d2a924cd3fa36efbaaf3d158ffc9ec WHIRLPOOL 466f24097a2ed37a192714e4c9301e4fd05d28d6aa5963a18f12123268a3e9ac7732aee9d41d4cee3330598414e41821876a88ec31fa522844cbd35f2056f27b
 EBUILD netbeans-harness-9999_p20150610.ebuild 4131 SHA256 7389bdc5b150ebf93af078b900e73be8f2a8aa57fa6775fed2c47df4dd33b375 SHA512 c0e9c7c596f5698e2a76af82c29bd281df82fe8af495f8fe86fec3d12b74e5deb74048fbd9e971fcaf1269886e27ba2d300cc363f2a37e123e497fed9afb8ea4 WHIRLPOOL 2468b748ec3ddc30b533eda9eec8d1475a511a8917cea4de7462ed2804f65025ec6faca63832e0f7f758f5b2e4770e3b115fda5d2eac2900769a99f1081fea03
-MISC ChangeLog 168810 SHA256 77fc12a728f5e06b78437a750ee9fa3e05935848e41bac0665605ace42f20dfe SHA512 a54cb236ce989b784e5e925d56e3ee2ef35b00fbb6c7ea58b7a1450c6b54f716ef9c4565665bded3daa90ac752c3cd274d75c307992f3023b6a3f37d0a8d85c3 WHIRLPOOL c0e13e40ec65de1e1b3b2ba1f0bf68a9eca46260c06fe359138328dc67b770b72863a0dea290ae2c9e334d8b8c765b54ada72f9030e3ccb062e68459dd9a2392
+EBUILD netbeans-harness-9999_p20150611.ebuild 4131 SHA256 bff3f0959e7d95706e6794639f5d4bcdb159018defb9cb9b02dcb28e52dddd15 SHA512 b79854a8c90aa1e8e0758c634f5068869b009c0269641235bb85c2b1c94223f4a90bdf9764e3bcae27e121f1814736fff1b28dfcdaa9469603a4cae6f27606f0 WHIRLPOOL a351f8aea41fbaf8835eae4faa0cde0cfddfb701a98b4ccfa7e16ed20354348e4b222e023eff3b239eadf0c0223f72ce53643e7fb9e62b3bc7279419c931f655
+MISC ChangeLog 168985 SHA256 3f5975f576b56f29c3a37b6a395dd0e93418d3d134887059a7dbaae87ed88bc1 SHA512 22e5c4bcaa04a6a55d0b28d51a530b860b89792fec81bef3d9b3e5b415339e940f4ca60fb8bf2e07dabb9aa1c9f1757173877d0d58af8dc823b7d4c892ea1d24 WHIRLPOOL 740823f621191839f63d1fe758a4ce7f17c4c4d604557e277e7648cb71f15ce1b0e95cc4825dd9ec6c79fda94480f0cc99930ad525d33750d9a9fead13d76b72
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20150611.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20150611.ebuild
new file mode 100644
index 0000000..dd58d63
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20150611.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-11_00-01-56/zip/netbeans-trunk-nightly-201506110001-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 52074e3..008991e 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_p20150611 (11 Jun 2015)
+
+  11 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ide-9999_p20150611.ebuild:
+  bumped to the latest sources
+
 *netbeans-ide-9999_p20150610 (10 Jun 2015)
 
   10 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index c12db2f..c9aa35c 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -244,6 +244,7 @@ DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9
 DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 DIST netbeans-trunk-nightly-201506090001-src.zip 207886954 SHA256 ae0945f940a854d3314f1be40e4f915788eaa7902a71ca7ca645456236230f71 SHA512 61b3be2bba95f4a08ed4fa340d441c3f01ac9de230c8125b94a61adb47b0c09e312e0c75eba3ff4eb446468d00982edf66b7fa709263f50cae6690da85d9ac66 WHIRLPOOL 16a5f826bfafcf74c32fa3e6620825fb0287b904d9cc9ad76aa24001731c83029d641ec658559d6ad479b1169e49512906e5aa2c8df806d6e695da6af41f141f
 DIST netbeans-trunk-nightly-201506100001-src.zip 207888598 SHA256 ffbd120304de4f26f654fb22f4eb73ab9778b7795204002270a69eef6be1ab55 SHA512 c238bbc661698ca4b143aec8677f64a26191703175f1096d4e662e533e59dc13f08ef85d81e70e2ee104563cde8b026befb192b660604230cd53ac4cc23a2c9c WHIRLPOOL f8682cb4006efebe7f1a750a6a76734e95e4ceb5529b3cd47c01b6ffd4e4d3594e25a043ed8b21d510655192f85f88dbaefe85fcbe4d42e5123bda3c81c7ecf7
+DIST netbeans-trunk-nightly-201506110001-src.zip 207909918 SHA256 830b6a1c8aa25b5c6b16f5192ad5a9677f5ea14e227d635be8da0fadc85bde76 SHA512 b9274f0d4e7a9f16b6870b85202a9a8e660dfe80c2145b42f8826e53ae4a53b1faaf8fe3c6cdcf1b22785b7008b91f5b370ba0ca9375377f31257d0aec999476 WHIRLPOOL d7fb89342079dc27208dd6d8376770758ec48acf25297189f44dfcf9b53d5333898928f56e1d68b737d70816c9cc5936b01cbaf7aa4d04794c8ac4ffd0cf9319
 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
@@ -274,5 +275,6 @@ EBUILD netbeans-ide-9999_p20150604.ebuild 30352 SHA256 f987f4da5399cde056dc8f949
 EBUILD netbeans-ide-9999_p20150608.ebuild 30352 SHA256 1dc75e6d3fc2e22ac46f455f4daeb43d6c73c51fb296460c22453ca2d080e81b SHA512 6226ffee5280fbaca45e2ced2a2aab08a5452ad133a883ed481150905a33432d7d92cb7f33b3ff6820348ad51e8c3ead253775a27111e8da78ae92aa20e32057 WHIRLPOOL 9f6e8c6d6f339cb1d63cef29ec6b6b41ae0b61939ed3a96de628ef063621308d2e390c56fb2f9fe89a3a64429a3ad3cc107e9daddce46a304a0e3f3e8680826b
 EBUILD netbeans-ide-9999_p20150609.ebuild 30352 SHA256 31d3b3930c1b4f9b992e033e3df394670e4b3443046bf22d778539622b98ab34 SHA512 d1ffff4e97ce3d48ac81c1e35321d82bb31b29058264f8d2277e8ff5451a9639010a263a6e79e0dd608b1c829f14a8a18d0f0afb5655f02dbebc1fd0a44ee053 WHIRLPOOL e06d8e8391357816bf096d93f04515d759094a90774d7cb81aa5d8741c02b31bfe381a4a8a1d017d6804272207b548bb6eca0a1b102495651cc1f12209c79eb0
 EBUILD netbeans-ide-9999_p20150610.ebuild 30352 SHA256 699b09086b20442d7bc27fd4bbdb051e9ed56a06cb942cc0fdc6e7dd120515dd SHA512 907c7391471096cfe5fc526ae73a9e76243fe790de06ddcd3f3a677176ddcbef834b562f426f22cb22cdc48f3949da17e01c6c2322a7faae8c71a089677da098 WHIRLPOOL 665c281d6e9cfbbae89ca98a61edd4879b02d624f8181324acaf4b0aae28e86e15947b412337fcb83201a8cfabb81ab733a6566b0184ff5ba909f74bacde0c21
-MISC ChangeLog 160712 SHA256 bb1eb01e380afe142aae108b07f087a7753d63489cb00877e6c2168c59aa0db3 SHA512 57d0af4eb06712b877f13986c701de750c0aedc245c66af5892036081fcbda35aa5c85a99fb0145a1c8505fa2a545eaa6b7538b23017595844503f23d9135018 WHIRLPOOL 2d87ac41ef97503ff7f65d71a00126829f2a795c3dd7bb0c58ac0f9368842aa334f8a269bdb07802c8b8350baea3daf225f4742d7c6db08600c6f8a08c75f325
+EBUILD netbeans-ide-9999_p20150611.ebuild 30352 SHA256 78102bbe772847b9f048bfc8ba4fd8abe3e54ae25775bc5933a3d3e505c0dc6e SHA512 84ecb0a499dc0db47a28c56b6e8e17c8af4421e6df64b71220fb468f04844204983cfe291148299c73773a76838b3957fe1db3d80435886fd6c9eb9457419a7d WHIRLPOOL fe2cb2b451c87737bbb83ff936382b1aa044b7b0161c84c014c3f0e0351e2af3f568713c874bbd4e7ead77eb8fa6a708b7736f4c8f26e83fc7c38d45ec4ec3a0
+MISC ChangeLog 160879 SHA256 8b5a685cd53c640abda422071019338ec8eef691b152a524c0e88cdde817c83d SHA512 2b7a35c90dff4e87414f716232a489222bbc56fb59d0b90ae87cbdc3f9b02feb98b16f8393af5a503c6671da54d91dc789755cad4c31e50543b9aa0ea755881b WHIRLPOOL acdfd715a251d8b05d23d69443e627f369bbc81485afe06b250bbdea106181ac2c647952c38af5ab5ad2d8920a05923418d9e20a9c076000cda4d88b12f6937c
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20150611.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20150611.ebuild
new file mode 100644
index 0000000..05ba88c
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20150611.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-11_00-01-56/zip/netbeans-trunk-nightly-201506110001-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 42b1369..be3d38b 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_p20150611 (11 Jun 2015)
+
+  11 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-java-9999_p20150611.ebuild:
+  bumped to the latest sources
+
 *netbeans-java-9999_p20150610 (10 Jun 2015)
 
   10 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 028d175..35fb5d0 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -114,6 +114,7 @@ DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9
 DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 DIST netbeans-trunk-nightly-201506090001-src.zip 207886954 SHA256 ae0945f940a854d3314f1be40e4f915788eaa7902a71ca7ca645456236230f71 SHA512 61b3be2bba95f4a08ed4fa340d441c3f01ac9de230c8125b94a61adb47b0c09e312e0c75eba3ff4eb446468d00982edf66b7fa709263f50cae6690da85d9ac66 WHIRLPOOL 16a5f826bfafcf74c32fa3e6620825fb0287b904d9cc9ad76aa24001731c83029d641ec658559d6ad479b1169e49512906e5aa2c8df806d6e695da6af41f141f
 DIST netbeans-trunk-nightly-201506100001-src.zip 207888598 SHA256 ffbd120304de4f26f654fb22f4eb73ab9778b7795204002270a69eef6be1ab55 SHA512 c238bbc661698ca4b143aec8677f64a26191703175f1096d4e662e533e59dc13f08ef85d81e70e2ee104563cde8b026befb192b660604230cd53ac4cc23a2c9c WHIRLPOOL f8682cb4006efebe7f1a750a6a76734e95e4ceb5529b3cd47c01b6ffd4e4d3594e25a043ed8b21d510655192f85f88dbaefe85fcbe4d42e5123bda3c81c7ecf7
+DIST netbeans-trunk-nightly-201506110001-src.zip 207909918 SHA256 830b6a1c8aa25b5c6b16f5192ad5a9677f5ea14e227d635be8da0fadc85bde76 SHA512 b9274f0d4e7a9f16b6870b85202a9a8e660dfe80c2145b42f8826e53ae4a53b1faaf8fe3c6cdcf1b22785b7008b91f5b370ba0ca9375377f31257d0aec999476 WHIRLPOOL d7fb89342079dc27208dd6d8376770758ec48acf25297189f44dfcf9b53d5333898928f56e1d68b737d70816c9cc5936b01cbaf7aa4d04794c8ac4ffd0cf9319
 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
@@ -144,5 +145,6 @@ EBUILD netbeans-java-9999_p20150604.ebuild 14590 SHA256 5df785c849a644e93a682152
 EBUILD netbeans-java-9999_p20150608.ebuild 14590 SHA256 50c2cd985701ff57f7ca1144a01cb52da625e56b41ca7321b7915ac3394704bb SHA512 c8b440e8e2c9646bf26a742abb5e2e302f74b4360cd9c285b85202955b3150c01ea40229c5f4e7682de7ea038068ccaed1811debbf189bce1842463f1e689a53 WHIRLPOOL 007749552d73056283b3d699a693b5200a65546a63e1a0d7d698c4de7b07dcdb4b859696da4c78760725cbeeb647dfb03b27e7301e06a4b1abea1c455610303e
 EBUILD netbeans-java-9999_p20150609.ebuild 14590 SHA256 9c44466c3a38df69266d56aa17e26de4a03c6b759bed5d3d3ba629b890a9d803 SHA512 a2c221fe1cb21bdc04e33868c719bc17cc4bb2f33c01b6664bfff967e9f67d98cb9a87d52ed9d06d192d801d1e800b1522a5edee9b3afeee55223c5187df73d6 WHIRLPOOL 7272325ce1455689c30917698952ee603c5fcd1968866598b2839fdd8ba664f22db27903b17f18495d473bb8fe5d682f233a41fdece73f4bacddd566eef80fdb
 EBUILD netbeans-java-9999_p20150610.ebuild 14590 SHA256 c53fa8109890fde3604ade2fa72cb524170c01667b29b14036514d779b202699 SHA512 549948b286f1b88dfc9ea45c1dfcb1f27857d80b1bfc33c0baa115e71aaa87924c49d23d7f2d88d5723bb3f336312b08af5fd2a6784a7bda169268867f0fd67d WHIRLPOOL e66b2385266e78b2b7173d4555460dcb79e91906d754563a56c19917e888e28fd5a0a8e13b75c4c80fea06ba0361c4830f4de36855befb3b2b426187f6104616
-MISC ChangeLog 163946 SHA256 c674eb7eaa82252d2f3c90f526a80b0c0f7a9689475e596fcb3f28b63252751c SHA512 7316050fef504361cb6642b1e7a99952edbe7c9d72d7011a9e10ccb658b8f19366c3d50969b2fee7e4071fb7e4e7a0c765aa650fe6f03ebfdd8ef787eab55a10 WHIRLPOOL 6bfd4b2d7da1471f28c09a57e28518def55984a32c90bb1334aebc89f399f529f4d2d17714fa1bc7343a5e470d161f6821f03b3f116f5606ee4cacd1b7d79f95
+EBUILD netbeans-java-9999_p20150611.ebuild 14590 SHA256 71bb15d5df3cbc52ad53a36b1c1283a8dcd94e0ba2e7fb69c64e1826d43a93da SHA512 18c26e2f5273941aadc696373b1c97a9944175383ac450742b0977389316c4371860cf68eba7492aef0bfe633ea116cb9f60def4a9b824f615d019cbc1ab2ca9 WHIRLPOOL c0ff4b1004db956f930017785a7a379d8f6763f0b5cff299558afdfb8155275c385cca14fc345463ed000ec44cc2edb22b9e8323b2e95e733f61c39f088357e8
+MISC ChangeLog 164115 SHA256 c082a6a0181127a211d0d505ebab703d1dc09542dcb695d1adcb5607f394dad0 SHA512 d968c0192f4d474b8cfd87c5f9c3b834677bf2dbb9ea5062e0932e04be07ab479527e4200fe225dc35fe60f95c3acc0301de679653d8acdda7670dc38d78a4ef WHIRLPOOL 04735ca7fccb61daaf509809d9fa0e1fbdc5953d0a509301b150b627d0b85f9924fe2b2e391c41b0211788a9144fec0f7a78b3299f9da8ad57a845da1ef03df0
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20150611.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20150611.ebuild
new file mode 100644
index 0000000..53273da
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20150611.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-11_00-01-56/zip/netbeans-trunk-nightly-201506110001-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 01afd62..ad710aa 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_p20150611 (11 Jun 2015)
+
+  11 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javacard-9999_p20150611.ebuild:
+  bumped to the latest sources
+
 *netbeans-javacard-9999_p20150610 (10 Jun 2015)
 
   10 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index a7f68f2..bfa788f 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -37,6 +37,7 @@ DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9
 DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 DIST netbeans-trunk-nightly-201506090001-src.zip 207886954 SHA256 ae0945f940a854d3314f1be40e4f915788eaa7902a71ca7ca645456236230f71 SHA512 61b3be2bba95f4a08ed4fa340d441c3f01ac9de230c8125b94a61adb47b0c09e312e0c75eba3ff4eb446468d00982edf66b7fa709263f50cae6690da85d9ac66 WHIRLPOOL 16a5f826bfafcf74c32fa3e6620825fb0287b904d9cc9ad76aa24001731c83029d641ec658559d6ad479b1169e49512906e5aa2c8df806d6e695da6af41f141f
 DIST netbeans-trunk-nightly-201506100001-src.zip 207888598 SHA256 ffbd120304de4f26f654fb22f4eb73ab9778b7795204002270a69eef6be1ab55 SHA512 c238bbc661698ca4b143aec8677f64a26191703175f1096d4e662e533e59dc13f08ef85d81e70e2ee104563cde8b026befb192b660604230cd53ac4cc23a2c9c WHIRLPOOL f8682cb4006efebe7f1a750a6a76734e95e4ceb5529b3cd47c01b6ffd4e4d3594e25a043ed8b21d510655192f85f88dbaefe85fcbe4d42e5123bda3c81c7ecf7
+DIST netbeans-trunk-nightly-201506110001-src.zip 207909918 SHA256 830b6a1c8aa25b5c6b16f5192ad5a9677f5ea14e227d635be8da0fadc85bde76 SHA512 b9274f0d4e7a9f16b6870b85202a9a8e660dfe80c2145b42f8826e53ae4a53b1faaf8fe3c6cdcf1b22785b7008b91f5b370ba0ca9375377f31257d0aec999476 WHIRLPOOL d7fb89342079dc27208dd6d8376770758ec48acf25297189f44dfcf9b53d5333898928f56e1d68b737d70816c9cc5936b01cbaf7aa4d04794c8ac4ffd0cf9319
 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
@@ -65,5 +66,6 @@ EBUILD netbeans-javacard-9999_p20150604.ebuild 4982 SHA256 0b085fe452879f737d765
 EBUILD netbeans-javacard-9999_p20150608.ebuild 4982 SHA256 bd493a5bd267593768778615a5a45e34235c4713f6efcc10e09ed22ad5154427 SHA512 c161dda42ae739e6a5e422efe684f0f7ecc62c92c3a5d9f768d4b240b7c04d1a83a2142b1e27283411601c9b60a4527cf9708a95dabe01178fd520c7b2e1e4bd WHIRLPOOL 7206b2e6371e6e4cdae7e5c34859e2336e79d5913593fd30c30aa0ca7c889792f0a14fa2251b25cb0678b9ae981f7c26e4a3858359d1b46e104947cc05aa315a
 EBUILD netbeans-javacard-9999_p20150609.ebuild 4982 SHA256 aca6bac72191eaacd9c9e82c0248d7c80cbb1b7a04f75d7645c41ab7dbf65343 SHA512 798c622188a287a58218fe97dd437f093708d938799b5de24e683d421a3f042845d3ab73cc082a08022e35c5b187103eb97661e1b16979a14f63e85e24ff0afa WHIRLPOOL 2922063d306948acf05b73ebf18a01cc669fb7c2d55f5d609e09707515989b1e502382ccebcbc59750c1602c73a97e55c6a06e6767e3880a389a451186e6b9d8
 EBUILD netbeans-javacard-9999_p20150610.ebuild 4982 SHA256 9aa7851599560173b7b835f3110821bd833668cff7e944481c537a7616b5075f SHA512 97d23da4da9edb0df0d6e5d3112b949a62a7bdb74f580828b5ca1f7acd043096bdd42f36f5a31eb84944ea0b122275f14a4e63fc242f438eb63da1e4209062e2 WHIRLPOOL 7a196cb27af720dc8daa00cb7f84932dd94660fb640b40b598b9784a057fe388bb1a10122dba9b35b586f824a2ed1b86b5db38cef6290bae46d4222de890f234
-MISC ChangeLog 170942 SHA256 4ed928379affbd46e505ec8ed941cb8e14f77d3e11f0e01b34c94e1131a1f64b SHA512 fc3a8d15fc917616b825c1a8820ad21e5480f5a61b081837f414218cebf86a518224d851ee4dc8be1b7b1556fe8e41c30655dafa284d7107cf985b5228c9c5d0 WHIRLPOOL 90963b75d177502307431769465f4186487e38dff210ca0af93fbd80b89f391a390c0746fce13b5106a89cca87f4f2cfd46b8128967bc1e5602f5ef78d64ccda
+EBUILD netbeans-javacard-9999_p20150611.ebuild 4982 SHA256 0d03818d39b24ebc9f8d91d09ac25d5682cef7f028c86ec14f2325ff67c1feeb SHA512 c589d622bc73e6612ca813f9d439b206f1d071e47e39776e0df058a17809821844ba4e4363a95301a9e8180e77bbed2308b782337944818c83cd72927d5dad3c WHIRLPOOL f8d45513a2932f95094c6a3bf3965c766e2e15cac84364944c4838fc0c4f4f106c146d9b261a88da6b2f712f99a7514b858768337b075b5c98a797e8c2cb0be9
+MISC ChangeLog 171119 SHA256 3e83debba192b9fea71a963943bf601642fb833a5c54f87881e5575461504297 SHA512 a1cd900ab0ccdec4afdd636af79317e423b503891e49818878d74a0811d3913c56a7acfaf4c4f1fb439ba55589d249e3b5ca9517bd20ab0abdf716ce155d87d6 WHIRLPOOL e45e127d3971424e5c06c5f86123521a73afa61d84d2a9a7192f6ed11f1cc72386036b71e020d3d3c28847dce5902a68cc056a624cbf078e366b096a63e5029c
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150611.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150611.ebuild
new file mode 100644
index 0000000..fd6e784
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150611.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-11_00-01-56/zip/netbeans-trunk-nightly-201506110001-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 44685c3..61a2369 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_p20150611 (11 Jun 2015)
+
+  11 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javadoc-9999_p20150611.ebuild:
+  bumped to the latest sources
+
 *netbeans-javadoc-9999_p20150610 (10 Jun 2015)
 
   10 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index dbd3ec7..db5c2de 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -40,6 +40,7 @@ DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9
 DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 DIST netbeans-trunk-nightly-201506090001-src.zip 207886954 SHA256 ae0945f940a854d3314f1be40e4f915788eaa7902a71ca7ca645456236230f71 SHA512 61b3be2bba95f4a08ed4fa340d441c3f01ac9de230c8125b94a61adb47b0c09e312e0c75eba3ff4eb446468d00982edf66b7fa709263f50cae6690da85d9ac66 WHIRLPOOL 16a5f826bfafcf74c32fa3e6620825fb0287b904d9cc9ad76aa24001731c83029d641ec658559d6ad479b1169e49512906e5aa2c8df806d6e695da6af41f141f
 DIST netbeans-trunk-nightly-201506100001-src.zip 207888598 SHA256 ffbd120304de4f26f654fb22f4eb73ab9778b7795204002270a69eef6be1ab55 SHA512 c238bbc661698ca4b143aec8677f64a26191703175f1096d4e662e533e59dc13f08ef85d81e70e2ee104563cde8b026befb192b660604230cd53ac4cc23a2c9c WHIRLPOOL f8682cb4006efebe7f1a750a6a76734e95e4ceb5529b3cd47c01b6ffd4e4d3594e25a043ed8b21d510655192f85f88dbaefe85fcbe4d42e5123bda3c81c7ecf7
+DIST netbeans-trunk-nightly-201506110001-src.zip 207909918 SHA256 830b6a1c8aa25b5c6b16f5192ad5a9677f5ea14e227d635be8da0fadc85bde76 SHA512 b9274f0d4e7a9f16b6870b85202a9a8e660dfe80c2145b42f8826e53ae4a53b1faaf8fe3c6cdcf1b22785b7008b91f5b370ba0ca9375377f31257d0aec999476 WHIRLPOOL d7fb89342079dc27208dd6d8376770758ec48acf25297189f44dfcf9b53d5333898928f56e1d68b737d70816c9cc5936b01cbaf7aa4d04794c8ac4ffd0cf9319
 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
@@ -68,5 +69,6 @@ EBUILD netbeans-javadoc-9999_p20150604.ebuild 6234 SHA256 457be63312f0a84436df3d
 EBUILD netbeans-javadoc-9999_p20150608.ebuild 6234 SHA256 2cb2d2bb193a613f0e799d7df8e138130ba55e2bf17907f1549505502164cd8c SHA512 a64893f14f9af258fe9a22ad9f89b2c7a678906b34903377a8c0a616f75a1d598b69c255a8070f5a32ba908e7fd82db4672bae3c5da07140a307dc7cc61ffc92 WHIRLPOOL c088e4082cb672c6c3b82142dd6fa09c0216df9f6b33ce469b4074d60efb5dd950443c12bc271cf10a94d194bcdf9a9b72e45f997c9f769159f02a0c0dbb6e09
 EBUILD netbeans-javadoc-9999_p20150609.ebuild 6234 SHA256 0a0e6474c003fcd3370dc334e69920873ebdcb5648808f9b4d4e04432fc8d93c SHA512 3c2043feff5b1ab3ea077463da8352e08cb9f24608f8fe3ee3f9ef45129fe3e99cf44a82a86839de215655adfd82089930f7745fd560b888b5ba4fb834f125cb WHIRLPOOL ed92c62909a364a6c23c091fa129bd537d8ba20906745b07d9cdf4bcefd98bfd2311fd3ab470e12bc3edcd7ab0d37799e6260e5eacc4476905abc473f2e1e7cb
 EBUILD netbeans-javadoc-9999_p20150610.ebuild 6234 SHA256 a504a7dd2defff2182cff062606d81d6a6fc930ca782cb0136ca3ad809a16bd8 SHA512 b165619b79c5f4e154559dac7d35eb9efd2177f1796dd96d2a8e58eef2ef7ed4695b9ab42908bb7afd8f88d522cc87060125e2ac7fc58733e8cfc2df9a621bea WHIRLPOOL 510cb2a6d755d9aae5a0dc7e0898a9af99f2d8564e5aa26e11ede323f648e22cf3920210ef4e50112735c47436940814817a772e24cc669b85a85c3c56c7b501
-MISC ChangeLog 168636 SHA256 e1674b047383aac4898fa4b5f27be22ee8eb0d2215fcc9f97307bee5f1d04b2f SHA512 e92cfd9e561b98eb74fc8fc0421eea080fc38b958a0fd702dfd081688a5c043509dd17a62cb0a31f6e3986d0dbd6b1e56fce56fc22b9fd455e83c5309753a504 WHIRLPOOL 29e10d304dee6326f344d7e926796ddfe6384aa7a908fd9ed5b021601a3c63ba4d8ddcc51b11240abe2a7418187e3b4840dfbc14d0ffd3b6d246ad592b251a8f
+EBUILD netbeans-javadoc-9999_p20150611.ebuild 6234 SHA256 bf5a9ee5b138f53c4a8294439f79d71f94e1a1f784a72e3e87c18b4495b9b940 SHA512 c23de5a856766435d72b8a768fd4bf642df2d935a4216e56fa1a6e378751f585c7fd48f695a008d41ad8502c49eef0f8f749720be1f56b42949a7d27fde660ea WHIRLPOOL 36932f79c19b8a9bbaae6e5afe078b87ad31f3ccee0df630dadef341c1dab2e8a968b353adda700b5e3f59c9d4d79911d904d9f1c1815bec43085254e8585714
+MISC ChangeLog 168811 SHA256 191d73f5d79cfaa563de234919f7ca11fd13a0465ce5d77d6822596c93a47541 SHA512 72a0ca2ab7fe6dbfbf2d8fac001c5c6cc44ba170b89d0c9d261def3a64882a9a65b81276ea739fcf2d1d2355974cbb1cedc86576a4f35546ee65b9a50d202849 WHIRLPOOL fe15a9bc366b9a445b309047a7643f963419cad3d4738b5e3cdfc61ed9b8c9789e7318e140afc27c3320e42c879dc156b9278ba49362c7cab555bffd472f9fd1
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150611.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150611.ebuild
new file mode 100644
index 0000000..35541d1
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150611.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-11_00-01-56/zip/netbeans-trunk-nightly-201506110001-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 940b4aa..8132fb8 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_p20150611 (11 Jun 2015)
+
+  11 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javafx-9999_p20150611.ebuild:
+  bumped to the latest sources
+
 *netbeans-javafx-9999_p20150610 (10 Jun 2015)
 
   10 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index d1846d6..2b6beec 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -40,6 +40,7 @@ DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9
 DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 DIST netbeans-trunk-nightly-201506090001-src.zip 207886954 SHA256 ae0945f940a854d3314f1be40e4f915788eaa7902a71ca7ca645456236230f71 SHA512 61b3be2bba95f4a08ed4fa340d441c3f01ac9de230c8125b94a61adb47b0c09e312e0c75eba3ff4eb446468d00982edf66b7fa709263f50cae6690da85d9ac66 WHIRLPOOL 16a5f826bfafcf74c32fa3e6620825fb0287b904d9cc9ad76aa24001731c83029d641ec658559d6ad479b1169e49512906e5aa2c8df806d6e695da6af41f141f
 DIST netbeans-trunk-nightly-201506100001-src.zip 207888598 SHA256 ffbd120304de4f26f654fb22f4eb73ab9778b7795204002270a69eef6be1ab55 SHA512 c238bbc661698ca4b143aec8677f64a26191703175f1096d4e662e533e59dc13f08ef85d81e70e2ee104563cde8b026befb192b660604230cd53ac4cc23a2c9c WHIRLPOOL f8682cb4006efebe7f1a750a6a76734e95e4ceb5529b3cd47c01b6ffd4e4d3594e25a043ed8b21d510655192f85f88dbaefe85fcbe4d42e5123bda3c81c7ecf7
+DIST netbeans-trunk-nightly-201506110001-src.zip 207909918 SHA256 830b6a1c8aa25b5c6b16f5192ad5a9677f5ea14e227d635be8da0fadc85bde76 SHA512 b9274f0d4e7a9f16b6870b85202a9a8e660dfe80c2145b42f8826e53ae4a53b1faaf8fe3c6cdcf1b22785b7008b91f5b370ba0ca9375377f31257d0aec999476 WHIRLPOOL d7fb89342079dc27208dd6d8376770758ec48acf25297189f44dfcf9b53d5333898928f56e1d68b737d70816c9cc5936b01cbaf7aa4d04794c8ac4ffd0cf9319
 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
@@ -67,5 +68,6 @@ EBUILD netbeans-javafx-9999_p20150604.ebuild 4723 SHA256 6cd0605bac8888cb74de12c
 EBUILD netbeans-javafx-9999_p20150608.ebuild 4723 SHA256 8f0b8c624aca3928eb99f67fec66d08bcc3b40b8464a067e7ffec56b9e4fe5a7 SHA512 bf8b14a87956e0f6eebbd2c9f1799cf01a1ff2746a2e99e324002bafe4072cdc675fcc7b2b0beba6f56fd7acffcec9e414371fb5e09008bf08098a3bb3d5d1da WHIRLPOOL 45150f4b4e6403e3dd581a23e0394a80add97a85f55352083c089dc70fa8c97d7b8094d6649848ee58c3c88bbfe5af17a9fa911bad0834339a7555c445e61766
 EBUILD netbeans-javafx-9999_p20150609.ebuild 4723 SHA256 04a093fe4e95dd71676760b7e1604042e44fb28a5dd40f1a8e9bb69d76007b44 SHA512 5fde99555c54cfb6c48c3d3e6065f62c68e362225a4f4b9fe670c9bdb0f77550b7320d8a037aa5e03f82efd3925f6ad457a992e609f712188c3102cae72bc9e1 WHIRLPOOL b7db901e10cdf2f520bd5ce38b785178b8138bbee516caa31578b848425046e824a12417a8a7e1fc72cafa5101b229b5b1f46d1e24c045c5e5ea5d3b085cddc8
 EBUILD netbeans-javafx-9999_p20150610.ebuild 4723 SHA256 1f633c6eabf2df02c49934031e41a433d91abdab2fed91722c5b00e71cbdfa0a SHA512 aeff3344cdbd67c584b9a0334462d5a99b5ee777d6f0ed7fcf895933a91df195f57e829097d23f4d70aac62fc5206837e5ec1eb3b7e6fd40e720f6f632121bde WHIRLPOOL c862e570a22e85ab6f231e0fc7858387a14ce4eb0f5d0d766d28dbec93abea6d0f4fe0955f74974d1551ed8eccd1b5957082867231a5890d7f6dd02ea7158c8b
-MISC ChangeLog 153197 SHA256 3e845e3ad79cbb6b75b1d20d251d7924f6d6e27df7bf2f55a1a95bef98cd1612 SHA512 ea5c89843978476691432c7f8c33e0608cddd33b5399b5df36c99b60b1288ecda78fdec0e24548722d9ea60b62135cfc0ea380a2b68039f735a879a50e8090eb WHIRLPOOL 0841e40b1848518ffd53a17a3af75f3aeb5b95132cf084412be0b499bf4bfd31baad76ae7ac6b5099e482b2b70093fa9387e6cb2363e3107e709a5f614853eb9
+EBUILD netbeans-javafx-9999_p20150611.ebuild 4723 SHA256 17ed51f16d905304334d023cabc2e07a1a3e9cae2b330ab785843f235a85caf8 SHA512 771166797d0002e4e5d092be5f240d33a17fba181ecb519bbb2d4c0db9e6a264226b35ad0499e200d5cff54b9ceda7d199f42d4271dcaa237d0bdbc7cb64cc93 WHIRLPOOL 7f9c75791ef9b0ad8ff24024ee31a4cc58a70e87122e252f68e7516f066e4292c95a879793347dbe539b337789f20149c799508d08739fda3881e9f9e53c7efd
+MISC ChangeLog 153370 SHA256 ec4d63f5fcc025471a62c5beeb7f47dd733954c144c277809dbaed441a0e7eaa SHA512 480b33df761bf3d6f3bf483a4786b989570ec4c40f01b782e42e8bc79f1d977433a1cbba540a71590637e33f53edc3a93372ad2e7d62d6961a8e882d42b5e2c3 WHIRLPOOL 2d2b82807550bb03e0152a162ce2475f5a8ad409950f6a70fc4b6e8cff12f665126bb4f3e5674e563ff2a44d283add798a54c6c51bc537c2ac8714fde53638fb
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150611.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150611.ebuild
new file mode 100644
index 0000000..7c3fd5c
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150611.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-11_00-01-56/zip/netbeans-trunk-nightly-201506110001-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 94b4a7a..a755730 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_p20150611 (11 Jun 2015)
+
+  11 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-mobility-9999_p20150611.ebuild:
+  bumped to the latest sources
+
 *netbeans-mobility-9999_p20150610 (10 Jun 2015)
 
   10 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index c322c81..555cc04 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -43,6 +43,7 @@ DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9
 DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 DIST netbeans-trunk-nightly-201506090001-src.zip 207886954 SHA256 ae0945f940a854d3314f1be40e4f915788eaa7902a71ca7ca645456236230f71 SHA512 61b3be2bba95f4a08ed4fa340d441c3f01ac9de230c8125b94a61adb47b0c09e312e0c75eba3ff4eb446468d00982edf66b7fa709263f50cae6690da85d9ac66 WHIRLPOOL 16a5f826bfafcf74c32fa3e6620825fb0287b904d9cc9ad76aa24001731c83029d641ec658559d6ad479b1169e49512906e5aa2c8df806d6e695da6af41f141f
 DIST netbeans-trunk-nightly-201506100001-src.zip 207888598 SHA256 ffbd120304de4f26f654fb22f4eb73ab9778b7795204002270a69eef6be1ab55 SHA512 c238bbc661698ca4b143aec8677f64a26191703175f1096d4e662e533e59dc13f08ef85d81e70e2ee104563cde8b026befb192b660604230cd53ac4cc23a2c9c WHIRLPOOL f8682cb4006efebe7f1a750a6a76734e95e4ceb5529b3cd47c01b6ffd4e4d3594e25a043ed8b21d510655192f85f88dbaefe85fcbe4d42e5123bda3c81c7ecf7
+DIST netbeans-trunk-nightly-201506110001-src.zip 207909918 SHA256 830b6a1c8aa25b5c6b16f5192ad5a9677f5ea14e227d635be8da0fadc85bde76 SHA512 b9274f0d4e7a9f16b6870b85202a9a8e660dfe80c2145b42f8826e53ae4a53b1faaf8fe3c6cdcf1b22785b7008b91f5b370ba0ca9375377f31257d0aec999476 WHIRLPOOL d7fb89342079dc27208dd6d8376770758ec48acf25297189f44dfcf9b53d5333898928f56e1d68b737d70816c9cc5936b01cbaf7aa4d04794c8ac4ffd0cf9319
 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
@@ -71,5 +72,6 @@ EBUILD netbeans-mobility-9999_p20150604.ebuild 4418 SHA256 2563246d9db894af2f5ba
 EBUILD netbeans-mobility-9999_p20150608.ebuild 4418 SHA256 e92b80bd7851a29dbb8fca839c63889d01fd3a691b3369dd27d6edc837b3c01d SHA512 600dff56b344b749ba2b6bcb4672864ed503e3117fdf9bb63e540d5c0d77c087a2c04847545929ac3410e6651d1ecb098ebe1568b10da91f5c997e17402eb159 WHIRLPOOL be7f1ed87e998d1626a75a71d199c128978ebed7cf5db79dd4bb9f482f1495e96796b5a34b0626130171819ba7685a3ba7943a4aac7feee6d7b3e85c122be43e
 EBUILD netbeans-mobility-9999_p20150609.ebuild 4418 SHA256 0b43946987a7a5a80015e31f08eca7081e0ed9ff74570b20d6fa70685ccb479c SHA512 f385efcad1775c6b29207a1c513dd64e3e7d13f5db6fddd1fce8eb388975356989d290ae940a66f10e01484ee9f26ff24c972d7aa9a65787609892765010258f WHIRLPOOL 6f25dae1bfd51a95901435d6b597a078f616868de7033041dab26c9806d463b671fe77ddf7f3800a3458fc9b846572d23f08fc19a896b1f1d11ac534f34a7a19
 EBUILD netbeans-mobility-9999_p20150610.ebuild 4418 SHA256 1caada7b74de28a14f831e72d4df5d7936907ba921a927ec7873478678f88c4b SHA512 309f109de35edc2c7c5f84d7b17ead6049d33779df2067aaf4e0c8d58a8099040e80059cf6ce47ad8d8b840c68c3c5301251d507a436a6c7d56d87fa490f8124 WHIRLPOOL 04eaacd10f663a7c460cc0c09af86202ca73f73f31c6fa9b3b75f81eb32e558f1f9da69f50ec4ab58e1bb8a508419585f2e0d1700a07fab8aa20548868a0bc68
-MISC ChangeLog 171083 SHA256 75f1d58eb0a335d7b85098a3bdf45b2eabe39fff29c0ded7b02e70219a18965f SHA512 8e1ee680b290219b63f71e0e9c1f7aa680ab9aa18affe1358e0c34b824f46681b081add32134b0c6889e89a78cf64d6fe9d2f44f67390e0d7252c064756f37a8 WHIRLPOOL 1ec5e5810b1e0d6fb1c21c12d37d0743b027621322b15332b660fdcd9f77d8961d63f6ccddf61d7ec7b04c9da863186439f08c5d06226e42dfe8489eaf9d242b
+EBUILD netbeans-mobility-9999_p20150611.ebuild 4418 SHA256 48c5122481dfdd4ea870d7fee736bee6aae67f1e79b6d1dc8fd729f2c7b86114 SHA512 bba0569a3c8aa3dd43fae0b4024b21d4a054cf08b8e044f3da1e620d76fd6bd5dc8fcc849088a3fed514529dacd45c38a905a81180a6816b00374145672c5a86 WHIRLPOOL 4ea1d29e56a1166a685a13c4548d1d36552897095ac032fb73d7067bd8044eb8a2985e559c04d911b184c6c48a9da98ba3e2be231a78cdb7851157ec84fc5cba
+MISC ChangeLog 171260 SHA256 ae7e6c09e61d4b30aeae8e5962fc0b60e1cd34daf7828633c9185a908d2f3af7 SHA512 9caaf24f6492c5ef1eff0c58cf41efa66f307513277cb7c312b0300615192103da0070960b6b8f54064d6dcbb957c5f10421bf23485c8a67e868eec6d219ff61 WHIRLPOOL 26423a14195af861f5d0b900811d8c65f162b9d7fdbafb8c406d12f1bb6ceb825b80a29ee92f88afb868e181a626bd9a74626bf1c412b6f57c2ba88220b3c9e9
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150611.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150611.ebuild
new file mode 100644
index 0000000..6be2132
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150611.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-11_00-01-56/zip/netbeans-trunk-nightly-201506110001-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 0c16593..3021c05 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_p20150611 (11 Jun 2015)
+
+  11 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-nb-9999_p20150611.ebuild:
+  bumped to the latest sources
+
 *netbeans-nb-9999_p20150610 (10 Jun 2015)
 
   10 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 54b9475..64d22e5 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -42,6 +42,7 @@ DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9
 DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 DIST netbeans-trunk-nightly-201506090001-src.zip 207886954 SHA256 ae0945f940a854d3314f1be40e4f915788eaa7902a71ca7ca645456236230f71 SHA512 61b3be2bba95f4a08ed4fa340d441c3f01ac9de230c8125b94a61adb47b0c09e312e0c75eba3ff4eb446468d00982edf66b7fa709263f50cae6690da85d9ac66 WHIRLPOOL 16a5f826bfafcf74c32fa3e6620825fb0287b904d9cc9ad76aa24001731c83029d641ec658559d6ad479b1169e49512906e5aa2c8df806d6e695da6af41f141f
 DIST netbeans-trunk-nightly-201506100001-src.zip 207888598 SHA256 ffbd120304de4f26f654fb22f4eb73ab9778b7795204002270a69eef6be1ab55 SHA512 c238bbc661698ca4b143aec8677f64a26191703175f1096d4e662e533e59dc13f08ef85d81e70e2ee104563cde8b026befb192b660604230cd53ac4cc23a2c9c WHIRLPOOL f8682cb4006efebe7f1a750a6a76734e95e4ceb5529b3cd47c01b6ffd4e4d3594e25a043ed8b21d510655192f85f88dbaefe85fcbe4d42e5123bda3c81c7ecf7
+DIST netbeans-trunk-nightly-201506110001-src.zip 207909918 SHA256 830b6a1c8aa25b5c6b16f5192ad5a9677f5ea14e227d635be8da0fadc85bde76 SHA512 b9274f0d4e7a9f16b6870b85202a9a8e660dfe80c2145b42f8826e53ae4a53b1faaf8fe3c6cdcf1b22785b7008b91f5b370ba0ca9375377f31257d0aec999476 WHIRLPOOL d7fb89342079dc27208dd6d8376770758ec48acf25297189f44dfcf9b53d5333898928f56e1d68b737d70816c9cc5936b01cbaf7aa4d04794c8ac4ffd0cf9319
 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
@@ -70,5 +71,6 @@ EBUILD netbeans-nb-9999_p20150604.ebuild 5003 SHA256 211c996e360e5d6097eeb932b42
 EBUILD netbeans-nb-9999_p20150608.ebuild 5003 SHA256 038667681b9fa30d57c7c200a906e7d1237629c4c4c439459062cbf5d08a63cf SHA512 1e030704f86f5632599d0ae91000d5cc954919f7e4a1cf98a628e1a4103b1cddb1d2b4d8215d390b1912cb7c95058342d4dedf5339a59770aec55b178761fe65 WHIRLPOOL 3bff022dfa9726d3fe010f7911fc0b9ffc77a3875273033cdb5c087abe49cfc9e889f3b3a1c5cfef1bd03651a51ace8591d873d0065eeb253335d9c3ec7c2d7a
 EBUILD netbeans-nb-9999_p20150609.ebuild 5003 SHA256 2cddf0fe3f823023dfa046c2b0a7ebdc8acd8cfe91e9062cffea626c9db8f097 SHA512 3cfecdccc5e8483e677a55e7a627ae6dbbb677e41e4c95c5bbd2c9b516b5d34a053fea7024fe7c08bfaf5f3cfca0e63f8f9a632abc1b1c8235a2cac01b83bc06 WHIRLPOOL 12df18edcad1c8127214227f5a953fd6279d9c32a9f1261c9439a8a780e030b5b9c0d8a78db3fdb26b4d2cda5821f0c8ae2794c4bade56f5092510bc2c2be909
 EBUILD netbeans-nb-9999_p20150610.ebuild 5003 SHA256 b929d864513827174498541473cba811eee3131d02f48d091d1e68a9d424e27f SHA512 ae9fe3dbcd85dd69faae4b83d87c398f565a88973be15defb88155e67a66102af4b8ceceb0bbb56ad83c17c175dd0f74848bb70bbdb3e4ee52f6949409151367 WHIRLPOOL eae965ad68850c3dec8e5453cb0cefd26aedaa6abe55640ac77ae9e9a3b37b16ade560a42d804db2988b8331dab2483fa51350a6e8d1eebb595110b96fae804e
-MISC ChangeLog 159777 SHA256 15ea91584dc785bfc3f0523e4b9d3490ff3e9bca9d4f4ea592e91b026e8f0fce SHA512 7c3a75e7ef836277cc4c0d1872eab1a0276674e211dd536eeba52ce2af6499215b7c891e11e4aecf042db29e192bc63641e3adea65e299beaf7ec998b426c5b1 WHIRLPOOL 4d0bb19b465d1aeeab5c825ea4e89ba4b7f8aff095aad411844f1b862cd40de34b593324ea4fe5f462ed5f87fb8624d4d59fcd5028eb01944a3cc78ace6f2988
+EBUILD netbeans-nb-9999_p20150611.ebuild 5003 SHA256 15ffca25793893fe4566a8cc1e57eb9c6fecab9880aa472841642def9a8e7e1f SHA512 e8ad4fb3e4ec2878c681c54ae0a451f84394ef917c19acd3bb5a5ea1de689917fc5be10897d2774f356bfd3932ba8340f3346967ca21e18aaf8d57160162e288 WHIRLPOOL f696af013fad6c4cc021d01021cf769fe0a3e8b84c239e0a0df18b001eef55779a09f75184f7ceb2a930d4bcfc0380c02f8e0c45eea01b2aae7c75e85659e6db
+MISC ChangeLog 159942 SHA256 3878d4d90fac21aada22c3a6fff7a67cba78e025632d0702fb4f7267a250064a SHA512 f99e398897a631eb1be1938f6c200f107b6b333aa9ce066746363c13f4d1455bddc71dd3f29b6e903a2b584fa481915080babe452cdd28156dc3baac286f766e WHIRLPOOL 67968c485616a223708037e924867bda29b6da5eb771ddddd4ab4a5ae188dfc951e099e1fe7b674f80cf7b26c5a96a5f51704a449ede4f0a6cf1ab0b1c30a2f3
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20150611.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20150611.ebuild
new file mode 100644
index 0000000..daa6e79
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20150611.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-11_00-01-56/zip/netbeans-trunk-nightly-201506110001-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 faacbe6..71e885f 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_p20150611 (11 Jun 2015)
+
+  11 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-php-9999_p20150611.ebuild:
+  bumped to the latest sources
+
 *netbeans-php-9999_p20150610 (10 Jun 2015)
 
   10 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index dee90d9..c97361a 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -47,6 +47,7 @@ DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9
 DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 DIST netbeans-trunk-nightly-201506090001-src.zip 207886954 SHA256 ae0945f940a854d3314f1be40e4f915788eaa7902a71ca7ca645456236230f71 SHA512 61b3be2bba95f4a08ed4fa340d441c3f01ac9de230c8125b94a61adb47b0c09e312e0c75eba3ff4eb446468d00982edf66b7fa709263f50cae6690da85d9ac66 WHIRLPOOL 16a5f826bfafcf74c32fa3e6620825fb0287b904d9cc9ad76aa24001731c83029d641ec658559d6ad479b1169e49512906e5aa2c8df806d6e695da6af41f141f
 DIST netbeans-trunk-nightly-201506100001-src.zip 207888598 SHA256 ffbd120304de4f26f654fb22f4eb73ab9778b7795204002270a69eef6be1ab55 SHA512 c238bbc661698ca4b143aec8677f64a26191703175f1096d4e662e533e59dc13f08ef85d81e70e2ee104563cde8b026befb192b660604230cd53ac4cc23a2c9c WHIRLPOOL f8682cb4006efebe7f1a750a6a76734e95e4ceb5529b3cd47c01b6ffd4e4d3594e25a043ed8b21d510655192f85f88dbaefe85fcbe4d42e5123bda3c81c7ecf7
+DIST netbeans-trunk-nightly-201506110001-src.zip 207909918 SHA256 830b6a1c8aa25b5c6b16f5192ad5a9677f5ea14e227d635be8da0fadc85bde76 SHA512 b9274f0d4e7a9f16b6870b85202a9a8e660dfe80c2145b42f8826e53ae4a53b1faaf8fe3c6cdcf1b22785b7008b91f5b370ba0ca9375377f31257d0aec999476 WHIRLPOOL d7fb89342079dc27208dd6d8376770758ec48acf25297189f44dfcf9b53d5333898928f56e1d68b737d70816c9cc5936b01cbaf7aa4d04794c8ac4ffd0cf9319
 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
@@ -75,5 +76,6 @@ EBUILD netbeans-php-9999_p20150604.ebuild 4423 SHA256 489ad7dfe954dd589134d78aa5
 EBUILD netbeans-php-9999_p20150608.ebuild 4423 SHA256 a5c2a4c5c7366a650cf2771b7b4a81ea3ddb9e2fcab5bab54e658d49e77fda28 SHA512 83cd4e9b9cafef85782cbef5c88783fa9a5651e9c176376b6814daad6cfbda409b57d42d786991fb2e60dc2e34ca42164072ec8ede3fa06c48660be021fe0642 WHIRLPOOL 0089d2a15da9c3e875c5b5ccf3fb9250f2185fc2a8fe7824dad0dcaac9f1102ae76fde539b95c7f2f7673a14c0d5eaac84673f382d0a01a0f7b8a439d389b583
 EBUILD netbeans-php-9999_p20150609.ebuild 4423 SHA256 2015d85d3b0199d9a7b3c02f2ec42e7c2ecb22c9698e23cbfbea1e4b4a0e90cc SHA512 84e4df2400802c45b3e5aec87b606e5963844c9a664ebcf94ba0584e31e98341f8f1017319f5aa0abe8207b8ae00bc9d25ad62e633ea43e096e732cd1d19c88d WHIRLPOOL 93d52e96e0d3d95090560bc5df00927c549675aa19d4873a80b914f467a9a7261bd70d9d329db1378214bb10da8db1511a5434e8d256d28dfd7bfdc9de286a5c
 EBUILD netbeans-php-9999_p20150610.ebuild 4423 SHA256 085f470788498366adff452d8b9f78945708304021ea086e60891cb45b5a0e93 SHA512 6cb142929f7eb9a4c1c494fc2956ad95476b4effbf2058ddad25e38b3a6c6f34b24998be1d26200776fa409625f0ba7f485e4012d1139f65724b1bacdbf5207b WHIRLPOOL ac782795b9e486446cf5c5f8dd8681422a062d1167ad3f9785136eaba2477b0ba8c0fd05cba0235cba5c06cf50026ccaa6ffe2621918a9353acc7caf751b3fdc
-MISC ChangeLog 159541 SHA256 c23fcd670563fb0c5f60576f0b25c38d4976b3955e08f18579e40d12f82b2bb4 SHA512 566704b39950690142fc886b93a796f7f43b6ba3f4fdcfe47650326e4432dec104b2127183b121ff939d7dca53ea8431a11d70c657142ddcf627c8c961932d22 WHIRLPOOL 34aaeeade137b5eae56e000f2916546ee057f3e6c3e03b99121855a107f3ae9b9b411e9d086c95e0a366715916793b4a9253e48bf1a1083e80e8393eda61ee17
+EBUILD netbeans-php-9999_p20150611.ebuild 4423 SHA256 848135c12c807f0d70028ed03993b7ecb7c52b4bc33a36e1049d23dca434f7c6 SHA512 f912825b6b7af65d61c3a8248de8aa03e3a7470317a4b02613fcbf96c37c41a446c1cdfc240d6af12e275a38835df5f6d412f5e7743cf9274170005dec320c11 WHIRLPOOL 0346a3ca46f19245d1122b3978f2271576d7619e4128abd3b2156a104f2e20ef9f9e82314800bc500517f012544f25fa7eff43880d9fb9b7f60471c9acdbcab9
+MISC ChangeLog 159708 SHA256 2ac10f6f99821c5a945e482fae86186f9bd6c3fa332b5a09ba676eb53b66f477 SHA512 fc420f7a1ed12f3fc937e14208ddec2144b8b675ab6e28252a67e52ee4e2c1338e79bb349db64282f6b0dcb6de1e5f7457d397ee4bae2564aa764634d77e9ee0 WHIRLPOOL 3254a12434883fb1343e040bc8c297306f38271acf533fb7fdd0e4019545f63f74b131891c232eace137fb36d7546d1c852088f6fa4ea1701d2049520d97bb4b
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20150611.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20150611.ebuild
new file mode 100644
index 0000000..57a985d
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20150611.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-11_00-01-56/zip/netbeans-trunk-nightly-201506110001-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 a65d9d0..843f60a 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_p20150611 (11 Jun 2015)
+
+  11 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-platform-9999_p20150611.ebuild:
+  bumped to the latest sources
+
 *netbeans-platform-9999_p20150610 (10 Jun 2015)
 
   10 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 8278c86..d91aaae 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -61,6 +61,7 @@ DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9
 DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 DIST netbeans-trunk-nightly-201506090001-src.zip 207886954 SHA256 ae0945f940a854d3314f1be40e4f915788eaa7902a71ca7ca645456236230f71 SHA512 61b3be2bba95f4a08ed4fa340d441c3f01ac9de230c8125b94a61adb47b0c09e312e0c75eba3ff4eb446468d00982edf66b7fa709263f50cae6690da85d9ac66 WHIRLPOOL 16a5f826bfafcf74c32fa3e6620825fb0287b904d9cc9ad76aa24001731c83029d641ec658559d6ad479b1169e49512906e5aa2c8df806d6e695da6af41f141f
 DIST netbeans-trunk-nightly-201506100001-src.zip 207888598 SHA256 ffbd120304de4f26f654fb22f4eb73ab9778b7795204002270a69eef6be1ab55 SHA512 c238bbc661698ca4b143aec8677f64a26191703175f1096d4e662e533e59dc13f08ef85d81e70e2ee104563cde8b026befb192b660604230cd53ac4cc23a2c9c WHIRLPOOL f8682cb4006efebe7f1a750a6a76734e95e4ceb5529b3cd47c01b6ffd4e4d3594e25a043ed8b21d510655192f85f88dbaefe85fcbe4d42e5123bda3c81c7ecf7
+DIST netbeans-trunk-nightly-201506110001-src.zip 207909918 SHA256 830b6a1c8aa25b5c6b16f5192ad5a9677f5ea14e227d635be8da0fadc85bde76 SHA512 b9274f0d4e7a9f16b6870b85202a9a8e660dfe80c2145b42f8826e53ae4a53b1faaf8fe3c6cdcf1b22785b7008b91f5b370ba0ca9375377f31257d0aec999476 WHIRLPOOL d7fb89342079dc27208dd6d8376770758ec48acf25297189f44dfcf9b53d5333898928f56e1d68b737d70816c9cc5936b01cbaf7aa4d04794c8ac4ffd0cf9319
 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
@@ -89,5 +90,6 @@ EBUILD netbeans-platform-9999_p20150604.ebuild 9244 SHA256 5ea34a955267886224c7c
 EBUILD netbeans-platform-9999_p20150608.ebuild 9244 SHA256 73a79f9d69488dcf1ec402bd6944cfcd6b0925e78587b9796c675cde13a659c4 SHA512 5792edf278a0704feb9e038f269e627839dc27558cc02513eada5bf1455d907e3d53de947ca2242c0c989c85a8cf629d1039209d316ede50c9e451f8e96e019b WHIRLPOOL 7bdffecd036a6f9137ed4d2d43b07afbc0409d34be4c2a40a066b036b5339fdb0d3031932f557ffe9b558ebfea4c708c14711424dcd586111b1b16d174dfd933
 EBUILD netbeans-platform-9999_p20150609.ebuild 9244 SHA256 e2308bf12544895b4972a5a0f6992269b18558df5c29a923527faac08324d2c9 SHA512 cbac97a3d871ce70aec2f2961028939ae28974ea3fc02cd66d52184963c009f86d25b07a1a49a1db4ac99f5eb5568cf770131341e62ebb5314ce626ac21b4500 WHIRLPOOL 998678ef8f5345137c568ab40ba1c0888c84e3a1100d77921aaf8f92b17d28217c036b505e536384aa71e21c569ac652501de01ce9a5ae897c45943b6a62dfe7
 EBUILD netbeans-platform-9999_p20150610.ebuild 9244 SHA256 81df9a6597c98752335066f10f752ba50cafa5c97965f06ce4596512e919009c SHA512 ff2b6afa5b89fcc923b2b4a208b1f2b8535e250ff9211e7e47358c8549e765cc9e40166b39f013460864068224780acc8e428f1a00a6596b766c48e0467b05cd WHIRLPOOL 127adc1e79e6d4285d60c843babfd35d71f90e89fd24da05ce1076857a702cce159a64894070d3bf590a6032874bf7b48ae9e4f53caa2884a8d830a62c8ce099
-MISC ChangeLog 171679 SHA256 1eb60444385249a6a7030866a19f96b94d4e8fe02da3bb8525edd92c8472891c SHA512 2edbf6d5804b38e0065116965dc2a6a593444fb4dea260d90c92af62eddebbd644681572324d6184f870082fea7b32e274baea32f1b169e09f0202c1de0af4c3 WHIRLPOOL 1ec1bdea56437974b37079f9de78eebdb337f0fd2f1482f35e176e0e1b629ac76ba9425f4d775b07fb96d96c29b1f4276446a0d00d031cc8551fc99194e3c831
+EBUILD netbeans-platform-9999_p20150611.ebuild 9244 SHA256 f12b492f068135eb145c515dd75150923219aabb70cee052c695f15c5232dfe2 SHA512 5ffe750613da3d6b306d056268a91530fc9fd8a259ba4bf02c04ed7d3e895ef8fbc8574e1aabaab0185756a163ab9cc05d6d68f6aeecad950018897415e6b449 WHIRLPOOL d76963d4e2a6fd1762acd7fe57a2762924471baf2de36c7c2ae00dfdb9ebd72aec29adeecf4ce1aa6511682a00824d06771e14ff22893ac88f3fdf3e53496a3e
+MISC ChangeLog 171856 SHA256 15d145eb22e7331822ebe913edea927bf8cc79b8dc4745259a04e844eb6c7c38 SHA512 5e52aaec9b4cd373eddd44ee1ba2988aeee983926f93036ea0fb795af3847119c3ca389b6a98f582b04e94e279a64fe3074ea39deb4537b3e9c5375161ead77c WHIRLPOOL c11308b5400e8063518873aa19f72b402d1314bd396ed92334f48649bc7fc72c1fa3d2dabee3fae768cbed3ed4668e8e0cd78bd4e6862d0620ba3fbedb7339dd
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20150611.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20150611.ebuild
new file mode 100644
index 0000000..f0781fd
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20150611.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-11_00-01-56/zip/netbeans-trunk-nightly-201506110001-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 a6e209b..174305f 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_p20150611 (11 Jun 2015)
+
+  11 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-profiler-9999_p20150611.ebuild:
+  bumped to the latest sources
+
 *netbeans-profiler-9999_p20150610 (10 Jun 2015)
 
   10 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index f766ec1..6a5d01e 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9
 DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 DIST netbeans-trunk-nightly-201506090001-src.zip 207886954 SHA256 ae0945f940a854d3314f1be40e4f915788eaa7902a71ca7ca645456236230f71 SHA512 61b3be2bba95f4a08ed4fa340d441c3f01ac9de230c8125b94a61adb47b0c09e312e0c75eba3ff4eb446468d00982edf66b7fa709263f50cae6690da85d9ac66 WHIRLPOOL 16a5f826bfafcf74c32fa3e6620825fb0287b904d9cc9ad76aa24001731c83029d641ec658559d6ad479b1169e49512906e5aa2c8df806d6e695da6af41f141f
 DIST netbeans-trunk-nightly-201506100001-src.zip 207888598 SHA256 ffbd120304de4f26f654fb22f4eb73ab9778b7795204002270a69eef6be1ab55 SHA512 c238bbc661698ca4b143aec8677f64a26191703175f1096d4e662e533e59dc13f08ef85d81e70e2ee104563cde8b026befb192b660604230cd53ac4cc23a2c9c WHIRLPOOL f8682cb4006efebe7f1a750a6a76734e95e4ceb5529b3cd47c01b6ffd4e4d3594e25a043ed8b21d510655192f85f88dbaefe85fcbe4d42e5123bda3c81c7ecf7
+DIST netbeans-trunk-nightly-201506110001-src.zip 207909918 SHA256 830b6a1c8aa25b5c6b16f5192ad5a9677f5ea14e227d635be8da0fadc85bde76 SHA512 b9274f0d4e7a9f16b6870b85202a9a8e660dfe80c2145b42f8826e53ae4a53b1faaf8fe3c6cdcf1b22785b7008b91f5b370ba0ca9375377f31257d0aec999476 WHIRLPOOL d7fb89342079dc27208dd6d8376770758ec48acf25297189f44dfcf9b53d5333898928f56e1d68b737d70816c9cc5936b01cbaf7aa4d04794c8ac4ffd0cf9319
 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
@@ -62,5 +63,6 @@ EBUILD netbeans-profiler-9999_p20150604.ebuild 3478 SHA256 4b1ce387effb3c87747d9
 EBUILD netbeans-profiler-9999_p20150608.ebuild 3478 SHA256 d1b533b348106f61218ec72b99fe9073b57f412bd0cd1a5d94beabaefd0df8d1 SHA512 2b84841a66192ad3baa4651051846a6a06c1c5501339e206ada82a5211539d4cd0a180ae326e0e3223278176164d7d099e8038d4228733eddbcde30f2edd3ff8 WHIRLPOOL c898d2ad0bc573cc445c22b78cd9a047d602f11add25472b21b6080586634d0cd733a29e762e132f1e048a53a930ff224d812371b59d5c7793b7479f053be81b
 EBUILD netbeans-profiler-9999_p20150609.ebuild 3478 SHA256 7dd96822235ef01c7cf50609f1d8320b377e8f410d7b59ce23f20770096bbc76 SHA512 28a00b8e794134c0c327eb020fffe1f6e6f0819b4277e8b23fae7934569ffaea6f33e82ab2893650d7cb150ba03504f758283a583db4af3baec65e73d529ea41 WHIRLPOOL f1e9d42b1f4323ff183a7571d4bd7a51852d2eec27e4886dd2bf777ba11bc1d10b9ed50fb277e8d98c80aafa8a4850ecad7d7bfba8441923a1574dcefdf8fd6e
 EBUILD netbeans-profiler-9999_p20150610.ebuild 3478 SHA256 a3717d98e4328942703517006834361a990b91847c2add7712230211859736e3 SHA512 f527bf9ae359474b7a450bce67391a989a5be8cef6d5bd7044eec7e73d94fffbd833c2bd1f62edbca695d21a0e63ee2b6520a2439d7c6c264846a0ec3e5c3380 WHIRLPOOL 996deb3e4afe5e58fdcdf1c8081f7efaebb5e76745294e4d59ac2a7223d6f756d762afa61dc371f93ce3485809d1e5926d3243304ef2e63e4f4e1f974fa80816
-MISC ChangeLog 171140 SHA256 aa35c98e97f5dc652098f39c4084e08f375327180ae62596346a05876c361d38 SHA512 ee0a2c8316e9e53f3d65a2674189cd7ee883b90be6149cb6d8768a4eb239bf01214477150a245151eb18bdeb41d3de1605ff4675e12dbe0caa0269e76c4b5625 WHIRLPOOL 875a336530a4c793f43328aa993bd2e9de49b50ae791d0416b1af1a1cd772215eac2310a4a9b2224ec0b10168d4e831b6acf523b0f7c1266e02d63045c13fba6
+EBUILD netbeans-profiler-9999_p20150611.ebuild 3478 SHA256 823cec21903d7bb7a8be674bbd6bf8741fd84269e7f545724d60f13d3c9e09c2 SHA512 8fd2909776bde19deced4d02f4871fab69e0822e45ae09dabd1c55d7b7329158caf83e9c09c5c5d2e083e9c35604b1e8d43e1d4a1eefe79c0d1e05fde17c5532 WHIRLPOOL 882c69888bca9c251bb89621ed1564ccbaa0933d861a46d3fbe1f46915894b5417f3eabd56cfbbba62b72d6161a8c42334219d7dc265f745959e9cb01605e7b8
+MISC ChangeLog 171317 SHA256 655ba6f514e9aad02d4e3365b4a905ee8263b9987563582501005ca35f63e8ca SHA512 d1b39661e2e88d0e81c3bb1798ed7490a65c7f5035b890ccf5ce5395e64b7542f010ea00e295e5fbe026b397eea1a7cc29b4216c48baceb7739b30e406868c46 WHIRLPOOL bc78642e16ef3aa6ea5207e4e7b79a4b8d522d41969bb1df819ff3bd8057313d552b90ec2825f9eb3ff6f6234a6351f771e4c44c18a4a28655d6bf2ec10ae8a6
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150611.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150611.ebuild
new file mode 100644
index 0000000..2cb8c62
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150611.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-11_00-01-56/zip/netbeans-trunk-nightly-201506110001-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 ddbfc05..8cdfbd9 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_p20150611 (11 Jun 2015)
+
+  11 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-webcommon-9999_p20150611.ebuild:
+  bumped to the latest sources
+
 *netbeans-webcommon-9999_p20150610 (10 Jun 2015)
 
   10 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index 3f6b986..cba1183 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -40,6 +40,7 @@ DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9
 DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 DIST netbeans-trunk-nightly-201506090001-src.zip 207886954 SHA256 ae0945f940a854d3314f1be40e4f915788eaa7902a71ca7ca645456236230f71 SHA512 61b3be2bba95f4a08ed4fa340d441c3f01ac9de230c8125b94a61adb47b0c09e312e0c75eba3ff4eb446468d00982edf66b7fa709263f50cae6690da85d9ac66 WHIRLPOOL 16a5f826bfafcf74c32fa3e6620825fb0287b904d9cc9ad76aa24001731c83029d641ec658559d6ad479b1169e49512906e5aa2c8df806d6e695da6af41f141f
 DIST netbeans-trunk-nightly-201506100001-src.zip 207888598 SHA256 ffbd120304de4f26f654fb22f4eb73ab9778b7795204002270a69eef6be1ab55 SHA512 c238bbc661698ca4b143aec8677f64a26191703175f1096d4e662e533e59dc13f08ef85d81e70e2ee104563cde8b026befb192b660604230cd53ac4cc23a2c9c WHIRLPOOL f8682cb4006efebe7f1a750a6a76734e95e4ceb5529b3cd47c01b6ffd4e4d3594e25a043ed8b21d510655192f85f88dbaefe85fcbe4d42e5123bda3c81c7ecf7
+DIST netbeans-trunk-nightly-201506110001-src.zip 207909918 SHA256 830b6a1c8aa25b5c6b16f5192ad5a9677f5ea14e227d635be8da0fadc85bde76 SHA512 b9274f0d4e7a9f16b6870b85202a9a8e660dfe80c2145b42f8826e53ae4a53b1faaf8fe3c6cdcf1b22785b7008b91f5b370ba0ca9375377f31257d0aec999476 WHIRLPOOL d7fb89342079dc27208dd6d8376770758ec48acf25297189f44dfcf9b53d5333898928f56e1d68b737d70816c9cc5936b01cbaf7aa4d04794c8ac4ffd0cf9319
 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
@@ -66,5 +67,6 @@ EBUILD netbeans-webcommon-9999_p20150604.ebuild 4997 SHA256 9156b46ccc1937d0671d
 EBUILD netbeans-webcommon-9999_p20150608.ebuild 4997 SHA256 f470f52b2580da76df36ff2836d3b345eee45b30588c0c842aa96939774872ce SHA512 8b7e4a3931b65857b88944f762bbc8f0043108e37a7fd35be5ac76bd5482a3a358d53c5cef19534b3b159a7944db6818bf0affdc4a2b4bfce76094626bd8805f WHIRLPOOL 90d18b1491df605fe664de57c6626968d09ee7c9740aea94e2dae7fd68203ea52411d21a70e5f8156293e5afe4c729aa9ae5e76520ad9bd018fbfde789c1c122
 EBUILD netbeans-webcommon-9999_p20150609.ebuild 4997 SHA256 d8e0d173d66255410f7affae31c82ecec63b733d9a86f1977bd4ac77e5ed09f5 SHA512 289cbccb65686a549b06061abb6f48a0f2a4852a7191b9a8144c46e4e2b2d26889d6d9512e7df7484b3019be423de7eb1a0287a2abe3807609459d7f2d198b9b WHIRLPOOL 465cad540cb7cb2f0953fac34b55a5c6db05388daffb8743688e9c909710e4857932df00d1fafdc574756a67e22a69f245de3ee672b8fdde64e7abbb95a4abda
 EBUILD netbeans-webcommon-9999_p20150610.ebuild 4997 SHA256 3c4810e6dc719c17845478dfddce950e1f73a97994e9d9f18f9f347bcfc21ec0 SHA512 f4151a6b86a9b2332e362a804cc83b9c1642f016446191cfd8d7eb155f9772ded8629f0893e9f03110d684a31568e8c0952c4243491d8fc58fca3dc296750185 WHIRLPOOL 8156f3867bd51dd95df4c6d534aacdea3cf595e45f12dbbf6cbda00e28a5194526b73c2d640180ae8011c6e540102e9f50eb3ff22a493e260924137932ce0aa5
-MISC ChangeLog 144259 SHA256 ad43f6a477aaf60f47afad599e76d5d21b6000813383d6c9d2096e1a6fe39e7b SHA512 ff101b229974f294eeae4acaac9caae2fe14a9e15372114d9dca99cd1f47a32ee031c2c5cc3ce87b9794e59421761aad8e3413e6eb851091e14f9173241795b4 WHIRLPOOL 4dc84541ee32b7e7eca7c16a799fd6598d48654d5b705e981fe30fdb5d40f7d4467163d545a7dc88fc82479e2ee01e2bca1bfb70f61f2038e5d31736d5693624
+EBUILD netbeans-webcommon-9999_p20150611.ebuild 4997 SHA256 0b61e84c00ea02d8fc9f60c811bdb0a7891cf24ff4ac74738845d89be126551e SHA512 26a4850d537d33b6f49a79ed6f970c66856f2539d8e052e495c112d0cc87217bf13c93a4efe2daf60ede3e36f37b27169637b426032a1d50e72da8c1240f1b41 WHIRLPOOL c89e0e87bf8f794673c4d4b8a474b53c92ab38cd4fbca12ed26fa2371da6bf391254e53a72d9c5552d9716dacc9f9bc1f1c094c7941733d35b1e9512b21f3e69
+MISC ChangeLog 144438 SHA256 dd50bde7a78f8f1c61ccbad5adb6e6d32deae2c9ad7e5c5275156bbb65ea6626 SHA512 b4a38918b8f4004588fb0e050441b5818cd5c9f3cfc5612cfcf2da90143afa4599fecf19381db1dcfc0e351bdb961bcd7873e912a50d7c0b443ec572f638e5bd WHIRLPOOL 899a248f26210c750549941c81db8b3a70e7175ce19fe96275d168f843145932c57deaecf879ac39d52a6a0c4a89d6b0b30d784a0be2449a29c3965de152af76
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150611.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150611.ebuild
new file mode 100644
index 0000000..fd7f769
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150611.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-11_00-01-56/zip/netbeans-trunk-nightly-201506110001-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 4cd83fc..b6c9ee5 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_p20150611 (11 Jun 2015)
+
+  11 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-websvccommon-9999_p20150611.ebuild:
+  bumped to the latest sources
+
 *netbeans-websvccommon-9999_p20150610 (10 Jun 2015)
 
   10 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index e11acaf..cec7df0 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9
 DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 DIST netbeans-trunk-nightly-201506090001-src.zip 207886954 SHA256 ae0945f940a854d3314f1be40e4f915788eaa7902a71ca7ca645456236230f71 SHA512 61b3be2bba95f4a08ed4fa340d441c3f01ac9de230c8125b94a61adb47b0c09e312e0c75eba3ff4eb446468d00982edf66b7fa709263f50cae6690da85d9ac66 WHIRLPOOL 16a5f826bfafcf74c32fa3e6620825fb0287b904d9cc9ad76aa24001731c83029d641ec658559d6ad479b1169e49512906e5aa2c8df806d6e695da6af41f141f
 DIST netbeans-trunk-nightly-201506100001-src.zip 207888598 SHA256 ffbd120304de4f26f654fb22f4eb73ab9778b7795204002270a69eef6be1ab55 SHA512 c238bbc661698ca4b143aec8677f64a26191703175f1096d4e662e533e59dc13f08ef85d81e70e2ee104563cde8b026befb192b660604230cd53ac4cc23a2c9c WHIRLPOOL f8682cb4006efebe7f1a750a6a76734e95e4ceb5529b3cd47c01b6ffd4e4d3594e25a043ed8b21d510655192f85f88dbaefe85fcbe4d42e5123bda3c81c7ecf7
+DIST netbeans-trunk-nightly-201506110001-src.zip 207909918 SHA256 830b6a1c8aa25b5c6b16f5192ad5a9677f5ea14e227d635be8da0fadc85bde76 SHA512 b9274f0d4e7a9f16b6870b85202a9a8e660dfe80c2145b42f8826e53ae4a53b1faaf8fe3c6cdcf1b22785b7008b91f5b370ba0ca9375377f31257d0aec999476 WHIRLPOOL d7fb89342079dc27208dd6d8376770758ec48acf25297189f44dfcf9b53d5333898928f56e1d68b737d70816c9cc5936b01cbaf7aa4d04794c8ac4ffd0cf9319
 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
@@ -62,5 +63,6 @@ EBUILD netbeans-websvccommon-9999_p20150604.ebuild 2727 SHA256 279e6e26da3676032
 EBUILD netbeans-websvccommon-9999_p20150608.ebuild 2727 SHA256 7bc4ecc4478b440d3a8988ba0737d1f6f3eaeae276a04e466ede6ee83674c7f9 SHA512 634ca980e020854c5bf8940e4d11c6ecf62932186f20af5cc946bd36cf621989b2359eea534c49817aa715a3d064bb9f5587fb6b8d1708b996d4fc00b65a9f8e WHIRLPOOL 26c0b79318137999a80305180b17be026ee7e22a7787f74b2fa98930bfd759afab9696512153b32fc54accc7c0c138d8d60f0b4ddfe9c0fb0c151a12d5483a00
 EBUILD netbeans-websvccommon-9999_p20150609.ebuild 2727 SHA256 a605e36da4ebcc31519fd3782526eb38660047d8cde87706837502abb309e165 SHA512 238917cae4bba6f27675a78f66740f3de805d41c2006d9cdd9eeb237693fb26d1beb762a4bb3635aae1e2ce44bf69952a4a7ab1a6b1631b77e649045c7052e1a WHIRLPOOL 4dae45a516537e362dbf0f05c43dd61688b35f2ac87d4f574a15b6835a34c317e65eaf5ca6a4ec4f15bd1119aac1b5c55f3e2761de932c54431d10d23e882c7d
 EBUILD netbeans-websvccommon-9999_p20150610.ebuild 2727 SHA256 a932256c72ffba50aca1fe816e2e929ff8acc1699fe0fe6f70f9d707f0d9c134 SHA512 2bc302e82d1b8dfbe1b4aabbce14969921ef0da1ad3d9b7a650dfdb14b0bff71d8262b1324b3edd530741b57d14dee9a6f348f57ba9074b6c434bff959c0b810 WHIRLPOOL d4e8301d1e2eb56ce6e50327ff9f2382bd24f7c4cc41fc58f2bba683df5ea5021e785ddca2a5d5d80b2686c2104767b888ffdd62d67a094d2373ea6fb7d47083
-MISC ChangeLog 179357 SHA256 f3b31e3ddbe3ef2a80bf57127e426bf6885268392d611617ff6922e598288ce5 SHA512 f2a8a86895ff67fc8cb599113b40d09be9333c9d957fbb1afe2a105375e6a41b00644877cfd4583c2ebc2cd7c152ce6e7bd7db70ba26e5872a53b3e96c25fdc7 WHIRLPOOL 6136ba1a80e5ebbfea47e6431016680f5186a949d6807ecf105523fbea9bd9a969dcf590d4db0e63396b6d683eceb7f5f50734c6569d5279de496d450b8daf38
+EBUILD netbeans-websvccommon-9999_p20150611.ebuild 2727 SHA256 dbabbc0fd3c53dbcbd6c5ae407d3c70edd2a3191f475fd9e8a7d62c3dbac97e2 SHA512 e74bdfd6c609be009d9ac7f88a57aee47532afa61d91225a3c13621745034c00093fc8a8c472383dd7f12e32064b80cc8cb25e2ed700bb9a336fa9840e45bb49 WHIRLPOOL d74239de9bd03536e0287770ab1bcd0f319a7487b63dcd2cc3ecacc433198f6420d8a0f0de5c0d7bdcf036bea48a94a5a334cf73e1c8d8a406089fa572552bff
+MISC ChangeLog 179542 SHA256 89a7068793c5ea2af2293360d0c0c67c3f0c66ad92c87ff3fe3d8d6a2569f991 SHA512 9ebb565123e720111b6b9da198ab8b2edf250854d57b227aa68c96543bfbb37ab742273411fcc74cfaed736ba266726d9ff8feff63d3384c0dd2cf48fe2d7bd9 WHIRLPOOL 309d0db1ab3d04fb027df2a3ffd03f0557f9ff46f056308295177334d2524fbcc9cf456036c9ac54a2c5ab8b822cea5768090fe8517f9bd28d560121bf11fb5d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150611.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150611.ebuild
new file mode 100644
index 0000000..6802ecb
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150611.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-11_00-01-56/zip/netbeans-trunk-nightly-201506110001-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 e9ce002..2cf962d 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_p20150611 (11 Jun 2015)
+
+  11 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-9999_p20150611.ebuild:
+  bumped to the latest sources
+
 *netbeans-9999_p20150610 (10 Jun 2015)
 
   10 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index af9e387..2eed33a 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -42,6 +42,7 @@ DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9
 DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 DIST netbeans-trunk-nightly-201506090001-src.zip 207886954 SHA256 ae0945f940a854d3314f1be40e4f915788eaa7902a71ca7ca645456236230f71 SHA512 61b3be2bba95f4a08ed4fa340d441c3f01ac9de230c8125b94a61adb47b0c09e312e0c75eba3ff4eb446468d00982edf66b7fa709263f50cae6690da85d9ac66 WHIRLPOOL 16a5f826bfafcf74c32fa3e6620825fb0287b904d9cc9ad76aa24001731c83029d641ec658559d6ad479b1169e49512906e5aa2c8df806d6e695da6af41f141f
 DIST netbeans-trunk-nightly-201506100001-src.zip 207888598 SHA256 ffbd120304de4f26f654fb22f4eb73ab9778b7795204002270a69eef6be1ab55 SHA512 c238bbc661698ca4b143aec8677f64a26191703175f1096d4e662e533e59dc13f08ef85d81e70e2ee104563cde8b026befb192b660604230cd53ac4cc23a2c9c WHIRLPOOL f8682cb4006efebe7f1a750a6a76734e95e4ceb5529b3cd47c01b6ffd4e4d3594e25a043ed8b21d510655192f85f88dbaefe85fcbe4d42e5123bda3c81c7ecf7
+DIST netbeans-trunk-nightly-201506110001-src.zip 207909918 SHA256 830b6a1c8aa25b5c6b16f5192ad5a9677f5ea14e227d635be8da0fadc85bde76 SHA512 b9274f0d4e7a9f16b6870b85202a9a8e660dfe80c2145b42f8826e53ae4a53b1faaf8fe3c6cdcf1b22785b7008b91f5b370ba0ca9375377f31257d0aec999476 WHIRLPOOL d7fb89342079dc27208dd6d8376770758ec48acf25297189f44dfcf9b53d5333898928f56e1d68b737d70816c9cc5936b01cbaf7aa4d04794c8ac4ffd0cf9319
 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
@@ -70,5 +71,6 @@ EBUILD netbeans-9999_p20150604.ebuild 7216 SHA256 06a59be2e208bc610695eb3a27c6bc
 EBUILD netbeans-9999_p20150608.ebuild 7216 SHA256 e8fceb97a55aea7179726636c49b018eefc62ed0b2f8798e5391760383afbe71 SHA512 bac3f10ed7edfb9b7700c227c93189cb2f96f6b9d741bdfde5c62fd076c87cfac471053a3f0c5d6ec2e4040c8f8d18788ab44955a8208914b96a062c13ebdd87 WHIRLPOOL f9151e1b34f100dcd7b92ca1e9a8e812f0d7fed0e6e84f2f6cb6a85c92077e493f98e036e79a5e8a6460eea7c19a605d187698f27a5b108365432ac3b0f0530e
 EBUILD netbeans-9999_p20150609.ebuild 7216 SHA256 5dcf28a33c80d67d6db66e4e3b60140ee64e379a6590e3f475a64d2fdf57d247 SHA512 a83fdc4d9432c8f618d9a6566d36db9acbe97b9c5b4f8326788a2c3795efd021055af23c2cc1737574b7ce4c21f424ba897bf816f12a550ab7acf779879fb566 WHIRLPOOL 3a5be6175d842940ddaf62d3af54f2606178d056ba4b95c5603a2b9ea4fad2357bf89e0aae925678ff4c1070965c7d77f740f5e9a562e9ce784734ac2b3e4cdf
 EBUILD netbeans-9999_p20150610.ebuild 7216 SHA256 18a284b32e9682f4a07f59243f7f0dd5f2c8782640fc5eae2429c2f88bbe4f55 SHA512 22c09f22e9f12ec1901af9eb2874926f929f6255eeea730a1573b368cf4dcdd47d8631a61f7394342cc50469bf66350f9e30caca00b3186474338c702b779862 WHIRLPOOL 7b6200ffa670ac4423af0faeb280bac46e6653db3a9e59415666fb1edd4f26249ed31744d0b7c6d66683fa871193a6e11d95dcc9befcb7dc8a272985c825e7be
-MISC ChangeLog 152398 SHA256 045336592fb5a9a713c6ad39ae7bd161a1fc83b79d5f435f1f2413e39a16bedf SHA512 4cb53a1d9b7479a6b0c064ecf5e2844e95fd9d8c9701e39c682545d706e36f636785f3eff473d3eb36b0b4bde22d005d9f66f386ba218766159c76380d69d3c6 WHIRLPOOL 803846708e041a1df4a7713c915ea7af9e6c410541d396b7860a8145c848ef123f6ad17712ba28f01985c38f171c7399a6dce489a3e8a0372df278f90c1f8855
+EBUILD netbeans-9999_p20150611.ebuild 7216 SHA256 3f7895587e7ea2ecd1295947a28197861a279d15bf5bb69f8c9ccf75e37f32b5 SHA512 53356d26920b92b9dc2742c36347970f7641ca14eaf3bed762bf1cb6444fa2bd5dd8f62e7c7d56a8d21c03f5ad5df174c405aa90e0fe5a7d0d912a0550e453c7 WHIRLPOOL 9f7fb542ce69ec39735891fc9d107d12fae901c359a58836bbbf88bbf97a7b3fd7260590ce077dc720e1cea4894a5d8fe74c1fe7277c27715764910192f5c586
+MISC ChangeLog 152557 SHA256 bd1f12c925757724bedf8fc2c3f4e7f19e5c519f22993deb8b9626afb385540c SHA512 455315441fe445226b9bb2c09035affb6990f9d812ee2ff8e5bd24d1f9df85dce1ac4229d4ab0c0beeaa17666ca67c03c6f34240915513d483d07f92c077e80a WHIRLPOOL 90b7a85f18f37a83189fb9e862a3131d1354fd2dba6ca6b6e9bad373a3c27dc6abafda76283f49890ab9ca8aaa468da4477cd3e732cdd6e9563e83f1b007dcd0
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

diff --git a/dev-util/netbeans/netbeans-9999_p20150611.ebuild b/dev-util/netbeans/netbeans-9999_p20150611.ebuild
new file mode 100644
index 0000000..f6acc32
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20150611.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-11_00-01-56/zip/netbeans-trunk-nightly-201506110001-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] 3+ messages in thread

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

commit:     fb5e703a2dd8a051e1ba3ec5916a5dc8d794c814
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 11 09:52:11 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Jan 11 09:52:11 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=fb5e703a

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.2.26

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 057fcdc..d8cbb1a 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -18,6 +18,7 @@ DIST netbeans-trunk-nightly-201512280002-src.zip 209403445 SHA256 0fc2fb9260022c
 DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
+DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
 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_p20151210.ebuild 3384 SHA256 7668f3c93058f8e5097cfeaaa621eb2b0bf8af3ae390020c11a15b3b748dbf1d SHA512 7d20a1b87a0b0d7146b3b34f4234ab0e468601afd8d2118d463bc8cdc2a523c1a7c7c8962b21d187274965d6b6f0bb151ceadf91f718c1b937695791ea511564 WHIRLPOOL 937c85615048a5579319bc263f9bd645baa42fee2d89dacf645a314007bb3ec24866248abe23469d4d48993e03bace1c8e07e44a70337e371e25669895540dce
@@ -35,4 +36,5 @@ EBUILD netbeans-apisupport-9999_p20151228.ebuild 3384 SHA256 bdae8f084ad92159fae
 EBUILD netbeans-apisupport-9999_p20151229.ebuild 3384 SHA256 a9e8aca349720d3269ba2d112180084112ea2ee7184043e7a9c31dbded2a894c SHA512 a3aeebd561b2e88ae1712e955a797a9e949646758ff5ac66a58dc432d9082270bdf72c866b7c76d767b6febc0ca636805ca82445e58641685d668cb44c20f8e8 WHIRLPOOL 24d00d4c926f4080ef38f75e8e93ef19b4fa0bef2155bd633e6b02f99613db07d74125a18e511eaebd10cb324d2f4b78f36377fd5ccef4384b81fb066cd84fcc
 EBUILD netbeans-apisupport-9999_p20160104.ebuild 3384 SHA256 1b7544b71eb8ca0b29fd04285cf3f1fd7a1b3ed24bee476e091d398e2a8af20d SHA512 f4937cd18f555b2e916f49cba0cf94ec26e0131ff840f52d61d82abb7496b74fd0693051770f6db41c2bb35bfb086cd2e63028ed77234f90669db1ed4379b883 WHIRLPOOL 13003602162a041610cc0448d4adeeef075c346b997c2f49b8084350ea63bb6ecc4e6f1c0ebaa699dd2cf5688e43d58575d39ac91d8bb717c83d41a0721b646f
 EBUILD netbeans-apisupport-9999_p20160108.ebuild 3384 SHA256 d8dc22131998f889bcca0e7b4e6d43b3ec298135e386d7f06883b5aa10c71c9c SHA512 289bae2cd42d587b2721a2e43d887055dd4f292b127b8f1a1424525fb42e755140968ad0c1c5a69cd15d989a5efe63c8cbe5c32a1babf705cd4288552ceba274 WHIRLPOOL 16169c9745087e1e7a336db58321bb406c9e9ad2ca69c3d860e9d74815c323116197db668c62d37189252806b3fc60f72c48c77e53ae0cd96acef6c349fd819c
+EBUILD netbeans-apisupport-9999_p20160111.ebuild 3384 SHA256 65e8ac7c05eec6a2d8124789137e8763bfc06c691bc7c1fd1674a17effb3459e SHA512 8b3b80fd87d07bc1cff7883c986a9aa1dd54f60a34d448e04a29f760d0b23295c9d120f99c2d16ba482a76a8ccd9e84500486dfcbb7a9e7a7868c62fe2b8eacd WHIRLPOOL b1a550ce648252e91082550c15e24ecfc842206c50f97372e50fc960475f8b65a68162ba8711e4e5ac0be9fbc7f1dba9931bfa8b337631c203baeb5bccdb83f4
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160111.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160111.ebuild
new file mode 100644
index 0000000..a4d0fb6
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160111.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans API Support Cluster"
+HOMEPAGE="http://netbeans.org/projects/apisupport"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-01-11_00-02-04/zip/netbeans-trunk-nightly-201601110002-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 71ace42..94eff2d 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201512280002-src.zip 209403445 SHA256 0fc2fb9260022c
 DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
+DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
 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_p20151210.ebuild 4790 SHA256 a52f26182ac4f7b05f9cd8d73d31cd2d987a93dd9c215f79c77df666712fb617 SHA512 f405ebdc3de5badc3631a0f8870beaad90f743c9431f3d681f1418fb92f49b98b1b5ffe31ed5a0b4d2f7e345d649b6ac93c534d724dad4d7cde7b74b0c65fc47 WHIRLPOOL 6d54ffeef22acf465aeca507c9428d2c28b37c79097eed3679614aa7d28b4e7736624400f6b6e1a1ccb41b4d5c4bb1abef7b5b28a1d93a9a174f8b8b52f3c332
@@ -46,4 +47,5 @@ EBUILD netbeans-cnd-9999_p20151228.ebuild 4790 SHA256 e89eb5fe8a8d7ac2864d2bb9cd
 EBUILD netbeans-cnd-9999_p20151229.ebuild 4790 SHA256 40e984d3e7b16b22d2287dca20a7a19605f5ddc8db4048fa93459625dcd4c22e SHA512 01130cdd859af8a9af42940077931b3d1b71382ab406de5e566f305210f21c1c99e67d957c8f7007103388cea621db54958bd519ed56734fff8e813c6cf18e92 WHIRLPOOL 2495372543e121638a7a42718a37b9eb8ab8b6e2677a44921f0ab9f261075f455e223da621ef59a25f178ddfa63206bbc19aef908417d078bfd29f2e13697f50
 EBUILD netbeans-cnd-9999_p20160104.ebuild 4790 SHA256 6c50d15e2cd72a6d604d038d57ebe93ece2e574d113f73d534e6048e1ec515e7 SHA512 c5ba5a6786c08dae2a90d73b8e5adc769f09212532fe65ce78a7ad8fd285d74905d19889995a65e92416fc8d58940cff7fdcec89339047a8a2ab7efe8388e8bd WHIRLPOOL bf2f4243f17b042e9f6400873a3edb7c6f9a03acab3a7bcc97c793e6267a2cc2f4bd7eab97ece26cc3502d628b728a28b90f0f000d8ad7c9786184fc31859d8c
 EBUILD netbeans-cnd-9999_p20160108.ebuild 4790 SHA256 0e7eabbd12b9f3326d5b5cb240535e7ce9fcb916f2826f078ccac8a70b0b89d1 SHA512 bbeeae09cdfc68ef09452e0793b82aa259d5548663334d42c105da1ff76eb2169d57e3aa3857808b8fe3841c55466efc8c946db431612984bbe5ecb8f82ce751 WHIRLPOOL 07a7d7aebd2bd08fd1167cc9d00657a01987f328e44c7659936b6ab862d4b6ecdb015e3044a44b991545fc6634b75a76dd087ea38b986466f393f5f5b40e77c3
+EBUILD netbeans-cnd-9999_p20160111.ebuild 4790 SHA256 3c86c5a49c8ba8089e3df0531851b6605b5932171ae0d4dd03a2ce152e71a1ad SHA512 2fb21ceab1667e3e120d326be172becfe5df9a0ddfb3dc1193af33a66dc4b7ea675f35a7fe4510a1fdce0eac7a5a25f529ba2b7329b202a7a04cdd3e6df84b99 WHIRLPOOL df46145b7d690ac2aff13a41e23b8849d701a5e361b5e707c99feda72bc0c25ae4fdf2b624a3714bdd7bc6d1ede2a261a18adbafe21bb922ec6f611646824717
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 46349ed..e32dec9 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -21,6 +21,7 @@ DIST netbeans-trunk-nightly-201512280002-src.zip 209403445 SHA256 0fc2fb9260022c
 DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
+DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
 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_p20151210.ebuild 2968 SHA256 e4ba54a954d7f1aeb2088ec2a8638f78b5ef1541488a7ded86f74b026fd2ec79 SHA512 04a72146f40a4c75209f6832bc503ab146005a3e983e9eb60a2a1d94ec5303b8b49cbf57a51bc90fc405209b8652bd08242641123a0773d7aa0ed8c959b61727 WHIRLPOOL 5c003719c78bf62959dbc59524bbe4468d04124192531640a1b72f640103d3d5a9a5c68a343285db51b41a2626a1056bd373befb309d5fcb21f1322e22acb3d8
@@ -38,4 +39,5 @@ EBUILD netbeans-dlight-9999_p20151228.ebuild 2968 SHA256 cec386cca4df21af230f12c
 EBUILD netbeans-dlight-9999_p20151229.ebuild 2968 SHA256 850bfd5b4c690305c784f03103eb6546fe8c9d8580e06f145ffe2d5e04688df5 SHA512 c3df9e2f1d1ce75cdc0cd9374dc8fbb0b6430cce225b3ec40c36a2116f7940a10ba4a72a52cd2aec276727abb1cee47e7528f3d3ffde7151a5e76687f766fad2 WHIRLPOOL 3454d360a63354a2f66a2f0111689ea4480008d1b812dd286c54f46c8e40f4aeb01a144d820a3c79261d89997398639140b3c275be323a1514893e24142a2743
 EBUILD netbeans-dlight-9999_p20160104.ebuild 2968 SHA256 0100bcc27ac6d26bbfb248f08baf151f02c4259bb0e0323bcac6aeb83e6583be SHA512 7fcda8e5abef409491dcde6b2ed7ca4244f1a4316d871a0a1dd1ce77bc1ddd9800b08ad9b22df38dc7f84850a8df0b298642f5631e7e4e799273a5254040fd93 WHIRLPOOL d18ddd21053660c3f67dcf35f47426effff0ccda85c5e72e553b22a36b342cd875d95fdab8ce41e7e91ae9684ff164cebac535c693edef3693bf3f86fa346a51
 EBUILD netbeans-dlight-9999_p20160108.ebuild 2968 SHA256 27f08dfec6e4bb02cbef6a9979b444f0dd74688ac3c44177fdf5444f2909a3bd SHA512 29864e22f61edc575e0bf79687f1857ac57bdd92d185ec72a79418204ef37a62c5f23e3880295445417ebb39c38905952a43f5c3df20196b0e22b3a26469bb2e WHIRLPOOL 6d02dae9d9cfbb27abdde72759982c089f6c6d2426062e215577ac77dada0a5c2e373c417a7517097a75c45e1d9cb6a09664d109d7033c67c92e59c68cc1f8f3
+EBUILD netbeans-dlight-9999_p20160111.ebuild 2968 SHA256 751be0cec30e7ac0e3dc808d1d5e655d76b44408591386e9ae397b4a061fee84 SHA512 eafa2cfc11ba5ef19fc9a792dc245873250b5ea5f9fec369f05f817d4dfca4477b012071f0abcf84a03a17657dfa098b645ad6663845e5ec3bdf1fb9ad719133 WHIRLPOOL 2c7752be1f799f4ce3e1ee0f5c96f59b5f043489739ffcc52f2ac03531cc1815a7dc8ef2f7e5c8d2103bbf8514adc7ca56cd6557c860a4839ef1b4935e59ab5d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 964974e..3eb0fe0 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -50,6 +50,7 @@ DIST netbeans-trunk-nightly-201512280002-src.zip 209403445 SHA256 0fc2fb9260022c
 DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
+DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
 EBUILD netbeans-enterprise-8.0.2-r1.ebuild 15075 SHA256 41d376117ad1d8d59c8194debfd29dc42f5fd4de70aee12a2134ec143a604dda SHA512 4cd9de88e9a401cc0be88e3e2605abc411c47307818376b2bcc00f9ae570b21324f2bf00fd83e819bfa076da0fb07811fa1f0f9362a6cd0ee05b63221a199000 WHIRLPOOL 73f4518c14430fe7aa3614ebf1b11a06ba0e9bce7479af2770db3a114f149d575a16a655218f757ed416b5149228ac56dac700f5a8d5e034cc838bfa4092e636
 EBUILD netbeans-enterprise-8.0.2.ebuild 15071 SHA256 84621e3bb946cfa254bb70ca3c3f61202882a7e6d631769ad2f0f4639b0de875 SHA512 6ad38e840764661e6bc5b89b5925e9665871009ba0b640c0a78c555ec104214dbee1200a93cb48e655bc620e07bb6e4d8932b23a00fe458f8a5e9e5c3200d79d WHIRLPOOL b2c2bbf2ff72f8cd9b4cdbe039fdbf7cd074b0fdc20f634aa0b6f79f5c639be358c61fab30854a6e3ab9714a285d9461ac4e39e94e10c14c5068422d6c873c56
 EBUILD netbeans-enterprise-8.1-r1.ebuild 15888 SHA256 d4c04ccfee01a46819020cb7cf8fd8297618f3c0431ae2d9dd7eec8131f988ab SHA512 6c7c39c378cb79d3f382cb80d07710a8c5233aaf0df8fb58889ee6aa6bde73624efa6aa49b43f84105685094a7aff89e4b6367ffd1fd113da27b42d50d07e983 WHIRLPOOL e678e2a6957e428c1b6e51469c0e7cc6a08da2c797f1575b6bb660a7f3281c00f071179de459e27c983304915b005baaf94ad4fae0a4c08162f218bf53b7d821
@@ -69,4 +70,5 @@ EBUILD netbeans-enterprise-9999_p20151228.ebuild 15825 SHA256 439801953f275e5178
 EBUILD netbeans-enterprise-9999_p20151229.ebuild 15825 SHA256 b4258d1dc8bef26206ca4cf7ab15af9c2b8d5a299495add2dc32b86789a62d2c SHA512 434ee298b4ca4e8808b979f59eea633c3778d3778949b39497ce2378b3a034dc52dc3d75619b1217dd081a574acfa3a9d6f0e53e0da3b4037da6938eab190db7 WHIRLPOOL d9e2f2e6905213cd8446bedbf5f65995fc0fa0a2279cc54fbbf238c26faf2c613d29b1b9dcaae9d9070c1ccf5ea5237e8fbba08fc1265e3a97f7797236154670
 EBUILD netbeans-enterprise-9999_p20160104.ebuild 15825 SHA256 efe232a4ee688084bfd86d70c2fed4a9fa5cb591fd9ff4237e7c8954340c52da SHA512 ab3ec93b101b8091e979bb574435dde70b22e9b87c230542486843565db6a70521dd933b4f992a13a5ad4ba93f019823130c3e61c6115a4b74519c37a0759524 WHIRLPOOL 9d53fa6b979851c4d46b27cea723ed8d22e85e4e2438e56e7fcdc57745308e98f1927800a12e432de4d6c46eafe7e4e5ba71600e67f031a0394aa42c4e5656e2
 EBUILD netbeans-enterprise-9999_p20160108.ebuild 15825 SHA256 f34cb390190dc60d95784f28d943de98fbfe42eb32bab20cb7c964046295005a SHA512 d265877a76712c6a7a2589a93b90fae87d8bfc1c12aa4a5a9518cbcf366582751c993e47149df924add26d68e348d442f87903d3ec9a60246cc681f70898c8a6 WHIRLPOOL eadca79074ee37848e20e99cdd32b8f87452679899b1f0dabfad79ddc7cfdb1814ffd7a5268a9c1e459d7f0c2eeb821e21c35832750fa02914e5892222b0f2dc
+EBUILD netbeans-enterprise-9999_p20160111.ebuild 15825 SHA256 b5182122909cb40c05257c03a7df1775299bfb2212a029707587dbfd1db5d431 SHA512 f0bcb7c4209a85a9acb750bcd7da0159bba83954aa1b91f2b5f0f0397418dc114aa1f6da55b5371555485ffde62bc80b22bdb904e4634fba7546fd5d793c47b6 WHIRLPOOL 529edff06c75160e4a08bdb1d6056ccc3b387106def6a87984ee81e1dfec8720589d84dd8a03610955ec502f6842966d96cfc8cee7fa6bcbff825b5be4189ac1
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160111.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160111.ebuild
new file mode 100644
index 0000000..6e39465
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160111.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Enterprise cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-01-11_00-02-04/zip/netbeans-trunk-nightly-201601110002-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 2134410..1058111 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -18,6 +18,7 @@ DIST netbeans-trunk-nightly-201512280002-src.zip 209403445 SHA256 0fc2fb9260022c
 DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
+DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
 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_p20151210.ebuild 2913 SHA256 3bf3897785ff616118f00335c4395c09702720aa8546d99b2dd3354f67f9638b SHA512 27dd9b273874fcdea2af175cfe410fe20a0501643d79fa866b841ef97db97e431a7b289dc81e5907476239ff4ff68bb98ff5da55d5abb176c922b423cea2798e WHIRLPOOL c6aa2cc7156d41de1b093cfc0ecc586aa4f199ff7475351dfb9d8100ac1597c54e56b42c4990fd6ed9aac3167a82ccdbb41f6e2ce829260f70a04a9545ee5878
@@ -35,4 +36,5 @@ EBUILD netbeans-ergonomics-9999_p20151228.ebuild 2913 SHA256 cb438680562e0413957
 EBUILD netbeans-ergonomics-9999_p20151229.ebuild 2913 SHA256 659462872eb193d863de274e70b3c2f9833fd09aa92ba11a7a98ece702ab665d SHA512 f270f7bc01575ec00d7eae54d1ee9fb02ef49509404b0ab6f66e3bfd373d406b98f164b3e04cc1c499e76cc064a59f03aabad9d8a0e45d6aec57cfb010c53799 WHIRLPOOL 80f9fe9e2100b3a44c0a9c246f89a6d7cf3a7f0d40853316b01bc31b819c038ad48ef8972ce2c7bdc2aa33e6b59fe5d023553eeacd4e51b4d77271269740fd4a
 EBUILD netbeans-ergonomics-9999_p20160104.ebuild 2913 SHA256 f6962ca5bad97184363417c21b385b4a4e376dfa15b86a42fbb576f281d4edc5 SHA512 5f2dec61077a3750d7feeec4b5b58765f72f4aa8ce2e8966c7140d196cf4608953a3aa00a7c8b0d11150bf134b124200115ab65d0eea107bbd14841cfc46f435 WHIRLPOOL eec826fbe490527fb017b0f9ed8ca729168030261b49c5bd1c57f3bd824b7d76f4ac8bd022b0705443d0e7b2516c36a605737c1e30a2ca429e4f4276df07fbbb
 EBUILD netbeans-ergonomics-9999_p20160108.ebuild 2913 SHA256 4b1afd1b178c6d867c94d6e686561d8c72aeea70feecbacf6fbc6c886ed1c7f1 SHA512 d17c41b2d1750183086c0abbf2da232145102c0f875ae89c840aca85ec670b496e82d46c9558d701f93370998ee6c46eaabcb0eca29274e0d8993f7ae932e80e WHIRLPOOL f339153c2791b78dfa2cc16c208c79de5f66a99b184fcc420ba741b12f6e104334fdfc7de5371834b8d56b75929f498641c56196a307c3e7895e1bb2c3f197ed
+EBUILD netbeans-ergonomics-9999_p20160111.ebuild 2913 SHA256 18e5e4b54ad13418ad908a5e60f4cdd077bc9869da898a7065c81cf92b78e8af SHA512 d6aa0b564d484f5e98630180da459cfe6f9e9dc8f269a833103d0888b234a0b360d4a0d778972009857223bca1876dedfbfa0c82b6591ca54b591600345b4273 WHIRLPOOL 2bf3241d42687b0f4ede5be9a06865962eb4b51fec763b1a0248ffe16795e41b054f00afff69145893efe5ccac7397af0f7e9c1b76de5b150495ed5935387996
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160111.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160111.ebuild
new file mode 100644
index 0000000..5963787
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160111.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Ergonomics Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-01-11_00-02-04/zip/netbeans-trunk-nightly-201601110002-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 10f3aa9..724c06d 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -20,6 +20,7 @@ DIST netbeans-trunk-nightly-201512280002-src.zip 209403445 SHA256 0fc2fb9260022c
 DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
+DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
 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_p20151210.ebuild 3377 SHA256 3680c898cbf7197035ab84632647c7c7c9e285f2ae94ecf9eebab0c9d97995eb SHA512 6d6ac31e44332c400329ab9daf67cca2bc9a17cba5b338f6b3bb406c744697778f68446cda04d34fb47d7e2cc0ff2e4fd2148b98baeab9c5c40d98eefc5ef39f WHIRLPOOL e1a9326e8a46bdf24f93c401652d886d93b8e1ec6c567b4543b61a7e6e4c5131d8e38cc1cfa472f2169fd350175b2ec50b60a6078bc8d58572ddcb8b511ee621
@@ -37,4 +38,5 @@ EBUILD netbeans-extide-9999_p20151228.ebuild 3377 SHA256 fd592e5bee7642b12a3a5da
 EBUILD netbeans-extide-9999_p20151229.ebuild 3377 SHA256 7031c0f8bf48bbaebffe6292961f8232147e830e8f415ce1b374c6e6d90a83d0 SHA512 e87e332e2ccc09d085a85f8b04fb5bcc87c5b1fb05df15b462aaa059b495445c827b6a62be90152eb32b53ad24321a906238a7ecc99a4514a08ad3958d2e6738 WHIRLPOOL 1851185f16dc912805cc2f82846a16fe6e0b709bbc25b1a11e0967e858039c30f91a291a092ce55f4651e8e499692bef14563e4dbda9dd2f9d2464007230b1a0
 EBUILD netbeans-extide-9999_p20160104.ebuild 3377 SHA256 67dab498c39d86278fec38b2a0faf691c889136520bc0692de03c19c2f94be9f SHA512 7cf6f05711df39c569228c0b62734955c8430ed981ddbbb6a7252c834bdb083f043398161b3a6b9cc3ead2666595bd27f51a9413c95ae9397f8cd4766f2c8953 WHIRLPOOL 15cb3f4ef19842935a829e24bedc9910989fc4caacd62750f46263af6c3f501c9b00985e7f7509b034f1b479341f04ed1f7a9a9d3c4a1d4b17ab99cf9785fa82
 EBUILD netbeans-extide-9999_p20160108.ebuild 3377 SHA256 c6676bf6c5ac323a20fafbb6d798413ae7aa982a414873a654ef73365af9c225 SHA512 ed177424f7ad0ecec26071d7c9669198de81aca39d3c0de233220db59b3264fb46756efb77ee791fc9ceb7c8dc31cd7ec4521514fdb7ed411250c5e7060fbf21 WHIRLPOOL 295756c0ae5eaf4f9055ef9f5e02bb3449375fd9564f1288e621d666e82828ae5e20097de5a2bce379214aa6e463cdf46bd4099627361e80d327601ab99eafce
+EBUILD netbeans-extide-9999_p20160111.ebuild 3377 SHA256 d07a40e7a6384cc8a267eaf3a14374e7c2b08635ac055a0c5cebe58f9b138a62 SHA512 1dfe6c2d5c29b7d8d0aaf8f2aac80dd1d8e20a3af8c11edee7fc98eef4eb9f3481150f8c6cdb74d3a9347d6e4a5b4eba709adf282692549df0e838212bb2c94d WHIRLPOOL 4545c48c0fae1bfbcc903dbb6e8b20117e1cada414f6e276a3e2f7bee56c8bb601bee08a5c6080e0d9aee180a350838de61444911c15dceeeb2c4117347ad939
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160111.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160111.ebuild
new file mode 100644
index 0000000..04b6fd3
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20160111.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans ExtIDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-01-11_00-02-04/zip/netbeans-trunk-nightly-201601110002-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 b06cc03..7453097 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -20,6 +20,7 @@ DIST netbeans-trunk-nightly-201512280002-src.zip 209403445 SHA256 0fc2fb9260022c
 DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
+DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
 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_p20151210.ebuild 3416 SHA256 158475683162d3dfb9a591a20e4f435368f2cea224a72c16c1f9d47fdc639dab SHA512 54773b5f8f2e8dfb9b4de279b1d6e34e34f361e6d7636fda98b93a1e8b0e1653bd044c802a00018ee2ab2b62eb2aa715501addf82f344e0e0d192b16d5e16529 WHIRLPOOL d172d61ec1c5e1ac59324e072622113fe832a156850c359b41313fb623d6b9096ee94260302eb7821a06530c51e45e0e142cc75b99d963e91ef548621382ee1f
@@ -37,4 +38,5 @@ EBUILD netbeans-groovy-9999_p20151228.ebuild 3416 SHA256 48a5cde3b4b37154dcdeff6
 EBUILD netbeans-groovy-9999_p20151229.ebuild 3416 SHA256 9ed0bd8bc7d926fd57aa49b6b5ebdda503b5e84031862b68561e49c17fd851a0 SHA512 dfa061673936bb2a6ae4c034d6d58846e3e9546adaff9916ed8bfea7eb838105b11ff000d018bdc75c90a243c29e51e41de21e83b92c16d2e7d02cd8e05e0643 WHIRLPOOL f4dc8105d0030ed389f77c02cf8c72d0e8252c7068fa7eb663b368e70e641651abbaac614d813b1f496f21960c9f962159578f0cbd52ed9186689b9a4448a8c8
 EBUILD netbeans-groovy-9999_p20160104.ebuild 3416 SHA256 06d03b6e5ae56ee23ec7291f7499b6bbb3007c151c225c31838b41aadb901565 SHA512 e2c9fa07945e0311a5f0d5c5546c00025c5d4d44edc1c97184cd7b8c44b380f6b0303afd88f066165ba7bb4523160753b4535cee5ab820fa97adf7a4d84e9581 WHIRLPOOL 5491d208c112958027225479a6075ee47c45637696a7ab735047715ab3eef3ad1c99c86307c1ee99fa9f498875fceb318526e87f3e0f9e7ac5d495706b06d21e
 EBUILD netbeans-groovy-9999_p20160108.ebuild 3416 SHA256 1c3253d2ff2f80bf8eefeda33cc6f75c7b9125ab3d4a294f646a3b2cebcd514a SHA512 e5d33196531e963597cc7c95dbf742eb4bd2ad1f83f3f2375ec10347a018bdb98403a7eae760956a8379327db5ad81c95051d28f8cfabe4b39da4aff3aec8219 WHIRLPOOL 64739e7e3f824eb4a0a17c786810f501949c5e80e47d09df46319d2e3dbb151faae19a2a3a229c82d1cbd762088932f9bf603bdf57a1510574f10fc4794a1993
+EBUILD netbeans-groovy-9999_p20160111.ebuild 3416 SHA256 2d65c80602130e87d39f8f3759521b3a2d5acd1ebb85ababb1425e52a2855d8f SHA512 f462d33ab3f255aa875a2673b39f2c8a4dae5e0b77521b75e99fa995aa7f427ea4bc6f2f9e346ae03cbae78d0c09b95b9ede48202960f8dc52bf91e3a3c6d6e3 WHIRLPOOL 8b0af3b18ca31e34a6a4f411a387dff97263c17020ca063f7f39d5bfbbc5569d486e99e9b259d09b162fefe6030993dd2a7949e6c8e487816716038181a77c26
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160111.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160111.ebuild
new file mode 100644
index 0000000..9631316
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160111.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Groovy Cluster"
+HOMEPAGE="http://netbeans.org/projects/groovy"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-01-11_00-02-04/zip/netbeans-trunk-nightly-201601110002-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 2bf7da4..6fb0b22 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201512280002-src.zip 209403445 SHA256 0fc2fb9260022c
 DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
+DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
 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_p20151210.ebuild 4125 SHA256 2103a4ac66ecad2d675ff0cf9e2c6f85a491d790f7743b9cbd4da9658f143d29 SHA512 2d476e53d5eb5c8336493cb2ecee08f9af0ab277abcb1a75a903b867689a91837ebdfe88bb6d717beb0d5e1df3b5531c22a334bbc492e52b7a5f7cc41d5934f2 WHIRLPOOL dca4c7caafb96af3d025c06f33b9731e9c77da457e73495698f8f9153534e915f8ab63122e4d79c73b676ecc4bc8a82df94485a5e604e89cfe979477f36d7d86
@@ -40,4 +41,5 @@ EBUILD netbeans-harness-9999_p20151228.ebuild 4126 SHA256 e3c23aac6b0696876b45b5
 EBUILD netbeans-harness-9999_p20151229.ebuild 4126 SHA256 83fa7c63e708281a8f71121aedb75bf00031151e337442dc5a875755734730c7 SHA512 07b253f8136ec18d0df12556cd76b1c8eec5c4658401ee20a7f836c43860e4dc29609a2ae8edc1296fa3c09353c899f044293771c5cd0c2d9720f9a14a996cb3 WHIRLPOOL b22324479779826bfa201f7095ad4a80bd065089e1bca95ad542aaeae44e32a1e5d89a97a7c76fc82e10d2502291049977b2f8d16c6689a2178f7e0bbb37e330
 EBUILD netbeans-harness-9999_p20160104.ebuild 4126 SHA256 6bf8a72b198b98472cfe603cea05f99c6aef71fd9472f3a70945a7d60c3b424b SHA512 89ebd29de70b23981c3a87bff1c5296931902e5b391a5990af381fdcbfbb27f898841b89720c4ffdc59e2a2aba556ae0f463f92d016aa18a86ce9f73bc16064d WHIRLPOOL 050f630f2b743aad37480f278fdb753db2e2f4f699f7b5abdfc5bab62d7364b5e30a9c6ab91237554fc1f01ed5ab6342ac9370959683146cef57b65d977903dd
 EBUILD netbeans-harness-9999_p20160108.ebuild 4126 SHA256 ac9e052d58e0ef821f2030484f576bfb1778f31e0fbb4295f23cea5de0ae444a SHA512 994bef755ff15e22e2334f1f3fc6a095cfb6a1cfaedfe19ff5ce4932283bc3f2b356d6462d984730f66c002c3fb62fadc6821d80a12ef3a05935e326b42e7c64 WHIRLPOOL 94abc87b3a66da8a3b36e39cd1c34497a3196b88a83679ea230e2d963cab984dbdfb15c799096995cc809ee56c90562eb9f08feeb3a1cf66b540e73b7c88df0c
+EBUILD netbeans-harness-9999_p20160111.ebuild 4126 SHA256 6aa6a32589169d8d304f28ba0f3e69a39b1bb07bbd5178e421d5e7cc63e49ae0 SHA512 5438dfc1baaff1ba18628b568e625c32f0db392531753aadd16b6416eba57db8fa6d8e3874ef0ac5c4cb9b9d505a3c38fb69564e4c04a134872931cb083562eb WHIRLPOOL 82a10fac824a252e9526c16659d97243cae5abfd6caf05dd2d780990c8f89b2010e3af9765d43517e97a654c23e9f8b90c119a5a67b30051ce6b6694cf29b974
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160111.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160111.ebuild
new file mode 100644
index 0000000..b52bf6a
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20160111.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Harness"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-01-11_00-02-04/zip/netbeans-trunk-nightly-201601110002-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 df70baf..1354e72 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -149,6 +149,7 @@ DIST netbeans-trunk-nightly-201512280002-src.zip 209403445 SHA256 0fc2fb9260022c
 DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
+DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
 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_p20151210.ebuild 30890 SHA256 168a0aed6caf6df09d0731505276a24e5e2acc0fca7696ad650946f51ab8481c SHA512 4e8a19ff0877afb50e43eb8805531af77a50e7e78fd7eb0e0fce0c9e17e147c92d0fa6f6e41b682980759b70071727f6423d8e0576595a553b09a1c25d0e8516 WHIRLPOOL 474aded7d5ddce8c30af7ec64a3b033a669ed7be49118b65855f6a3c1de1621d0d36950c878603aa569748009a482a9aa3bdb36457b910b92b048f4436c25229
@@ -166,4 +167,5 @@ EBUILD netbeans-ide-9999_p20151228.ebuild 30832 SHA256 4d0770d2b56d22594d15cd6bf
 EBUILD netbeans-ide-9999_p20151229.ebuild 30832 SHA256 343c5ea332b85d9773ef3f71d381d3dd3958f5975557de8f6c19f55ffe2cc44b SHA512 d575c83bff68fbfccd27862e5a3c166c427b1b5f0dbd52f10801d2654527801a807d0a692a780d29582c733cd873b8707cc076d7756adecec2e32ec31fdb4f00 WHIRLPOOL 74a477b12d37c9834d3f186b88ca1a9cbee175eee7e7e59527a7955c8d2922afbe80a17498f8d405dd0c8c80a03f052d84d9ebe9467ec8c4a21a9fab50aadfe4
 EBUILD netbeans-ide-9999_p20160104.ebuild 30832 SHA256 a8b1a0a3f049cb08ca20e2458cf0b1fc092a86803e50cda8560ab84310edd5a9 SHA512 e306444283088c8f9b4235e7570da2f7508d0b3a61578384f23150467dd873a8292608656c7129c10e3da34f413da7f9b5d045c533cc746d9685e43390f4b59c WHIRLPOOL 7c002e5145f6b07f23b214b44b390fc2ccd1c44720ac9378ad1e5be262b4d9ced1f13d8aceed181baeb5077d431136960f44783aa00009d2488882e966d0fa00
 EBUILD netbeans-ide-9999_p20160108.ebuild 30832 SHA256 0bc7c27b36ed19cfecdc744c24bf8633dde7a8de5b8596574a7b78609ce36352 SHA512 e67bbf338bd6328655489d258d1dc0ffc1b60e11f911dd02216bab41da337d03f79cac52832a6fd89c0d342913c4873a5d4511017266702ce8d81dcfa9c737a5 WHIRLPOOL 6418d332c041ff069b3009e7cdb7d7e9027b8710ab9780f82616aaf685eb5651ad65bb27c494d439d2f2bb16b1646078eb5f0c9c906c9238ac719a3e86cf8da5
+EBUILD netbeans-ide-9999_p20160111.ebuild 30832 SHA256 a86afff328df13ef40a2d1095c4caddf1c9b9d62f677c0932aa00e51d59a9c02 SHA512 9358184c003761a80e130292ab77731748b368fb7ee9c47288ff455fee18c61e1d9642f4e9b7dd8e66bf0e5958b3fa3c7095525eb85f86d0001f15b726b3ff6a WHIRLPOOL e765780b09c81374468442c533b3697a71d67e1e91c38c05bfc4c06d18eb0d34b0edc655fceba9dd6d336caae8e05bf6fb2d1922d28ce806017270f454a8be75
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index ffdeb6b..782f653 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -1,5 +1,6 @@
 DIST 29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar 1366247 SHA256 4eae7d13d7493c86df8b84b9a922dd9e8302e47ac80efcc47094344ce64de27c SHA512 06d887e5cd47b6bd86ea9e1a26c604b630285129dde43e6068d4b36f0e81c39cd91757e3323e77316e76b0fdf8c18a609bd216c7103ac8a4d947abd0ed6bab47 WHIRLPOOL 27c9f01d85f31781bc76411701ea5668644d83ec761f9d42ab93e3932cfefe5a6277429f889a6f9c68ce9efeb2cddaecb6ae8aa2c42ce8ea9b3a06305f2657c1
 DIST 2B9EAB164D8748F9793F6A0D29B6463E97B284DA-indexer-core-5.1.1.jar 227233 SHA256 7bfaa3a602bf388094c8fcfba989f0b121c0e71c6df4c3328244615a5cb24d59 SHA512 7669d2e11346b62420ab9db2e9a5a24bcea356099ae4d6f0a57c75ba168de9d24160277b8f044ca9a5f637c2591778150288a963787b6983d093ad64fac83550 WHIRLPOOL ba0f5a67dbc3a64ca0b21cb1f1a74b4e9b2d2c4d7a5f127de9940f375b70d0bc321f5ce6aa607bbe27d39dbdfd1d179b1457b5fcef65c0a0d4420e1194657192
+DIST 37781101C4BAF40437CA4D1A16149647B4082F3B-nb-javac-impl.jar 3036086 SHA256 8e0b2df2152fe9a8d8e66982923aa621e3c1e25fece2c4c614b3ceb029a2d0ca SHA512 b9512af9379b7308bf678c7a21be76b6fe69dec4570f892642328c15a8438f5ceee5c253ceb491d6f73edd89190198e536ec87ab6080de13aeea19b4e8ca02e5 WHIRLPOOL dfc4b8996c92d2fb2b0563363fbc28810656ac9cc07016503c76b8aa8fe92fea0489e2e68d3d9be43073664aa102564196aace334294be7ee092bdc16c26d1ce
 DIST 3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar 45718 SHA256 18a77f915276751b01ed8e7feaf344e78f5ea62bf53b7bb6a821a22865165044 SHA512 1abad0ebdb35d8fd4eec1350ac497cc6a372239aea9eb6c45a94265f46e4e5c2458fe5e4d0e1e067effc9ba8629451abf169bb4820274484f9c2404271b21727 WHIRLPOOL 7aeb90a8661d8eaa2ee2a5953932e3b829187554bf605bb5e55abb42edb82ff13a6e4b4acb8f3615a74961f044ebaf19343e3d403a476a019890cadeead73dd5
 DIST 450929B1252E7AFEAFD7FCCBE7D1DCA6AE153ED5-nb-javac-impl.jar 3036056 SHA256 403349effdf8e1f97334a4c2b610cd8d935d6a4cecb8c9a9419de5ec53878475 SHA512 39300522a14018a615702ded380cae52a840b0532ed89ef2c5ed3844003da611743a30dfd29a4849fd8d89ed8055bb49361ebc4c7de38e40801bdaa404b51fcd WHIRLPOOL c15a49531bd2c97089e6d60226ac2ac7a424428fadc5acefb9c698fb1c60f5bdb6ab8a0325ca2c99895c4f0ee75c6fe328761cf137112b780090f373a3c82828
 DIST 562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar 23838 SHA256 0c05ac203cfc63f1a6d59dea84d915220e18e8e37a57cfbb317e769f992f3e8f SHA512 a39da963b1e0c0111870bc3989e10c70dd136c0276099b48cadc70706f76b0b2ba1ece6df67c05bf8e26a4638b19b28b454df6c23ed5a9d4936d3cc5506ec4b1 WHIRLPOOL 88043adc7057b68647d9205782e46a2d7824533b9a46366e7949459e88fd2ac7be6dcd1bc1c7371e071c7efc5fcf6d3956c211f97932cee0e0a4f47c58db6983
@@ -47,6 +48,7 @@ DIST netbeans-trunk-nightly-201512280002-src.zip 209403445 SHA256 0fc2fb9260022c
 DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
+DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
 EBUILD netbeans-java-8.0.2-r3.ebuild 13294 SHA256 4abac657cff75400e92b1f2b19bca696113cdc37611c8c0f49dfa8c82fec4296 SHA512 32e41d7acc3aca026993e5edc791f1314f2bfda47413538af655b0335973c4fe50d998c67f129307b164075c3e0503280b4c1729d700431644ca6610d7f0f635 WHIRLPOOL d7f99c13421d08529b54085138fcffd2959a3c3f97d94a1dbe6e726a6dbc2cded69ec0bf97e1458b56847ac121954e8f173c1adde0703fd2969defa53ac37c51
 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
@@ -67,4 +69,5 @@ EBUILD netbeans-java-9999_p20151228.ebuild 14930 SHA256 ea7e3719aa92a4e983da961c
 EBUILD netbeans-java-9999_p20151229.ebuild 14930 SHA256 27f166d19b52e9ca7c9e8833b234a3d2e024c14f4e79f458db1ae8695895aad5 SHA512 da55f7945bde1ffdf5c933f5ff9830b389cb1c4c3d9fe9634bc64476fee963d977a2711e44db2256499710cbf37454080002367c8159be3fa712206e823a0682 WHIRLPOOL cc771102b6a515bae8681542eeefcef695d12af27e6fa86a6abf10021cbdccc07ab36e963bdd93fd5e5383b24cb6a0c6905f198b87332764fc4f938f27712b0e
 EBUILD netbeans-java-9999_p20160104.ebuild 14930 SHA256 ba68f8dbd62648ed6962e9179cef0f5b8dc9068acc1f1585ede34fb5909d4f15 SHA512 181ebca4afbee9c2dd2c372eebb3402f36338668e52e1a471bd137b65776d7c3d0af28095ffc9067fff54cb95daf1e61fe557de3b485e0b097eb83de9c7c7cbd WHIRLPOOL a8f3af2ea09682a8182638a3766505322445720bd3235127474468bd2b75d2440f477baa44d821cfa3f89faee8ace29fdbf34e4edc7ae7437aabe62c6ad06784
 EBUILD netbeans-java-9999_p20160108.ebuild 14930 SHA256 7a8618286dcb80ad6d6f36edd0e9bfdb4758ee8cbcf1a356628e21e75bce3cad SHA512 31d3e97201b3f355b9497d71b2265c49ef983c6125f378b738812eede8fc2d0539d1d939f719e3ee3d1965650ad4281940f98caa26a444a5c39e5d58e744a288 WHIRLPOOL 0cbf06054910d64eb7364f1374cc82f443a20854dcfed9cf8fea2b0e02772be2301e33560113c0c4b37290c956c85d6304725a1df54bcdd76ed73f017eca139d
+EBUILD netbeans-java-9999_p20160111.ebuild 14930 SHA256 dd0c03f1b8aa7fbba7f8387b75d15a3a04f0573ba598531e893b2b9d9dd19f2e SHA512 be73679b3db61100745704618871d7b85fbeb9b016454a1084ae4435ab81afbc920267337642b793b7be2008a3214194d452346523583ec8ba3b44cdc0b9eb16 WHIRLPOOL daf3be86711d2475f566dd836717284f7a8087f433ad4bd754f87458597299e3180d50b0ade0b7c208be761fbfaead2b54f54d275fe3f2706f48e7881b0316b8
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160111.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160111.ebuild
new file mode 100644
index 0000000..58f2096
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20160111.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+# Maven cannot be unbundled because it depends on exact maven version and exact content of maven directory
+
+DESCRIPTION="Netbeans Java Cluster"
+HOMEPAGE="http://netbeans.org/projects/java"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-01-11_00-02-04/zip/netbeans-trunk-nightly-201601110002-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 de7e7ba..4588f24 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -21,6 +21,7 @@ DIST netbeans-trunk-nightly-201512280002-src.zip 209403445 SHA256 0fc2fb9260022c
 DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
+DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
 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_p20151210.ebuild 4976 SHA256 d9ebe200e152c78579ffce98ae515ad5a9ec41119ae7694d05175f43f051d782 SHA512 5591408d92a86aa54db65cbc055ee8603767174162f1b3caacc170dc6199f2fc3b2b8e5ac19a93118fe3f83e66f99c5281dd34663579f20e247ae40fae148f63 WHIRLPOOL a3dde0f3eff5671c18697a99877a5073924110d8de11aea178de4e3e2f13ea36e6002d4f3637f270336079724b61df12166cb26b177499dc8fdb825c9ccf5a6e
@@ -38,4 +39,5 @@ EBUILD netbeans-javacard-9999_p20151228.ebuild 4971 SHA256 3d0be589a984af9162a5d
 EBUILD netbeans-javacard-9999_p20151229.ebuild 4971 SHA256 cd7446cd9564c50fb7b34a3c41fdc4a02c745d20b32e77f76804de7f678d9932 SHA512 eb381b9c038d298eb8c1f1ac0a9ca417fc6e03d64e3e9ec71c675b05468a4bcbc15407ad41566e3ec00eec27721659165353cd2ebda9315ab8fa5507cdc1b07a WHIRLPOOL f2176499facbab5125dad58816090dba17cb3ea07b6871b2da905517cce6f26a0d590d6524a2c10d9684ecc60c19e23d1c3b13d8298fe3f58d7f60da48a1064e
 EBUILD netbeans-javacard-9999_p20160104.ebuild 4971 SHA256 2d9b446422f5bbdae0bdfb9499f69d24199ff3f6b00d08b50cf85ffa6d92d5d3 SHA512 a5f8a1e4cd2426324c437b37c7119ccdf0826433490911b2f65124e9e37a5084c0021467057a338621f6c6dd0840e2ffc7fe425225ec10b6bc3cd2ad01be804f WHIRLPOOL 7d4c1f5ebf1b91996459f20d0b74b0a4fc18b96047cb967933435474a7c640b45bab067a18d8b86ec903e2dee7b28b59847339461a1d261f5edf677b63e42654
 EBUILD netbeans-javacard-9999_p20160108.ebuild 4971 SHA256 5799211de058e7e9aa1ea0949e6ff80bee1a79ca44af0fa4ba898cac1a5e30d8 SHA512 6a679c0a705c6ce077667f142f0f0c1a45df29630a956d5068e4b874552075ad1d2188c8fb4c99f41268e432988811eb47f3b7deb1c3da2280f04d7d636faa0a WHIRLPOOL 6ac05574f1fd269a1c39e4bc9f4d3c15132ccc69f903d76b8e1b127a8d05861ad6d802be6599794949ed823d97f7995e19d3eca429173c00d5cde8559a102d51
+EBUILD netbeans-javacard-9999_p20160111.ebuild 4971 SHA256 444dff9c2c13f95fb870418bdfd4635ee1d7ed382beca69bce93afd76072d065 SHA512 281dbfeac334ceb8ede44721a73311d0d2ad3f844ce6a725e7d601b3036e86456fc6ada2921c34e394a857ed3ddafa5434dd38aed2552802c2f850246bb902c2 WHIRLPOOL 544744d9bd6601d7c08cea384521c1e424c2f177bc3ac11a314a4c102f3ba3f552b31ba84136981b3b0555c139fa028241914909f4b3189f83af7ae73246d47f
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160111.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160111.ebuild
new file mode 100644
index 0000000..b0159e9
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160111.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaCard Cluster"
+HOMEPAGE="http://netbeans.org/projects/javacard"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-01-11_00-02-04/zip/netbeans-trunk-nightly-201601110002-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 3f0d4ec..915446e 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -19,6 +19,7 @@ DIST netbeans-trunk-nightly-201512280002-src.zip 209403445 SHA256 0fc2fb9260022c
 DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
+DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
 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_p20151210.ebuild 6293 SHA256 111f348146bf2192bb1822e7a80020abf048c085137fe205c236401f5dba4e42 SHA512 fcd1e641ecdece88b986218c0183af7a8b05dd9797cc9adea7151abbdfd90c150e81ef9828784541ab90d019163f546ed74f6b4a92cc049541774efe6792434f WHIRLPOOL adfa0339bfd9b22deb72f8c7e76d87913fb3af26a2b8e0c2490c2ddf21c7e7a2454f2358e99016b17607a0a90875f8a866d61586b574636914e3958ca78fbf99
@@ -36,4 +37,5 @@ EBUILD netbeans-javadoc-9999_p20151228.ebuild 6293 SHA256 18f43b62a199084ca2c591
 EBUILD netbeans-javadoc-9999_p20151229.ebuild 6293 SHA256 572525c079b0c8c8a5f547dbe77f22230b5eae8f46410f3e2c8c5b2d87721a69 SHA512 0b67494c2317aae103b194aecdac9f766063cda39f78007ed4edbd5d961bf8f5dd402b7293802acedfadbd7b926c66d28330e4ad077ecd242d216b2cf8da2526 WHIRLPOOL d4fb602fc6291779eab2259e33498559a2604ad68960c30d863964323e9b44c1533ab10a2c1e3f440fc37bc59819649bb53cd6e4b111987d4ef9f5de12bdcfc8
 EBUILD netbeans-javadoc-9999_p20160104.ebuild 6293 SHA256 2d75f2091fbab033f643f1aef2b33034e5a0003846a91bc676165144f8835a7a SHA512 b159873d3cd86818f353f43d7f12b764ca42d24abd965b44513d32b0c6176255eb4ce833a5ecac9e5f1fb68a4dabb10776f6e95dbd13eedfd4b3cf3b352005ff WHIRLPOOL 73a968ce3674f5c4027371543fd286724fb3fb96b25f1d85b7311ac3d978ea13407c2457c9931e814b443349db7e23e58f62946870e38d01a954d31f28dc34a6
 EBUILD netbeans-javadoc-9999_p20160108.ebuild 6293 SHA256 a312c7663133df8311244766d7cd28afb67ac3538647b5c7837bfb99c687e705 SHA512 c6e180bf67cf1f968f97bf083451401faa3d87c772ed4a82c07aec3c0ca612c28bf461adc5536b0a26ed876c441b79d1042bb28cc6c0a0e746edf7d821290c0a WHIRLPOOL bf9d0727e6b5dbe79b5530469cb40ce8eb38b62e50326cb6fb1b1346de7ef2db49600805c86a4c67864bf50fbdcb8e2b9ca5972a1ad8ee0d7bf70317250079bb
+EBUILD netbeans-javadoc-9999_p20160111.ebuild 6293 SHA256 92b134d3634dd196b679285a9b6a1d8643d03e3db03b077645447d5af604271b SHA512 57edac8b237c110581aa1f8740b224370599519100124319560914bc89b8a470ecd3016dc5397f1e48b3c316d19d9611020f2e956eb818fa19a4d4b6c0d9740a WHIRLPOOL a8c6a997461a4ead44384b741dd7f2218176d8c0958624c73d5b90f341614699444350106a2884e5d5c32c570975e5fa1a8f376408130d2d81a1f1a963f7bdb6
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160111.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160111.ebuild
new file mode 100644
index 0000000..2c5f266
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160111.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaDocs"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-01-11_00-02-04/zip/netbeans-trunk-nightly-201601110002-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 fff0cad..61b617d 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201512280002-src.zip 209403445 SHA256 0fc2fb9260022c
 DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
+DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
 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_p20151210.ebuild 4717 SHA256 44a2c5631c5062b541c25c16963974fcf9aaead1c9ea6aad957c6429a84d5ee6 SHA512 32d9b1447c88d1419f05d1c16640b0926abeb5990e3962bfae0fe435d50c6382e9a6d9fe3da65a03067036530f737ecd7f9a171d95f225b2e498d3161c67e712 WHIRLPOOL 8600da0e95a1dfca69f8f696482e8b628d2f66618e9f35c09ce5b51807b343b61ab688e174d8582f50e1db58def3e5ceabcfd170cdcf3fe44c6226924b5fce7b
@@ -43,4 +44,5 @@ EBUILD netbeans-javafx-9999_p20151228.ebuild 4717 SHA256 6b477e0473baf54a9e409ab
 EBUILD netbeans-javafx-9999_p20151229.ebuild 4717 SHA256 8469b0a41e25ad8cd23f44f47e9c2b6db741625466f8023f235703c5bea2c4ef SHA512 b8c78104924823e265da7775a9d5cf8d10a77cdd735a9c0e86a328fb3916be5bd42160a63350977c10b96e730cb0c50c8c30cd2f477c5768aea56fa21af616cc WHIRLPOOL c1a76a0a40bf1b49908df6f85690413d490d743d150c6f5e993629f17014657bf2f82a982aa33405f6e12f49ebe4e56fda798314a8c518945d6d6713e2718126
 EBUILD netbeans-javafx-9999_p20160104.ebuild 4717 SHA256 59a80e6d0bab595781c7a607913a4fdf0b9590d7d81dffa8396f84c3f13d9136 SHA512 b72ba3e52921421bf51edec7080a390df9232f62bce3b7ebfedb732599d4481bf34aecd610799768ba3449c35f8bb50e54bf47c0c78ec8585d424ca3a27a0cea WHIRLPOOL 8073288bea2a476883eb9ddf78fb1327b7b634f9245355b9d6e2490bbadd2a5328515925afa079cca9b307f3026082176027a1cfbb4a4dba70c148bc1b4daad1
 EBUILD netbeans-javafx-9999_p20160108.ebuild 4717 SHA256 e9b5ad69533d04f102b9d6f892e7f0173706f42aa130e075b4e4770f5131b11f SHA512 c7467a586e8cc74f08f36bb8b9a77beb96abe13a0841438cfc8bed174663ea5949ff6da202130c961b2c52e654c502812f79615455d93f3e5727e4cf93e60b7e WHIRLPOOL 24ebe2a5f4b1160a4157423fd277fc4f5222378c022422b5874f65d9346598ec2ee252105042b1e297830418f975b311a7f8efdbecac5f0c83e903c0d7bfe5d1
+EBUILD netbeans-javafx-9999_p20160111.ebuild 4717 SHA256 b324c0fbbba0034583640e08ea5ceb5d94904a93b025f3b01171ea3316ab475b SHA512 81afde2be0b009e2db65835fd72c79de4bf4c411be9600b127281d09eea457b40b6e9fd5492e87c9301da47606e30587319943b7fb1cfea7c93e3dc57c9728ee WHIRLPOOL 7a43413a66573bfe1c572d2781c44f9fcbb6a0fcf98df0ed302987db15763224c19820523899d16dcd290451dd116626366dadd6f197560904d965d70e9e3631
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160111.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160111.ebuild
new file mode 100644
index 0000000..294c43d
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160111.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaFX Cluster"
+HOMEPAGE="http://netbeans.org/projects/javafx"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-01-11_00-02-04/zip/netbeans-trunk-nightly-201601110002-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 ae43306..d5c7ca6 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -18,6 +18,7 @@ DIST netbeans-trunk-nightly-201512280002-src.zip 209403445 SHA256 0fc2fb9260022c
 DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
+DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
 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_p20151210.ebuild 4412 SHA256 24aa2aaff3a5f2696b812a173378641abff3a033ce612ff973b0ec41d8ce9807 SHA512 af54ccc084d647fa7f72878f7b86fd29b804d008eaf68006d8c096b439b2558e31d787c7a56b4379bf28766a604ecf5078ad2a89d4f3e54bb24b9e95f0c2971a WHIRLPOOL cfbc410994df31c021304eff12c72c1c3f7469966e7344395ee43763f069f54952b587142bcbadd639467e6ef1c305b368c8f3c9d42675bd8c7ac7cf70c60dd1
@@ -35,4 +36,5 @@ EBUILD netbeans-mobility-9999_p20151228.ebuild 4412 SHA256 53fdd047a751f1a032a03
 EBUILD netbeans-mobility-9999_p20151229.ebuild 4412 SHA256 8bc4de3868b8f53ccbb7ab4445fdf027712dea92b8e7ed4587bc159e6bb56097 SHA512 056ee42f1ab26d6e1d463caaa52cbf967fabbd19248a49f358d7e445b0b40f57e65a5f982350bbe9c199188f768c4437fd02fb3f5b917069b96e3c783ab93e7f WHIRLPOOL b1bd9b1ba3f62a8e22e66b592108217a763dedb96ab3cd6b2b078d7849ce411e6eb35500bc1b2181859c2c6f646098c7e6b34c59dbb6ff5405b3f74799ecc474
 EBUILD netbeans-mobility-9999_p20160104.ebuild 4412 SHA256 53139800c0b259b2bd7254d29547e225c9c31695e4b3c195e2d19fa4e65efed2 SHA512 4e0845b40fa279a700e3ca6e5f4ab221465c47c535d2405ad7432139f240a02a58c111753527c09a7de5364c3d6c7d7e83ef242d4711ef0e73109974fd689a51 WHIRLPOOL 3d6fc8ad2bb81055fb9e533265975590784091e8a3f8ff9f8f4d28f347a4c16e61c09bf70775dcdc05d13f0cd56afd391cc2336ff5cc7020eda32d7bd86a6fc6
 EBUILD netbeans-mobility-9999_p20160108.ebuild 4412 SHA256 0b1cd91916939bca6cfb06178757f831625fed434675393a0687069911f1d2f8 SHA512 88764fb80fe99833b24543b2f5580d34d4fe2aba444aab8b1f2384c880f71fc02389456e877461ca96b544a29b3416201d9664a81ee68d5e67e47fcb3c2f7b08 WHIRLPOOL 979ff013bbf69c720157df10c49bce1e453ad42f706b5ac78bb3ef06b5891dba345f906c002506ae46924c23038c807effd318c5acf20c2f2a459b539ab53ca1
+EBUILD netbeans-mobility-9999_p20160111.ebuild 4412 SHA256 a626a4a5232ee5235e851862491c1f0dcc5b84e33ae85ef842531948b8627d4a SHA512 7afb898984150c7491bb1df9f087b2701a689b161914084408ee1fff3ce48a96ad3663032e6db2053c5e0341004f7c34068127126dc893b12fe4dfc9b8d1d3e6 WHIRLPOOL cbb5aa89af025337f5e5cf967849dc10fa2cd81ec397bf8d89752d1a28bad618cb0a06fe44f7e58460724864a82f6da1c6072dba998168647583517aa0f5f73a
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160111.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160111.ebuild
new file mode 100644
index 0000000..4b683e7
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160111.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Mobility Cluster"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-01-11_00-02-04/zip/netbeans-trunk-nightly-201601110002-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 5271a8f..8b2f7c8 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -21,6 +21,7 @@ DIST netbeans-trunk-nightly-201512280002-src.zip 209403445 SHA256 0fc2fb9260022c
 DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
+DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
 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_p20151210.ebuild 4111 SHA256 dc890938d0e91599aec3b9dbf55d58220f5c834409b6cae8ad19f95bc70677b9 SHA512 3940d39bdec8a248d946e84e332871d70f9728b1138fbad84a16e31b5ea8607575a9d6998eb621e3486ab4587f81462c14243e60388b7135a106e5da7ddd8889 WHIRLPOOL ead3d84140ca4fe3d7e8ce89366c7d7ea08a794ba7c37db03a1c538b268365bd32577e50c217009e1789a4cc602807fb0e2a6a63f416d1d541d65b1ba0f1f361
@@ -38,4 +39,5 @@ EBUILD netbeans-nb-9999_p20151228.ebuild 4111 SHA256 ad3f99ebad9825beded6ca7443e
 EBUILD netbeans-nb-9999_p20151229.ebuild 4111 SHA256 307405ecf0b1996504856035f6d74cb8b4ccac7f433e343ebad0815b87c9901b SHA512 6a4e483e4007790a22bff6f31dfd4d11aed0f899b25c6527e197dd71d779ee2a9e7743d5deb41c9c35d8c11b0b495c086107f5ac5c9091edaf7bd9fdf1cef0dc WHIRLPOOL bb287d8a383384df7e65c8c4bee205598540a0711d725d0e71fa04da7b4afcff728c3f585c7f5c5416a9030e64117b0b76a46beb3ddfeea4a44ea4d2dfb23ac6
 EBUILD netbeans-nb-9999_p20160104.ebuild 4111 SHA256 37c19b6aa13fa95700d10483a58ddaba41482cfb04a7946eb4f6e698fa60a5c0 SHA512 2faff85920f5c09e2b52c7042e62585c4368cb9fa3877dd21ff0f23d3ddd91ef1323c1e669d56991c4048c7549485ad8c92842ebf5393c80ff3dbf00468a4de6 WHIRLPOOL 633e87b3dc1d067592ae1b7ee9f0bc8b6fe288457a505dc1d018007a791cd927966969afb936a340b58eabcdca04063c982a8b3e089dc05dfc33aebdbdbc27f4
 EBUILD netbeans-nb-9999_p20160108.ebuild 4111 SHA256 4f26d5e7847051f7bb02e0b8e8c67f483c4f405f683714c8f5613af748513a7e SHA512 75c8dea4e0df38d80f94a52117d54a06621d545681956287cfb23746f0384462bcbe5b272643014f18586cbb9001ee853679ca25e0f23d476ef78f700d091cf8 WHIRLPOOL 5e762a34b0eab5072d7d6ecfdefe94851e981a48b9764f6ac09a75eafeb9f5b60a5cc763a078c020e8551fd7e41ed300d889b337ddfdfde15c8a23741f6969ac
+EBUILD netbeans-nb-9999_p20160111.ebuild 4111 SHA256 bf3596d4b39073e985748910fcce8ee7a3f6ce63cac8e206a1fd33071a809263 SHA512 26afbc618f8d19f6db3a2ba633836ae58caa89e261903d8124f42a768c9c0c3e431149e5b1eda4002c9a24630d553ffd98449459428a73500d01523263f411a4 WHIRLPOOL 800f5b7bf794f5f7001e1eacb2e911b62343895c4c141504599f3f5e70ef0331a59279d75aa44f3c7430cf88db4a24a16f1e2ca63e5013d8b118551065726f1a
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160111.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160111.ebuild
new file mode 100644
index 0000000..95cf7c5
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20160111.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Branding"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-01-11_00-02-04/zip/netbeans-trunk-nightly-201601110002-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 4a41424..ad32d74 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -22,6 +22,7 @@ DIST netbeans-trunk-nightly-201512280002-src.zip 209403445 SHA256 0fc2fb9260022c
 DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
+DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
 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_p20151210.ebuild 4417 SHA256 5a34ac5b1363b3a26835a8714f18842c04ca12c9089265480739f62de400e80c SHA512 a08bdd1504617edfb58c5faa6fb1e79b384979c2750e98658eab40ed680806ceda8cc5d4a1c52183b5bb8b52a462b76547ee2748b2b3308c3a9d37cbe5115cf4 WHIRLPOOL f03cf153bf3b5b00fd92a6dbbda50b7e82c791f0429c5b139bf790935489104eab6c8f1ba54ca51d7216f40a43d78ee53d9b4687a84a0f65414f2bd418c8a97e
@@ -39,4 +40,5 @@ EBUILD netbeans-php-9999_p20151228.ebuild 4418 SHA256 87f4af0d87441be4dc327166cd
 EBUILD netbeans-php-9999_p20151229.ebuild 4418 SHA256 b0288009fdc8ee4de26b7312434ece060f10567bde810d647baf43550d540d4f SHA512 72f3467694ddd7dc867c4c447404c5353c6b1168e52ac3b5216a16f5adf3789e364b7fbd5b4708e9e8d2e93ac2eaef1ffeb307bd58b5eeb669446bef7d5ff059 WHIRLPOOL e304add104734712933de3fcbaf494fcf358e28e467b0fa7f18883ed2fcea717d1ee36dba3a5c6ea7b0b90952a6419889ff6d0ba9c366a983fe50c3afd5f901c
 EBUILD netbeans-php-9999_p20160104.ebuild 4418 SHA256 08d408fbba6d43b353b2f53f9e16eeeeb3b449ec5da875bd1d88261f87405b7a SHA512 47aea35c7a21d931b57a75e97578a42dd4e8c34406ccff8b62c32be569618cfdaa78342202b7b0d34334b3abefd8276bd4d90d92bebf5697935dbfafe7f2ee90 WHIRLPOOL d61e370b17ab86c73d5a1087cb415cbbe925bef4ab27e5fa5ef7f3b4841a015f903d73d4796817ec2ed14856b30dc1f5db65caf3d58335707e5934cd61e10e53
 EBUILD netbeans-php-9999_p20160108.ebuild 4418 SHA256 c3ac87d1cfa4d64dd6c89bf2d38e36922c753588f343e241e9ada0a5b1509d24 SHA512 3fa73ee72855fa3d8dded8a9aa8be6ede38f31950112e7d59013074449fe042b01bc425834c7259afd922cd5d99ec2ed5260c57125c2f5ab752543fce72bb5ba WHIRLPOOL eac696a5e1404ce10a41d058816b2f656aa68997823ab563ba51da9fdd3712ed196de038bbe88c2a31f656061a05347f9163d6790608617d0fa8cf475d785beb
+EBUILD netbeans-php-9999_p20160111.ebuild 4418 SHA256 b422382d085f00464ebd8013437eb7737343a757cb4a04a858ff9f6bfcf1f00b SHA512 8718b38349556090538ec1b0714f2c346e1b9ef56263c6b47784a5702449ba3fa121e5a203d715fbda70553bc12ad2d4e0095474b21e5b1d15b975f041b5e1eb WHIRLPOOL 846fb26ef76c5b2a1b7617f64faad1693fc3360d832c9262ae055935c358c65757e4db643f2ac60ad0515f73e9f3ce2e9bb5a91c8441becb77810e9f05601755
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160111.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160111.ebuild
new file mode 100644
index 0000000..e6e7930
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20160111.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans PHP Cluster"
+HOMEPAGE="http://netbeans.org/projects/php"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-01-11_00-02-04/zip/netbeans-trunk-nightly-201601110002-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 8983ebf..2bc9450 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201512280002-src.zip 209403445 SHA256 0fc2fb9260022c
 DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
+DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
 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_p20151210.ebuild 9367 SHA256 ba09c24265ae30260cea3e50939c9d28bd5fb8c2d4aa213e06963b7a7c2f9ab8 SHA512 46eaf15856eb88bf337e0ebbd27002251e0253d3e2ddba76671f7f8ca4bbc96c11b365f0d6084a7ef4c0d27b1fb7e63452153b39eac643e3077c121370dc9c5b WHIRLPOOL 43d27df27927076a56dc1a21a351b0b87e7fd1e498d2780286dc262f350637d9ba6280c5c1f3467c21f54be18ce99576967fcefb0ec0baa8da89372a90db3826
@@ -52,4 +53,5 @@ EBUILD netbeans-platform-9999_p20151228.ebuild 9360 SHA256 a41e76d7d4c208d09f046
 EBUILD netbeans-platform-9999_p20151229.ebuild 9360 SHA256 6abd4f200c6d3edcc5c66df3ed68a6725565ff7aacfad514e45ac13b156f50ac SHA512 5f76c40f20e8fb8828e190548db2bdcf977f642dbef6bca11f7b12c5624e33f7cf8dced1db751613ed6c3dc5e93279a0eebd519b62f7c0230a4abb36537d88d1 WHIRLPOOL 2d2888db6bfb144051d7e943b154b783f8a5039886ce1861e8b7f3982420c940a32fb7731b5edf30a177e6214ae9fd134f39a633d90821e824186b09c809547b
 EBUILD netbeans-platform-9999_p20160104.ebuild 9360 SHA256 dbe0927dd378235a4e5d2c1a80e1dce1e18f2ed930f8a61886fd4fa715ec3a4d SHA512 2fa60726a78b3d387bbd3a201dc40c3c50a35a6da7e4f94a8e1e2fa22b94ef66b8b3883365c29e205c04a01c6cb3dfad235e22796d869bac335da5e757e939b2 WHIRLPOOL 6a7c552b0c82c1fd6854682f874e60beaeadacdcaf3fd22b3b1ae5009c3ef610de4bdb1433ae47d132eb15d74714f5a18ed7850ee119a7d221e6e2cffd8c2da0
 EBUILD netbeans-platform-9999_p20160108.ebuild 9360 SHA256 d2a8a154699e83687f87795375e5e1e9d4eeacb4e74027220ddc5f48c3c826e9 SHA512 c25d4073ac52080ad78bd6ec82732fea120d4d5ac8483e4302c0f7c766796b87efa0ef83c270d812656238b72ff187700f283c16795e392a4726f15dd29a01ea WHIRLPOOL 28c729eb7cb088df965df5c739042197d681de831e151399aec69bab7808e70cb531ae607423a34ec8773d18411a35c3c23390868b2fbe2632ea080da95731df
+EBUILD netbeans-platform-9999_p20160111.ebuild 9360 SHA256 ee44a5257c5b5c9fdfe3ebd7b38079b0f055b5db406f9208b71e583c45742290 SHA512 1abcb6b890fa0771189598b9c0350780150b372f6a9aa07632d6c58b8464c8892e4ff49cc942c94391f80f73bfd8b38cec7d1c1a87e4552d2a1704e1826a4f19 WHIRLPOOL 708d892213ab9821c7d8fc83bf508c192308df295699fea24a94bc4468d2375517ddb3c672b18dd02051d24784fe12a95449f4f6225d86a4ddf1489f8da71b99
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160111.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160111.ebuild
new file mode 100644
index 0000000..fd20947
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20160111.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Platform"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-01-11_00-02-04/zip/netbeans-trunk-nightly-201601110002-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 991ab9f..11c0fdd 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -18,6 +18,7 @@ DIST netbeans-trunk-nightly-201512280002-src.zip 209403445 SHA256 0fc2fb9260022c
 DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
+DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
 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_p20151210.ebuild 3472 SHA256 9c1d330418770835f88ef77162689acb4bbad4a5a2a7534fb39e10fd0660e7f1 SHA512 5f352cb3b00a360672de0e164349f313377c255566b5dfae9516aca8c0e19ef8d3b1bfcba6d8d7e7282f6cafecd95cb032d705b4451e2860a7db7aa0d54885d1 WHIRLPOOL 2ea80c7be201e065243f96dc08695c08b319e1fbbcf78239eecfd2d9c4635284d978637774b37ac22cb457100fcdb814c1ae17039e4efb30c1447808bc89d41a
@@ -35,4 +36,5 @@ EBUILD netbeans-profiler-9999_p20151228.ebuild 3472 SHA256 2665a9255a705422b339c
 EBUILD netbeans-profiler-9999_p20151229.ebuild 3472 SHA256 ebca38f2b4c1822b284a0a1d7592afb0a6f632f4e04fb7170aaa77c1beaf4635 SHA512 8e78b04568a2a635149ddc79fdc914f6bb4edff42556d126b356f90abfd1decc5c16e081b71b2524194756a5147f908f4a56ad6c914b3cd861af7396bc6e2bba WHIRLPOOL 59004107286634479d2ebffaa83e86edbc5c2d1b8c0f301f1609fa87eacc259fa3f76c4206e944fb4ae80c431d214c375dc165dc090143bdfb0c69d9b6ea9fc0
 EBUILD netbeans-profiler-9999_p20160104.ebuild 3472 SHA256 dd029b7ae4365dfef7c8779dbea31a273118bcfa1b2e3e96f55e3a9c78caba36 SHA512 e5e44865b0d67ac5b78ac6faf95441ec7cc7ce38923048c65e07fa91c38f8739bfce78be900e887b189690b9390ca099f68add9269f11dd4d1b4e96769f65e80 WHIRLPOOL 8211c224d29751e32ae94c22c66a32f5985ec8388743c43ff8100d5a0a5295f1448eaa500deab9f891843c8220c54ee1e773fae8899d33b4c90c91e6be056a44
 EBUILD netbeans-profiler-9999_p20160108.ebuild 3472 SHA256 dce9b6d9b9d65ecc15b7e08a391b5209676f4faede24dfa02dc025a3d4ab3c5f SHA512 db0877681b5c37791189542cc616d49203fb377a0050fb73127035ddecc55ee7f2d090e905c560268d011b8ddc12b2efa1046f5e05e3fab1278484161678e063 WHIRLPOOL 9b4c40ed7cd9ffb8ac8b3f7a4d5bbad77dd54243f87df6243fc2546dfc9e5114767bbd8eda8061283bf4534581365dc6ec86d2f99fad8656e2b87de1c9dec4d2
+EBUILD netbeans-profiler-9999_p20160111.ebuild 3472 SHA256 eb063ae4bb16a18103f598d470aa14c7fe5c27f47567194eb198fddaedcbe5b5 SHA512 17991fa2b67149c2892c8218aef01bdc1d5b1462d8715e959814a950f64d17176efe1c6a082af58d90d1e8e188d6ccff61156d52b3ac7c037dd4f5d2abab62fd WHIRLPOOL 2a11634a4227d5981a99821c99d1970abf67423dec0eba41cbda0c05a212d8bcfafd8f4bb6053c5f382c3492dd60f590cde0d7ff5cf2c0d039713766a2e8ba0e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160111.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160111.ebuild
new file mode 100644
index 0000000..c7304a3
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160111.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Profiler Cluster"
+HOMEPAGE="http://netbeans.org/projects/profiler"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-01-11_00-02-04/zip/netbeans-trunk-nightly-201601110002-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 ef28ea9..79b93a7 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201512280002-src.zip 209403445 SHA256 0fc2fb9260022c
 DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
+DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
 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_p20151210.ebuild 4590 SHA256 a6243964670c3d85ac343a58ec818a64ca9be8d0cce8ef94f5aea328c6d69317 SHA512 56f5240d6f659998007d9369f04d5d43505a71e461a2b62a4e299c147ae2ec56f56d5fb1d8272ef7f00873b5a9f1055ec5cd2ef1544701f4920bb48aafa5f49e WHIRLPOOL 554650d2733238aa323e13ac2908d9f5e6ff844d7afb09149f3cf5c2b2633e82bf29b06780885e86abc10d62ec206463ed01134184b33c316eb0c9e231a29eae
@@ -50,4 +51,5 @@ EBUILD netbeans-webcommon-9999_p20151228.ebuild 5280 SHA256 bb296bc66955847fc996
 EBUILD netbeans-webcommon-9999_p20151229.ebuild 5280 SHA256 10543ccc3733dad581b7fe62c979919cf8804770fcdd0e5b417a1a1bbf8de039 SHA512 6ae9b2f9835f3e8ee3db3416c45928ad559ce5929ced94b007244326ea1a88453a87c01fc1443aa14cc59b8b9ef3d66433cd6d5973cabb03ff2c3eec95f2063a WHIRLPOOL 268e5da422f0414d26f145b50b4ab71fd11bb6ebe2ff7c9a51bb0b9af311aba55e35dc9129d00425237f1548cf17e1b8a3d21ec133865864e0d1484f96da8eec
 EBUILD netbeans-webcommon-9999_p20160104.ebuild 5280 SHA256 8b6cba663a851e4f552223c9cddd9beecdcb2b2ddfa873c777368e4d303f1a7b SHA512 b41607612f133ce80472864b4350e1f1bbfb8057180038cae421e1214950a201dbd69e5757ba1ea2937df68fb400dfe70443a001095db0a9446abf0cd9a5370f WHIRLPOOL de759519558037f98e171c71e8deea939a8144c035d9e21e39590a9dd512631fa22511f068be80fb71cc02d7fe1b7dc4561a73cc3376503fc662bf0c7f12557d
 EBUILD netbeans-webcommon-9999_p20160108.ebuild 5280 SHA256 0dd5d66c0533ae34634cbf3f7bb170490ee66e53958e5f71c623a9d0aa6b9954 SHA512 4f3a7a89ef58828f561f195f0c59bcd38600d5ecbc2e1d6be0509b57963c566cf240cfb631dbeca36451faebb3c6502aafae89559b326ecc9aa08d035580f9a9 WHIRLPOOL 8ca9815d403868f9da5f2f1a17f75515d8bb547c982d1e5c2210de16cdeebfa2b4dfc3bb27e53b5ae7c26b414e832f724e0b34450288451b92549b6a09a6f33c
+EBUILD netbeans-webcommon-9999_p20160111.ebuild 5280 SHA256 7ac164f96f7a03759df519ac86a5300f5c4b1d9e942fd47f0ab395c53d1bb142 SHA512 604d168c22b7b15720c90aea05bd58f7ce6674973bc6ba6c236835854c30a5f9a510e020c046ff6a8a4b31c9458ed408914882bb01f027b1d1eec9f6f31fce84 WHIRLPOOL c4ca3602705c20bb494d5d2849bcce323cc3eba4e1774853695a34f72a31c813a78d66c5b0c2c9430e82a3d2aae733d8e2f8d19910a6124dc91c65b91bd76915
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160111.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160111.ebuild
new file mode 100644
index 0000000..1dab4f6
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160111.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-01-11_00-02-04/zip/netbeans-trunk-nightly-201601110002-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 853121e..ec1031c 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -18,6 +18,7 @@ DIST netbeans-trunk-nightly-201512280002-src.zip 209403445 SHA256 0fc2fb9260022c
 DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
+DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
 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_p20151210.ebuild 2721 SHA256 e65dff2e62c6388c775fefb5e79c5f16f343d81d10f6ca63f2b0b1fe7a9fb731 SHA512 73e2d0d84349930747ef9679ef6ab8b65f80f8b8c334fdb05fa2cc20e8d639b3bd2bec24fc17e8b8426d727fc49cd7c1ea9ec14a4e13ebef8f8bd2d0a3085c47 WHIRLPOOL d6215538aedcaea47e0efed77dc69ab8c021450d62fdfbc0b8d1ec57c6eed58ccfdd0d32c8cf6e7e9576b296d002b7a81da7b659a68497fe78ebe4e11bec1a73
@@ -35,4 +36,5 @@ EBUILD netbeans-websvccommon-9999_p20151228.ebuild 2721 SHA256 e59ba17e3566feb5c
 EBUILD netbeans-websvccommon-9999_p20151229.ebuild 2721 SHA256 f1b6448004d210974d8ae5410d2302bf456ed4316a7b4077d71712eaca7af507 SHA512 8f8dadc568c9c91c8a5c2578b77e207938648ffe298752798067de5ef9f9ccdf3bb977bb4833a02dcfa27e2960359a4c233aaf2611aefac19f04c973f52fdf98 WHIRLPOOL c4531e92ace3df09845281bf102d92e44c01ec4b04a8861dfcfe5323835c95b91368f003481d16834d36c95f78f297f51e31d83bc2df6bf77af8331687614fd8
 EBUILD netbeans-websvccommon-9999_p20160104.ebuild 2721 SHA256 1859840a6fe758cc115b174961d79887638a3c360e0835718151f4a800a6dbee SHA512 80d0a30a980b99bf6536a605ffbdebf7b2c2625482110006864b37a4b2d99988d58eab8c320b7010e3284a342ea11f5808e7d6c3d097460afd74d6aa118830a3 WHIRLPOOL 01e2adf818de5ee27041ccd2392797de927ed145cf2e56084ee36da19c7fd181b194f24792e26f96f5ef0244a72ee9c1b809d89d595a0f98daf8024197c93d0d
 EBUILD netbeans-websvccommon-9999_p20160108.ebuild 2721 SHA256 f987affbdbcda640f214df4c9d6a7d0a37f444029574defed75cd0846ec16db8 SHA512 9a98d910cb152a0134734f568646cb19610686e6c500c7742afee243cb2de0d7c0f0d4a302048a0f186ee3672d692e679c53bbd2ddad337e349b3913dbfeccdc WHIRLPOOL 2408f28d35dbda995c4d2357874bc60906c57240a37ad1429ac27423ce88450ce0de02204c12d641de475037aae47a3b5ab5df66ac7b4b65fe4c46cb5422fac0
+EBUILD netbeans-websvccommon-9999_p20160111.ebuild 2721 SHA256 e9d1f3e2b0e84da15edd1cc9668be983d4d1fdf683cb1eef766eae94af3edb4d SHA512 3adf6ba01dcb9491b31f6c3bbcde535c543696b3c7c773d5037ce36941b6ee152640a766156c625da8b7dccd122186ef6e6f62731bf113ca487a383bc0eaf406 WHIRLPOOL 0e2668771a3a6344b259aec6d1b99b54bc44780dccb7d51c410c6262d4ff508f397c786c868dbf2ea994174c6fd4202680e79cf57dc2808a4f26dc4b80b6d610
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160111.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160111.ebuild
new file mode 100644
index 0000000..3e219d8
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160111.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Common Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-01-11_00-02-04/zip/netbeans-trunk-nightly-201601110002-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 3a41d30..165d92b 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -21,6 +21,7 @@ DIST netbeans-trunk-nightly-201512280002-src.zip 209403445 SHA256 0fc2fb9260022c
 DIST netbeans-trunk-nightly-201512290002-src.zip 209403536 SHA256 4c4a6b8d8d5ab3b551e82a85d5f941b1ab1333846238eb7fa0d185d10c13fcd6 SHA512 d1302d4725060f01117fa9a7426ee4e6bd03bbdabda98851ac2ca3c80fb0c971a31b0eb8da0983ce2596f73db11762563961aff06d0f8d21be6f44a7d58c0293 WHIRLPOOL ce982881e43bea32e7c72e9e503a39ab6da3c4ed5d19ae505fb9373c9dc0453c96f5b40a3e2c2c0ab74120926c9a4ca415f5f1ba324906f5546f4fe811f28b88
 DIST netbeans-trunk-nightly-201601040002-src.zip 209409390 SHA256 185b5079778ac29562a6c327d77c36cb476b47ce704f4ad5087ce209273e115d SHA512 69904671b04e6a5ab0db1cc44835f6e3ae61837a99c079ba2f2bbd52ccd5047344ee33e5fc68989171601786b0c32ccf74c098d951394876ca6e6f95a0082774 WHIRLPOOL 03f23c78fc4e088aeb35eff6d7aae58b2dec5b70bf06748cb232569af140017d0ade14f783e5564958236f8f6a63dcbfef7be9431afe7981ce0cd3d1bdae21cb
 DIST netbeans-trunk-nightly-201601080002-src.zip 209452309 SHA256 13b645a2e46f5da41206c25f98a25f6f5af18d680125fbfc9cafad707b6e0315 SHA512 ce2d7d3d24c4fdb98b11436721e0aec899058a1c69748cbdd096452cb9837fc1571e6705def5f310cdcd691345e9c1f9ff676e4a76a15eb70a385205fbb8aa6f WHIRLPOOL de5c68dedf159b3d5ef66fc58284600d36f5cba181a08fc52629beb3b00e079015886a1f8648a0af58278b29e1291e4cdf6a1394ac44dd126fe1dd1f0f25c1a8
+DIST netbeans-trunk-nightly-201601110002-src.zip 209481201 SHA256 e13ef16ec98327f2b42290ff7ce9db95c99f5367752e0134cd4f6e0bc798144e SHA512 e5d9f462c4d26fee1954c721c4247d70c766e702d5a98dcbfa4a6979586336b6dcb5e48580f8bcb3b3922d353939524f66cffd85b1dc2a461c6b1db39d60f634 WHIRLPOOL c6910fce68ec5528ef1fb2add684cfdb1a515bfc743ffa4206367a10efb89a1a0d923b747c61e66bbaaa415a56767919177467b2eb4bead6f71caa4ea41a889d
 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_p20151210.ebuild 6938 SHA256 35b8965aa69c1b3650b4df98b6aa48ec7aa963ba092888e4ed88fb3397e2db93 SHA512 8e63b6de8b36a4f93c30171b2a0ec3e2ea46c2d6fb3ffa68b553f063f2f8135a7162f385d58187f21ffb0a1525d3f5ecd27b8baf4c5cc1f013a927a617582365 WHIRLPOOL 9e9328ee7a8404318d5691369d16ad6b5d244625e33cdfd0e10804c30f61e91fb2e2f97bc77d04d3b25167d078e9b070f1a7123beccff4095709fdb338f94075
@@ -38,4 +39,5 @@ EBUILD netbeans-9999_p20151228.ebuild 6938 SHA256 95f484fbe564ddef8f3589b16af6c0
 EBUILD netbeans-9999_p20151229.ebuild 6938 SHA256 48434dc7c4f72cc32f2789541b85cb842a0024a58a3db7b01c011b551956c487 SHA512 48cee46971986b6bd7afeb22728ac5b750a95bd9d22063c3d87763aa562e3663e4a72bb9af568f5270036221481ed1a0e9660cddab6fa434aae2c8e7e8e8dca6 WHIRLPOOL c4da5b86f86667626f0bd37bb385c5c364f372fff3e408b68eb31b641179e2ccff35765ff5969a27602651acac51e97c9347e6d22f98afab548d3ed58a148175
 EBUILD netbeans-9999_p20160104.ebuild 6938 SHA256 1135be98d1f27e9b9878f3f8c3b1f45f376812992c33ef10f65f0816e8527b8b SHA512 f2c130e0a405cc12d8deac7c1fe15870f6e59228d06cfa54dc794d75b48465d97ab6b181c81bb8a1aad8634b97eacca5e1776ff767d3ec6fdfdfab2b4b299b7e WHIRLPOOL 64318e8fa604d8e307d2f5c7f01fc8a8b447d9e78af4e86ec0608b56c966c35a3654fda021a2695efe76c825ccf58fbcfc6495897c5a5e3e6a97f759e5ceab91
 EBUILD netbeans-9999_p20160108.ebuild 6938 SHA256 d88c1b351d2832fea3b58e9c5b7a40aed4dbb73cc0d68d4810792fa497b9e94f SHA512 cffb502d84ae2cd7ca0c35f09200484b95614f1bfcf65148faa7b7cffb7221ab517e61be9d075c1d791b90fabb3ff599f7fb7414ea50b25a8cfed0ff17145292 WHIRLPOOL 6053108db25b04b69cbc6fa42df8d99ac417fae17e011fe0ff75349099dc37e1feb73e2a0a31a36a1eeb41c936f5792eff906514c4f4ce6daf46d2dd546b49ae
+EBUILD netbeans-9999_p20160111.ebuild 6938 SHA256 be09bdb58187f8166ce4cd09484de01053547ed6f20fdbff36ae2832f1b058da SHA512 2f2b7d23e93243d2d0beaf572938ab44afe0367f753e326b8c639a6f1bcb7a245fae75a35e678a9f58531c565e1371ac24eb25d32dbe31b4db4ceea1017c2f79 WHIRLPOOL 86e02e132c7529cb435b245a88ac5fe38988c81b9169bb23ab5ae5b2dca1463b7d639f080710671595c2803a2d926053a208162d793dc62f41143b720ddcc720
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

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

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-apisupport/, dev-java/netbeans-java/, ...
@ 2016-10-21  7:41 Miroslav Šulc
  0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2016-10-21  7:41 UTC (permalink / raw
  To: gentoo-commits

commit:     0e29f44dd1c451afd14f034f2e858044165c3ec8
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 21 06:44:36 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Oct 21 06:44:36 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=0e29f44d

netbeans: removed obsolete ebuilds

Package-Manager: portage-2.3.2

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 6716d84..9af3c37 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
-DIST netbeans-trunk-nightly-201609190002-src.zip 218003305 SHA256 b9524ea17aae5220e46bc2d7f603ed8c741c3f07dc18bb36bff6b8feb1b105e5 SHA512 711ed0e38e0ee172f6ab1b3411075c477f9d4d86b2efd317ba72a0c2b716ca736ac1458e43ca2a35bb564eac3592e829bc72d0fa28abfe6f77ad1e22d2bb9b0c WHIRLPOOL f4624966ccc61c3d5cd6a339fe6b1ee52a87e7a585b360582b0549c49ba703c64329fa38a0edb6a546e941114b8adcfd2ad8d76b23127b15e5b7c361e440826a
 DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201610200002-src.zip 218421842 SHA256 c7169ff7d83f89
 EBUILD netbeans-apisupport-8.0.2.ebuild 3314 SHA256 b68fe791f275fe4fcc8b00888688949b8927cb39db2cf9ad7860017c6d20adee SHA512 35c4bbcd34ec0eaef8a2de86c13333d2bf092db61af48558c3e173bb17dbf8fcd15001307bd7c498f4ccdbaa4277e1ee42ff0909af6170039165b547f646c383 WHIRLPOOL 206fe8d5f64e76827d3eb958a629ba087e8a16c2797752f5d9e62dff4166653677587a81be19e0a2c6adcf49292255d532e1f542c02550b1cf6ffd51467bde3c
 EBUILD netbeans-apisupport-8.1.ebuild 3338 SHA256 d249a09cd1a527bfc4f0dc87b1768aad9f05fc7fe7079fad0094c27d416d030c SHA512 47e5db58581625b23157ef7a7b6e340fce1327db85e015369ac32791178a0836af3348397ac6ff4439ab246170d3318c2062994c81019ff361084f00d432c9c8 WHIRLPOOL 8e379c9219b7730a15c10216bed00c3ec104f84b252d32da629f066095897398a4d8818e07cda5afdf94b115b97ead8de6a9529f38c81c1c41144067f119e54e
 EBUILD netbeans-apisupport-8.2.ebuild 3059 SHA256 605b99cf2fe6fd30b28053ef3a3e6dfbed6189f97c20728c41e00ae08b766edd SHA512 876916d7591bc518c9ba63d8335391a41bbb89809828dfb44c3eb4edefddf7393c143825e8731de2b8cf6e6a1aafdbe274ac1d7456a982d3846b43a2d16adc8f WHIRLPOOL 329046fd8eb19229567f85d19e6fef0f0636bc6efb5ad1b84c102c3dc7119ea8672a8f4ad7937f837b4a43537725cea7e137d88ea01ea9fafb34cbebb9b0ec56
-EBUILD netbeans-apisupport-9999_p20160919.ebuild 3384 SHA256 789c6bde2584a8c5294727c0b49fd689cbe559f9f29b4940005c2cf9ecdd95d9 SHA512 cf2590f492fafe089d08daa257235b5169f52f1d1bc81107877d87ed401bbaf2ea3526cee54e587edc1f20fc58167c91b4ca00f7d0ed846f97549c40f93d2f69 WHIRLPOOL 62232db730aa3333783d4447b11646ab13bb2847b4385265d6172baef13cd57cde2a0951c8a1b13f1ed99f29d08d1f5c9a659ca6b2695693c08e36175c454eda
 EBUILD netbeans-apisupport-9999_p20160920.ebuild 3384 SHA256 de7d5a01a0af33c46c1b997b056a614afc01b609534976f391665a9ead4be8d7 SHA512 52ea6b6418eb9ed056064fae73bafe93b800697bc77438004ee1e6cff81a6d5cf295bd7643c91c15dc542cd5fd60c41c61a11e18a1be2013318477e177933a14 WHIRLPOOL 11f423becd2ae0d89d3b2262689e0ae5e14b76a52f6db55899835629c0612d9f6d55300386e69d54142bc50d7d7ff196e1a29bfbdb7d08ed066354f2cd891e9b
 EBUILD netbeans-apisupport-9999_p20160921.ebuild 3384 SHA256 9372fb191756ed900d0a6f59fd005eadf314485663e48da56cf2ba32ae950e24 SHA512 ad53d9b0575fbf875f978808d7f1ef88eddd9ba7998a610979aa7b15b12c93377e56d080bdae8c45c12ada854e711297a356cf741292a2a552e5a678ee561823 WHIRLPOOL 40fccc3b9fe9f1be2cc000994f11b56a4bee7246b0f16f11869960ed3fc89d2b8510bcc09d297a964cc2320f0dd800d5ef0680315b2577521b87fd707b4c0d39
 EBUILD netbeans-apisupport-9999_p20160922.ebuild 3384 SHA256 09616722b9367099d6abf15dfb83a81cfdf5119bc54fa6ee6bb56c0fc12d30cf SHA512 1b54b505064a656fae662ee1daa141f1022bf5a8a6f3fb6a5f593a66f75b40dd3c9eed6fe7d87bc14c8eae4d1da627489be68d01372b72bac532c101c4c4a512 WHIRLPOOL f8d6f03a79198ee465619b8c4b9eaa558314756cebea9feb719246826542046e47940c557a654e23c55c8d351febed1c8c0fe6abc2c002d42a4daeddb4b5ea42

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

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index ed41783..bd908d5 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -18,7 +18,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
-DIST netbeans-trunk-nightly-201609190002-src.zip 218003305 SHA256 b9524ea17aae5220e46bc2d7f603ed8c741c3f07dc18bb36bff6b8feb1b105e5 SHA512 711ed0e38e0ee172f6ab1b3411075c477f9d4d86b2efd317ba72a0c2b716ca736ac1458e43ca2a35bb564eac3592e829bc72d0fa28abfe6f77ad1e22d2bb9b0c WHIRLPOOL f4624966ccc61c3d5cd6a339fe6b1ee52a87e7a585b360582b0549c49ba703c64329fa38a0edb6a546e941114b8adcfd2ad8d76b23127b15e5b7c361e440826a
 DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
@@ -44,7 +43,6 @@ DIST netbeans-trunk-nightly-201610200002-src.zip 218421842 SHA256 c7169ff7d83f89
 EBUILD netbeans-cnd-8.0.2.ebuild 4510 SHA256 0a9a4e58e28f395b5bcb017016b6ddb1b77afe393d0e5bd81cc05e3a32076c71 SHA512 2b1fedfe292fa140920fd11829e77127f9535e08b8307886accfa37e6d11195a1204e6b71b2640937da0711c3ce0bbf80c0eaa3c248a64fd61b6a3d99d5de14e WHIRLPOOL 10b1518360ade5d6f1f27c79a10f630b94a2ec5062e18df11f9828d4b374e6cbdea0b9f770e01c117ca90fa194dff9bd3be6a468075c2d35167fb78a7bb32794
 EBUILD netbeans-cnd-8.1.ebuild 4744 SHA256 e008e92761489558e039a07d4858b5a9745aa38c38c57668cba8b5f6a28dbd9b SHA512 724af3f292851fa1a04ccc95fe0a4f9d0fab5503ce31d2ff11be73779d67bd0f38835b334684f628f8eea2dde44543e6b872611b2bd6c01191ccfe26e69f4ec2 WHIRLPOOL 59ddd65a105dafeb8b783f457ec7a8c67a5a3aceb78ca60ac7c4f45f330b28b429ba6236a643ca0023189a9ebdb1ca0182ec0546943ec2494693859aa8f95515
 EBUILD netbeans-cnd-8.2.ebuild 4465 SHA256 e5268b1872a0ba3f39dfbd8d49fddd9938900bbbc96e432fa1807ee0b6c36fbb SHA512 6c30daf1aea9d0d598d16903facbbc4a02660821dd6ab5b98c940305adc3dbe41d5410bfad7c1afe4adb33b45056730c95eb9fe2462b5fff26449a7814202bce WHIRLPOOL f60d88d6cd35594ff406fbef4e181abb02a3699d442450f19da173e802576fbad7c891efeff236e3d02d7a217f4685650bd2d57aa6ea17e29f550ede9ac13d06
-EBUILD netbeans-cnd-9999_p20160919.ebuild 4790 SHA256 1bf0d8971ef4655986702ab5c01f034b4d919b2d6f93a7e53ee3ee05262425d8 SHA512 1553186a841215cb937f28886ca25463ab689e46049c33456def87b32c711ae12ced4a7940a7c9eb558a5282f3539d29c73984d29e00fc84eedefe1aab9e2561 WHIRLPOOL 211958ad88ed8e442da1355708dd2ec4b55718fc0b2b11e963f4ff450b94a69080134c3c9f43ce801194329e31fbfb60314c1ea928c57578f067668d8d4aa0a8
 EBUILD netbeans-cnd-9999_p20160920.ebuild 4790 SHA256 16b13cee59598f079cad6409309a3b2d4388f51b16a834231531b465bebc0b68 SHA512 3ad16c8530ad8c55e716c2c72a10358e8b883bb8b1150be98cc5276cbae2906f0aec33d98c4215e7fe83918bad25265a70e53ca688e290c9675b0a0d26f795ed WHIRLPOOL 4a4336654e7c3a9d260fe29258645a20fdf35b431f82aaddb4f505ada2b17024990c099ad9789a77fb233856d9f2270cf1e0a8ed8418e65ff5f982f039e192dd
 EBUILD netbeans-cnd-9999_p20160921.ebuild 4790 SHA256 da3da80e958a041a4390cb41003586fce8990b229358084ebc81a1080469b5a3 SHA512 18ef8cc5c50d5ae457a853ddc0ee84f445acac4f3d1c63e7ad70df308d30d270c52879fb2937ad997b6fec30f475c9ecabedfeae121944fec411697a7799033e WHIRLPOOL f7e4e4ea1b0c9d4214a6a597d4decf33bd74053d6c6e8f0633faf93ab898dc1c8496b72f60302a2c02012d5336d63cd169122696cedd376b5dc7fcb7c82ca67f
 EBUILD netbeans-cnd-9999_p20160922.ebuild 4790 SHA256 9a60a0268cd04e850f372732660d2b462655ab999dca6db8824a74c40b84604e SHA512 b9e737b10ba9ebac717da8a929a231cdc165e55c906c96e52bb567ffbaad5fae1dc16ec38da879477c8c68cf4039fe8d7e112d3d7cab51a67eb79fc9c9ed3cf2 WHIRLPOOL 15a1392d789ec3a3e86b31d4a2e88f0442cacfb6712d50f9c5e0efd70f4dacb6e449c953f2934216bb10f63ea8204202dd3d6ebcbecae9136c3aaca16ce5f22b

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

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 4e7c1f0..7706e32 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -9,7 +9,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
-DIST netbeans-trunk-nightly-201609190002-src.zip 218003305 SHA256 b9524ea17aae5220e46bc2d7f603ed8c741c3f07dc18bb36bff6b8feb1b105e5 SHA512 711ed0e38e0ee172f6ab1b3411075c477f9d4d86b2efd317ba72a0c2b716ca736ac1458e43ca2a35bb564eac3592e829bc72d0fa28abfe6f77ad1e22d2bb9b0c WHIRLPOOL f4624966ccc61c3d5cd6a339fe6b1ee52a87e7a585b360582b0549c49ba703c64329fa38a0edb6a546e941114b8adcfd2ad8d76b23127b15e5b7c361e440826a
 DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
@@ -35,7 +34,6 @@ DIST netbeans-trunk-nightly-201610200002-src.zip 218421842 SHA256 c7169ff7d83f89
 EBUILD netbeans-dlight-8.0.2.ebuild 2898 SHA256 08402481b573b90396431be03bda45904b2dd29f0086e09a111fe362e310c3f7 SHA512 3f6d6c9ea0043382562fbe47ad16e3273032407a74cb44ec7ff26736f96483835af4be8674361e910912a550b9fe592cc5a28c2b93b6b993076553195c35eac5 WHIRLPOOL 9d8706ccbc0d97b0f5d64ebf22c36316b08d8fbccd57408119ca5f5faef08c7f82677bf67488ff611eabeaa730e4c9a730c50966d94d738cfe79330ac147863d
 EBUILD netbeans-dlight-8.1.ebuild 2922 SHA256 f003a099e3f82f5ab53dcc56d86c00a662c98f47480feacac2a77ffea90ccd0f SHA512 94706ac4d8570deb8860236300cfeddfb2c3cbfd385ecb438a039991deeb018f292f6dbb2267d7c701b7f1b5b88d200f2c25696fb3204fcf205c15155b26d1fc WHIRLPOOL 1e44f40c8e2c03b7aa7385ef20a3247ea15a4d4705ce4b5f860bffe236eb578ab3d912f2cc2457e5906158ae747edc3b6b92463336c69af9cd58eca3fccb223d
 EBUILD netbeans-dlight-8.2.ebuild 2643 SHA256 0608962b0d5b55245c0197d9d3611dce2abbda380cce67c72c5df8922367658c SHA512 fc46e711046fd751f358771c5fa08050bbd9fe51d81fc7f696c3ff7d597b5401a06fc1395c77baf33f8b8d5271e3f8dacf91a94f3a223af383a5596b227d9736 WHIRLPOOL 7a9d758015d16fb389b9a0e3e2a666508fa7079ddcf3fe36d967aeac73f5078f90ae72a90ddf28587337a1906b458034cd648cf75b71ef1a0fef52d168fa5192
-EBUILD netbeans-dlight-9999_p20160919.ebuild 2968 SHA256 19f4fe180da1aeff8ad17344cdc672dacdf6d671f9203073057a2067213bd6b1 SHA512 1b04569368486d99bb246da9110432c47366e16bc36ccea627f1eaa58cd14a8fd06b3c4b6652bea5c13193e03c606163a80bdff6100c6870d720f05f8376f04d WHIRLPOOL 1b1fced51c157478bb92e95abde381ea69d6f34ea233a984e7083a84bd922f5fb52869bc296734e2ce74e7b9099a455cbc9eb318a2516a10dbb0aedc10f0dba9
 EBUILD netbeans-dlight-9999_p20160920.ebuild 2968 SHA256 55d14cd8522cde2857e3cdb34e8e567e3dbdbf51af57dbaa2f15b96793ba73c6 SHA512 dd4a3191b5397d03b6c5f9a63119b281326f1b96640e4196916fa5407315341e17e071161de9c4b0211861f95dc995934666f942e03f073c9107e32195a77170 WHIRLPOOL 09b11a1edf82e3d3ffe6f68d8b5caeae887f0538989e3dbe70b5b6417c5053606d6daa9631b49fb3fab10b3b72188a74f086abff016d89f4f7b2491d2f23384f
 EBUILD netbeans-dlight-9999_p20160921.ebuild 2968 SHA256 8929fae200cc9536eba4a8e528c8a3f598a99bf052452203ad7759981eb72d9e SHA512 1eaef46875e0579a45a18bc27c7a88900f9f1109cad9d293168dd9932cec1eec42af6b2bfc6d91d53886fcbd5d8848eb74f79a0250590486ca44ddb5e3644676 WHIRLPOOL 31cea4def2343ecdbc8021189406ed409b38f4891be2abf573414507182787fc69120b307626339068ce8dec7dbe3b4b6801e6115859bf5b81c899eda2e43d69
 EBUILD netbeans-dlight-9999_p20160922.ebuild 2968 SHA256 88b1fbca1de4604bcdd6cebd13733a3c9b689a3f59f7b384eaef945858a440ea SHA512 de97d61cc3d63f12d3ab1f80501dd86b6162ecbea3915c19f65f168bb6c918be0a9257b805efd0f8c32f56f4096a7c5d17c8728d145d58a27bc023aa4e032b53 WHIRLPOOL 8f5f4c1c8b06fad77e0888dc65a3efd89d65fb4a156b0bf28a5da788b7e2dd5c04d2d32331ff30087703bc51d3145c4c02e2acda545e1c9a8cb6f0a942da72f3

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

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 567ae61..4a9b971 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -38,7 +38,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
-DIST netbeans-trunk-nightly-201609190002-src.zip 218003305 SHA256 b9524ea17aae5220e46bc2d7f603ed8c741c3f07dc18bb36bff6b8feb1b105e5 SHA512 711ed0e38e0ee172f6ab1b3411075c477f9d4d86b2efd317ba72a0c2b716ca736ac1458e43ca2a35bb564eac3592e829bc72d0fa28abfe6f77ad1e22d2bb9b0c WHIRLPOOL f4624966ccc61c3d5cd6a339fe6b1ee52a87e7a585b360582b0549c49ba703c64329fa38a0edb6a546e941114b8adcfd2ad8d76b23127b15e5b7c361e440826a
 DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
@@ -64,7 +63,6 @@ DIST netbeans-trunk-nightly-201610200002-src.zip 218421842 SHA256 c7169ff7d83f89
 EBUILD netbeans-enterprise-8.0.2-r1.ebuild 15075 SHA256 41d376117ad1d8d59c8194debfd29dc42f5fd4de70aee12a2134ec143a604dda SHA512 4cd9de88e9a401cc0be88e3e2605abc411c47307818376b2bcc00f9ae570b21324f2bf00fd83e819bfa076da0fb07811fa1f0f9362a6cd0ee05b63221a199000 WHIRLPOOL 73f4518c14430fe7aa3614ebf1b11a06ba0e9bce7479af2770db3a114f149d575a16a655218f757ed416b5149228ac56dac700f5a8d5e034cc838bfa4092e636
 EBUILD netbeans-enterprise-8.1-r1.ebuild 15888 SHA256 d4c04ccfee01a46819020cb7cf8fd8297618f3c0431ae2d9dd7eec8131f988ab SHA512 6c7c39c378cb79d3f382cb80d07710a8c5233aaf0df8fb58889ee6aa6bde73624efa6aa49b43f84105685094a7aff89e4b6367ffd1fd113da27b42d50d07e983 WHIRLPOOL e678e2a6957e428c1b6e51469c0e7cc6a08da2c797f1575b6bb660a7f3281c00f071179de459e27c983304915b005baaf94ad4fae0a4c08162f218bf53b7d821
 EBUILD netbeans-enterprise-8.2.ebuild 15500 SHA256 c873137315dbae5c4e106ebb8e45c4f0f393b827c1f780c7b0bb8b1fb9acaf1b SHA512 b5c42aef845bc6095652f0fdc0cc09decd06603d7564de0b579018719127df108632f7c123b17477985adc5e06f53711221f62a50845f1e1163df5a8b5489cff WHIRLPOOL 802f4dbbfb9f49bcd3f82203612e5fee8ed41974f8d879388239fa019ad9336ac58c98620f2482d0de8e9fb19989ff77ff93130ae2b0b4c027fc3e4073704cf8
-EBUILD netbeans-enterprise-9999_p20160919.ebuild 15825 SHA256 a2ee1ba683fa966fdd3634beb36b1400ca544485b5dc53a2197ad98d001b2e96 SHA512 4ff2baf2e858d1820ec223275a041b64dfff5a3dd8a1c1b1b185fecd7c126ec4db000501e5204480e3a571022b85c9ea31cc01aa35132ff3ce6fb1bd32dedaae WHIRLPOOL eda97973a1e11c043ca9b9466efaa9d7d02e28e8ed14c8b62db882b8bad71f06bf7037ee6b65b7e5d369287ef733ae4f217db2bdeef2efe80eb63b9e8f8f4a16
 EBUILD netbeans-enterprise-9999_p20160920.ebuild 15825 SHA256 71f2de62de7be7787224eabf2cf43aa127383b6547e074c194afce0020d82928 SHA512 63d6d4da000ed067856aea100e269fc8f1b32c7c33707022bc8571a7a38e8aeef65a53d131a0b4ae895b8126f2fca6c97fdb24486dfbf97057d66348fa3622bc WHIRLPOOL 0a1d11a8bc1731f22bdc92815505cd8f90221d611b0ac10272a7d551bac74632dc8c9bd645270108b74bc6be6f7e46a5778d34233cbdf7f9c12977a0c5c9778b
 EBUILD netbeans-enterprise-9999_p20160921.ebuild 15825 SHA256 d5d36a26517c98a7fd7ba2ae9df90ee1f49458c3ddea6056df8db2a06bd3922d SHA512 cb7311d13c5d836a65b2e3fcacbffda94cb8bb93fb632c5e94216c0cd0fd1eedd31c45fc32d8b1adda6c323ad3619c86c5e80123950d5b23e13ca3ae2a49dd32 WHIRLPOOL 7c4a17aa92a70461a4de7acce285805a3b862753ab64275e8da87fbe7c477ddbbe39da190dbcfc22c4fe49732fae0cb7d495587bd66ab77692d29de0d75b3b41
 EBUILD netbeans-enterprise-9999_p20160922.ebuild 15825 SHA256 9bc3f731dfe2bb62eb7e039c9f93810256099fb3bfc484c1ce82e4cbaf171d67 SHA512 36d48fefd0f288465361d05fb6b2ec69a99740998c67750a80b03e8373369804519acae7c79a0bca68e8576486f0e1305a583300472719ecc424221c4b39cb2a WHIRLPOOL 29ce318476918afbf1144fd112fd94d16588a019e0c2e2c12400a12c39a00552f6a01c398d66619f015095efa47891fd9e4f75a5906b4693e8bd4ac207f7cf32

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

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 27cead9..77b798a 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
-DIST netbeans-trunk-nightly-201609190002-src.zip 218003305 SHA256 b9524ea17aae5220e46bc2d7f603ed8c741c3f07dc18bb36bff6b8feb1b105e5 SHA512 711ed0e38e0ee172f6ab1b3411075c477f9d4d86b2efd317ba72a0c2b716ca736ac1458e43ca2a35bb564eac3592e829bc72d0fa28abfe6f77ad1e22d2bb9b0c WHIRLPOOL f4624966ccc61c3d5cd6a339fe6b1ee52a87e7a585b360582b0549c49ba703c64329fa38a0edb6a546e941114b8adcfd2ad8d76b23127b15e5b7c361e440826a
 DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201610200002-src.zip 218421842 SHA256 c7169ff7d83f89
 EBUILD netbeans-ergonomics-8.0.2.ebuild 2843 SHA256 f9262f6ee7f2aed1fab9bf4cf756f565272e9894afa50b349735e39961e7acc3 SHA512 f158c27640541f7aef31da050e0811c07a251ae4797cc663b95a074a47eaf9d6bb7a9aa11ba38ea55e75c185f7dba74629ba6716a819e8ad68eb3db9ada71451 WHIRLPOOL 4fe9634fb673fb05dbba25996efc3a212ef3bb23ab6e7c732cb75de076feb930735e3901806fd9c801abc7ee8aa8eb800718065325d415371255a886474061d4
 EBUILD netbeans-ergonomics-8.1.ebuild 2867 SHA256 6d2c0b7221d47b64c77b243c8c5232c6d8c24d3199eae5799adafeac609b2e2a SHA512 6302c8c13d43ec51048e8b0439916746a01bb67f14e7cd21be95b4179df6106dcff1d3973b9191f7a36cf6f29d53b1d2308864f5f64d9f87f980ea264b1a97c0 WHIRLPOOL 63ceaad04323d9085dfb90d1e5075ad13f6e14e8991b13aafaf3fc174440152054f32498ac8d03f57917744887db3bc1efdfc30b473b8d1a33b514ec4960ea6f
 EBUILD netbeans-ergonomics-8.2.ebuild 2588 SHA256 68db901e9ef42508812495dd42af7afc5c85398b3b6a4585dea23c5423ea9c50 SHA512 f79370f1568ce6125e366d023f008799036a0b4c4b6e97ab4fd0e52270d0526710edfe0a979e703dd668796c56e4d9a8ea32fcccf9ca49993eca9a0f5fe5dd2f WHIRLPOOL 769da617620b71da2c5dac7901a352b76939fcdfc12e3d2d2014fe209e0e1c6666a01f185b9543ca800d4e201ad1467afc054e5dd1fd5a7187224b669547c834
-EBUILD netbeans-ergonomics-9999_p20160919.ebuild 2913 SHA256 e352e03a76698723b4333f02558080d2607a327315634f254c6b6df30fd5c2aa SHA512 6adb94989931286020947680c8f659be6d302cff8fdb05e367fdf830ee8dcce8250ae7446018578346230fcc6d0011e2dd00b40d8f79d3aaf0ec4174511e3e5b WHIRLPOOL f3dfa6d34ae695a6561f6c39e90c49038e41d9e5ee8ef08832668d016bc8612920c5c5929c2a29e2c5333092c0449d5d7600aba7fbc6b61ee716fcd76fed03c6
 EBUILD netbeans-ergonomics-9999_p20160920.ebuild 2913 SHA256 3e3f526858d5221b6e4968dbc8445bf9cdaa55a13b514d0c59ade13b1b4f330d SHA512 d468c8b08ad55e18f6597fc5e56d853ff943174797691bf3c0be643c010c4994c9fe46c021b3357a577947af56c29dbdf05cdab486c842ec2614055f3052e425 WHIRLPOOL efc07b013856546d68ebda24da7575eee796479c579c8f9a46c216a434ddf1536d25fc3505d01c5f49d10d9b1730403e144f15a51e25ee714af575c5d681539b
 EBUILD netbeans-ergonomics-9999_p20160921.ebuild 2913 SHA256 242eef7be7445480b75d30b51172fdf7e79aaa76080194c0c73e5d3b34be68cc SHA512 1f8590eae56bb744f2370199a057d8b6e139f6cf2de5c39bd8351e0e0a905f53c0c6df1c7c1143e0ebcf183c3df333f86637b225528612c0da01f1dee308e170 WHIRLPOOL edf684e0046a5159f18eaa45e22b15f0cff5a91ad2231b17021f50604d6c6adbb1976694d4356054f89cb1483b41e0a5271e01155acec6bc90ea414a3a3cd40a
 EBUILD netbeans-ergonomics-9999_p20160922.ebuild 2913 SHA256 a71c94636e2d6a18d7a0349eba93a88443c7ea94b44eff33df16530c63ac7db2 SHA512 f1805dd048cb67cecf69b64aa4802ecee815755605810990808824df684aa0457e40151111fdd944ca79c84faac837858c7e03193e78fcf5a758386bf0808224 WHIRLPOOL 98725c779ca894afd72f7c2cb8fa5efb4df76e1f508891ea863a5477cc79168e5d9c67a9e7ad2261d8fee688cf9827877b986b815333af31e8e9f69381e131da

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

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index e0467a4..5242597 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -12,7 +12,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
-DIST netbeans-trunk-nightly-201609190002-src.zip 218003305 SHA256 b9524ea17aae5220e46bc2d7f603ed8c741c3f07dc18bb36bff6b8feb1b105e5 SHA512 711ed0e38e0ee172f6ab1b3411075c477f9d4d86b2efd317ba72a0c2b716ca736ac1458e43ca2a35bb564eac3592e829bc72d0fa28abfe6f77ad1e22d2bb9b0c WHIRLPOOL f4624966ccc61c3d5cd6a339fe6b1ee52a87e7a585b360582b0549c49ba703c64329fa38a0edb6a546e941114b8adcfd2ad8d76b23127b15e5b7c361e440826a
 DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
@@ -38,7 +37,6 @@ DIST netbeans-trunk-nightly-201610200002-src.zip 218421842 SHA256 c7169ff7d83f89
 EBUILD netbeans-extide-8.0.2.ebuild 3307 SHA256 084e952eae1708b0fab785fd34313985e864dbc74a8531a0d5cdcf906e88f85a SHA512 ade8dc37aa932d7ec20966199e521311716061c23df08d02635f78efd2776f1d7bf040b0f9c9488b947bbbdfb3e33fa764723e3dfffa2214892bc6d685428f6f WHIRLPOOL ad2c26b005675ebca7d902ff1e6caa28552f3fda6795e327cc3584cf109f0ad6efad6516e15af5e70d689be236298b0948003e09a3da4991b3e29a1c85607b2f
 EBUILD netbeans-extide-8.1.ebuild 3331 SHA256 7d81adb3cba102e13678052bfe288e8417753ebceb69f69ce528ede3fedcef04 SHA512 ae445552036799069f31b40c145879ac55cf0964e168f328ac84f2d434171de8c4848e3416ad7425563e8565c09f798c9520bb3cb7511348f5d6a7522b878e40 WHIRLPOOL 44142233d4d3047ebb5c152992b484e5fef1fddd04cf274cc370f00beece5a75a986e5fadedd4bc18a01559c4f6cb58289cefbfc24d8d098d70056707e8b8f57
 EBUILD netbeans-extide-8.2.ebuild 3052 SHA256 f02128c23e03f164a7dae35617012088d766fb7300808f0283916a95df8599fd SHA512 02b2646836ada4d32ba11d6acca442a9b261f27d1d2cbc0996b046bc6a9b32399a3a826bffaab1c1e688d0c96fce4e02499337fb02beb6a9be67cce0b80039e4 WHIRLPOOL 75ba6170663f260e5e8b67b1a1a2df6aa56db67674c84c64348acd0389647bdc1b310bd5202af9e2e280a442caf82aa64b9424a8d0830ac48f7a23665365bcd2
-EBUILD netbeans-extide-9999_p20160919.ebuild 3377 SHA256 a3c0528cee6034f0aa1659ef0e33dfe33377dd8439e43c3a10bb3d7028a70ee0 SHA512 027b952479635e1e6d7617d4671b35a2a96a1071a8e3e24fe47963379bd4f3f787e6704fcda89d6af8d229bcbdc6f9230efbd41ec4e465e243faf3f997f675b1 WHIRLPOOL dc90763f96cb2e0147b6ead4933c7d22eccf0f64c9c43397371e08e52b55bc8795e34c37e7515e938ea2e63b4a46cf9231bed348b895fea2c0fe7207feee5e55
 EBUILD netbeans-extide-9999_p20160920.ebuild 3377 SHA256 7999e7ccc6b393d509e6025379fef3fa783c6af7ff1401e43831f6b3a236c6f7 SHA512 a6b90952d9ee1607294445f44de8b319c7988199824072ac8dc64c6523f9c6e0ede60a93249f3fc999cccdd6222373d1d35d792998bb35d4b5afef5f8ede7eac WHIRLPOOL f65010b1c27d5ac2ac33714bc7aa353013a2016e06e6d3fff11406d707ee8f77673bdf255392a2b23eab2f529a55be912dc83569528993ed412aac96dbce8ded
 EBUILD netbeans-extide-9999_p20160921.ebuild 3377 SHA256 72a863c9877d8f8f8041ea8d33b2a8b824fc66b907d076d8164d9dfb6589e65f SHA512 0c2afbe9e8b1a8295f80356a239f75a27e6c2efd2c4b9ba39e740726177f8ec41b9bc3152564ee4df4a71ec0f32a52f5884ffcd3b586c9ee1ab8def859b39da7 WHIRLPOOL 0670ab486ce5e24a429567b4b1638ee77a05a91813cdef973dbc298798ae30f9bf761b66d9de88d1d6716c4e4fe79ec9ff90a062c0e7d30d71df2d96bb3d7c14
 EBUILD netbeans-extide-9999_p20160922.ebuild 3377 SHA256 534d4faf272ca3cc66c0e2baddf479093968192a7b94ef02d7350ee3a30faca5 SHA512 58e913bc89a9103f2778da9b61a42456b62ca3ef665161b2036445812e21ed757ebf44d171223ba92d7192148682fef1c0e96e4b0679524abff439af45187492 WHIRLPOOL c576e9077fdad79947a4b80cf39e13e3c17a5d187c1f2c1e367a8c67fa78c36633a1f339a7cd390ea591c034080beaa94ba4425946fc622379bf73d6c3f0054d

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

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index eeb4795..1d82fe9 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -8,7 +8,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
-DIST netbeans-trunk-nightly-201609190002-src.zip 218003305 SHA256 b9524ea17aae5220e46bc2d7f603ed8c741c3f07dc18bb36bff6b8feb1b105e5 SHA512 711ed0e38e0ee172f6ab1b3411075c477f9d4d86b2efd317ba72a0c2b716ca736ac1458e43ca2a35bb564eac3592e829bc72d0fa28abfe6f77ad1e22d2bb9b0c WHIRLPOOL f4624966ccc61c3d5cd6a339fe6b1ee52a87e7a585b360582b0549c49ba703c64329fa38a0edb6a546e941114b8adcfd2ad8d76b23127b15e5b7c361e440826a
 DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201610200002-src.zip 218421842 SHA256 c7169ff7d83f89
 EBUILD netbeans-groovy-8.0.2.ebuild 3346 SHA256 907e6cd11c222f15c826494b44929483803f0e4249de0d54db51e6855b574148 SHA512 8bb37121e7e32621959318d109b1d982e2c705a9deb7171f5fef1dcaed55fc5718b0bc9e6bbb2592cdaa5e96d874bb6e6bfa96d06fe09f14d5250c1485eb1da5 WHIRLPOOL d5e09fa1e975835f05c6132c091fee4ae9fc9dd671af9f5f88a9195d5cd4a93804f96687ed3f2bd741117fa65773f2c464b3cfd6697425039cc51a940efa2a31
 EBUILD netbeans-groovy-8.1.ebuild 3370 SHA256 ca32569d438060704e4d5d5e46be2ebf20bffdb0ae2471d8718ada8676f32082 SHA512 40555d2ffa0ddab1e55ca514eddbd98c6e721caa230cd174050fb56f144def46f389b0ac018068c9f509936c83235b2d3423cae8676db7c96e8782b0da73e4ad WHIRLPOOL 7b2b021581db21aa8ff90ea188ddeea0974ec84fdb064cf367a56a6fa53487affe89edb1880a83934a2cf0c586060a9192838687ffebf33b55e79d9ddc7ac986
 EBUILD netbeans-groovy-8.2.ebuild 3091 SHA256 874191c03509577bc4a4bf7e54730eaa185a29620f09d1e44633fcddcefb08e1 SHA512 72d80927284126809760da993a3008cb7a45bb91f83781435c3199a51c5e2fbf5e85f39883322134c44dd1070d1b7274fa357b9187fd9ebc7cbcac98a5be925e WHIRLPOOL d12be4d592e12846bcd5e87e541170d0f27f4cb8fa21656dcc9294e4893cd0fe6bc4098ace1aed25bffa1faa5aaf260995395e29c3a2fc950c88727899337255
-EBUILD netbeans-groovy-9999_p20160919.ebuild 3416 SHA256 720aab00c1a4ce6c61af0ecd0c88b26148266d9d4ddd315c7cafa870b8c0cc99 SHA512 7bbee2afddcaafbddb360b8e736802a45f8b65efce7c2aeb39dd9db58a37f4cb6952fa12ff9394231cb7a9cc25cc4efa6a41ab00af1dd118dec8ab6153b624fe WHIRLPOOL 0bc17deb701b656480e27661b3d26f9f4a165108b525127d850ff01abe65d7431b106e8babe47ad1956d5f1586fa64cbec8778780212864e7b17c142b90fd15e
 EBUILD netbeans-groovy-9999_p20160920.ebuild 3416 SHA256 523fffd499a2acf8232a6243451b1397e3b3672b2e69cea8753c86c1b1972d95 SHA512 d787a617b0f7039ffe1a1402963f9f124f0b35680d776178b7248fbd20f95440f38ae3930e32c6e04e719278e50a1dc9ca376e28f813dc6de9bd0aaf126b69c2 WHIRLPOOL fd07967c5943bdc15e33e8ba8eaccf69c2bae89016313952df59201ed57420b79964571a7a50f7012fe9285af7f44d25cb42d592b68c877b34bd8121311a0671
 EBUILD netbeans-groovy-9999_p20160921.ebuild 3416 SHA256 a3258e5c6204ea4ebb735fcc49ee909a66dc25a6b1de4d8772cbbede5d546326 SHA512 782abb3a84a62f2eb50f0b7cbfcf9b53dbb574f910d923a210c1051d782331e7086d4ae65791b5fd2ef3b4160bbb43fd7e6a5552c3e1fb60d9f84aaaece9372e WHIRLPOOL a9486e05cea0ee82bafa18a2626a604a017f0401226eb79ba8b14a56215073ae2543a05e7972632b1844c9f4a266df23723b0497d006098b0a9057298507a833
 EBUILD netbeans-groovy-9999_p20160922.ebuild 3416 SHA256 4ad0fbdb8fd52a87874ce0481229fe9e4b46946ce8d4723e8684d6e2c2b19298 SHA512 5bb756b8b4fa1a969180dd812dfa08ad0bbf99430632fc13d3258a7007c8b3b7967fa6f33865567313a1de35a79ce697b769cb2e24fcd3ac2a8a29a1a3c48934 WHIRLPOOL 7c014d0c226a61d53ea4704edadab0dd7493820840c7f9873fc4779228718e3322a811b7a004fc3d6a75f9a2e50ed71a9c1872010cac1524b1352a609a0f569b

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

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 686d536..ff3dad4 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -11,7 +11,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
-DIST netbeans-trunk-nightly-201609190002-src.zip 218003305 SHA256 b9524ea17aae5220e46bc2d7f603ed8c741c3f07dc18bb36bff6b8feb1b105e5 SHA512 711ed0e38e0ee172f6ab1b3411075c477f9d4d86b2efd317ba72a0c2b716ca736ac1458e43ca2a35bb564eac3592e829bc72d0fa28abfe6f77ad1e22d2bb9b0c WHIRLPOOL f4624966ccc61c3d5cd6a339fe6b1ee52a87e7a585b360582b0549c49ba703c64329fa38a0edb6a546e941114b8adcfd2ad8d76b23127b15e5b7c361e440826a
 DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
@@ -37,7 +36,6 @@ DIST netbeans-trunk-nightly-201610200002-src.zip 218421842 SHA256 c7169ff7d83f89
 EBUILD netbeans-harness-8.0.2.ebuild 4055 SHA256 2674d562adc57648c82cac9f714f74f9d29dd7b7ff7fa7f0ef37c43ef0975489 SHA512 7d72bed5b955b2365a4c11fcd97a2d6f2372ab939fb9a03b3ff7915053f24d695373c1aa154f6e6916d37ef3ace7b38864d575419460382760500576dae52e49 WHIRLPOOL 72f54a6cb83f282a75f0abb073109414a7b8bcd4e9263466281e68ff34148a7343ed3bd78ebdc8afd109b6b9f5b9f15bfd0e250f418fcaa4986a7c886b57b9f6
 EBUILD netbeans-harness-8.1.ebuild 4079 SHA256 116b90d6e6fd1b1ad8ce99c81104262a416a485b3a3110beed70e9381333cec2 SHA512 77ca4bbaf078adf6e13c0fea0a8e673262aaed60dd799ec161584589fb4c791d9bd758c87f4272297d863d3992b54a66b77b7bf05135cada530d111e1c428e68 WHIRLPOOL d385cd6292f31a5817a2c096f960330186a68242b51ed26e4272f33a690a98175e0b622a5d5309e1e6a72ff824662964785b7d235cf3a73ba4d715cd19e89dbb
 EBUILD netbeans-harness-8.2.ebuild 3801 SHA256 fb8e3c76ee96cbe6d36c5dbabb49f4baf444dc3f879ac319c0bec693484684e2 SHA512 5ac59770e25f2ce3ebcd0af36c895060a1b1f3e38dfc2b8efbd8aa8d7d0cd09d9c88794a7d1a40bc69dc6afd2fa820f7add7fabc55e3cf064702bb8bf5903f3b WHIRLPOOL 7ac28d024972c33545f8163d3375d80defe3d1e6890a118e497a7fc6177b4d35e065a7283dcc7a04dda8a56687f18d55711018df168c302624800c80d68949fb
-EBUILD netbeans-harness-9999_p20160919.ebuild 4126 SHA256 c96d2a7b1e6ff950d7aa7ec75bc686a022d053fca132e9c04e9c141df45be875 SHA512 51acc6ad4b59a51d6a497c68ff3058b24c71f07c56bcfaf41a4b2523a33be71f5d62e343196104fb5ac8c58067f32c8acc35b9e7be74a3b34cf0276833fd5756 WHIRLPOOL e6b3759486c8cd03e64290094f70e72b38c98ba158edab0e77ec17dcc0965da5f1914a7241d9f7376006cf8d70d823a53cb3ffc442ec1f2329959f3cbf19553a
 EBUILD netbeans-harness-9999_p20160920.ebuild 4126 SHA256 644bb12dea929e3c68a6b636840512d987087c2ddae067a833cd45b199ea4bf2 SHA512 99e40ff3f204448e0d49a86c63a76693267a6d5ea423df6dfa137fc48d7ce6130d52f97a96a86604c7c8a5e87e3663e9cc444ba70acbb7e2047009cfd88e590a WHIRLPOOL 1ced7ee5f25c861b45c232848eb42fd6d8cd0b28401aa49cd108efda0c73ddc7e4838a8f4c1f7c7a0c1dcba9de425ff76e0073099110e2878dd6b06efc27ee4b
 EBUILD netbeans-harness-9999_p20160921.ebuild 4126 SHA256 e6e857b6983fff8405ceadd509444b81f24f7e08d0135fad61ef7c65d08c82f1 SHA512 bfc0d12653efb4571f53c5181827e600942c24a36b41c0999bf146f47adfd46bdd50cdeca8036458755b339a0a2381ee11a636fb2dc972389ded7c5f55efc741 WHIRLPOOL 32461b02fe0d5acfa92556f1b51813ad18029c0a4859dc5d01b795d3a0505f715db86f467a9e72ebef61f97a51a42c8977b3d15c8daa292b69b488130067d558
 EBUILD netbeans-harness-9999_p20160922.ebuild 4126 SHA256 fca1856381e1a7494d7c9cb309b7c7253cd2ead2bdebadc4d13442ae409ea0f4 SHA512 9591cef614662591dca590f5b7c1134f60e694fe440129586c2dc9acbe6a1e90e8d9d52dae9c8773bce66d8b8fc477d770c7f6822deb6d211fc7b1703340d32d WHIRLPOOL 60c0abf60e09df66cc0506ac372f178c369f7274d09eebb4e153e7446fc8d536f6e1706fbe68fef22d788c5a971dd8f48afbb606357de84ee7a86020d6c1352b

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

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index b3234a8..5ba62e8 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -145,7 +145,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
-DIST netbeans-trunk-nightly-201609190002-src.zip 218003305 SHA256 b9524ea17aae5220e46bc2d7f603ed8c741c3f07dc18bb36bff6b8feb1b105e5 SHA512 711ed0e38e0ee172f6ab1b3411075c477f9d4d86b2efd317ba72a0c2b716ca736ac1458e43ca2a35bb564eac3592e829bc72d0fa28abfe6f77ad1e22d2bb9b0c WHIRLPOOL f4624966ccc61c3d5cd6a339fe6b1ee52a87e7a585b360582b0549c49ba703c64329fa38a0edb6a546e941114b8adcfd2ad8d76b23127b15e5b7c361e440826a
 DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
@@ -171,7 +170,6 @@ DIST netbeans-trunk-nightly-201610200002-src.zip 218421842 SHA256 c7169ff7d83f89
 EBUILD netbeans-ide-8.0.2-r2.ebuild 29330 SHA256 4822cbe26fc19685164c35d69e75bc20578ca8a5ce3394fe97bde6acc721fd2d SHA512 552f35cb1aa5429beb70c72a0cd2a3aa3a006f5870ec4084e88632a39e2ccdc05d0b2b15a87f26c72cdffb3c9a6fa0a124a8d501edeef9aa9580396922071e8d WHIRLPOOL 4c9bce3ca21d5ae61ef9392b9282c2dff9de7f82f2e83d2944a2906ca2180ef0ffab59489bdbb6afc7ba88d5143d77b47a0cf6b219a5a4d385b68afcacd3fe6d
 EBUILD netbeans-ide-8.1-r2.ebuild 30301 SHA256 892f20531352d85b5b72b1c85352eefa444917b515b0b564f04c4f91d1e654f9 SHA512 50af4873fd3ea7755b0d33b086be7e07766b6c009a46ec3954a67a1da9930378bcf9da6d18b7e60078b31af4b36ccf060f22378a8ef26b3829ccf30a529dd023 WHIRLPOOL 1024af16e7cae7f4728dd37f88031be33253b7c62548a095d3e827abeccb6c183d34ce312bd1a0f808f0d107aff217e4b81b7a17eecc6842e1d914d7061df2c9
 EBUILD netbeans-ide-8.2.ebuild 29530 SHA256 90a463cbcf7753c53f3928eb542ad745a81f3b2518e1d6da3f3e28a951e08cad SHA512 37ccead9a142e330c07e030b1957d17cde945ed4fbe9a13f62125f7762d83965919836fdce654c8c305a34d69d585184155799f55495f9247b8916ef780510ab WHIRLPOOL a7e1d1c148dd776698bffa0a1fcb8b7e4f31ff32a7059a1c0327a266eaa5ac8b768b7d7dbba16fd71844f6e8834d2edf884a9f8470df1e22b8ecb7b44e0a6540
-EBUILD netbeans-ide-9999_p20160919.ebuild 29849 SHA256 864d511828c868eed5501381b8dabf91ade990d40dface018906c9419300ed7a SHA512 e7efeabc2f424e425f7b353d3fddf4c70d3572ddbf8c0d1c6671e20c62e3a10ccc6b248c7b56bead1b68f0a7b6e8d67d57182c436bbdf132d0a46484e3bf4ccc WHIRLPOOL 3ee23b9953ddf06c7c84d8c21e204d02a9f98f5d40ab3a8ff3d58ffa565337bb9f6cd34649c70aafbc53e6188e3726dd01371142211157eac2f33726a00d91ca
 EBUILD netbeans-ide-9999_p20160920.ebuild 29849 SHA256 b77baa64e73048f604ebaa909079eeb5ec6984a3e89f708a1721953c705c7c14 SHA512 695c020d32b4f7b123c9dff580ecac1b5d6173d8a836330d09a4321d8b372b35e78bdb54410983114863a94711c5ed334c6dc16de5c78e653535bb9edf0e4938 WHIRLPOOL 5bdbb56ad3d9c86d8b719d46251c93846d0b96bec7899936bb3273077565bfe49d8187c9b8a61d8423276c730912514fd2dfbad0ecd9e663f079a6333c83bd27
 EBUILD netbeans-ide-9999_p20160921.ebuild 29849 SHA256 a8b62cd0a7a0fb29d46dc96b2e85b2a09dbe54a36d587032f3de389dca18cbf2 SHA512 c2b351954fb43715efb9996c77ba2150137330ffdafba6a1d0ad71e7bff260186d9cbfc41b7892e1a012e08a94a8d55047ad4d8ee71b1f020752b5c003afa009 WHIRLPOOL a06b6062153d8a63becaa310ec4f9713b7b6b672ee55dd12cb8080e3e49bc403d28ff1f820ce22a3a67adb1ff3215918407f114d2f495d3af71cb713b57c1c9c
 EBUILD netbeans-ide-9999_p20160922.ebuild 29849 SHA256 8917983cdcf8818f1d1e95470eff1fb2580e38e73d7e9e5902d4d9c069ea3db8 SHA512 6e16058d75d8c398406bf95eb1394a12fe6b06e4105af26aa92764c45f23c43098d617de303db0a7906dd6cf3c1773c7bc663fdf141332c97bc9592182116dd4 WHIRLPOOL 234ab0bc091a84ee6cfc27ab2826b7df9a64f13a346fce9cbf467463c91e2366abd7b420a4af30098235509604e451f5f5987b034fed14df9807c30e319ff0b1

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

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 60e3803..fef93bd 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -41,7 +41,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
-DIST netbeans-trunk-nightly-201609190002-src.zip 218003305 SHA256 b9524ea17aae5220e46bc2d7f603ed8c741c3f07dc18bb36bff6b8feb1b105e5 SHA512 711ed0e38e0ee172f6ab1b3411075c477f9d4d86b2efd317ba72a0c2b716ca736ac1458e43ca2a35bb564eac3592e829bc72d0fa28abfe6f77ad1e22d2bb9b0c WHIRLPOOL f4624966ccc61c3d5cd6a339fe6b1ee52a87e7a585b360582b0549c49ba703c64329fa38a0edb6a546e941114b8adcfd2ad8d76b23127b15e5b7c361e440826a
 DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
@@ -67,7 +66,6 @@ DIST netbeans-trunk-nightly-201610200002-src.zip 218421842 SHA256 c7169ff7d83f89
 EBUILD netbeans-java-8.0.2-r4.ebuild 13298 SHA256 d4172dfdec5afecb1cd099e18a21aa872c7822bff40b192b5f4ec4d35e6e0ef8 SHA512 48ae6f7141117fbf58123ded750d76f2e7311211a6be3b62bd491349817460da11f781ec5694da91584315547c32008f568fac3bfb406dbdb5ed7fd825ff694e WHIRLPOOL 73fb68aec003707c14b2b390c2de80f24e1e5413cf7e16cf7e661af47c908e2d559214580379e45e21d316767987ac906b5a119a61ae39f03c3d01dafad49b7c
 EBUILD netbeans-java-8.1-r2.ebuild 14814 SHA256 1f49212c90fcaa9a6483f19bb60c963520f20aa08c2a509aa19cc7fda12e4564 SHA512 2d6b225f5d32f0ce1801124808b0cc2101f16a703540877c4818be06694742cfa262c3a2e7018761254f9244a7992eb7fe9bc15cdb20f6f4cb83958789c0ef42 WHIRLPOOL 8557163a46ea91a47efec3c272b8a8a0f2acbf9eaa8f6c280d0ddaac6dd8b2185f06716ab12ebf76fb87fe6c05ab1a14bfd281875ebef586f1304d2162e5f2dc
 EBUILD netbeans-java-8.2.ebuild 15331 SHA256 c35725f6dee4e634e4de474617a307e2aaa6434a9569bffd9566304501adc9d5 SHA512 259c16a255409df4d0519bf7bddd4200ccaefdcbae4436fb321c33b215b757910c8cd807c8f142e8ae42ab4bd59478436ecee8c4d3d38615e8bbf110c265e950 WHIRLPOOL 07b86ee0c402eaed18f3a640ec5a447bbb781154e477db93ca51ee8034b991be39d8203c88ed0119bd785091cd82ae41367477e902dfb96ad41ca97410f5f41d
-EBUILD netbeans-java-9999_p20160919.ebuild 15656 SHA256 638828772b4a1eee02bd29f203a2d5fd87b34e1bdcf33b017afc3bd8ca1968d4 SHA512 c05793c2adae49d7e429f91321a63b4c2c78d413ad7c1a369159d83d5a304fd2359da6f94a6e2b74e0dce5459f0d935198bbd2de31a2edcf023b5285b41402a7 WHIRLPOOL 65649d3c562af4547b3733e429165b10c0afdd5ea12b5461f352e111bfdee52b987cf8d14418a820380e4eb1ff7aa0f169afb065b3b03bd9ac173377c48d0d9b
 EBUILD netbeans-java-9999_p20160920.ebuild 15656 SHA256 eb5eeba801ce75f3e4c8b65a8930b64a8c8fedfb2bb4115dd5ee34cf8a9d055f SHA512 07f7890f532d744b55b10ddd06eb5df0fb1b373d8fe11ca31c805e5d3cd232523a7412e86fc960407c01292e554880af5576d56aefbec681bc8bd18516f3a398 WHIRLPOOL e216f0e2ec2b6aa1cbfb46a3c1e01f4f92e53182be1411efadc3a5e27d2857c232d0cc929bce1a086611e34e04fb209b20de394a3ea018d51f686e02a2723a54
 EBUILD netbeans-java-9999_p20160921.ebuild 15656 SHA256 142511e71996d902af4597cd0020dfc79788c52bc4c67306098d79fce4bab8a1 SHA512 ccf7f1ba490d06e3bd82338e0fd2a92ec5cb702796e58fc0ae28839bebd1030afe2332e72fa043e321bb379144cd432e9e9bc2f8892be935a3a0337c62012ab9 WHIRLPOOL b06b67a24bcc7e97cd61cfa51d998678917ea8e69914e0c56adbb1b98cabf6ecfa95c73e8bc673a1513d3e90a212207409005534fde27fd45e57fa34c84f6044
 EBUILD netbeans-java-9999_p20160922.ebuild 15656 SHA256 47fcde1b320798b90abf6f888ca8e724e7ea0fff7f1ac8f55da90869cf450c07 SHA512 e8020e54a8c044b7e007314b46e965f3d881f5b4bcf557d2681739777e8529845d24127a448077d93b19c2c854a640650716232990552491e4f9b94543d22467 WHIRLPOOL 7d5bcf931aeba8c6b17796726b00f9c3963b9ce5b488be7b0bce0f0f320a1bbb48c078cdc1b3f96a5b1a242caa03e68bd0bde71262ca8e22ee05174e9b09d22e

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

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 85fac4d..126b5b6 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -9,7 +9,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
-DIST netbeans-trunk-nightly-201609190002-src.zip 218003305 SHA256 b9524ea17aae5220e46bc2d7f603ed8c741c3f07dc18bb36bff6b8feb1b105e5 SHA512 711ed0e38e0ee172f6ab1b3411075c477f9d4d86b2efd317ba72a0c2b716ca736ac1458e43ca2a35bb564eac3592e829bc72d0fa28abfe6f77ad1e22d2bb9b0c WHIRLPOOL f4624966ccc61c3d5cd6a339fe6b1ee52a87e7a585b360582b0549c49ba703c64329fa38a0edb6a546e941114b8adcfd2ad8d76b23127b15e5b7c361e440826a
 DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
@@ -35,7 +34,6 @@ DIST netbeans-trunk-nightly-201610200002-src.zip 218421842 SHA256 c7169ff7d83f89
 EBUILD netbeans-javacard-8.0.2.ebuild 4906 SHA256 944fee40d693c2c287e748f70ba565f3cd84bb7c19110f8be716134ec20694a7 SHA512 1f66cd2756effbfde7d43f9da7d8d93cb6252c58a02ee3d821f6faeaf63bf3c63e28f80c6eb44689e3aa954452a2f3893c65e75de84158dff1da0d94cafea14a WHIRLPOOL 88197e03008b8acb1ce62f72783bb096d9a3fc2a289b83367841a8adbee2bf822031f9bd6051831515ee44b1d5d2a109c5646f98ca723506f27c874301fb4189
 EBUILD netbeans-javacard-8.1.ebuild 4930 SHA256 5342d0d3f4207da3d36eb19f0fa78015f33b4a6e6435fcf43b7f568afabb9d02 SHA512 5275ae0fd617e26cd8580f6256a766bdd9cc0299f5a488be5a97744ec6abddf262e5fb1db358b9ac00203bbedfe7ac152828b174856d9cf6fa06e1e2128e219b WHIRLPOOL 427bfed5b61a421340acf7ec0cfb5e88a8b4a68cb546b9d0546b7c69ab0e29700d03e2bf58641bde63a2a43579b0521c028cf57dbf25af280fb0732565a30617
 EBUILD netbeans-javacard-8.2.ebuild 4646 SHA256 3eb779b4872b425a8f9ac0b2eb78984eba38c614d784be47af32a3fc90b8b2fc SHA512 361cb549efbb2835509d9a6aba409832173a4f3731e1ae31016a286faa9e8da94a206ec876109f1a1095fd1f7e9d73f3360c5c385802268314e93aed1f187218 WHIRLPOOL ff13272370d4782a140484c0d4967c3b2d16a2687c9fba444637577ac3560ac4cd23a67699debc539b884049a61feefe4cc91af842c3c0243ee9077a2b6b9c4f
-EBUILD netbeans-javacard-9999_p20160919.ebuild 4971 SHA256 563d365faea9bfe643e866bb0275af353a7747d7c40f400ffbe9e088118746a9 SHA512 d19bfb9d047b3148b0696c765cb598c5edd1f9d4c896806221dab730bfd112e428e01769b913a18f10692d161c8e7deff41644b16415e136d29f06b88bc0fb24 WHIRLPOOL dde57e774f930f45dd5466b1bd2aaf71ef780bbe90f1d7bac3457784d1191593223bb519f118d37b1217e21c4ad2d78d1882aea64ac4aa059e305b6f38f1058a
 EBUILD netbeans-javacard-9999_p20160920.ebuild 4971 SHA256 f942b0a7bd02a0aea4e897b90fece8cbadaf0a96f9cd798aca9baa36dbe8a125 SHA512 1ed4a96dd17f5eeb5c7cd5c9a1cb65de911742a258f48a62d4ec4483a9f366e58484fdd6303a6fd97685fe0964bfbf0e565d4d24de263913a31466a9cbc65850 WHIRLPOOL b8dcca77e0eac26c38ff4b7b2fa742df2d91bdac2fa81e6d81adea7d944c15ece6967439e2ef4185b160a3892a7dfe8dc5a9f45f7dd3fa4e3bdc02c917b41249
 EBUILD netbeans-javacard-9999_p20160921.ebuild 4971 SHA256 21865902b7308019b2845fe76bb1b343913a0906d78f088b4385d3d554e075b2 SHA512 f4a9435803090501c346e2db625ef681ecd118c062927c81acc7a4f1e68b68a034fc2654ff490cdbb2e850100ce27bc447910a851e0a4fdd05e57f72ea35e886 WHIRLPOOL 9a88567d837160283db513c38588e3283c393c41358406afeb0aab4c7c88276ffad8a606115213a122b41afff7bfc8a13282c737d7c3c60e8aba27d2b81d08ab
 EBUILD netbeans-javacard-9999_p20160922.ebuild 4971 SHA256 4036468b046ac27f060a8b41e6aa686f061121a9a1fb525e6835d62682c3b6d1 SHA512 156ff632dc843a0cc81b0f3421c293bf0d27a50487f9fbfb15ee330869b09cdf162daec0b5fa2999e256ce4e3897cd320ea3dfd7003441d1a69a7b5daea315ef WHIRLPOOL bdd286b4e5a123926b53e5762047fe68a254508b559dc4085da61c2cbdeaeceea3ff2336c059a5103d56c782884b141775a43f247dcaa0b9bf142219009e9bea

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

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index 64f1a97..768cef4 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -9,7 +9,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
-DIST netbeans-trunk-nightly-201609190002-src.zip 218003305 SHA256 b9524ea17aae5220e46bc2d7f603ed8c741c3f07dc18bb36bff6b8feb1b105e5 SHA512 711ed0e38e0ee172f6ab1b3411075c477f9d4d86b2efd317ba72a0c2b716ca736ac1458e43ca2a35bb564eac3592e829bc72d0fa28abfe6f77ad1e22d2bb9b0c WHIRLPOOL f4624966ccc61c3d5cd6a339fe6b1ee52a87e7a585b360582b0549c49ba703c64329fa38a0edb6a546e941114b8adcfd2ad8d76b23127b15e5b7c361e440826a
 DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
@@ -35,7 +34,6 @@ DIST netbeans-trunk-nightly-201610200002-src.zip 218421842 SHA256 c7169ff7d83f89
 EBUILD netbeans-javadoc-8.0.2.ebuild 5993 SHA256 baf9da38d87b86eb8ed10ef46017361f36ca8583dd90885c9d1667a51851bc52 SHA512 892bc25b30dc26e3ee7c8be9aaf8542c00a7fa1d1d8f883d82bebb816edfa93e1ee9abeac1b0c47ecc8b4169bcaded56c5c71f18151fdc22fe241fcee0fd4521 WHIRLPOOL 2012f28f3ba5074b4d262b20e9a1c8ddf590ce444339ec1a404c890867c1271e38f9f9e09717d0648fae061553f5c8da3d97a70c35c8e853fe4894fb6fd4ec96
 EBUILD netbeans-javadoc-8.1.ebuild 6247 SHA256 5f0ab01cbea85353ac471a46e341750785f4889732c9da111d77b87bbd1bcc2d SHA512 4a4636f4f58a9baba9d9f5bac4ee7d4f57c0e07d6790902d34974383660f2926c4c4b16a27bacc2a3a7a0a6d5b7699caae90bb2ac513ac8e0535e46d11ec345e WHIRLPOOL 9cbac0234b9f1a8122df116512d5154b7e85561fd9541e0a77dc5c2b5863cf3238400ac17d05499e950705309faa97caace6da00c912ea07d6a74b0076f683ed
 EBUILD netbeans-javadoc-8.2.ebuild 5947 SHA256 1f1c2aab9b63d0e87c93339f5457515573248c09532f2596ad272001605d096a SHA512 d133bfe2588f9a766ef4d5f01f8f0aacd683813ee93815af11f4560b2a7a9d7c48e919d36f002e667aec6ac978f02e07bbaf67a26512b69cd965a8f238b2f60b WHIRLPOOL f5e83670d013e22d4448d70bfdf38ca28adf99b2418446aa3018a59b5fcb75d43ed932659e222e6383e75a56de2340b4f939066631efdfa98ab016e438bcfcd1
-EBUILD netbeans-javadoc-9999_p20160919.ebuild 6293 SHA256 da219b92ab3ae26abeae551d1dbd0926021cb15af68de0fa28d7bae8a6827b2d SHA512 d9aa5a63688034a3dde960b961092227c536f758f5d035f132fcf3a896b04ba75da938da44b37ee71f9ea97ea773b57a003fd6981150e8b3a97131985b16d349 WHIRLPOOL a22f3b5e07170e577d2f2d6439b4d372be37155e03581e88f61f1117748ccb0077cb768e3dfcdb523953fe69725d2adb46800149169ac4f8d390a664b8e6cbbf
 EBUILD netbeans-javadoc-9999_p20160920.ebuild 6293 SHA256 8e8a74e20716e35510182e53940b4097ded4257aa66f751175b0cce0bf4d2766 SHA512 e3dfb14914e0d4d5ccf5de51d04e5409dd997b5d5b9871eac23de200e8aa18520ffd40dc6b7d3c50062848aa756e97bf8fc9033a564390a031adf5100a19df2a WHIRLPOOL 23e795989fe821f5ec934f3ffafced8fe40ac19388d76e887ff7b83db2d05976ad64eb36cbcdbb507b9ffe6b49a0d4d7fa7e170a62ac81bcf8e8c5f50ddcddbf
 EBUILD netbeans-javadoc-9999_p20160921.ebuild 6293 SHA256 61d3c823f386ab5efa25a3213e2878d02a34ab2bf017a00355757f25c28ecb9d SHA512 45d02b81d4f303d4a0042a81a34ac4fde1ec9e898dc6a19d6d9bb2f1efbe22559a4913cf6eb34f22ae65c34a87ca985d8da208fa6097f939df13a138b886a074 WHIRLPOOL 610af3784a880a23a9e7d89c37f90aaeb590109ab3f4cace4ad7a194222e82beb8c10d59f9b2cf952a2756e8083ad59b6bd10acd1d402f5b04f5bb908dfca41b
 EBUILD netbeans-javadoc-9999_p20160922.ebuild 6293 SHA256 6fcf03a46bed23279cf1507b407e003bf1e1229e9864de276bd5052c2afd1f13 SHA512 e3ae3c7e394d2e3e3ac37f86e6fd8abf325eba9de51354ef98879d05f133194857c1629e06a176b8c531b01628ee4845b67a452e69372a2d4ea466226b172a57 WHIRLPOOL 7e2fe33e3100bd3b2a3528ddee7ffcf9767ece1c20f9aa25ed720e20589fb4c3999877f1d592ed69af81f4464be917b4f456f2fca63fe5df6ef4a9d05398043d

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

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index c14efa8..0069e63 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -15,7 +15,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
-DIST netbeans-trunk-nightly-201609190002-src.zip 218003305 SHA256 b9524ea17aae5220e46bc2d7f603ed8c741c3f07dc18bb36bff6b8feb1b105e5 SHA512 711ed0e38e0ee172f6ab1b3411075c477f9d4d86b2efd317ba72a0c2b716ca736ac1458e43ca2a35bb564eac3592e829bc72d0fa28abfe6f77ad1e22d2bb9b0c WHIRLPOOL f4624966ccc61c3d5cd6a339fe6b1ee52a87e7a585b360582b0549c49ba703c64329fa38a0edb6a546e941114b8adcfd2ad8d76b23127b15e5b7c361e440826a
 DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
@@ -41,7 +40,6 @@ DIST netbeans-trunk-nightly-201610200002-src.zip 218421842 SHA256 c7169ff7d83f89
 EBUILD netbeans-javafx-8.0.2.ebuild 4647 SHA256 15e5e0b1c4729852dd55e5bfb2dcb520ba7c959bd9927d315c0abcb3f94e4ecc SHA512 520c60264fee67b0ccfd50ced0cc8586d5653d5186fa75c6b7cd8b400aae834de446b7e6145ad38df7e68207391fb360ef4834140e096d48add568fed387ac98 WHIRLPOOL 416a56ceb2ba85e3923ada0c8ef485cdd6fa16b3423b8fd0de523fa54dd082cbaedee5da4f1a92b50e440195f9256376f50e99a850d70ccdcb8c0ff370007f7c
 EBUILD netbeans-javafx-8.1.ebuild 4671 SHA256 2a12bebaca0ddbb03b84c33de7f5933f76a8381db3c40013fc4014687ded6cd4 SHA512 ff410f96e808c414e3e9485461866239080098e46e843ee771a78a0afffddc1c776697dccb276daf7f87dadf915a212bfe9c2a07b3a8a9057cb3ea19b77163fb WHIRLPOOL 51729142255a16d4cd949d4bf5f3b681d36bc83f30dad39aad9d1dd56f7dcec0dae4377817350e7947d518129a74eec7f227c3cb1600ac168ea90d056b87d195
 EBUILD netbeans-javafx-8.2.ebuild 4392 SHA256 8f8d1cb51f4071d00fd550a3cbcf48df0e1f3ccc8906bb43d7c384adf3ac2764 SHA512 4b4f347d25f758fb8c3f9ece13f831ca2365e510b895f6cf71b8063213a8db6cbc83f4cc4c3173e3778a536e425e969e7810df79ceaa453ea57b502d5080b239 WHIRLPOOL 73f50442c2d03473d0e3075c6c90f6dde8900faea51ed19974445db7a6a2abba6f525511ddc58d9da03e011e851e5a58539b73fe6e1c5b408b3d000318ce5630
-EBUILD netbeans-javafx-9999_p20160919.ebuild 4717 SHA256 c976e2244621bfd7cff2483a448665d6a7f807971704b9f966d58193c06167cf SHA512 2762e6b0d09128f977a1e67af39e50fdfc607fe660172b7ed38080830b5e18279efda98e1e2dbd59573db9d479b2dee65c2e347b3109cc466c3d7ba419930607 WHIRLPOOL 6aef12a5e53a93cedc787dc85c77e7d974f79897242f8b5ed573ac04a20d992280322cea208287d66fbd04ba7810c253ed8751d5e673706fafa1c7436dc723ce
 EBUILD netbeans-javafx-9999_p20160920.ebuild 4717 SHA256 dc9fa4554706242615ca9f44f012f17997545b2088dd276a309a22ae5f5f5e26 SHA512 f282a6ded78b8d1def6d5cc00de383dea78fac0dea4eb49d3f47afc987903495928845306299ad9dc7f11443f5c74e0305470804b7e045a00a194e5019cd0b64 WHIRLPOOL 77d6096e1f0561e7b2cc0a38be5eab3054e0d73cdad298629c80f99529d5572ebaf81559db526b1794c2d13ac29c6266253ee5ceea25bb2c9d7966a4bf2e88c3
 EBUILD netbeans-javafx-9999_p20160921.ebuild 4717 SHA256 76680ecce25bbad915149b2979e7273d5d34d9e0205a2b4d64d3493e0d7ba7bb SHA512 37725e1749c144ad89916a3bee858df8ef1a162f232c40852b5af932d19f2589f6e8128bcd04860b1b17dc356e86a5decde75b64e0c64a66eaf7b20108f73343 WHIRLPOOL a97aa91d857683baadb676428f53c987d344accabe056fe6c625f12aefe60176af038d1438766f21890fa8c094d110196340e2b5156a740dc370d15591dd572c
 EBUILD netbeans-javafx-9999_p20160922.ebuild 4717 SHA256 654c5ea152120db6c9967e538d21531fef2db633c6a2b59458407694557de992 SHA512 49c8f2c996c9fcd0787f1e85dfa971d32e35bc259818dfd8b7da583f88d8951204affd8e15457d2271865712290f3bf01333049385db980a01dcdeca4a9d768b WHIRLPOOL aad3b34d197d6c479d8160517476964f8351e07205ec7e107fa44962663b786cd05d4ecaddff0c8816c860360366a0c16e27976b5f44240502ccfa96457a5c7c

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

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 45b7d3c..4835391 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
-DIST netbeans-trunk-nightly-201609190002-src.zip 218003305 SHA256 b9524ea17aae5220e46bc2d7f603ed8c741c3f07dc18bb36bff6b8feb1b105e5 SHA512 711ed0e38e0ee172f6ab1b3411075c477f9d4d86b2efd317ba72a0c2b716ca736ac1458e43ca2a35bb564eac3592e829bc72d0fa28abfe6f77ad1e22d2bb9b0c WHIRLPOOL f4624966ccc61c3d5cd6a339fe6b1ee52a87e7a585b360582b0549c49ba703c64329fa38a0edb6a546e941114b8adcfd2ad8d76b23127b15e5b7c361e440826a
 DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201610200002-src.zip 218421842 SHA256 c7169ff7d83f89
 EBUILD netbeans-mobility-8.0.2.ebuild 4342 SHA256 e9b4ff8fe38904346bc21a82219696e97322bf9df4e9d4cad2259b6f08bbe7f9 SHA512 338711fe61c469cee80e499ddf8c3ad70a3a38e6658311afcd1d24edd1a99b87566fafcbd392bb958b589796e0913d2574b07570870c8d3382a91a324227082f WHIRLPOOL 855b2817c36bea67c8fb368a0740be18b71dbebb2b98a154552f002a56eaff34f54eee2698379d7200a6042c1de699df23e7717b5b6c532776852d8757b74cb0
 EBUILD netbeans-mobility-8.1.ebuild 4366 SHA256 fe10d103a284b8f82b67179ea52d51d57b43cfc4a4084b97e3f9650526621497 SHA512 36bdf0948b41bfe4f9c66fe093030d5f27b90f5a89be94dfbd176e3887b249d5aa3eb9b0924df142291f0d693f274eef840ed3a7f658106847327befd0374710 WHIRLPOOL f9dd44e6401367b2df73c5f1428bff53547ac012068297667666d0241c29310aed4413a368e5350a996af37ad026e875325467b1a165cba6953d99a5da3a0d76
 EBUILD netbeans-mobility-8.2.ebuild 4087 SHA256 38f5fef1c2f2ff5030842622999f12ca02d8978eea528a38a6bb3c0705e46344 SHA512 2b6c00f2f2003b336e25f6c4a524be1835c2565302ed43f3eade9cfb251d368eb94ad5fed01578561684e8a1ed37f3368c78b0b9d00ea6c794abf200f007525d WHIRLPOOL b990976000d451d23144bbf1378365ad019252601e261558750fe38821abbf293fb40ccd5a966890a688162aa05bb34fe69b78519fa2b09fef0a539a482bd5dd
-EBUILD netbeans-mobility-9999_p20160919.ebuild 4412 SHA256 f50dcead7e961cf7dce38a249340b83ecc37e2eed5f0438930b410602a3824e2 SHA512 d13aa2bd7b51cfc20ae274affa0b246a116156bc4217c31a6d8461e29774d45740808e23a209ff756b04ff5211927dcefa876121e26ad8ea95960f84b903d210 WHIRLPOOL e7baa6941ccafba68f068d06aef3523b1b1a4433016f2a082848f182fda461909a78d0e6f4a8d9a6d62ec9f78af17b5d9f10f3857ad3ba6df0a9faea62e404fd
 EBUILD netbeans-mobility-9999_p20160920.ebuild 4412 SHA256 3020a5b9fe9ddfee9f58adc756b8c327fe580238c022342e8b5cc2829a03b068 SHA512 b87b67d64da0348cf36a89bca5d518c6af7ee2e1a5d45b7d5ad02bdf094d6c85f3294f8f36c1987a443bc4cdb44b79942ba009bd48b96234531929420bddbcad WHIRLPOOL 9a6f04e89311a9df34b07ebc78f3bf273ed6bd393e842cfbb726f791dfe528dc806d7a2f8e6a60ac51737cdf45e927da503649bff4c6d4dbee87cefde939cb45
 EBUILD netbeans-mobility-9999_p20160921.ebuild 4412 SHA256 90fbf38757830eac8f0bb29030e4302feff0d6c1937c0ae19135313ccd5ce692 SHA512 e5b69a0dbfc86f6970f0ae2e0d41c2d0108cbf7e8513e692dd11fd188b3ab4cea8cf57f0d54270bc4c988f007f6b099cebf5a68b0513f5a2cd08125847876d4b WHIRLPOOL c43a0acf87379ffe4ffbfda0cb97476518f692799ef0a1bc0a4bc7acbcddf15744949bdc6dbc7ad42d32eaacb3a01220b8894c4105cfb8568fb08c427d7c6491
 EBUILD netbeans-mobility-9999_p20160922.ebuild 4412 SHA256 d6bb5a34a3742abba1641d16db1564456e86fdc1f30e3f6a7438bba1f0212475 SHA512 2febe56aab2bda727d518107564cd63bebe5b168eb7ae0f1b38104ec4ce57dad069cb28ad79d64c2adcef66bdb51586e0065f3aaf644f544b65cb29633d54838 WHIRLPOOL fa200f54f108b114c29fb460046373f5bfe9efc3f09c47e6e4a6632c0b6b03498567baa5e8cda13c8f249fff5551f8c289cfd5c80103019ed87d1145a05a3675

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

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 0864f74..c3ab963 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -9,7 +9,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
-DIST netbeans-trunk-nightly-201609190002-src.zip 218003305 SHA256 b9524ea17aae5220e46bc2d7f603ed8c741c3f07dc18bb36bff6b8feb1b105e5 SHA512 711ed0e38e0ee172f6ab1b3411075c477f9d4d86b2efd317ba72a0c2b716ca736ac1458e43ca2a35bb564eac3592e829bc72d0fa28abfe6f77ad1e22d2bb9b0c WHIRLPOOL f4624966ccc61c3d5cd6a339fe6b1ee52a87e7a585b360582b0549c49ba703c64329fa38a0edb6a546e941114b8adcfd2ad8d76b23127b15e5b7c361e440826a
 DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
@@ -35,7 +34,6 @@ DIST netbeans-trunk-nightly-201610200002-src.zip 218421842 SHA256 c7169ff7d83f89
 EBUILD netbeans-nb-8.0.2.ebuild 4927 SHA256 7531e50c4d76608bf925efdba4f54f522de3a8ceeef4d48807fb4ee48bfabdf6 SHA512 925734f331cf228066c5c9e614f48b756af31cac8b559cfe756347b6a2cb0ce362c7c41489a25084f2ed3f2e415baefd148a54f39fc00269fb14179efe056cb9 WHIRLPOOL e3224c5f22bb8e4792a5f98bbe819e071ff18c99533ce05a3fc1c5898ddcca1e3ce34487ba78159bb4d60155acdf15ae4fe81189ff2d5b1bc77ffd9ee4e20aca
 EBUILD netbeans-nb-8.1.ebuild 4065 SHA256 c1bfd704ecaa1fd62b149114b7391b4633a90a8a1d87645b833731920aa6efbb SHA512 56bda99c3d05522d5becb032177e4b4411d862d18a069e2d4343ddc8b08d05ed6c3199588e28aece7e583ccc9f95517621780a246bdd65c7d3edf072a61ef1cb WHIRLPOOL b9a43e6b4ada929bcf2aaed0bffe9cdfe0b9dbbf001e8ee4f2ab3cf8a08e27d318ea435d0580c80fd23cf921d261ca9b54d54a2b2e7a53173f955bde03aa0a12
 EBUILD netbeans-nb-8.2.ebuild 3786 SHA256 52734d6772f8851119fd367429d69e4b2a1396cdaf0145cf5969a2532ecd2ec9 SHA512 52494c0b0b6988461d0ae2b730f2dce5a4ba7477851f3076637c4d4bba01525efa2ccd869db7f59827c201f47cdd933c25430fd441282bc6be41991f26af8370 WHIRLPOOL ca58b3abfe895c4c68b8b2bb60388924181fd9f44832281ec43d5561c36936ec13f189046bd9e6e12d17c80199a7692758ceabd903e839fd57c6776e3da21898
-EBUILD netbeans-nb-9999_p20160919.ebuild 4111 SHA256 8ae2a291a7603198dcff946e7806ad8f4beb788d5e3715a74556f6f6f6da5386 SHA512 899c46d9bdda7f35977caca7e6e564e1f10ff9f2d625326fc3e4a280820ff2c9df6283f9410ceecbc65dec624a07b265769dca3f2853d6289ef2c43b623989e9 WHIRLPOOL 669cf72063a9978917f584a60a465d2b9e7df186d0f7866a619e54b2382070286413104b7020676dbaf302cbd1673d8f3342548d18965c8719d203a9d74efdf5
 EBUILD netbeans-nb-9999_p20160920.ebuild 4111 SHA256 60dd1c81f381320e4ded3b4847bd1b27003ac60c6f94878b6cc64ad75df63608 SHA512 13da90d8791ee2d776edf5d1fe6025cca2cd13d0c6dec4107956bd05287d8c975a4ff51144c2c03ce4512fad17d140e4b0b2e77332d12e2a7623bb2f4a66b34d WHIRLPOOL 4d70778420193e47852797dddc67a3a3e21ff7ad0d8b6c87696a320528b08e6c90e5b39f070b3d7394b01448dd0fec28a59bdf7833025d69e72354aae1d62898
 EBUILD netbeans-nb-9999_p20160921.ebuild 4111 SHA256 561d42c61ddd8a944c49494594f16db3adcc75675fec213b1e3a0b0bbf178fed SHA512 e1ed23b200a6efdebb52e63418e51d1c17908beb4154831bc20a7945740a2e518d048d2ec639197ea3a12e20332f9efbaa500f15e4be48d2798456a8bf9d9e78 WHIRLPOOL c00aa9756cb4180c485ce81fd2718ee5fc877b9c4ffeef3f3d36fe5c8896dccf2461d19e5da07f010bc21e8f4134d7609c5c72925c28460d697f79a3170a8c04
 EBUILD netbeans-nb-9999_p20160922.ebuild 4111 SHA256 99f929e187c809bfdfb930a67cf32463eff7ee1f88d7d0264f751414d7368941 SHA512 17e167a50e9f9678bb3b89a6e252324dd3bc110747ed94e1d6167815aa40fe8f8c5cd39e40f226e89fe82420acc814d0d6049684cfef522b38fcdd49e23a3196 WHIRLPOOL 336ce82df999df3af21935ce281a0a4e354c988fefc834fd45a6457d841717d20797b3de1420e8c6336ddc27f04d535a12c0f77f27b4f38eaf6b28757486eede

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

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index d868394..deb2b7a 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -11,7 +11,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
-DIST netbeans-trunk-nightly-201609190002-src.zip 218003305 SHA256 b9524ea17aae5220e46bc2d7f603ed8c741c3f07dc18bb36bff6b8feb1b105e5 SHA512 711ed0e38e0ee172f6ab1b3411075c477f9d4d86b2efd317ba72a0c2b716ca736ac1458e43ca2a35bb564eac3592e829bc72d0fa28abfe6f77ad1e22d2bb9b0c WHIRLPOOL f4624966ccc61c3d5cd6a339fe6b1ee52a87e7a585b360582b0549c49ba703c64329fa38a0edb6a546e941114b8adcfd2ad8d76b23127b15e5b7c361e440826a
 DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
@@ -37,7 +36,6 @@ DIST netbeans-trunk-nightly-201610200002-src.zip 218421842 SHA256 c7169ff7d83f89
 EBUILD netbeans-php-8.0.2.ebuild 4347 SHA256 585b2488d748f3d0f87c17c951870e167aac7bf10847428add786e4a8a446583 SHA512 1431305d4f340cb0a2c7c896c54d45f6f02ef82a4201f82053278b98511a5a4a68210317530e9cdf5cf1f495996d3a3f9c4b2c3c479aa407abd375072ab3182f WHIRLPOOL af8476f2ff2d119f2657e6be03cfea1160f86e41bd791f40609f1bc8a8aada46ba1081e4f2417b0fddde931fa4e43d20956c0fe1d4fdf3617b78d01afd23f9b4
 EBUILD netbeans-php-8.1.ebuild 4371 SHA256 a9e7565a8cbcc5dfca4d9449f43b959911c47ad8da59648e383ecce55c4b0064 SHA512 67d43532ea43abf007adce73e7da2345d9cc42229189ba90d254d7764e19e3fd3c86b990ea2fe08cf52e49422def481046fe6e0e447fdc1de1680ac59f51d9d3 WHIRLPOOL 433275570fd81db477180e58909ebd50b83cde03bd5df807cc9ee213e2f3a44f65f3ec4877851aa6322e7752969aa72313ee7b35b8ee07446e8c22be4321d536
 EBUILD netbeans-php-8.2.ebuild 4093 SHA256 849571671ca312e7c0f800927c355cc43497e2c1f0608ca59fc24a6e1c27700a SHA512 ce37abd91c8bed53c0ec17a71491c1ae734e973f1d537e8163e1ad49ef4ef7b7e26b9a5c8d58d9b43875f8d265e05664b9029841797e2207c9d8ff95467a573e WHIRLPOOL 3f1207f96c384836bd834ccc5287954b8767d8569cb1e0184d48da740de4c241d182d8016e53c6133f9c23788bdc168d4ce601141e88488329b299ce23e64e39
-EBUILD netbeans-php-9999_p20160919.ebuild 4418 SHA256 eb8f9adae0721a6ef1888647160d5e3abc7453255a0840d38f253fc34c0f3c0c SHA512 52e42f125edeb13f965d7b229ff5cbdd62e8aa599911900b2a5b15eacfedcc54ae05160aaf3d094cfed7d898060c72be60c6ea85df6e083d8a8bcd48a0d54ec9 WHIRLPOOL 11957da397df21766049341e13c5b7abdfd4809518d772a72ae50b9568836386f289e7fd58110d26e200f57273961d68feff4afaeb380c4fe639b0e6aaed84bc
 EBUILD netbeans-php-9999_p20160920.ebuild 4418 SHA256 158832e6eb864b252f9b66723a49ec67146aa6a9cff6d87ac1ca319ebd2e9003 SHA512 ac9631c0c4ea2be2e8cc87fb9f09a1c87108cef9528e596c4a867d797814c32cfd0a11f0bed794aa5312a98d8be9d1fc84ecc08fe122441ace995b6a69bb2952 WHIRLPOOL 293473594db3debe4580d2fa3e54ea8791202ce72228bb545d7e29db68f867c9e259ae8ee16172709ed6daa160499eb37bd628a9543f3e3380abfb1d15a49ce4
 EBUILD netbeans-php-9999_p20160921.ebuild 4418 SHA256 12bd9e2e016096645258eecf0b540eae005058d3d860dd86db4c4a3dcdc872bf SHA512 02a7dfccc3a64ee0976230b55afa1dd9969d411646b843f569d593a6b3848ac77549359a269a7e8011c67d586839afbab58f3787974b5a58533ac3009dbfc8af WHIRLPOOL 4baca7f1020f388c471a2a074f3729534a531d47aee038d981b69500e0ef7b0f0048c2643d2796c811492ea58be13b4833e2cebb9ce9e20eb4a357d4d758b110
 EBUILD netbeans-php-9999_p20160922.ebuild 4418 SHA256 9b76fbee63f82bbf5e12809df5fc7e91fab65a409d8ecf759ccf1d1e73f818d9 SHA512 694d17097304d7df2981fc192d8a3f1831b9a694306ebba012100d6951173f2654a21dfb7167393543468d57991ccaf104f8943bc6ebab8f8b59f36904e1f0b4 WHIRLPOOL 910cdb5b7e5b9935165a1f7fa201bc2ef2cdf2727e506e52b6573e8fec3d98ad39a896981bfd73c6670afa5cc7701911116d18160f0f48546d669bc31e18c1a7

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

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 15898ff..a36fc96 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -32,7 +32,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
-DIST netbeans-trunk-nightly-201609190002-src.zip 218003305 SHA256 b9524ea17aae5220e46bc2d7f603ed8c741c3f07dc18bb36bff6b8feb1b105e5 SHA512 711ed0e38e0ee172f6ab1b3411075c477f9d4d86b2efd317ba72a0c2b716ca736ac1458e43ca2a35bb564eac3592e829bc72d0fa28abfe6f77ad1e22d2bb9b0c WHIRLPOOL f4624966ccc61c3d5cd6a339fe6b1ee52a87e7a585b360582b0549c49ba703c64329fa38a0edb6a546e941114b8adcfd2ad8d76b23127b15e5b7c361e440826a
 DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
@@ -58,7 +57,6 @@ DIST netbeans-trunk-nightly-201610200002-src.zip 218421842 SHA256 c7169ff7d83f89
 EBUILD netbeans-platform-8.0.2.ebuild 5406 SHA256 98e9861da45ead0d2d975a0527315df5282870b2d7e71a089724d91c18852e81 SHA512 cadbe66132d3ad81f6d149e20731b558c11c529e2ec15b1fe47ff97d99a3f4b4612fa5c98c435c4ff979eaefab6702721db009a03162202c96b4b411cf9f872a WHIRLPOOL 9552948e8bbad308f4379eaae69d8c214da9fbfab87d75226949b69ddca3e68c2d36c4d05738196073e5b959ab0b764064c9186d421198937122aa4bdc4988dc
 EBUILD netbeans-platform-8.1.ebuild 9320 SHA256 4a03fc6a399aaab949edb3df7c629da5bc7ce6288d44dbc848097352c2b4ae3a SHA512 7015cb042dd4e371cdcad49838eb2e4109d1ec505ac618f3a6f98d4dce328ab34be90a3cb0820896bd75337a180a1bd9c91c842a143fdffdf033696d5f496402 WHIRLPOOL 8c5311df396a374bf9d8c994b37c5c9fe6aa3c82a9e9e0824a5caefb0006fd9b44f4fdddd387ee12da48592929d5c4dd7e7fb2d866c9ddaf76acf5b3adbe310e
 EBUILD netbeans-platform-8.2.ebuild 9195 SHA256 6d0332d7983992e46c28840c56a9e2d2fd3fe7cde121f7b3b0fd861c2c2fe87b SHA512 3b62b7a2c35d6a4f124e17724a60145a673464d406d93925de616db07413d585b69a8dc6725c6c3e3ecb0f5ef89a9153c7d527b0d9e9c2922488f73f65123ae0 WHIRLPOOL dc00da4b290ae6148e7cd1636703207903688fc4f5a9d3593ed904aabf327358cac670b739e68ebf4514edf6d4d9ae5079082b84d3c11aafdbd586d5c15bc8d6
-EBUILD netbeans-platform-9999_p20160919.ebuild 9520 SHA256 ad6916a655bbb2548cff09be271b72c464e6ce06fd89199b38508b23afc6fc9f SHA512 233ba9c8e1bd5c098eec4635605c68142a83fdca4c099ccce8e5093dcf4596a221c7c4d4bf86cedb66b21b5e4443197d0007c4294bd916dd4f4ef8d9c15afa27 WHIRLPOOL e0c9aa76b542db6a654d2e3c4ea789d1b79c42d88be829e2156f2cd8dfc6ff7b0d908d8a77403aab62a04e0b8c33c509a7b0ac0fbc84fa501e91b5e9e404d7e2
 EBUILD netbeans-platform-9999_p20160920.ebuild 9520 SHA256 3920316f3bdba192111215e9fd7f95bd18f78d71a2fb90c0153328db8432bd9d SHA512 920861657aa16dae7e4247b1d61ad307b142d4c06c10f03f6362c103f25de5d10d842f1909479e33606560dba8558e7cabf20f0abbc1d6cc55fd9466bf7ec0c8 WHIRLPOOL b054ea3e99895981cbd2ee79535752f766ea112dec6d9daf5fdf7d97e705828a911698737f6292d8e1fe22c514e1bbf0ad675ac5506a399bdb320b8f1959585e
 EBUILD netbeans-platform-9999_p20160921.ebuild 9520 SHA256 6605bc3d321144d739c758b3f289cb0e0f09cd4bfdc15e18ff997499877d8b6c SHA512 88e79dcb8ec6f12ebb1ea326c0b340f349c9cc64eb3d46e6047b7c5165795f309da23741e9c96cd2fbea3ef77a8e14543a479c4e5a2f40079f252c331ffb245c WHIRLPOOL ca3ec959327aafa2418fc94ac5580717ccfafbbd96e694acdcac60ef429ac4fb9c106c0918bed786f0861757363bd92cd1cfda6e8e77fcde38ef8c77cc345f29
 EBUILD netbeans-platform-9999_p20160922.ebuild 9520 SHA256 be0d6e34acafb06fa50a32386907e85756c47a710f1ffa1c38518321cc0bc01d SHA512 e6a9861cabd381f9edb9cea48a01396248ce301d5b41c4f28ac7808fa2577eb68ac1b9b23540c45871d2d25feb8cb511c3983252480a8e1c4af127ba09286674 WHIRLPOOL 11f21c81a2c4d3232e48f0de32c115fe301dafa0658e99f7584a79fd51cd0712cbf8357f5ae7cc22338eba81339a54c5b31a3638b529ec82d3f938e4cbac0699

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

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 995fe6a..be80b06 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
-DIST netbeans-trunk-nightly-201609190002-src.zip 218003305 SHA256 b9524ea17aae5220e46bc2d7f603ed8c741c3f07dc18bb36bff6b8feb1b105e5 SHA512 711ed0e38e0ee172f6ab1b3411075c477f9d4d86b2efd317ba72a0c2b716ca736ac1458e43ca2a35bb564eac3592e829bc72d0fa28abfe6f77ad1e22d2bb9b0c WHIRLPOOL f4624966ccc61c3d5cd6a339fe6b1ee52a87e7a585b360582b0549c49ba703c64329fa38a0edb6a546e941114b8adcfd2ad8d76b23127b15e5b7c361e440826a
 DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201610200002-src.zip 218421842 SHA256 c7169ff7d83f89
 EBUILD netbeans-profiler-8.0.2.ebuild 3402 SHA256 8021dea620d1bc26214ff0ec285f8061c24693dd28a62a97a48ac3223707e920 SHA512 2660390337a973256b1aac3a02b14e16782c230fa2714ae695213b0cabc0eb60621c6a1ae234f9e57259a19de22a87447f9a89ab846bd59bcedd2be313c35072 WHIRLPOOL 5d1053ded03143b2de05b64cfbe59b515cb786d60bfa65566be795567bfaf5feb88a2f8e7161a05da512fafd523f871778d5ddeb3c6b89fc95885096e379f65d
 EBUILD netbeans-profiler-8.1.ebuild 3426 SHA256 81f8b3b135f021a2dbe7b5ccb53fc7fcf79908ab83ef14ca0e912732b7fb4b53 SHA512 210bc0c5214aa8f79f559cccf69f1ed885dd2d14dc55cd17bd89c8a7f04f1a76de5b414426337b2ba6e99576850f0753f13e41e0f424b3f0adc58001dffc217a WHIRLPOOL 293d12a03294532dc9ce10503b030282cb636f08af6300ea796885eb6a3fe36c9d37c2a07138d03e9c4d45b31352ce160901a96f659f26d50a0fe5caee3bf0fa
 EBUILD netbeans-profiler-8.2.ebuild 3147 SHA256 74556e56694578c6645cae3aa5257abe399a984e11d9982e49051731f1f1cf95 SHA512 3f4e0998aca161292f813d50e0e6420225b24e2020812011d5cb28e9465514855766bd9d4508b8739c9a38c9fb3d8cc652a69f722470bfeda968fae453183b10 WHIRLPOOL 3dc0441cb0fadae8cfc315c11826ae020d4242e0fa0901fa147a90777a9b2dc33c6081f2f251b5b2ac9f9fd32f03ad87cf999956dcdabe4fe339ee1b48976849
-EBUILD netbeans-profiler-9999_p20160919.ebuild 3472 SHA256 0025d9db2480a5dc66a77bd2689193a2133ba8e13d00816030276bbb6cde5c0c SHA512 4fb14b2f2b5c30089da8a1cc381554e0930653112c20ae533bf7d373e5922f43deb7774f680ebe28293216f55d2ea0301b0b569483e66285090da36f9810308b WHIRLPOOL cfadc0f361186f2ed9eacac00616b2965e1f5980d7c3e2dc679bb983077b34100caac79b6f01e26d6596e5201d926766f5c929069c1d771147263775f06a1e36
 EBUILD netbeans-profiler-9999_p20160920.ebuild 3472 SHA256 1d2c754743334e7c82cf76045c3544ec639e2f0db4fea9acb52b9d4d981990fe SHA512 5f44819d0eb17fc1c64bb1f92177bc8feae4a6c2eca80261d3b81641bbcaf805d742606e29d13c346e584862bdded19b09a32575deee6b9af54056f7673d5fc2 WHIRLPOOL 8b09a95ee22796c099a3349da1f493129b2d56df6b9f4725262a961c458c9ba63dc33ad849a63617f37d550a07dee0c3e7b77b373abcc8c964db5225154ac2a2
 EBUILD netbeans-profiler-9999_p20160921.ebuild 3472 SHA256 bde0aefc575ff44cb2519f43bfdbb4f2dc69c675fd467cc6bc8ce93261ef56b7 SHA512 008920fc391f9ee5e70b21a95c14e1fb4be78eba476e1b32c39d9f63701a6a275521db997f49429d45b0b2958e3972d5285253af2c2e18ed3f9839d6065dc262 WHIRLPOOL e6f816d67923da46bef9da77fcbc0455d71f6d6b1bfd5060b824a06429ff36fab1720d40702d1eea315b3c34604490574669ab1873a4e676f3e173fe8b411de9
 EBUILD netbeans-profiler-9999_p20160922.ebuild 3472 SHA256 6cce91b426d46bd0d31d5eac3a099a8fc14dff8ebfce1d0859771e4bb75feada SHA512 9f63e050219813f09a7837f38918dc3c2b9fbd4f178afef7cc71e957996677bdb60c6afa0a8b48c0bd56438f268abfaf5e57e80db5cea32ba3216777614e32a5 WHIRLPOOL 5da3f46caaa380cd232225b93fffee13325c655feed579ebed0dfb636fbfcf58dadfc8ee34327303a9e6270616655d88f93302feb4e2da60e30b4d29eab43577

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

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index 451859f..4d4c3f3 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -25,7 +25,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
-DIST netbeans-trunk-nightly-201609190002-src.zip 218003305 SHA256 b9524ea17aae5220e46bc2d7f603ed8c741c3f07dc18bb36bff6b8feb1b105e5 SHA512 711ed0e38e0ee172f6ab1b3411075c477f9d4d86b2efd317ba72a0c2b716ca736ac1458e43ca2a35bb564eac3592e829bc72d0fa28abfe6f77ad1e22d2bb9b0c WHIRLPOOL f4624966ccc61c3d5cd6a339fe6b1ee52a87e7a585b360582b0549c49ba703c64329fa38a0edb6a546e941114b8adcfd2ad8d76b23127b15e5b7c361e440826a
 DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
@@ -51,7 +50,6 @@ DIST netbeans-trunk-nightly-201610200002-src.zip 218421842 SHA256 c7169ff7d83f89
 EBUILD netbeans-webcommon-8.0.2.ebuild 4723 SHA256 e2ba39cb6f22c990acf9a492eac5707f130382d56f9bc1e3636e82cbe4d61938 SHA512 61955d38f829b3ed54bc5cb9a71da07f05676a2bf7219fa8073aeee0f0e2d0e73f7aa6ec1636be39fb071d3d2b9de7ceb813a247a61961874f4cc78697d4e568 WHIRLPOOL 1a272650fc2394716a790b79cb85a9322929c7cc96ea4776cc639fb869c5b536140dbdc632b1a8aa9cb1fc8e740050125c2ebe9390de7a8f4207e88e24924206
 EBUILD netbeans-webcommon-8.1.ebuild 4945 SHA256 55c57b638481134d659763154a7820467a9866707112cba0e60dbd9ba8cd2840 SHA512 a98987535f60b533bf0df701f83693a58584dfa9a10d5c8646186165d884fb7e8a3348ec77cbf25d1a8cc8cfd947bf54cdb30d251ae1a3fffb74947070d76579 WHIRLPOOL 36fe1b7b9b34a02fcda227aaeebed8a33562e6fe4a014c78e9a464d709bf5120322a35bd54a0ffa15c4dd4f3ae605cf6fc2d35c5652f7162ae646c61ad69210a
 EBUILD netbeans-webcommon-8.2.ebuild 5917 SHA256 c035b5efd55709fe58822548a97119768f99f33d025869d97da3d895c0e8e9a0 SHA512 5a5d6273239984590791ca40d4caaefee9f30c8ea44a4ec2d5abc07f087bcf4f4f35df444944badb7f7d80604d146f6768dcef5de911ac90b9b44891c6a02a9b WHIRLPOOL af8d1d6c692b206b90bbb81d54d839a486a9cbec1f38e6fb09b5745aef87a5c3de3961f0512f731e63abd8fc3fb54e03a70449034095173c2541ea7a12bdf389
-EBUILD netbeans-webcommon-9999_p20160919.ebuild 6242 SHA256 68b6b1f405e5d1fc5e4ac1166562411fd0e6b17d4546cf2f580f345ec503942a SHA512 da89cdf7f4a5ec551ea5dbfe16753c34a0e8524fc8e6a693267ac375e6c78787ae1787d6abfba914312da6d4cc239c6d28423e2cd16374d490230706afa6ea3d WHIRLPOOL cdc7b4e457ee3f6c2757629ad44321c56de415d00a354e09ccf7a1bef19a29cd9b6fde0daf5ac7e94731c784d723c1b9574da215670e9a9a3552c2e5d95d2141
 EBUILD netbeans-webcommon-9999_p20160920.ebuild 6242 SHA256 2d6623d7c15892c091adb90b7013b627794b6e509391168a1b2cd50183d30049 SHA512 50ee074d0bbe0cc161b730516252dd993b01c3fa781c2b12e6d04c4b6e1b5a56814b99026894807c779a48e0a1c2019e8aeceb86d9ad1d38f44fceadc08cbd0f WHIRLPOOL 0f14c23b86ddf85e74993c07409736e783bf9355bb4774adb7e7ae072b25adf4df46db69c8bc448a17749bb47794fc09b8f4807c998e7711b8dca5de9340cc30
 EBUILD netbeans-webcommon-9999_p20160921.ebuild 6242 SHA256 0815d845808d3cd44f3ea2202e1ad2ad8dee295b1f2123aa6a95dff43687143f SHA512 291968838fc281e380eaede34d83d4eb058299ab6c0a3bbacba422091bf342dfa3ca3d84e8e08cb57db05700340653b92d64d20b037534b8a2a13066bbc5c53c WHIRLPOOL 1f15a6bb34d01c0c371a5bd736ba26105cd42a38e7130e3b16ad56cc9c4a712b777d209d09efd70b556fd479a137c818ebf35999f4c30b9dc7de1eccf9e897ed
 EBUILD netbeans-webcommon-9999_p20160922.ebuild 6242 SHA256 174b69168a6521f7bed7fdd3b3ae230cda80181702b5f5e97bdad987f3c35cd7 SHA512 f6681373874cb29bb55aba015bdf7fced80b42eae763b6b09fff6d7a58c4c194738d2fda7972dfa7977e00a9fb26a5f0809382744d68d75e091589593e16c3dc WHIRLPOOL e741de5c8bec5e6303c22894fb330251d91928427bfc9ee74fc10f180f4df4849f60a1b4925fd722828633858f857f8b257e2b138236b0cd7a20e303a7e86fc1

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

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index c5fbb39..9c9ed84 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.2-201609300101-src.zip 217356974 SHA256 5a7141176fe655807f04bdde
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 DIST netbeans-9999-r17-build.xml.patch.bz2 2686 SHA256 5aede1694b7b5b806484e9b6becf6ec73b3b31ecdcd48a5955ef7a3141762e7e SHA512 9c7d16cf1912278c55feb5e109799a4d9005944933716b8a8f6a7a198cf31d2a0880601e20121b87cf3011b4aac2ff9ff8158d870548968b17996ad444b03c7a WHIRLPOOL 3c81ba9d0366766600126466f5c07853ea0864c57b0aeb1129b0fa8d47e3da6c525885987aee68b7bc6c9c55346df6c8c09c6355207e489ea0b632fcd355c914
-DIST netbeans-trunk-nightly-201609190002-src.zip 218003305 SHA256 b9524ea17aae5220e46bc2d7f603ed8c741c3f07dc18bb36bff6b8feb1b105e5 SHA512 711ed0e38e0ee172f6ab1b3411075c477f9d4d86b2efd317ba72a0c2b716ca736ac1458e43ca2a35bb564eac3592e829bc72d0fa28abfe6f77ad1e22d2bb9b0c WHIRLPOOL f4624966ccc61c3d5cd6a339fe6b1ee52a87e7a585b360582b0549c49ba703c64329fa38a0edb6a546e941114b8adcfd2ad8d76b23127b15e5b7c361e440826a
 DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201610200002-src.zip 218421842 SHA256 c7169ff7d83f89
 EBUILD netbeans-websvccommon-8.0.2.ebuild 2651 SHA256 a195b307847c466dbb5f46eb04240358ce3c92cadeecb8fda1562304de46820f SHA512 933626bd2073f58e3508180c042e237b9e61ba6f3c992cf37ea43978ac2fc972d2dcc3ef0b5c390b3867296e197ed2605c43452c98e36acf0982e7338b6d1eb7 WHIRLPOOL c3db8f0b50116d0129f50778e1961166e76601d8c165e20e73d75c91b02c8a095067e0f13e18178d849dd29adcedaeee7d3e0e62f99be592d7ce159fd6af632e
 EBUILD netbeans-websvccommon-8.1.ebuild 2675 SHA256 c9ff3d598c5f76c2b69dd5488a80c63025acc3cd0cc99321a0e84a493502df36 SHA512 89daec44b860aa8011d9e5533230f89dad7bcc50a119664122d2718db3e53501d1319ae4b27eac1d71596671e9a7c21315a641346e6cbab22edb3c7232bf5ce3 WHIRLPOOL 521521094b396c98687e2054742e4c019023045f19b01a6cc3a5f826f4cabe9448254db8b834448f3b33368c76dd667942554e1bae459c55de2c571bb5cfb4f5
 EBUILD netbeans-websvccommon-8.2.ebuild 2396 SHA256 a015f50a9fcebf084d42a550d5a654e80129a5d92d2bec7cfd543d065a4c32e2 SHA512 cf4fd6fcb2ea088be645a79009205a84588c9c7f1b7e5ceeb9c95552ffba860d211e3d6b4fe95196e652f5c3c5665638ee95f1ca8f2f5b938d2b09100dc186aa WHIRLPOOL aa37154ee5fdb6ff7892e3bc1218c37b45fcbfc7a4da81c8cada6d9b50a1bbbc51c685b00389d1114f3d0ae84d5a06d9e10ba0e9101f385e6cb59358eef3e59c
-EBUILD netbeans-websvccommon-9999_p20160919.ebuild 2721 SHA256 e35b28975a8097c992dc5e0784b380e762f8a0e276b02ef5c9514d9c1b14db2d SHA512 054bb48cc2bc462fc422571e78ef8847db0caa988c42cfdb67ba3bdf9ba4cb28fdbc28a565b095a595caea157c8ef2a87136769994cf76b35fac7e61ac3bcffe WHIRLPOOL 672e8bee38d048d78b9ea03469ae2f5064cb853225c98746adc9c3f8f929309f9bf2d1cf476c188a151871b07c690e2c5df12903a54d3307c8c2733012558448
 EBUILD netbeans-websvccommon-9999_p20160920.ebuild 2721 SHA256 e5ae98c4f2c8d36da6d8921971a44b508599ae60c8eed0b510f76fd4b57923c4 SHA512 a4f2ac41778fc3e8051908368999c489ef004d57194e37ead79a51a84e1fcd97567eac5215f40f8c092e75234d763af8b3820511e3fc88f775927ef3ce06e4fc WHIRLPOOL 34b923a7914c303c46fb787826ae10dcef1888db342d2c5c2591e28c85f665d295995bcddca09acd89ba3548da81e5dfb36c128d879471ea2df8365139386039
 EBUILD netbeans-websvccommon-9999_p20160921.ebuild 2721 SHA256 d6944a0e2c6617607193f5ddcda829c1ba6cd224ef775294fbf66299fd0fb614 SHA512 d49a533db74c1d2fecbcab357d58bdb6f1bd949d275be21bc0f3f22cddb35e6f9577c6fc7ac2a4ff4db9206a660074b52a2a10d81d9044c8da6ca8538ff0bb7f WHIRLPOOL 07482a937e0858ae5d779746fa2d4905b3b9d75c0ac3013ef0642b684590f24b4fe4ffb70cb1798fc4d0d16a3a08ebdeeb423d8797cf5b139e9a1cf9d57464d1
 EBUILD netbeans-websvccommon-9999_p20160922.ebuild 2721 SHA256 5b0ba48b0a4a9ed47c94eb5baa1192cb279c62603fedb3043be5d0d7edc79724 SHA512 9d04740d9cf0eb1c6fa08077e40667017f00769eece4c121e5fc620ecde22f22fea185c76270e5c001e12f8a3a8a525de185a37cc2b0fa791180c82f59a563c0 WHIRLPOOL 5f642a21c364b3aeaad9977ce698be4a40e7ee5c63877b273df5e15f92ffee41af3c5d7cd46ca995e9b2df3fad457549ddcd7d3ef74e175ee86391ba1e497b66

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

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index da564f9..2065947 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -11,7 +11,6 @@ DIST netbeans-l10n-8.1-20151105.tar.bz2 11945028 SHA256 33e86aa7315021d28fdb6479
 DIST netbeans-l10n-8.2-20160920.tar.bz2 12723797 SHA256 90d09843d2e0256f3196f4ea2fe9cdfd77d811f366a5d8cf13320cd813c7cc7a SHA512 4ac086e8189d89e7a0b91e7e03352f691f09edf208017062a8fc798e6f54906f1c85112dd2780feefa6a21c8fcb582b91bdd9758f5a90c05cbd2e3042d6c87c3 WHIRLPOOL 1002d7c6769eb9b4c0ae02e6c17ea91a064e7bbf99e151b720967f70a28bad3159fe5804f3c4ece62f7025da661bc717a098883995b0bebbdb7342b685cd475f
 DIST netbeans-l10n-9999-20131010.tar.bz2 12440242 SHA256 64c48605820ec1f35e38c34b48cc16cd40c053d085d50819d4b4e9a80453dfa9 SHA512 7d4d61fa61710186fefd90721598ec635db7c6249ce6fc484fd5813636220f163b60230349c984c398c87e083d2d629c531fe5b4cea3752ebbcaa9823b701a02 WHIRLPOOL 10506e3a3004d6c0ab17b05507f72db2c25d2713c3233a7f5478da27d3b1261b5fb6d5f71cbf369858668ca2d1219dad1900c6c42d3f250adcc935e846e56b09
 DIST netbeans-l10n-9999-20160920.tar.bz2 12724225 SHA256 f7bf8748874b30e7553c0f63492d556d24764bb4c8ea0083ade37707db0db0d1 SHA512 777160e22f648cd4c6343b51212c1a1ab5de31e84a36b8581dc3742aec7933122edc5215292ddb43df69960b6baaa8670b1b204c4728772627347b2bdcfa6254 WHIRLPOOL 9de45a38286d003e549da4eba2e1379c349d0aed4025e9c0697942a2596087994b428cf8843f3dbf2ac09524bc41aaa5ac1e7c810c78207a220af143cdc794ae
-DIST netbeans-trunk-nightly-201609190002-src.zip 218003305 SHA256 b9524ea17aae5220e46bc2d7f603ed8c741c3f07dc18bb36bff6b8feb1b105e5 SHA512 711ed0e38e0ee172f6ab1b3411075c477f9d4d86b2efd317ba72a0c2b716ca736ac1458e43ca2a35bb564eac3592e829bc72d0fa28abfe6f77ad1e22d2bb9b0c WHIRLPOOL f4624966ccc61c3d5cd6a339fe6b1ee52a87e7a585b360582b0549c49ba703c64329fa38a0edb6a546e941114b8adcfd2ad8d76b23127b15e5b7c361e440826a
 DIST netbeans-trunk-nightly-201609200002-src.zip 218003655 SHA256 9765eb98830ba222ec1b111b9e0d92acca2d814894054fbf3ce72f92a76c87ad SHA512 7a3bbc4e242746f406c7332730fc024855315ed8042b9129050fd56b0f869a898965193f39f4db9b6b38eb28d5879676c995726cf7705e0dce02787297d3ab07 WHIRLPOOL c7615c996bed0f31efebbdda4dd3bedf7ae87a592c1c0b76ad280f5907c117d9d4ab80ee5a3da396d841189693de3b5adfe0996a962df005ac2d66f2bacc4e8c
 DIST netbeans-trunk-nightly-201609210002-src.zip 218005077 SHA256 622016c5ff84b852503324fca31c6546b4cce400efef5554e070a3d5ebce5a8a SHA512 6aaedb742e475549c591ba922ea613fc28c70a75033593a1e5754ec4fce5823982fec3b7e6bbd11fe510d045b7d59e0aa961f6371735fe5c9efa2304514faf94 WHIRLPOOL 382b1bf4e00d31b55591f910d5e5bb177f97737b5defcbdbd9dadd8221dcbe6abdcda1195848a6404bfeddf2dc9e996503977f2c764e72583e6421d366a4b44a
 DIST netbeans-trunk-nightly-201609220002-src.zip 218004950 SHA256 44ed2ca54ba2b334682caf7150fc14f285c2a9e5b2ab27f0e171c98a57064a16 SHA512 242b4813adc683ff53bdba250dac485dd9f2c3da9190bb397044aa1057863ad4a24978203678b86e3eacee426231848f7764cac820217bdbe3b277891100533e WHIRLPOOL b6617b78363f888ed1e43c1e339f1061c29e0810deb32536d3fff5ff3f982de053f373dba40d54f9d15a9b1d1f1e8753772b3736de5540e96a4597f48c0d0f1b
@@ -37,7 +36,6 @@ DIST netbeans-trunk-nightly-201610200002-src.zip 218421842 SHA256 c7169ff7d83f89
 EBUILD netbeans-8.0.2.ebuild 7167 SHA256 80e31382a0ceb680c2a055dc5c78c1dce8edf32c50bbae6a1c14a2c568492519 SHA512 0ab466ca247ec953896ef0ab3b01b43ffea3a9f37e9bcdacecfc0476226d45cef35e4ddf27f2b85628d9512ed304e6cc6cfe963a5e547217d08cad400eefc4b9 WHIRLPOOL d09668e669f4f8d7987ab02cf26104fc6e54ba29b8b497fe0013cc8816a2d7560c99e6e1b02db77ead872d5240b84c09e3fabbc3465587d1d1ca7d6fcae114c1
 EBUILD netbeans-8.1.ebuild 6891 SHA256 22a19f05bdcea85475c0451df867367b69363bfbc6280f78b087248d9f8e9513 SHA512 812b6cdae3e5feaf37db5ca8b5efa1b374d5492f11cfa1df2adbd3617986cdca6a79d2d4dffd024c8c48492fc8a21704190242f5741c5699b12070620cea2c87 WHIRLPOOL baf5f750574c01effa0d02c72194139fb2757be932054f4900ceb0534607064af10f2b5b38063ff2cca34e75ab5be23d00c7e5d90d1c724339666d20f1bb10d3
 EBUILD netbeans-8.2.ebuild 6152 SHA256 ddb5db62422e635ff3aee1137e93bb45cdee59adf1d6444d3291659846810d0c SHA512 f20b5fce0a14233796ebf4bc2a6669bb6d9f429fecc05564bc2170a8577c1c7dd64c027a4c8f3ab929e12d1e258fc5718f073050efc6ecccb01b1bbc33f8903e WHIRLPOOL 017adf9ee69bc95e291a73419d2c043acb3d1c67ecbd73c8e2f924e408562c46b5c9eb0ef58a6f02562a879dd5aa0080ed84ac16bd5502f361c925d1db3aaac5
-EBUILD netbeans-9999_p20160919.ebuild 6939 SHA256 e54bdc55ce4a41e22b13568feaaf2628c9f2d0ecc354bd88bd5d6a56c37f146d SHA512 4029e527032aeb4a77a4452aab83a412be15f153c1bbe2b4dd41ebe2a27b5a5201a5d3abd6a1487115b692c7623a6253fd7572e7739aa375f2269a15f936af2b WHIRLPOOL 6a324b01be54775024419b1508bdd4645785b64c12ac2702d629733d0da1e93e7a575f52a06e7990c018daf7e106f81b9f4556fffc2a3b89bc99b0cbe0fd2dc3
 EBUILD netbeans-9999_p20160920.ebuild 6939 SHA256 56c017c40bedb1f60809d6c5e5357cf129aac1ab641232f353686ae0cbcfd365 SHA512 c5e783d4dd76b4440a8fcad2525ef9d27ac231a3a268752a2f6e618027cc32ddf0d11f332f643e161cfedd2c486b505274975d2fc18919af2eab710f699a0b74 WHIRLPOOL 9e3ac1d498f3f63fa9caab53eac68d58220d16f5a14810598599ce941e3bce1f69777c665ca9b34f0ec6af8171f9858d8032f932854456cf9f6ac2f4f80df477
 EBUILD netbeans-9999_p20160921.ebuild 6939 SHA256 ad1bf1c8a99452d8ec1e6e872a8a91b4cccc97a56ea6c4dd7c38a30b9815a7f4 SHA512 aea5283c6f064ea27a951214af716d3ef0ea4feb96ed2e529e740fd928d8f283a3233bdc7639de609018b214c5e1b9eed0b95e3091b493e3fd2e2317faa33a67 WHIRLPOOL 6082ab9fdd09c73340355c63add6d289c7f90e7ad7109a3253e2dc948b1ec5cd4a352d2682c15e752340945012d6f9c7df234eaa5f2bf49e84ef8000062c8b8c
 EBUILD netbeans-9999_p20160922.ebuild 6939 SHA256 ad2069cbb9ad4658cb4ef8fee5fa97a3d28a6eb3bad2609478c1c5465a0aa487 SHA512 541897fc7bb4c1c60701244492efaec3457be8734025bf2d72b45f1b89abb297c7ea5ac250e2080fcf48a0b97adaa95e29151a773e8dd40abcc00ec23064fb90 WHIRLPOOL 1f3212fea8f99255ec7eb30b3655a4f7cbb5274db925b7f795e57eebab137dc1d158030fe7ee1f305ed9cdcf5e6b10e51d15e6abaf1a129d565c48af289b3a2a

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


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

end of thread, other threads:[~2016-10-21  7:41 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-21  7:41 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-apisupport/, dev-java/netbeans-java/, Miroslav Šulc
  -- strict thread matches above, loose matches on Subject: below --
2016-01-11  9:52 Miroslav Šulc
2015-06-11  8:40 Miroslav Šulc

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