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

commit:     bb32e2aaae259fe248233ce380cceab6ee3185b1
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 30 08:17:43 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Jul 30 08:17:43 2015 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=bb32e2aa

netbeans: bumped to the latest sources

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

diff --git a/dev-java/netbeans-apisupport/ChangeLog b/dev-java/netbeans-apisupport/ChangeLog
index 3364fb8..1838e51 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_p20150730 (30 Jul 2015)
+
+  30 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-apisupport-9999_p20150730.ebuild:
+  updated to the latest sources
+
 *netbeans-apisupport-9999_p20150728 (28 Jul 2015)
 
   28 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 4469af6..1802e34 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201507160001-src.zip 208623275 SHA256 9c548527eb28a3
 DIST netbeans-trunk-nightly-201507200001-src.zip 208844011 SHA256 d913ef4e2aa53c81f799f9054b63f985be8273acbd4e73f6114c1ac9ac925413 SHA512 8bd91ec800079104c0bb74c79d7259722daf9d84d1119fdb768f25fe5acf6bc2833e4cebcb95ff015ed67d4a5d7c745e80faa88b8d66e241f03fab4c7136f407 WHIRLPOOL a6bf8042418478cf40773a6d4421e0570c26fe57bbe9d76e83e6d2b5fcb97dc364d6b164ea57cb69ed5a5063a783230404380cf9e5d8d5e88c62055ccfc28bd6
 DIST netbeans-trunk-nightly-201507270002-src.zip 208903918 SHA256 522afa33b0389ef48a5deb3c91ba3c4aa1ca4acf710e2c316479e6892aa3d39a SHA512 078b84e423f0769fb1a2c14bb092c50dd2f1901126b5f3c7b11700858c71b43230281799c248eb4198a22fad17f5a7c34baedd3aac241e2d07d91c72a1aad861 WHIRLPOOL ae082652979d1ba8f26a6001e6402f587809b2586406f93e42eb9b7d38e4216e290167888ab5d6836ff9a712d555cec66c9f54afea7ca6171dee6cf56c7c0fdb
 DIST netbeans-trunk-nightly-201507280002-src.zip 208905091 SHA256 502a75b45a6d7c2421fa6629cede99d70bb69b19287083ee9ed9cbcd9540343c SHA512 b94b76f709f931ecc1414eb80c1791bada942e7a6a7b2cebe4749453de1c17f929ba497b961a7ea9837057986a463f1d335dc7f2ab460f99c1fb168604d07196 WHIRLPOOL 119f4bb30844c9655760a23c0a48ddbc5abf32c07652165d508061b70f37861c123127735d14be01f506da65d072701514d5a4adb678fe8748f62762bcda6052
+DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae2846b93e0836ed96caddf2d425df5bab2a004b0417879a36e4dd3 SHA512 04e2e8f58102752a45b089cb70c62e6b920b5397cb427179fb042604eec4a78d6380341ab700e70b9190313ea5fc10fb94471a072fa8ad567e4d652b1fa2c3b6 WHIRLPOOL 153cd8da3506e0e3397a06b4341e90b2dc55170bb432a21d66bf425895deef5bf0611bdb181beefc29fd18648d60b827d9e453bca827c26305f55ffb01319f18
 EBUILD netbeans-apisupport-7.0.1.ebuild 3134 SHA256 41c32033c9945a39c0aebb6b0271767031d53a47e5c8365d9e3a7c86712e24cd SHA512 dd4bdde9574a87b46b02fd7204b1e90394bd87dc572dfa015b601203b026b35571f20323db834a310f90aefe6e4a822044b0d71d535a7351137219b50ecb2aa8 WHIRLPOOL f3721521a33b337d7dc24d6b49b0b2fe723f5ec446a5a4befb085051140a41bfd2d3081876e9f02f8b9932a3a0997b92211cd964fe372e40b42813df5db5170e
 EBUILD netbeans-apisupport-7.1.2.ebuild 3143 SHA256 cf24048c0ecca98a7d6371624bb0ddfb78663bead073d515a7c84229dbec00a8 SHA512 ec44c263e786210fd64c9ebb253bc9d4fc34d3be9493157dad06007c19734672bfd767765c003393d1e5cc6755fd5d1eda956b00c2092e98592a73ec1af4e729 WHIRLPOOL d619c304a994a2b818d892fb6315d092588f2ebf95e566f7a909f92daf21bb368a28c4e1af876ae585980dc82996e62aba30b12c41461103c23620a215480b76
 EBUILD netbeans-apisupport-7.2.ebuild 3126 SHA256 b0d64795b8403a932e3e20721a116c755c4de66fc36f7191476fcb4a226bad13 SHA512 cea062a72a8e75a9c2fe91c323f83d542a70149336360e1c41479f401fcae5ead6a301c8a7d5704d5beb27f7810b5d1e3cff0196cce7a26890a001c570179f6a WHIRLPOOL c286f4e4d3a02cbeb1a6e13b2005dc5435a6e9ec026a98fcc00bb83222014b800cd83f437c69352b48d16bdf442a6c7ebbed6aff86f10b3c5e6cdfb7edd9e184
@@ -64,5 +65,6 @@ EBUILD netbeans-apisupport-9999_p20150716.ebuild 3390 SHA256 81e259b36d75a130f5f
 EBUILD netbeans-apisupport-9999_p20150720.ebuild 3390 SHA256 6a46bd788ff98b8e02a1ec4b9ae6e656863e5f2859cb78e1b0e787744bb8a098 SHA512 d423818d3ebc8d0ae86c603213099120cdc568020631764280199976ae9fa36be95b5d8cdb3abe9b8787b28533d5807a5b670088485d35f91eb27693a3d46719 WHIRLPOOL f78b5c387cff45a85c0c11e1e151e1b6c8d54c4d60269f00e68b55bd9ee202815e532bf76aa5731341d2b41ca603ad68eaf951f55172c0a4f339ed1671c69204
 EBUILD netbeans-apisupport-9999_p20150727.ebuild 3390 SHA256 98d1aaa395813a57422e69ccbc9fe15ea7e6be0500b051da3c153d01f5aaca08 SHA512 71b793f8d81431e283da9970bca0ee8170153103b40e1800f8e549f0f47c0cfdcb9843e040ddb07ca36080671ef6bd308f28a98a329355b937ea2000dc04b2ec WHIRLPOOL 365854a982514b773f57b6a09991360e3dd1e4dff2ded18061e5660b31f0d29a840eba6c6e4f9ee500a42e397c48d5f2452c608c57d3e8d494cb3be9241c0e57
 EBUILD netbeans-apisupport-9999_p20150728.ebuild 3390 SHA256 1adc5f262cb3aa01f7797d774e556f77ac3e00f0fdadd6e5564bf5d8107ad70d SHA512 7629b16d67bf33c3b4d205dcc78ffc9828fafff45689d70d5d9b43c3fd7ce92dd7ac3c538a291bb5426dc9ce6288a1e7c2c9a4faaf65267c6fb7fb471b432d40 WHIRLPOOL d9a48a2cca40d40ad3cd589b4a5678bdd456362e2cd27d99e4681757641d0c0a60def46f845ba7bfce186416d8b78f7c250f0b7104b0d4d239e4985f4dfce7c0
-MISC ChangeLog 180515 SHA256 7b7f4824fe1a7f27dedc6c7b34378782b31f25908d5a1a1efbf816470933bcb1 SHA512 e0e371a4b1a457c1ead3b8ba2fd13b38793ca83c61a324edb8cc431586d90313e69d3ab7b2a3a582309e1c43aaffa83fb5b394435afeca776e45b82c0f5115a9 WHIRLPOOL 78d804effe3dd887308d55799fd1bc27b699250a582b0402eec7aadd5a82775f9319b917ed4b654babdca2986f50bcb62ab54d17b75f3bc89d6ad1f559c14bf4
+EBUILD netbeans-apisupport-9999_p20150730.ebuild 3390 SHA256 9e67ae8db251259a1054001c1beea20a1049158a90e5e55da3b7fc575f096dc6 SHA512 17c96a241036e37ebfcd61ed43f9221262b4b74d26a4e47536ef673b3dbda8a8f4be443d924663c0e1fb69667462e9874a6d61822ea30d5cfdf2c981ec04f936 WHIRLPOOL 1d761dbe8923b4a1980a308e5185a2dba4453d9c7c42161327368de6f96bca1e40c3898b52e7b182acc62384c691b65eb3fe3d9c8e2d44e45810ab9b65cf8e80
+MISC ChangeLog 180697 SHA256 7e4623c4a09f962f28004b7b1d6518ec928043457fc28119609f0156776394aa SHA512 97a7b3854c4a8248bea8592453ecf3699e11c7bd89f60b66ef2dcc2cc69778b82a8ebfb668063d62919fee2b825e94b5090c3c8b9cd9d3faa745037cbe616f21 WHIRLPOOL 4bceed294ba750f51155c6e6b85b6a58e0c66e3cd3f4432d11f75b86d4bb4aa620902e1ad0c61108fdb1a17df6118d6a1fc90d85603e8c74fbd62311ee0b59e6
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150730.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150730.ebuild
new file mode 100644
index 0000000..4a0f1b4
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150730.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-07-30_00-02-28/zip/netbeans-trunk-nightly-201507300002-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 6159959..f8c88b9 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_p20150730 (30 Jul 2015)
+
+  30 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-cnd-9999_p20150730.ebuild:
+  updated to the latest sources
+
 *netbeans-cnd-9999_p20150728 (28 Jul 2015)
 
   28 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index 52b39e0..5a7de78 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -21,6 +21,7 @@ DIST BB83D4F8047D608858154CB041054F5CAE35B903-cnd-rfs-1.0.zip 177647 SHA256 c92c
 DIST BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip 31891 SHA256 dd9105ad309b56d22ef08573ec48a5f21baa2c50f8606df9c7b6245abd9dbe72 SHA512 288229a85536a45fbae6ba5a4dc085fa2053264259f14833cd435f64191a4b2f4b93c3e9981589087ec293afbb0fc76e97d2b5312a196e3b3fed11a605ab650a WHIRLPOOL 69379d331a68e1c4eb15aa8b1ff5256c9b98d9fad4688f2d306841973b151fd22ddbca25c5388af39b487b8810a2e521ffefbbb9775cf02271626179c3810c04
 DIST C4CF9314A530E51B891D46DB65806A5A0ED240AF-cnd-build-trace-1.0.zip 27300 SHA256 8bcfad100ee9664b7fb2b6b8f20b14b3790121b06487e790214c571c9ec1f21e SHA512 21e69d6881efaa27ae91eb88cd851bb1e67c755668b1f96bdbdf8f4af2b2aee093c37b5edbb85317c22143083ea1fd1ca7386cb9523c32f502d86d933e27b739 WHIRLPOOL e09be2e79f88d6dd9d2e3cc89710fdcc67d4f825d44916a70a5625ec8b2f12112c9d9c0c39cd2e579d3c7846e9bfbf5ab709197cc784f5742a2ab9b22ae89b07
 DIST C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip 92177 SHA256 71e6d46d9c7e624bc83dbfa4edde20bfdcb47ae76dc2b19dd553d23f22b454e7 SHA512 64b15aa898a45c1dce0d9c58ec4ef8c3dc1a32e1213543d98002cbf5419d67b3caf4357c8a252e36951197f3edd70e34a226c989e5479ce3b2d1405783d3d530 WHIRLPOOL 675db7f81ecadcecfe52f18cf8bd465867c1dac12f818717248da9a7d071d45adeb3c6af2e6ac1863bb5ccca36ae9383722d2361c28af52e51e5f2ac34736e89
+DIST CF1982D5AFB4D85AB1CD9455744074063F13389B-clank_0.3.6.zip 7612802 SHA256 3ad752f4bd68da908eff96676ecb24506b5330076cafa246610c7cd23f8727e5 SHA512 7e574023f52597ef41e1a82d0aa91aca755bf4a76f8ca49be02e004e08c8fb8f8a24f6930e6bbdf50060a8997f92d8bdd8b800ecd3f023eefd0bd137f8326018 WHIRLPOOL 1a414e244b2a01f3718cff8b003424424ad8d7419b8cdd04487e95562a50c3f80a2ee99d3f503e1d4db0e02a26b59ae93c49d6048322e70bab9b2ca43059455a
 DIST D36EA6B9D385551FF2AD2B8DEC19EDBB4F96666A-clank_0.3.6.zip 7263460 SHA256 1aedac94d942311498cae10fb661c1242ef3ca5be2a18b4d21227d74f0b5946e SHA512 70633391815cbbec75cc37bde390e44336bd61a5a7d2b77bc8050be614745bd0071fd693473170581de4ae24ee8001ce27a0a10c0b5627ae8bb368a715c2c32e WHIRLPOOL f82bcc871761989a9bada6b2ff9aa083f754d83a6c0874fb3f27f34da6168788289b9e7657d94f720defa356ab48d36a87a8c8593e44a785e17f5ce97fab126f
 DIST DC58D8AA22207CFB67EEFA4B582EF581A7EE24A4-clank_0.3.6.zip 7323378 SHA256 7228ef079176ea9b8720f4ed28375e8101b85f6734dfb58712e649dfaa43c5b8 SHA512 cbf9d7189443ca732bedd18665de6df05c1e13e282f9521756fbf85c503460ee3f7d982ec4d8cf9a2583a19df4a87ad005d50ef555b19a063e5a4406e235e704 WHIRLPOOL 518cab76509e8090fc4ce219923b7c035255523af5212e6bb649e7de1cd1f77d01fcb908bea6cff03625b5a4093be1ab1dfa6767e756e28439b4161efd8d1e5c
 DIST E03865DA6B38B4F87DEC7F3066A6259B47EB449D-clank_0.3.6.zip 8218974 SHA256 f2a55be466df9441d628cd5ae09113e2bb65719d2297ab36d6c7223d4a27a14f SHA512 6ed22fd49a523904b4b77fd6c5e1d1cdc748ef50dedd7278dd3060c8e9466c6288ad38a93ddf0077b2f84c2f8c9c3c0ab3390ac6aaba6835d4a83807758f324a WHIRLPOOL bf1dc9b7906716456e691ddb736a336208fe8800025ca9298989f5910a6869da2a312cd718059b837b64c093ffe2be48347ca90b97b787879e0f90642376eee4
@@ -62,6 +63,7 @@ DIST netbeans-trunk-nightly-201507160001-src.zip 208623275 SHA256 9c548527eb28a3
 DIST netbeans-trunk-nightly-201507200001-src.zip 208844011 SHA256 d913ef4e2aa53c81f799f9054b63f985be8273acbd4e73f6114c1ac9ac925413 SHA512 8bd91ec800079104c0bb74c79d7259722daf9d84d1119fdb768f25fe5acf6bc2833e4cebcb95ff015ed67d4a5d7c745e80faa88b8d66e241f03fab4c7136f407 WHIRLPOOL a6bf8042418478cf40773a6d4421e0570c26fe57bbe9d76e83e6d2b5fcb97dc364d6b164ea57cb69ed5a5063a783230404380cf9e5d8d5e88c62055ccfc28bd6
 DIST netbeans-trunk-nightly-201507270002-src.zip 208903918 SHA256 522afa33b0389ef48a5deb3c91ba3c4aa1ca4acf710e2c316479e6892aa3d39a SHA512 078b84e423f0769fb1a2c14bb092c50dd2f1901126b5f3c7b11700858c71b43230281799c248eb4198a22fad17f5a7c34baedd3aac241e2d07d91c72a1aad861 WHIRLPOOL ae082652979d1ba8f26a6001e6402f587809b2586406f93e42eb9b7d38e4216e290167888ab5d6836ff9a712d555cec66c9f54afea7ca6171dee6cf56c7c0fdb
 DIST netbeans-trunk-nightly-201507280002-src.zip 208905091 SHA256 502a75b45a6d7c2421fa6629cede99d70bb69b19287083ee9ed9cbcd9540343c SHA512 b94b76f709f931ecc1414eb80c1791bada942e7a6a7b2cebe4749453de1c17f929ba497b961a7ea9837057986a463f1d335dc7f2ab460f99c1fb168604d07196 WHIRLPOOL 119f4bb30844c9655760a23c0a48ddbc5abf32c07652165d508061b70f37861c123127735d14be01f506da65d072701514d5a4adb678fe8748f62762bcda6052
+DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae2846b93e0836ed96caddf2d425df5bab2a004b0417879a36e4dd3 SHA512 04e2e8f58102752a45b089cb70c62e6b920b5397cb427179fb042604eec4a78d6380341ab700e70b9190313ea5fc10fb94471a072fa8ad567e4d652b1fa2c3b6 WHIRLPOOL 153cd8da3506e0e3397a06b4341e90b2dc55170bb432a21d66bf425895deef5bf0611bdb181beefc29fd18648d60b827d9e453bca827c26305f55ffb01319f18
 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
@@ -91,5 +93,6 @@ EBUILD netbeans-cnd-9999_p20150716.ebuild 4796 SHA256 5a36f1035b9a9d24bbfefcee39
 EBUILD netbeans-cnd-9999_p20150720.ebuild 4796 SHA256 44c07043c6843ec47db68302e59d80d2cc95404d37ccddca544924e6498002e4 SHA512 4a632ea75ffc03ac58ca0eba465494ed2ef7f802b8a52b8ab0bbae2dd0aa723703ff271a75bdf8dcba6ae1976e1ce70fa6fdd44c26fa610bfc1c7d31f2ede27b WHIRLPOOL 0c1472ecd7c1f981bcdf240167ce29e81c78b35153fd74e02f3972d818f2dad24632c2a2f4e591cdafb5792520f1c6fc0b8ef2ba99f7f30da3393050c7bcb7a7
 EBUILD netbeans-cnd-9999_p20150727.ebuild 4796 SHA256 cb73618c1a63f1639f54bcc2fffdd6f2654f0707685a8f93593d9a0766000465 SHA512 395e878d0ecc839f7860e8a5dfbb49846902a83b0b6cf48d7fc05a3a87755e0d046d13072a4aefa69a83deaccb67c4c2f515e56adf62274b72e0cb8a9423e6b7 WHIRLPOOL b6eef3ea89f8d4e9159f6cc7a61e813447ebcbb7d3c956c5bbc3cdc3d460dff36f1c437615d4c2f935905e3658a115af0cce262f7e60a790efea7a3592240d0a
 EBUILD netbeans-cnd-9999_p20150728.ebuild 4796 SHA256 a07167b489b444d2fe9c8232190fcb791b071997209d952a0e2d104f60c8f459 SHA512 bde312b57f345f9b2c57f72efcc803c333e3ecf8d7eb94ebe676660475434e1d622e8259afeb0e0439b030d82bc389364b62a2d21f9c927f55b3a990484f8bda WHIRLPOOL 38a2cfde1515d6e369094aca2e74dd12c4af99397e9d12577e29278551f9487be1febe080c97bfee1979617d5aa64282722b5067194dc211f7c1eadb56609e25
-MISC ChangeLog 164718 SHA256 578eea5b655513069f796c58866fb0fca73817e6b2c323ceaff10c5c7c8d8618 SHA512 ed1e200430f21faa1c9c495ed6fc471c82a7616806b4453249e8c0945717cd1506c316bdfe49e0b24f38518f0ce40a0ab20122c481143b9f8d8560169d109545 WHIRLPOOL 830bbbfdc66c98776b4d18a16fea433b71b0d36a55c03918bb97e3c4fe4cefb3f99d87953890112ccd6fbaa912d7ab20787838269263d2280fe669860a9487bd
+EBUILD netbeans-cnd-9999_p20150730.ebuild 4796 SHA256 9afca2683b1c39fee7e02702de7b3cf0c68781a4d461525e7238a6896adf049e SHA512 d35cd253927426752f89a8df7ea63d1d25d12084a20605bb106365474e69afe376dd18a0697ca722edc7a0536af9cc862112dcbcb9e869ce58b99c10c614ab2d WHIRLPOOL 5f0fd87f14aa44c59a77f97084c6fe00b5fc75f94fce4ab7dd9d5710d1f797d5f32aa43d60f113c7ddb9ea26062e4ee1c9a2f0fc59d56df47aed23eace352e5c
+MISC ChangeLog 164886 SHA256 b77ed409a6c411c37c206876aa50f5691093d1ffb924ba39053ee54999ada07c SHA512 6a21913c12d77e1e216dc840ee48127aa3b6f960d94d92c8a5f64d9cf542668264a0ed9981606e49736bf2a5401a3eb4a5025b1ecb8d24d956a9a9a9345b223b WHIRLPOOL cc157021abf3776d85c2a594a90eb1e27a2344a7babcb72b317219137a53c625e58f4c3da17928d51a0886b6ab2d53427b7571df9020336edc2967dacf94fa7d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150730.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150730.ebuild
new file mode 100644
index 0000000..d5c8782
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150730.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-07-30_00-02-28/zip/netbeans-trunk-nightly-201507300002-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/CF1982D5AFB4D85AB1CD9455744074063F13389B-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}"/CF1982D5AFB4D85AB1CD9455744074063F13389B-clank_0.3.6.zip libs.clank/external/clank_0.3.6.zip || die
+	ln -s "${DISTDIR}"/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip cnd.discovery/external/cnd-build-trace-1.0.zip || die
+	ln -s "${DISTDIR}"/BB83D4F8047D608858154CB041054F5CAE35B903-cnd-rfs-1.0.zip cnd.remote/external/cnd-rfs-1.0.zip || die
+	ln -s "${DISTDIR}"/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip cnd.modelimpl/external/open-fortran-parser-0.7.1.2.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.jna/external jna jna.jar jna-4.1.0.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-dlight-${SLOT} dlight || die
+	cat /usr/share/netbeans-dlight-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.dlight.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/cnd >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/cnd$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	fperms 755 bin/dorun.sh
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/cnd
+}

diff --git a/dev-java/netbeans-dlight/ChangeLog b/dev-java/netbeans-dlight/ChangeLog
index b5bd68f..b2d1871 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_p20150730 (30 Jul 2015)
+
+  30 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-dlight-9999_p20150730.ebuild:
+  updated to the latest sources
+
 *netbeans-dlight-9999_p20150728 (28 Jul 2015)
 
   28 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 2cd31fb..514ba82 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -42,6 +42,7 @@ DIST netbeans-trunk-nightly-201507160001-src.zip 208623275 SHA256 9c548527eb28a3
 DIST netbeans-trunk-nightly-201507200001-src.zip 208844011 SHA256 d913ef4e2aa53c81f799f9054b63f985be8273acbd4e73f6114c1ac9ac925413 SHA512 8bd91ec800079104c0bb74c79d7259722daf9d84d1119fdb768f25fe5acf6bc2833e4cebcb95ff015ed67d4a5d7c745e80faa88b8d66e241f03fab4c7136f407 WHIRLPOOL a6bf8042418478cf40773a6d4421e0570c26fe57bbe9d76e83e6d2b5fcb97dc364d6b164ea57cb69ed5a5063a783230404380cf9e5d8d5e88c62055ccfc28bd6
 DIST netbeans-trunk-nightly-201507270002-src.zip 208903918 SHA256 522afa33b0389ef48a5deb3c91ba3c4aa1ca4acf710e2c316479e6892aa3d39a SHA512 078b84e423f0769fb1a2c14bb092c50dd2f1901126b5f3c7b11700858c71b43230281799c248eb4198a22fad17f5a7c34baedd3aac241e2d07d91c72a1aad861 WHIRLPOOL ae082652979d1ba8f26a6001e6402f587809b2586406f93e42eb9b7d38e4216e290167888ab5d6836ff9a712d555cec66c9f54afea7ca6171dee6cf56c7c0fdb
 DIST netbeans-trunk-nightly-201507280002-src.zip 208905091 SHA256 502a75b45a6d7c2421fa6629cede99d70bb69b19287083ee9ed9cbcd9540343c SHA512 b94b76f709f931ecc1414eb80c1791bada942e7a6a7b2cebe4749453de1c17f929ba497b961a7ea9837057986a463f1d335dc7f2ab460f99c1fb168604d07196 WHIRLPOOL 119f4bb30844c9655760a23c0a48ddbc5abf32c07652165d508061b70f37861c123127735d14be01f506da65d072701514d5a4adb678fe8748f62762bcda6052
+DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae2846b93e0836ed96caddf2d425df5bab2a004b0417879a36e4dd3 SHA512 04e2e8f58102752a45b089cb70c62e6b920b5397cb427179fb042604eec4a78d6380341ab700e70b9190313ea5fc10fb94471a072fa8ad567e4d652b1fa2c3b6 WHIRLPOOL 153cd8da3506e0e3397a06b4341e90b2dc55170bb432a21d66bf425895deef5bf0611bdb181beefc29fd18648d60b827d9e453bca827c26305f55ffb01319f18
 EBUILD netbeans-dlight-7.0.1.ebuild 3624 SHA256 499a9303a1972ee89dfa2685e1dc1e4511c7531ff3b29caadd1136ba25dee82e SHA512 ad60adc5d64f93d03e27170311ce7bd0a6952c8b41cdc51385f8efc9140593201064d162b3130bff7a003570de11963d375d3676476115b1129ac74632d4a227 WHIRLPOOL d68dcdba50b2565d40e1adc484b51c1ed0171c2fcf99fbee08a221e6d9767f96d161d45eda612eb4c4d62e0db6826e2cd124b83e11ee2f7c9bfb6a440ec6821d
 EBUILD netbeans-dlight-7.1.2.ebuild 2935 SHA256 dc7d110b80174b1baeaca9c005e2cc9167540f186c7794067cfb45d335251b9a SHA512 7dc2db63ee40a3e64375eb49e669c54f88cc532d7ac8c7320329f8378a3be15ebc4536208ea2975c7fe4a9b3f2ac60d0ec5b8c9a9da392587fb04838f101e0ec WHIRLPOOL 1801653d9e146eba02642dbdb0a39c235a40e5d3d5ac8d4d5b8d2a570aa62330638355ee8df76693db177c58bbf31271342215c70d7e198e4b6bd905984ed9c7
 EBUILD netbeans-dlight-7.2.ebuild 2650 SHA256 9b0c0049b7cf6894cd44327c3697d4ddfb0dba2aebd6aabc1821b550932cd69d SHA512 0584c2a1cc65193673bded284c454b430fa3f5774c33d704922977d25ed26bf88d090670e330299c85ada2e897e5f124ae9f635a6f8be7d7fd10740482df7eae WHIRLPOOL 1c27b0c84a34865cb8a84062127f49aefcd245fa16fb825d7ee57d24c3f5841935242c16b3250319078762ce4e8aa5bc8dbd8dbe497b39af8e027b9e39ee585f
@@ -71,5 +72,6 @@ EBUILD netbeans-dlight-9999_p20150716.ebuild 2995 SHA256 8e27cb5266683ff32d1464c
 EBUILD netbeans-dlight-9999_p20150720.ebuild 2995 SHA256 66b9a4a1ff5e8a4ed3b3d2cc1c6f714208c3830222d3ff1435643b0c8c1bc98e SHA512 9106b54d94140c4943b478ed48c235aadcb0fe9635eaacc7eb95cd49e1d1fea6748802f6f7faab71544a7f4b887ce2631383d4fd1ccb41c03044eac57ca8408b WHIRLPOOL 84890582260a44bb4bfa74757cf576ac94ce6baeb0cf12c77a7b9d74e062d5786a39d11cc15af7aedd36918ad4a5ea2f6028c393e790c349d2afd79b0626a785
 EBUILD netbeans-dlight-9999_p20150727.ebuild 2995 SHA256 a57351f4989673c8579c0852143f5e801f163806a57577cbd033aabb4b518f35 SHA512 6a9d9c0f6e1b872f95c84d75b604f32e0d18e92fcfc14053d5989aca319537d97d5e06d1ae97ce83a48c9ff050a4f5951dad72755a4bf44c27b5457e9ce89f52 WHIRLPOOL d63acb503908021df032372e4ab36c7a086a1a32b794a1e24c39faa2d0bc3691f7c8d3d0789f74825c4ecba6875e0154f65c5ac7bbf110f2457f03733b49e6a1
 EBUILD netbeans-dlight-9999_p20150728.ebuild 2995 SHA256 9bb15dd21cd918721433afa99c3b06df5bed1be8b0decc2b761d5d21290ac25a SHA512 53aa99bfdabd92460a8cddad2b394a545ba81eac10fa30242c35edec9940cc64032687e37bc2f666c20c02b1cc028601e00e97648f19b663186bbe5ef1135ecd WHIRLPOOL c9344a98444a0b1e2deea705212a8520a285467ccef026f5cabb543fc279f5a815b8febed49c8a557ed60cca97741a34848cacc5de9be14c69c5270ab27f14da
-MISC ChangeLog 171940 SHA256 0b69f66b34b9c1d18326e8bfb5cd5ac4268e280e504109803b45867f5269f6e4 SHA512 92045662b735b9e977d62803b44f42651f32cc97940bd1e29547fc89c1664e7390b374dd81eb5af14486b5cfe2af0717a0c01a3563d9b0b92214e167f7bb0d4e WHIRLPOOL 22e899ab8f755b61468f00236e071618b280d8d3cdce07678904a11a1e718954670e028dca3c71462ea782b7703fb510ad50b34dfb5871149aa74f64158b37df
+EBUILD netbeans-dlight-9999_p20150730.ebuild 2995 SHA256 d84fe5648153e8541466deb68d61c0a0eb5e8677b9c5f781c87c819be916f28c SHA512 27cb3c73e706f0a83a5a1a742f0a167d1d9e2c9cd4d5d36ed5ce88febf80442ae6b9db79d84f57cca98b9a79eee9c0e51bd0e309458d2ea5d84235a210c441a6 WHIRLPOOL a18c8cc68a14e3bab634ce8a1e746ef54b8292ba9d12e1bbf44dcf474ca58d1a34403ec627b7e96759b0bf091a4b96a33fe0dd30fdb228f01ce1576159c04b97
+MISC ChangeLog 172114 SHA256 4d8b9ac9ec41b4d4dbd53b05216b37e9ffe996c4035c55186491625774f0bd3f SHA512 529200894606643a875aa9c9519c0a639d9bd5859c084e79bf7446543d467428abc6bb69c47d4e32d06aa4ab4b5cc622ac7745848a400c9cf450fcada588b0f1 WHIRLPOOL 20fe87fef50f71cafa07583985a6be1746948cdbeb62558f7b73888b31271c0ed7eaec9e87c08d92240119fe01d618994112c8765cf5528586e77fc1d2b01249
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-enterprise/ChangeLog b/dev-java/netbeans-enterprise/ChangeLog
index 12b10cd..d6d69dd 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_p20150730 (30 Jul 2015)
+
+  30 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-enterprise-9999_p20150730.ebuild:
+  updated to the latest sources
+
 *netbeans-enterprise-9999_p20150728 (28 Jul 2015)
 
   28 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 6d91137..3e18057 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -124,6 +124,7 @@ DIST netbeans-trunk-nightly-201507160001-src.zip 208623275 SHA256 9c548527eb28a3
 DIST netbeans-trunk-nightly-201507200001-src.zip 208844011 SHA256 d913ef4e2aa53c81f799f9054b63f985be8273acbd4e73f6114c1ac9ac925413 SHA512 8bd91ec800079104c0bb74c79d7259722daf9d84d1119fdb768f25fe5acf6bc2833e4cebcb95ff015ed67d4a5d7c745e80faa88b8d66e241f03fab4c7136f407 WHIRLPOOL a6bf8042418478cf40773a6d4421e0570c26fe57bbe9d76e83e6d2b5fcb97dc364d6b164ea57cb69ed5a5063a783230404380cf9e5d8d5e88c62055ccfc28bd6
 DIST netbeans-trunk-nightly-201507270002-src.zip 208903918 SHA256 522afa33b0389ef48a5deb3c91ba3c4aa1ca4acf710e2c316479e6892aa3d39a SHA512 078b84e423f0769fb1a2c14bb092c50dd2f1901126b5f3c7b11700858c71b43230281799c248eb4198a22fad17f5a7c34baedd3aac241e2d07d91c72a1aad861 WHIRLPOOL ae082652979d1ba8f26a6001e6402f587809b2586406f93e42eb9b7d38e4216e290167888ab5d6836ff9a712d555cec66c9f54afea7ca6171dee6cf56c7c0fdb
 DIST netbeans-trunk-nightly-201507280002-src.zip 208905091 SHA256 502a75b45a6d7c2421fa6629cede99d70bb69b19287083ee9ed9cbcd9540343c SHA512 b94b76f709f931ecc1414eb80c1791bada942e7a6a7b2cebe4749453de1c17f929ba497b961a7ea9837057986a463f1d335dc7f2ab460f99c1fb168604d07196 WHIRLPOOL 119f4bb30844c9655760a23c0a48ddbc5abf32c07652165d508061b70f37861c123127735d14be01f506da65d072701514d5a4adb678fe8748f62762bcda6052
+DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae2846b93e0836ed96caddf2d425df5bab2a004b0417879a36e4dd3 SHA512 04e2e8f58102752a45b089cb70c62e6b920b5397cb427179fb042604eec4a78d6380341ab700e70b9190313ea5fc10fb94471a072fa8ad567e4d652b1fa2c3b6 WHIRLPOOL 153cd8da3506e0e3397a06b4341e90b2dc55170bb432a21d66bf425895deef5bf0611bdb181beefc29fd18648d60b827d9e453bca827c26305f55ffb01319f18
 EBUILD netbeans-enterprise-7.0.1.ebuild 16338 SHA256 03ea08daaf5d4c5592937929bac33b4af3bac00a23f2167a7ef7b3c172a72abe SHA512 4d24162c7920b9a1c65e6c6753900ead387a4941c2db98b522631bb09889c281bce048a74e2e584f8b5732cfaad1d7125e0cfd37aa2dc81fe85160b0e123ccd8 WHIRLPOOL 35eb648c37cb6e59aca7969c1074c2c280814529aa7ec3c3191b0d3f2a92fa24e1a8d981f343e4217fff52f6100b4884b970df734c45145759889aa6e6661ff2
 EBUILD netbeans-enterprise-7.1.2.ebuild 18060 SHA256 f63721b8ce5e1afbc58f783348f66f1e3501be519a1c9c1287ef860acc64ceda SHA512 2ca89ec8f89f106a284136d4d0ed52fe3bcf49c650d56ded6e62306c531e5e41f62b8aa923cb544842cf6e34e5f433fecb278bc1515abac987e2d00fb68ffa26 WHIRLPOOL 879067d72285aa6c7273e84ddc3dfef7d09c7cb9f9a6c279fddfbd3eea6439dea053d3c648fcd56d47ef2292db14d101307eb1aa8b3081dfcdbc3dac4d0c3ed9
 EBUILD netbeans-enterprise-7.2.ebuild 17752 SHA256 2f46916df731fe33c5d4626ae580a77686c392932a3388f755324bc3184bd636 SHA512 3543d033b971108fa2b8e6633ed640e812a83b34807e1cb5a69d425823d1fec1c13ecba3cc36fa4504fbfd6297e7eff1ecabe07d01725d9f13c99ffd70d220ba WHIRLPOOL 512753153bbf714ae3fbf9c580f350234d88bd5ce5690e7bc0fadd1c355bd38c2a5c1e9adb7993c3678d759661bbfb1654b0630e3535a2fb9198742fa7fd2c1e
@@ -153,5 +154,6 @@ EBUILD netbeans-enterprise-9999_p20150716.ebuild 15937 SHA256 d82a3178b374445a16
 EBUILD netbeans-enterprise-9999_p20150720.ebuild 15937 SHA256 375b00d76a464be843df3ad35b3e388a92d0d80e7c4fafbd6f260f8f85123a83 SHA512 3fd36f6b2e64748ef910fc8e2aa70773bd3c348037f0676cdbeaf00d0985db166f3dcb9354a9f7103f496c7e7f454a4f5fe40a41974b252b0ea5aa8093719350 WHIRLPOOL 007d0552c5f793a2e5bc4081a8bdac290e36cdc8141ace2455003ab8153a112f69c8d1ece11344b3e7b0d17f4650686420e6faaf3847ad4eec590cc0c64cf4a6
 EBUILD netbeans-enterprise-9999_p20150727.ebuild 15937 SHA256 b7f3909d0f872aa1e28cee5e4c9a8e675cbe4b5e9959ad35b6de9268a6d406eb SHA512 69ab3d95aedce659a10c111c82eea6109b3cce63d6b3cbc1d1fd9f17900db63d39c98b1b709792b6e73a0a138536d9d7106b4d5a785af9dc95ff35d52a2ff252 WHIRLPOOL a5253c4295a96ee7a997bec49aef9b6d51657e3b57dc4b5185e116a89177467ef63e94fe09c84e9e91e493a0bc98774c5201e505147ef4913a94e872605b77dc
 EBUILD netbeans-enterprise-9999_p20150728.ebuild 15937 SHA256 7a4554c3758390eeec5b83ccc120c7daae09b08cc0c9f6f05495901cd1c54c67 SHA512 8a9fda673f57d9c94db528832e6f7698f4513181a0f7636fadaf9dc4f676866d30ebee39cf3491433ace47d09da4297a2abd18118e369a0ef718d6e0365fb104 WHIRLPOOL afee88455f34c31d9dd1d9993fdd43d8dc5f4f8ce3779c85d2f7fe064db4a86c4d140adfef4c53e67cdf06e8260e93ea807aa7309eca2cea25b48d3622ef58aa
-MISC ChangeLog 181154 SHA256 f35d8977bbc9d14b053a86dd1ce40f89f6ba7fae052c1806f50fb98c6e8b0c1b SHA512 6e9413b9ee112eab73d8845eb866b91a5f6fc04f538b8f209a688a4de088544afee76d434b8e3a9b7aa304213f1a4b18360968eb3df95333c8ee3acea102b0ea WHIRLPOOL e6325d6da8e75cf91d2f098f289c37049c9f46e6950f03ac62f09af1ddbc7d9b255859ed1143b3e264513d998efbcfabb2ab88e88eab317897521bedd3bbf4c7
+EBUILD netbeans-enterprise-9999_p20150730.ebuild 15937 SHA256 b15d462d4e5a48a815776bdaf518626cf0e31515ff82f059382e8b3cbce9fb9a SHA512 09261894d00d34feb5822df39e6a89b7917ce9db93c1347ee5aaf4d0f367e915b23e70e89eb969e84e737e7691eb6d41046e679c861a7b12196a7ca993bb68a0 WHIRLPOOL 38f8d6bdae7bdf03f48323ad0174ffeaf95cd8e9acc773cd33911229db416f4ed45fc9dad08c6edbf2fd39328abc271da28bd9d8aa68c58952a0fc70932f4ca1
+MISC ChangeLog 181336 SHA256 3473c72c207479bd1b00d56a67cf3391e475ffd458c038cf8e309928d5868204 SHA512 209d06677a6ae75898ba2b30aa7dd3462a38165393e6867101bf8dae8f4c4982f4c5f87976b90aac528ccfe40f08460dfc12b55565f317d0be60b3c38099d775 WHIRLPOOL 658e087ef96531a3c0208e97b34314cee6dfcebf25b2d39e86df415c1428faf959d4f3d3dccae7fd2d80b008741efeaf21f5d6c20784e92f1de666f3ab6c5d2b
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150730.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150730.ebuild
new file mode 100644
index 0000000..384bed4
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150730.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-07-30_00-02-28/zip/netbeans-trunk-nightly-201507300002-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 02b27ff..fa5cc2b 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_p20150730 (30 Jul 2015)
+
+  30 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ergonomics-9999_p20150730.ebuild:
+  updated to the latest sources
+
 *netbeans-ergonomics-9999_p20150728 (28 Jul 2015)
 
   28 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 6a98824..f22bf5a 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201507160001-src.zip 208623275 SHA256 9c548527eb28a3
 DIST netbeans-trunk-nightly-201507200001-src.zip 208844011 SHA256 d913ef4e2aa53c81f799f9054b63f985be8273acbd4e73f6114c1ac9ac925413 SHA512 8bd91ec800079104c0bb74c79d7259722daf9d84d1119fdb768f25fe5acf6bc2833e4cebcb95ff015ed67d4a5d7c745e80faa88b8d66e241f03fab4c7136f407 WHIRLPOOL a6bf8042418478cf40773a6d4421e0570c26fe57bbe9d76e83e6d2b5fcb97dc364d6b164ea57cb69ed5a5063a783230404380cf9e5d8d5e88c62055ccfc28bd6
 DIST netbeans-trunk-nightly-201507270002-src.zip 208903918 SHA256 522afa33b0389ef48a5deb3c91ba3c4aa1ca4acf710e2c316479e6892aa3d39a SHA512 078b84e423f0769fb1a2c14bb092c50dd2f1901126b5f3c7b11700858c71b43230281799c248eb4198a22fad17f5a7c34baedd3aac241e2d07d91c72a1aad861 WHIRLPOOL ae082652979d1ba8f26a6001e6402f587809b2586406f93e42eb9b7d38e4216e290167888ab5d6836ff9a712d555cec66c9f54afea7ca6171dee6cf56c7c0fdb
 DIST netbeans-trunk-nightly-201507280002-src.zip 208905091 SHA256 502a75b45a6d7c2421fa6629cede99d70bb69b19287083ee9ed9cbcd9540343c SHA512 b94b76f709f931ecc1414eb80c1791bada942e7a6a7b2cebe4749453de1c17f929ba497b961a7ea9837057986a463f1d335dc7f2ab460f99c1fb168604d07196 WHIRLPOOL 119f4bb30844c9655760a23c0a48ddbc5abf32c07652165d508061b70f37861c123127735d14be01f506da65d072701514d5a4adb678fe8748f62762bcda6052
+DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae2846b93e0836ed96caddf2d425df5bab2a004b0417879a36e4dd3 SHA512 04e2e8f58102752a45b089cb70c62e6b920b5397cb427179fb042604eec4a78d6380341ab700e70b9190313ea5fc10fb94471a072fa8ad567e4d652b1fa2c3b6 WHIRLPOOL 153cd8da3506e0e3397a06b4341e90b2dc55170bb432a21d66bf425895deef5bf0611bdb181beefc29fd18648d60b827d9e453bca827c26305f55ffb01319f18
 EBUILD netbeans-ergonomics-7.0.1.ebuild 2884 SHA256 e8e4a785fc11b6d0d3c722826761581b8c9c779c5460dc7d1487b3154f4402ab SHA512 3ba2810e650726f48fbdb1bc0c58b6ee1e7d9d29d4be3b27c00bc981b773f26d979fd90154184276e044eafd1d4d8940b47d6f0f58589f9cff7fbadef5fbb05f WHIRLPOOL 5fab7fe6492f91bd0e97a8a95c0652266d771e9b60957e16ce6ff683c1e38081372151cd8c7bea44ee1f1dd7bf435f8b00b9a1a23e4c6106c990794c6093ba10
 EBUILD netbeans-ergonomics-7.1.2.ebuild 2893 SHA256 cd56250980429160b8fa9deb17f15050d016394d5fdef19bf772cf29988c86d8 SHA512 32d4556218791a32efb8cf8ec8303f7e8f27bfb03b97af0c66cee717563c7e02fcd9e350b0425ec0cec28ab09865d4815aba1471ee958e05e7c42e421a7f71c2 WHIRLPOOL 318c8528c2338c1e2f6e342c263be52753fa74c9ac934b0ee60fe0fff2146e86d1761fef8eaeca8eab844709bea2196fbe181fad1f689a9d5b9994da3271b4db
 EBUILD netbeans-ergonomics-7.2.ebuild 2876 SHA256 ca7184ac24c255941c4ec3e686c4237ef0af4be7242c44417fa799813083515e SHA512 c6537bedf2fed4ea914c74a208124fe692af837ab2c81c98b8aa0347cb9d5af496378a8c042437facced26d3b42b101225dfa8b81dfc3d6ec4e3e5613e359f72 WHIRLPOOL c7e4c08ace118690f454dbf6a9040bff3e7013c646947fd02b05bca2b4d802393b6eca3234c6228f8e4df4da1ed193ecfd93c848038e4dd9ae3f50959692aa15
@@ -64,5 +65,6 @@ EBUILD netbeans-ergonomics-9999_p20150716.ebuild 2919 SHA256 3a73adcc0855753b7ab
 EBUILD netbeans-ergonomics-9999_p20150720.ebuild 2919 SHA256 30f6009db592e3a2148a3ab179fb733524e1df8f41f2b451aa9767467eba4770 SHA512 36c0ae8ff631f2c76a1d0e2c233eb3369ca59532f123614921719ef867d2a660c143fc82b97b58935e300ae12f46f2e29a55470986f99ea55d9f4ef3e35f9b47 WHIRLPOOL 00482958a71feac4c85a8b5f1416374d6117e08b8bc8fed4a2a1de9217eab4f443514d1b14e937328120611fc65d0121ca166a84f03238db8936d164ae3847f5
 EBUILD netbeans-ergonomics-9999_p20150727.ebuild 2919 SHA256 29a685cf29da593a33c8394ca8cd3e8d90b9f1113be4af48c4b163ae493de3ae SHA512 6733d724388b2cc96c1eed5f445b6031da212f2a67d13d28464e94d22e12f49fc7505aed24fe8323c165f88e8e043c695038a615a5c735e6d9e37e12c4dd2f93 WHIRLPOOL 2f4554e63b30b65d1ea58e55660f95b191ec34a3eb6e44516f9f2aae6dac55d2f0bc8dee80e241d1d07cceba5263555377d2c7d622aa8676754f31324e292317
 EBUILD netbeans-ergonomics-9999_p20150728.ebuild 2919 SHA256 9da6bce0a54b8ad426e2b44e8116b2d7d858b1b4502625d33a98958ad783d62b SHA512 34eebfad9c8513979c2464f6a77b76e3fe12d8e97db757d32406006f4eda4617b842d90ef176e653025944075feaf7b475c5559770832dd3e0887167e3827335 WHIRLPOOL 902bc1628af71b4585fdf2298b90ef983093d1e015398522f01310ec7323bcfa22817b850af90442d158e77b0e4506f81077f0bfe09fe345643b78b0e0f72ea1
-MISC ChangeLog 180515 SHA256 82bdc6227ec331832ca0b7e45e12d94cd043590ae3688891ba171b598333a73c SHA512 c9eb30b35bf8ad9a3d2bb205535108b82956af78ce2b91c234421c38ed163327e76af68b84c7e1c898804922fc06b6a8b70a9556ab256bbce79ec10320ed3391 WHIRLPOOL bd422129839a0ed3d79c60074ad4f5cb0c223d108a4f2e63e85ba517f8b3353022c8c0d641aa213e1e92d6e007f9ecafc02c337318bffedc967b1cb8d9727091
+EBUILD netbeans-ergonomics-9999_p20150730.ebuild 2919 SHA256 4e8310005c36503d28ec6c6a6e48d58c33c9689d7a49899354392eead08ff955 SHA512 36e0787eed10bff97afe808d3d28f9179595f0f1c84ae3748f533cd731cc3fcb0070b17178a8ba7c647620fdc7f39623b3ff0f50b4d979fe8d56ab7cb8237ce8 WHIRLPOOL 2d778e6fe29bfe80346a8206065de5deaaa924f5d6aff4f29e6695be5e873fe28e27a3990fb84b13d083da9870906d3ca7c0a6e830251b6c1d835c46309108db
+MISC ChangeLog 180697 SHA256 ff97f122b469b845817dfb37fe93652123cd9972ef0bba397b069118f5703613 SHA512 e8de55d4e3f6be43fcca71e0cdf2d884336e68f73f09b04de6e046aa1c3bf92270d5fea2d5e59022a99f48df464e9cdb6416d4c5419efb125b0495f42f359f26 WHIRLPOOL b544f34c81d4e0603908794b2d7cf5f8c3afc8a3fe250b7e1510e206ab01e6c6274baf27712e3c4912eac9b4f1ba6615e8e601c19a0397e0db7437589f2f58bf
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150730.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150730.ebuild
new file mode 100644
index 0000000..2f2975b
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150730.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-07-30_00-02-28/zip/netbeans-trunk-nightly-201507300002-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 d021bc5..ae11500 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_p20150730 (30 Jul 2015)
+
+  30 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-extide-9999_p20150730.ebuild:
+  updated to the latest sources
+
 *netbeans-extide-9999_p20150728 (28 Jul 2015)
 
   28 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index 8e9cce3..f998f3e 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201507160001-src.zip 208623275 SHA256 9c548527eb28a3
 DIST netbeans-trunk-nightly-201507200001-src.zip 208844011 SHA256 d913ef4e2aa53c81f799f9054b63f985be8273acbd4e73f6114c1ac9ac925413 SHA512 8bd91ec800079104c0bb74c79d7259722daf9d84d1119fdb768f25fe5acf6bc2833e4cebcb95ff015ed67d4a5d7c745e80faa88b8d66e241f03fab4c7136f407 WHIRLPOOL a6bf8042418478cf40773a6d4421e0570c26fe57bbe9d76e83e6d2b5fcb97dc364d6b164ea57cb69ed5a5063a783230404380cf9e5d8d5e88c62055ccfc28bd6
 DIST netbeans-trunk-nightly-201507270002-src.zip 208903918 SHA256 522afa33b0389ef48a5deb3c91ba3c4aa1ca4acf710e2c316479e6892aa3d39a SHA512 078b84e423f0769fb1a2c14bb092c50dd2f1901126b5f3c7b11700858c71b43230281799c248eb4198a22fad17f5a7c34baedd3aac241e2d07d91c72a1aad861 WHIRLPOOL ae082652979d1ba8f26a6001e6402f587809b2586406f93e42eb9b7d38e4216e290167888ab5d6836ff9a712d555cec66c9f54afea7ca6171dee6cf56c7c0fdb
 DIST netbeans-trunk-nightly-201507280002-src.zip 208905091 SHA256 502a75b45a6d7c2421fa6629cede99d70bb69b19287083ee9ed9cbcd9540343c SHA512 b94b76f709f931ecc1414eb80c1791bada942e7a6a7b2cebe4749453de1c17f929ba497b961a7ea9837057986a463f1d335dc7f2ab460f99c1fb168604d07196 WHIRLPOOL 119f4bb30844c9655760a23c0a48ddbc5abf32c07652165d508061b70f37861c123127735d14be01f506da65d072701514d5a4adb678fe8748f62762bcda6052
+DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae2846b93e0836ed96caddf2d425df5bab2a004b0417879a36e4dd3 SHA512 04e2e8f58102752a45b089cb70c62e6b920b5397cb427179fb042604eec4a78d6380341ab700e70b9190313ea5fc10fb94471a072fa8ad567e4d652b1fa2c3b6 WHIRLPOOL 153cd8da3506e0e3397a06b4341e90b2dc55170bb432a21d66bf425895deef5bf0611bdb181beefc29fd18648d60b827d9e453bca827c26305f55ffb01319f18
 EBUILD netbeans-extide-7.4.ebuild 3311 SHA256 8585e0b9eac3b9bb35d5b5e0152936f84708a824d76831930a3dfd3d196556b0 SHA512 19eceec7a634923b4712eb277a1ff9900a2eb4d9ac0a2c699175333c263f0c02baaf24eb30bd7919444f5c9df751186689b2d4359ca1c88dca02884d7c18c3cd WHIRLPOOL e64509f198c4d09851f98d5bd2ddd5b469b0a7c0f3122f391c17833e5d6d77b7a6c2fd9e942e34f2df42047504ad40593f97af9b2898450e769c7b012355c316
 EBUILD netbeans-extide-8.0.2.ebuild 3313 SHA256 d147df43b8e55de81e0429604a2497a82861864ae50fbb85368a3070e1c266c9 SHA512 8f2722ce12c1582ca6e9ed348fcb37b9969585037b5432e592e5dd6ef4b3e49c58783da5fe20f088bee07514e3b42de7aa36607900b285c32c4b91fa218df90c WHIRLPOOL 0fb074484787a5e0e688dc734efe027ff6dfd082dd63bc9bccc612f915fbbe33a4f93db6c43d345abc9c191e22ec196aada1e889d1240968916d54c69497a2d6
 EBUILD netbeans-extide-8.0.ebuild 3305 SHA256 b2d57e2e2d92760ead3d383fe4dd5b4fb9fc2807a9b58c6f40b44fc24072b8bb SHA512 6e7f12758188a564ef6b5cf8b0ffdf79e30d1021172d10f215d04e727bc4001e4385fd0961a26a6bb42638089e0919b1d4628a13ba11a3deac94d4693c7210d5 WHIRLPOOL adac8461de43669b7bb98ea8920c0a2944837211a37503b957221149d4b91c4bd92b6db160191990b838c474495c65f62c8a4bb9fdbcaa371b4648a335b1afa9
@@ -58,5 +59,6 @@ EBUILD netbeans-extide-9999_p20150716.ebuild 3383 SHA256 5a07445d2de5a054f9c8f28
 EBUILD netbeans-extide-9999_p20150720.ebuild 3383 SHA256 18787d19709051ba423181bc68c6ffbb5e62896ffd021f1c106edadaaae07d4f SHA512 1af3e2b4a2ce0a11e34933c9adc54316ec9834b405e007fefd019bc08ac4b34f62fa1295227e0fe6b080f5edc041a5dfe9b8247b4add8f5605cb11878c605377 WHIRLPOOL bf02e5a064c264e4812a56c264382d851e8544a4bd62469b059aafb326a03eaba4ca1761c63bd52ecc0b45b3552dc9451433889a97d74ce465f04b1ec9d3dd61
 EBUILD netbeans-extide-9999_p20150727.ebuild 3383 SHA256 f70fe4a371ceba622e0475d6eea2be2ca78c773dc24a458f39ea6d66919c21e6 SHA512 27fc00e2e71d6c7f3b5333068ff2246e346e48a5c4dd7a7eb5bbcc53d50de8aa9ec4a6ea587530f7cd889680287f173f1c163d0a28e31fb0953e9f4451f16756 WHIRLPOOL 52a74327154d82fa1e4c3cc1b1ed522d7476e65c1ee2a6ea204bb8a7667943d1422a5e61afd90ca9c4de6e23033ccdb8db05f99175897df0a93e037f403426c0
 EBUILD netbeans-extide-9999_p20150728.ebuild 3383 SHA256 8c235cd6a79b093b4720cf7c3d662caf86e8aefb631fe029b7d931fbb3d80ef6 SHA512 6dc65333e5b2029d46d2b98d25a3648c06d6f0f8e3b340dbdfe145cc0d657e37fc810528290f6eabe598ee5507528c6f7febdaa83a58df39763cb8a497102a67 WHIRLPOOL 25d0b7f43d6c87a249b0149fb7de956bdbddad235e39f8dd7e0b24b620479d2b7a2085ee932018124c490748bec242a3d524c176be444da4d0d5fe95e5ac6c2b
-MISC ChangeLog 103850 SHA256 31963bdd9918f6691e73ab49d35f6d3e1a86155479b3087035c19cc0566b9e1d SHA512 ab795832e43b5f023bbe823cea46b98e5738ef949b7a6da3acabdbe0990b2f9a1ebf99b9474e65bd95f7b058278d475029e04dc1fdf31aac728eb642c5b4b773 WHIRLPOOL 7136a0e420823cba5a8b7813a809b06ee6345f37df535a57468b818dbb1ba8bd0b0b9dd65576ee2a4b1471800d347996564efea3c94811bfd345c928d33d5a27
+EBUILD netbeans-extide-9999_p20150730.ebuild 3383 SHA256 fb5ea1313370371921139c6eec3e4d5df7d0ba2a82e4d2b5f513f5fc000e650f SHA512 2a62ebff93b523cf6e55da9f0d2082657a41c77d898eb3a62737350448f92e2f2d350cf35bcddfeffc37c80559800a8c07fee122506caea7e9e2a5e4dbef6e7a WHIRLPOOL 9c9dde84e7e5605d158098439a32a5fc542f58e5bf783b21a178308bd8806196bb1935c2aa4406b3f2c6a5146e1ca541d94419967bbad0f3c8a882fbf2b97ebf
+MISC ChangeLog 104024 SHA256 ecee161487f63c6946205a0f4e3acd05f46c0aaf01afff864428fd3f23f35243 SHA512 af3b3cfe355e7a6c365ce5e8a4610f0fc19e5c21da15fe7517a1d4a09ec5bb5ecaad18afb56457196e07e74deca57ebef216bf479b1d1426170e6126fcf35834 WHIRLPOOL 9ca14def06d57775197739bc3eaf211ffb84fc607ca53a006184887d1430f71c4cefd01492d5d6843b649306f46f68697e332a396bd3cf5e691a4eaf27e106d5
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20150730.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20150730.ebuild
new file mode 100644
index 0000000..2b13e0c
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20150730.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-07-30_00-02-28/zip/netbeans-trunk-nightly-201507300002-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 2086ccf..8680bec 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_p20150730 (30 Jul 2015)
+
+  30 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-groovy-9999_p20150730.ebuild:
+  updated to the latest sources
+
 *netbeans-groovy-9999_p20150728 (28 Jul 2015)
 
   28 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index e652beb..5290a1c 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201507160001-src.zip 208623275 SHA256 9c548527eb28a3
 DIST netbeans-trunk-nightly-201507200001-src.zip 208844011 SHA256 d913ef4e2aa53c81f799f9054b63f985be8273acbd4e73f6114c1ac9ac925413 SHA512 8bd91ec800079104c0bb74c79d7259722daf9d84d1119fdb768f25fe5acf6bc2833e4cebcb95ff015ed67d4a5d7c745e80faa88b8d66e241f03fab4c7136f407 WHIRLPOOL a6bf8042418478cf40773a6d4421e0570c26fe57bbe9d76e83e6d2b5fcb97dc364d6b164ea57cb69ed5a5063a783230404380cf9e5d8d5e88c62055ccfc28bd6
 DIST netbeans-trunk-nightly-201507270002-src.zip 208903918 SHA256 522afa33b0389ef48a5deb3c91ba3c4aa1ca4acf710e2c316479e6892aa3d39a SHA512 078b84e423f0769fb1a2c14bb092c50dd2f1901126b5f3c7b11700858c71b43230281799c248eb4198a22fad17f5a7c34baedd3aac241e2d07d91c72a1aad861 WHIRLPOOL ae082652979d1ba8f26a6001e6402f587809b2586406f93e42eb9b7d38e4216e290167888ab5d6836ff9a712d555cec66c9f54afea7ca6171dee6cf56c7c0fdb
 DIST netbeans-trunk-nightly-201507280002-src.zip 208905091 SHA256 502a75b45a6d7c2421fa6629cede99d70bb69b19287083ee9ed9cbcd9540343c SHA512 b94b76f709f931ecc1414eb80c1791bada942e7a6a7b2cebe4749453de1c17f929ba497b961a7ea9837057986a463f1d335dc7f2ab460f99c1fb168604d07196 WHIRLPOOL 119f4bb30844c9655760a23c0a48ddbc5abf32c07652165d508061b70f37861c123127735d14be01f506da65d072701514d5a4adb678fe8748f62762bcda6052
+DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae2846b93e0836ed96caddf2d425df5bab2a004b0417879a36e4dd3 SHA512 04e2e8f58102752a45b089cb70c62e6b920b5397cb427179fb042604eec4a78d6380341ab700e70b9190313ea5fc10fb94471a072fa8ad567e4d652b1fa2c3b6 WHIRLPOOL 153cd8da3506e0e3397a06b4341e90b2dc55170bb432a21d66bf425895deef5bf0611bdb181beefc29fd18648d60b827d9e453bca827c26305f55ffb01319f18
 EBUILD netbeans-groovy-7.0.1.ebuild 3296 SHA256 29c3d304eca5999e78550fd715dbcbef9d15639d4e4f17fa0e45a46803080729 SHA512 43a0ddb43354bb3c0b8e29004ab547da508662d037b0006dfd24250c49470ddc0384bfffb6423f1e3eeaca98410c5de8b314a69970189306869a16380ab098a1 WHIRLPOOL bf626cecf6dec0c51e7e0b95ac4ff26a795e44a5dabd25719eeb2244742d96d33cb20ebbd9a68728dc27d28b8e558a7e2a3ee318c2e4fde234e0b5e8d32e6a58
 EBUILD netbeans-groovy-7.1.2.ebuild 3305 SHA256 1e00f335b8cc1e90deec3c3251629ba699286b25be5b6945d135d271004dc34b SHA512 3a1d67d02054478ed15e11789292fcce3fcfd343b8feebde5e07a9463c380c644310603a3f9f984e8071b0b097075809dce423b888e1f2aed316cb90a562d20e WHIRLPOOL a790c1e186c4d1949de6b4dd975b929c132e3e7b7c455c7867bd1445f59fb6ace72b5c9adf09d0c6079718fdc6c34a0c5f0c9c437517b55b7ae109ce3e20b064
 EBUILD netbeans-groovy-7.2.ebuild 3160 SHA256 6d709b7cc07d7ebb59c3ede0a19c9890ca3230144d7f455cf24d984ac2f633b0 SHA512 e30c8d58165b87a39a356f8b813c593910cd2c247de41420369fee21157c2f2881db34612711f77c9ecd9501aa6d7235ab7bc41d4092be1e68fab778c16d8288 WHIRLPOOL 4a6495ca077f3c374105b25698c8251aaa89daf56c2749bdc73867b0ea1ae404cfc7b2a8b435ef7b19f00aee8128be051c04d6a24fb631379fbe98d6854a507b
@@ -68,5 +69,6 @@ EBUILD netbeans-groovy-9999_p20150716.ebuild 3422 SHA256 c4181d16b5aaab28f154a7b
 EBUILD netbeans-groovy-9999_p20150720.ebuild 3422 SHA256 758223d173c611bb9033402e86d64332dda54d794d6c526e978744912cdc7571 SHA512 66913d96f8f14f2b8a3f0011c5cd8e94887ddccc0f44a77cef7b7b16281b34e2749b16257c47906b39c6b8bdad6d15c36e2704800ea232737df183a6248a4336 WHIRLPOOL 7f4759798ff78ad039f9b22204475078b25ee64c2e4ac72ac3cc0870a9710a36790b154bd16fa993cf9eb6b301b7c0afb620341cec995e37c0f8ffe5edd54b47
 EBUILD netbeans-groovy-9999_p20150727.ebuild 3422 SHA256 fc31156e3406c0887d998bc8bab80681784def4b4d9b7836287c91a40c6785d4 SHA512 fd0fafb49595d2ab87421d506a931ff8f92d32822bc07109a6b7a99e9c2b8a453c80b88cac409cf92863d7639b27bd55aafd15758a8569627061e6f8633e121d WHIRLPOOL 5ba0f26c6d7bfb823aa36618f7565f83173ff645bd0411e9e6e1c0c7059f26f474505afa6672743da124cacb502f9ef55d6e94e7ca8d69bec284b356efdec6e0
 EBUILD netbeans-groovy-9999_p20150728.ebuild 3422 SHA256 92101c8b314445578a0226765f7b246ba4dcc9fafb94514706795d48027a60b0 SHA512 566faeca8cd3b4303a5c962c221b1a62259f64e0745ddb14466e64a8956ec1221105494c0e28d403aa6e5b5711bbca8c854b31f0d144954716c3d354ae547362 WHIRLPOOL f70b42e3635eb4657852f5f36be3d5201a779915c2c31d7cee4ae25788e92b897f876761e3bc834ed5e49c9b0cb675ed3250e8286e8b4d0f5826d5d19324e7ed
-MISC ChangeLog 171830 SHA256 e4bd9e26b00c98991c4cb732955332e9432fecb3089442b91dac99489e2c5ca1 SHA512 c9d32ad9b64000a74111b8f47083990fb70fe3d28596cc350e0b7f4f3dc3f946849562047aebc99020e05fafc75b905d41d7002e3498ecbd174da1fb5f36b4ba WHIRLPOOL d822a0f1efc887f9b76d8587265aaf61d96510c841f88a8917c42760b4eec185658006e8b92d1ee111c7981456f10171335e1df69b3489b694e67bfec59f13d3
+EBUILD netbeans-groovy-9999_p20150730.ebuild 3422 SHA256 6cbb55db70c8950e51631d02f53d0aecf6de64853cbf0c8a474de17025cb7f46 SHA512 06f571e2a1ef01fe5800b2ce83053949a17d847abafb640eb647ebcbb7536b7e5d0ea6712f572eb490a3dea1bb47df70bfe9aeafcc770af1e3770da0a47afc37 WHIRLPOOL ca5e0ef8813585ca8c3f442e6fe4b800cd9d5b8497278e252924898eb60115bf0af90c2d583ff824366a47d45b4fb5335f9a7cad11d9cebcbbf8673f0a8e5963
+MISC ChangeLog 172004 SHA256 cae7859bdb1e39ffef79bd934998cdfbb1811bb2e4bfd54c13555c446bddc390 SHA512 d63588d0dfe7a8d79d9bd33e0f3f34d7f86189f297da9a59e66971ddf3d6b45dd7a9b1cf9e9d9c6fe8071758e4a3f490f5f19ca5e9a845b6ee598d6a966ee1d1 WHIRLPOOL 4c09ca85cb13cf73599e38d09c89540091a2eb688b563bbd88930660a5dc62ec41144a5fa3bf65398223dbf8537a1a16507b241d2e302dedec9d9f1ff4678dfd
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150730.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150730.ebuild
new file mode 100644
index 0000000..99341e9
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150730.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-07-30_00-02-28/zip/netbeans-trunk-nightly-201507300002-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 65f30e2..5aded48 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_p20150730 (30 Jul 2015)
+
+  30 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-harness-9999_p20150730.ebuild:
+  updated to the latest sources
+
 *netbeans-harness-9999_p20150728 (28 Jul 2015)
 
   28 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 24bed90..046085e 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -41,6 +41,7 @@ DIST netbeans-trunk-nightly-201507160001-src.zip 208623275 SHA256 9c548527eb28a3
 DIST netbeans-trunk-nightly-201507200001-src.zip 208844011 SHA256 d913ef4e2aa53c81f799f9054b63f985be8273acbd4e73f6114c1ac9ac925413 SHA512 8bd91ec800079104c0bb74c79d7259722daf9d84d1119fdb768f25fe5acf6bc2833e4cebcb95ff015ed67d4a5d7c745e80faa88b8d66e241f03fab4c7136f407 WHIRLPOOL a6bf8042418478cf40773a6d4421e0570c26fe57bbe9d76e83e6d2b5fcb97dc364d6b164ea57cb69ed5a5063a783230404380cf9e5d8d5e88c62055ccfc28bd6
 DIST netbeans-trunk-nightly-201507270002-src.zip 208903918 SHA256 522afa33b0389ef48a5deb3c91ba3c4aa1ca4acf710e2c316479e6892aa3d39a SHA512 078b84e423f0769fb1a2c14bb092c50dd2f1901126b5f3c7b11700858c71b43230281799c248eb4198a22fad17f5a7c34baedd3aac241e2d07d91c72a1aad861 WHIRLPOOL ae082652979d1ba8f26a6001e6402f587809b2586406f93e42eb9b7d38e4216e290167888ab5d6836ff9a712d555cec66c9f54afea7ca6171dee6cf56c7c0fdb
 DIST netbeans-trunk-nightly-201507280002-src.zip 208905091 SHA256 502a75b45a6d7c2421fa6629cede99d70bb69b19287083ee9ed9cbcd9540343c SHA512 b94b76f709f931ecc1414eb80c1791bada942e7a6a7b2cebe4749453de1c17f929ba497b961a7ea9837057986a463f1d335dc7f2ab460f99c1fb168604d07196 WHIRLPOOL 119f4bb30844c9655760a23c0a48ddbc5abf32c07652165d508061b70f37861c123127735d14be01f506da65d072701514d5a4adb678fe8748f62762bcda6052
+DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae2846b93e0836ed96caddf2d425df5bab2a004b0417879a36e4dd3 SHA512 04e2e8f58102752a45b089cb70c62e6b920b5397cb427179fb042604eec4a78d6380341ab700e70b9190313ea5fc10fb94471a072fa8ad567e4d652b1fa2c3b6 WHIRLPOOL 153cd8da3506e0e3397a06b4341e90b2dc55170bb432a21d66bf425895deef5bf0611bdb181beefc29fd18648d60b827d9e453bca827c26305f55ffb01319f18
 EBUILD netbeans-harness-7.0.1.ebuild 3579 SHA256 f4d09cb7bd5e8485caf75a3020ddb8102d3ea326878ac384ef4aecb011a1f6a5 SHA512 390c26b4a3dbc81ad1ef210b3ea668926398cb38ea13fa37dceb6782b4478b1ceb7a49e9db300f691fb8b31c21c56b25f4c3237c0890f0c637ca45f596c88294 WHIRLPOOL ae1e34af6dd61c30f645f39a825b6235e3eb1f9a42dd23431225513733209a2eb225a741b75342f827a4be0ffbf41b9786a6a6430051f543c321abe3c20da6bd
 EBUILD netbeans-harness-7.1.2.ebuild 3587 SHA256 e0adc470109009641bf48569623bf0fc51a400ac1ba686475c7dae1a5b561c96 SHA512 e4157a6b294c17fd7430802b33253d473120dc16173557e0d7840078f4043a383d5e3672af64f124509e54cc85d590abfa4375f181a32ab8b49e976cb6613cea WHIRLPOOL 423a5844a2c55ea99db4ac78e1c605a55a04f634601c0ac054e739c0ab4a3e9c765778dbd81ccf4a1e50e9d9e4cc29ecfad2ec64b483197927f434b67cd4d773
 EBUILD netbeans-harness-7.2.ebuild 3421 SHA256 47a5281d140b47e0235592c58657a9065d1827175ccca7d0c73fd81e90710090 SHA512 403fd1f49e11b27ef8002c4066fc911dbeadcccc7adddcdded86c6cd95e8bddaf0603c0ccafd0e91ef31a0909508deab1eb326e98e621bcbae7304413acca291 WHIRLPOOL fe3c5f95a606db39861a80201c185cb5a25e2d80698ac78ff724587b54e859f861b834b89aa79aac22f2c5da700532eaafae67fbcc33259ee07d578ba5c7f9ee
@@ -70,5 +71,6 @@ EBUILD netbeans-harness-9999_p20150716.ebuild 4131 SHA256 8bbb0a51e1c8188acd25ed
 EBUILD netbeans-harness-9999_p20150720.ebuild 4131 SHA256 77eb04102b20495134978a3de83e0b4149207b0e602ead95c9ab65467b26c2d7 SHA512 cf7ad34136c8cf55edb832a8bb555c9d9d73cce15488c84e0017d50a61a2d9aa507982686720e6d434c7a008710803e3de2ab99bf2ce1dbc4ec4f09e2bb635d3 WHIRLPOOL ddf964742ad28aff36533860060b54ffc5d968995ee04abe2f41e5c2b621b78e15a5ef6040a531ec8d01465a8bf433dd0a0be4fb6f953b19ce70b3cbd27ebced
 EBUILD netbeans-harness-9999_p20150727.ebuild 4131 SHA256 2c6db0d270ed892e0fd1217f681ca60e80ae0a531926da8bea2041515d8131ee SHA512 3e58aa21793c8118fc58dd7985f2f2c456d5fd9a825ed9b1ed7d8bf17bec6f4bfab30918852365fbed75a0a3b0a351bca749752da2e975c1e2e470373fdcdc7d WHIRLPOOL 7cf0c2bd8ae0af42dc224ebb0965c364f803128b1a52fce9e1c7c21d2f90961b996ac586a391d371d372e060236c5a33a93904c64905e5f9b572b961407f5481
 EBUILD netbeans-harness-9999_p20150728.ebuild 4131 SHA256 f45f93b22763c1b72a1dfd1004d6ea1d481b3c7075dff844d78618dc97144b53 SHA512 7fc21d70b4cdc12aa5cfdd03b969369a18f29527a35623d87840bfe448fd391c26d3a30922e8520cb1e8355edc65b5678f502a0786e46f7dda1fecb80292137e WHIRLPOOL 32424b6877d6a53e2565d1ae069d8b3762780b0d0a72c6361d6b9af34d3d6e9586f10744cb3840908b55d563a2c7b1ef73e4adf8ba539de4aa4fa0a2bbbc928d
-MISC ChangeLog 174030 SHA256 e73f4b6d43fb6a32641e6420a073e88784d836c5bf5034eb0f6378bc1f0e23e9 SHA512 bebe3c2958f326003dcb1349c0b490cb7ec7788b5629d798b25c0757b2e8668bad06132302b5de9686cdaa3885342e27c69f85da02378038f8bb5bdcd4f61475 WHIRLPOOL 8436d775d4c45b2f6c4c0ce92fdd695b179ff95ddc4d476f1dbda4d15c7eb79197e6f589e912aa0784569edf90eed565ede8434bc0deebfe738290d76fea64ba
+EBUILD netbeans-harness-9999_p20150730.ebuild 4131 SHA256 a7a162ff6dab4fcec33e9b099184bd64eab0dc03f037e258a8bd98a3e7321650 SHA512 e10eefca2151bdb74625dab8d24d58e681edf34f4e5b8bdb2eb72ae697432369d98c91045167b5b871ea23ac5faacb49d7596a0e272696810f51543ec38e9799 WHIRLPOOL 02139643a8c610a42120239e55933a15a16c30c7936ecc8e1a26b665099370eee0a356f8f0a4f916d1b385602251ea9447780b3c4f7f2cf1cadd1fb3cd6829db
+MISC ChangeLog 174206 SHA256 bc6f6c3305d301b6d7c7167ccb2dec902ff20377f8af8d2d0c307a8110beb452 SHA512 d2c868bc1e7fd20e6e9768a6b8e05457440345c86bdfbf1684988cc025a0cca9d84ae22c709a736e93f6cb219bdd05ad8aa8ed3698e3d4ac61793d52c6b9f557 WHIRLPOOL 4eb233c9f169564ad90d8a278cd6563697acd3786396248cdcce65d26f9ae51ed2e44157c54e80a2c08682835ceb173d7a5d55a124b0e774a2f889848a7b905f
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20150730.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20150730.ebuild
new file mode 100644
index 0000000..d6e8f4c
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20150730.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-07-30_00-02-28/zip/netbeans-trunk-nightly-201507300002-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 845737a..aef0678 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_p20150730 (30 Jul 2015)
+
+  30 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ide-9999_p20150730.ebuild:
+  updated to the latest sources
+
 *netbeans-ide-9999_p20150728 (28 Jul 2015)
 
   28 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 438b5e4..dbf2665 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -246,6 +246,7 @@ DIST netbeans-trunk-nightly-201507160001-src.zip 208623275 SHA256 9c548527eb28a3
 DIST netbeans-trunk-nightly-201507200001-src.zip 208844011 SHA256 d913ef4e2aa53c81f799f9054b63f985be8273acbd4e73f6114c1ac9ac925413 SHA512 8bd91ec800079104c0bb74c79d7259722daf9d84d1119fdb768f25fe5acf6bc2833e4cebcb95ff015ed67d4a5d7c745e80faa88b8d66e241f03fab4c7136f407 WHIRLPOOL a6bf8042418478cf40773a6d4421e0570c26fe57bbe9d76e83e6d2b5fcb97dc364d6b164ea57cb69ed5a5063a783230404380cf9e5d8d5e88c62055ccfc28bd6
 DIST netbeans-trunk-nightly-201507270002-src.zip 208903918 SHA256 522afa33b0389ef48a5deb3c91ba3c4aa1ca4acf710e2c316479e6892aa3d39a SHA512 078b84e423f0769fb1a2c14bb092c50dd2f1901126b5f3c7b11700858c71b43230281799c248eb4198a22fad17f5a7c34baedd3aac241e2d07d91c72a1aad861 WHIRLPOOL ae082652979d1ba8f26a6001e6402f587809b2586406f93e42eb9b7d38e4216e290167888ab5d6836ff9a712d555cec66c9f54afea7ca6171dee6cf56c7c0fdb
 DIST netbeans-trunk-nightly-201507280002-src.zip 208905091 SHA256 502a75b45a6d7c2421fa6629cede99d70bb69b19287083ee9ed9cbcd9540343c SHA512 b94b76f709f931ecc1414eb80c1791bada942e7a6a7b2cebe4749453de1c17f929ba497b961a7ea9837057986a463f1d335dc7f2ab460f99c1fb168604d07196 WHIRLPOOL 119f4bb30844c9655760a23c0a48ddbc5abf32c07652165d508061b70f37861c123127735d14be01f506da65d072701514d5a4adb678fe8748f62762bcda6052
+DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae2846b93e0836ed96caddf2d425df5bab2a004b0417879a36e4dd3 SHA512 04e2e8f58102752a45b089cb70c62e6b920b5397cb427179fb042604eec4a78d6380341ab700e70b9190313ea5fc10fb94471a072fa8ad567e4d652b1fa2c3b6 WHIRLPOOL 153cd8da3506e0e3397a06b4341e90b2dc55170bb432a21d66bf425895deef5bf0611bdb181beefc29fd18648d60b827d9e453bca827c26305f55ffb01319f18
 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
@@ -277,5 +278,6 @@ EBUILD netbeans-ide-9999_p20150716.ebuild 30352 SHA256 c5483b330b30b8aac873bde9e
 EBUILD netbeans-ide-9999_p20150720.ebuild 30340 SHA256 8e2d82c480497b49791e21f54bead2e20ddf1e2b62898bc9602df4898ab1bda4 SHA512 f531a36b2a9478f6646e98d424f562ebdc06930d9cb536f23dc06625b7d68d78e3dbf542ed11fc592f9f3f178d18bb56e1725bd5fd7987e869cc5dccbc71a5e3 WHIRLPOOL e68b3e95eb0e9febbad222eeff19dd1e95a514d3bf960cf13f82bfa9cb7f54ea90d83353f6a21e41144971b67a12992f4ca683c8cd15d88e4ebcfe729b1b5d2b
 EBUILD netbeans-ide-9999_p20150727.ebuild 30340 SHA256 37abae4dd75ce8c8b26f8125c6b3ad565545ca483070253ab4e2337591f7b691 SHA512 30475800f7f251aa623b866c3a7d1c198561a17cd7bd21a6c2c67c9ffcc8a97ae003ca9517ca61e1fb3accb4d4438d1c68d0687b981f4f28f366e7127220022b WHIRLPOOL bb4b4bb3a3ddac29b45b0f26132568145bb0549214e1a43c8edefc4c33626657f97d3cf04ffc6a474c829ce15dfe9cfb13169ff7bd1f25916cc78d230a97f286
 EBUILD netbeans-ide-9999_p20150728.ebuild 30340 SHA256 79442867eabc2f2c6cc8eaa30bd896ec4495dde8c08e60a63f4ba2ff9faf7a07 SHA512 371655b926079ddc124fc44f16bd7242a81d563a5131e467950548ea0dbd244e274dc96e976d8bb756d6d2adec48c94d854b6a8d8a4f5f596131277c4b757299 WHIRLPOOL 27bd1e638486cf04a606d7b230dd0f037797882c65ba4c376e70983c346a8e64cec3d09ab285b129dcfe5b80ffd5ae1f41dfd441f2e450c40b6a2f38ee55fdcc
-MISC ChangeLog 165640 SHA256 d662fd3527d4f83594d6af3ebfdc8e1f92ac7cc1f68bddc6c6394f5c18fa69a5 SHA512 47b1c0f225d5dabb325669989b04a8e0bb0563d2b0ef5706abe9ecc85bfc2cfae7396f67f3da1192f45561c58202c1591ccbbc69a9fd4c2fc2121db31331cdd7 WHIRLPOOL 23e1ffb7d723200de77ebc7a2e2bfdecaca427f5cd81d3d43b379c88f936fe0922cbbea263b4c14a0a4844d118830d892f0b692f4d91d78500a76591e50efa0f
+EBUILD netbeans-ide-9999_p20150730.ebuild 30340 SHA256 85e711d85b2d4dff1254b9db90bc273861b64bab4347ed8526a3df34f2805ea7 SHA512 788e9aae609557981a746f1048f03648c8d0352cb9f8ae618c81eb2a3a0145bbd554350199019eb776a5f3b4034f20d41c1d6f7068e607b91db3bff08df77611 WHIRLPOOL 8772b17059223739be3b60e75f411460447232b9e5308896587af11be82c41ab0627dce1afdb523ff0d8b573bfd65ccf4954e253d7082b948512a599643fb9ad
+MISC ChangeLog 165808 SHA256 9612c56e81959b58a263a860a92d78e219232ef625d9346ddfb8c943b9cd0216 SHA512 975f9d3be13d455bf28e1633a2cfecaed654ed5f73844fb6b921b638a1e356b877f378c12e4b7b8186b1a5c075e6adfe60f297a052b1293d98796f19d9be0b1e WHIRLPOOL a64f426a11207d2398dd1ae5bbe1cd1e16876b57da8d082d4377c367db3bea1377469b28604e9316397b69cf5e7a03a64456cc4f24dfcf2038536429e61ec4dc
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-java/ChangeLog b/dev-java/netbeans-java/ChangeLog
index c77d211..ccf9f55 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_p20150730 (30 Jul 2015)
+
+  30 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-java-9999_p20150730.ebuild:
+  updated to the latest sources
+
 *netbeans-java-9999_p20150728 (28 Jul 2015)
 
   28 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index c637ef7..18440b9 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -119,6 +119,7 @@ DIST netbeans-trunk-nightly-201507160001-src.zip 208623275 SHA256 9c548527eb28a3
 DIST netbeans-trunk-nightly-201507200001-src.zip 208844011 SHA256 d913ef4e2aa53c81f799f9054b63f985be8273acbd4e73f6114c1ac9ac925413 SHA512 8bd91ec800079104c0bb74c79d7259722daf9d84d1119fdb768f25fe5acf6bc2833e4cebcb95ff015ed67d4a5d7c745e80faa88b8d66e241f03fab4c7136f407 WHIRLPOOL a6bf8042418478cf40773a6d4421e0570c26fe57bbe9d76e83e6d2b5fcb97dc364d6b164ea57cb69ed5a5063a783230404380cf9e5d8d5e88c62055ccfc28bd6
 DIST netbeans-trunk-nightly-201507270002-src.zip 208903918 SHA256 522afa33b0389ef48a5deb3c91ba3c4aa1ca4acf710e2c316479e6892aa3d39a SHA512 078b84e423f0769fb1a2c14bb092c50dd2f1901126b5f3c7b11700858c71b43230281799c248eb4198a22fad17f5a7c34baedd3aac241e2d07d91c72a1aad861 WHIRLPOOL ae082652979d1ba8f26a6001e6402f587809b2586406f93e42eb9b7d38e4216e290167888ab5d6836ff9a712d555cec66c9f54afea7ca6171dee6cf56c7c0fdb
 DIST netbeans-trunk-nightly-201507280002-src.zip 208905091 SHA256 502a75b45a6d7c2421fa6629cede99d70bb69b19287083ee9ed9cbcd9540343c SHA512 b94b76f709f931ecc1414eb80c1791bada942e7a6a7b2cebe4749453de1c17f929ba497b961a7ea9837057986a463f1d335dc7f2ab460f99c1fb168604d07196 WHIRLPOOL 119f4bb30844c9655760a23c0a48ddbc5abf32c07652165d508061b70f37861c123127735d14be01f506da65d072701514d5a4adb678fe8748f62762bcda6052
+DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae2846b93e0836ed96caddf2d425df5bab2a004b0417879a36e4dd3 SHA512 04e2e8f58102752a45b089cb70c62e6b920b5397cb427179fb042604eec4a78d6380341ab700e70b9190313ea5fc10fb94471a072fa8ad567e4d652b1fa2c3b6 WHIRLPOOL 153cd8da3506e0e3397a06b4341e90b2dc55170bb432a21d66bf425895deef5bf0611bdb181beefc29fd18648d60b827d9e453bca827c26305f55ffb01319f18
 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
@@ -151,5 +152,6 @@ EBUILD netbeans-java-9999_p20150716.ebuild 14580 SHA256 b4db966fde3ecfc00fc93090
 EBUILD netbeans-java-9999_p20150720.ebuild 14580 SHA256 eb95d49e2d0df457ceb45f0ac59506bc95b639123e25b7e24fb781b8cb346d24 SHA512 cf426a96fb423998deb1f1b30d17dc7941f61df787ba4c9902b88318077e07813f3f48163375a06260f0228d7546a896130b8c7c9ac27ecff3793a7f52310ecb WHIRLPOOL 81f09e1bfe0ff100e4414dd81467644cd1a44f6e67a7ba7c17085b9330199f85dc2943f4d8f7d9260424f8911670daad420a058594251f7ccbd0260a4c052a73
 EBUILD netbeans-java-9999_p20150727.ebuild 14824 SHA256 707482952d85ecf6d6f6f94c0460be70eea6f4196eab9b8fb8d0e6cb03888e8c SHA512 da92cddbbf51c3ae23a16295ac977dec6716d441d6281113d1d219cf3bbb1f5717a4a786309d23505277b77210848cd4d418de19ae1ebd4b212fda77f9831b9e WHIRLPOOL 91d9a87b971813acfb1ba00eb8385916fbc604607a63a974e5c11826d1055e4c00d698e9cb199b50d378979b1edbca577f6e84d077b07081c86df5ea9d43fb1c
 EBUILD netbeans-java-9999_p20150728.ebuild 14824 SHA256 9792fbf469239ab11cfcbcad697bc615b02d9ae1e83d335a02ad050ca68b6230 SHA512 f8f949ba3cfdec2b9377fe03e5bbfae37bfae8fa986516fe4e43b6f16726a11012b4e2c99dbf056113721e9134cb9461d3bf8369da55d43ac563986ff12a1990 WHIRLPOOL 762aeb8b8de127dd74ae28d13de93ec634bc929b883aea3de81a2a11eafbc8a1e575a789097daf724debab1ec6933bdce3c924fc02412aeb8f7c9950d16be8b0
-MISC ChangeLog 169105 SHA256 f634dafd3af2168c6c80cb40aa43bae4f676ff934be8c2b050dd9dc51920983d SHA512 6532e9885aff3604fe1e383a79996a06f4105e3d54179cc27b8f60d93a46e6b70b0dcff0788e15452171bb3f1581eb6e9f50c2c369fda7a3b344adf1d7977fb0 WHIRLPOOL 0c0f135fd2dc1c78f0707eba26b60d68534b444d3ca00a4df9971f2a964987f5c155d847f9fc4f36976310c6f106d42b24b0f0bcc1860d5f42cc92bf9940eca3
+EBUILD netbeans-java-9999_p20150730.ebuild 14824 SHA256 67072d22553ac772665d6494247af3d71a55abcda00f96c3d88fdeb10651c373 SHA512 29a201debf56b114d9493e238283ea00a5ca822d2087b51ba88d2dcf9ca000ae49e3a7330b2ad2e58293da91846a71507ab16b4a8c3c508fbb98ad0615c4a66b WHIRLPOOL be89979784635a4d0b96075ef1cef9a661890e895889e554b397791f94488720f88b18049229bff78871c55122942b74c8fe422b0a15725ae9e24aa73c89f9a8
+MISC ChangeLog 169275 SHA256 827d497cdf0b8e8cfbe2ab167263fb5de4b172ca592f575009f010a6a4a414e4 SHA512 b36790112949f7e5648256314fbca5be7113f1e452d71f16a1d25380da4580e1b9b34df7f6c1076e7a1c14e391cfcd6b0c45fdf26e77e5a076b120674ff3e02b WHIRLPOOL a7c7f4dd4254cf696c6570be44d6c75972fa7be53b5bc553aba2f08ecd077758e0394569d71ac6856ea95cf84e45919788dcbe4c9dd2de147f3c78daeb88021b
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-javacard/ChangeLog b/dev-java/netbeans-javacard/ChangeLog
index 4104d96..321bdc5 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_p20150730 (30 Jul 2015)
+
+  30 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javacard-9999_p20150730.ebuild:
+  updated to the latest sources
+
 *netbeans-javacard-9999_p20150728 (28 Jul 2015)
 
   28 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index d729e82..9aa610b 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201507160001-src.zip 208623275 SHA256 9c548527eb28a3
 DIST netbeans-trunk-nightly-201507200001-src.zip 208844011 SHA256 d913ef4e2aa53c81f799f9054b63f985be8273acbd4e73f6114c1ac9ac925413 SHA512 8bd91ec800079104c0bb74c79d7259722daf9d84d1119fdb768f25fe5acf6bc2833e4cebcb95ff015ed67d4a5d7c745e80faa88b8d66e241f03fab4c7136f407 WHIRLPOOL a6bf8042418478cf40773a6d4421e0570c26fe57bbe9d76e83e6d2b5fcb97dc364d6b164ea57cb69ed5a5063a783230404380cf9e5d8d5e88c62055ccfc28bd6
 DIST netbeans-trunk-nightly-201507270002-src.zip 208903918 SHA256 522afa33b0389ef48a5deb3c91ba3c4aa1ca4acf710e2c316479e6892aa3d39a SHA512 078b84e423f0769fb1a2c14bb092c50dd2f1901126b5f3c7b11700858c71b43230281799c248eb4198a22fad17f5a7c34baedd3aac241e2d07d91c72a1aad861 WHIRLPOOL ae082652979d1ba8f26a6001e6402f587809b2586406f93e42eb9b7d38e4216e290167888ab5d6836ff9a712d555cec66c9f54afea7ca6171dee6cf56c7c0fdb
 DIST netbeans-trunk-nightly-201507280002-src.zip 208905091 SHA256 502a75b45a6d7c2421fa6629cede99d70bb69b19287083ee9ed9cbcd9540343c SHA512 b94b76f709f931ecc1414eb80c1791bada942e7a6a7b2cebe4749453de1c17f929ba497b961a7ea9837057986a463f1d335dc7f2ab460f99c1fb168604d07196 WHIRLPOOL 119f4bb30844c9655760a23c0a48ddbc5abf32c07652165d508061b70f37861c123127735d14be01f506da65d072701514d5a4adb678fe8748f62762bcda6052
+DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae2846b93e0836ed96caddf2d425df5bab2a004b0417879a36e4dd3 SHA512 04e2e8f58102752a45b089cb70c62e6b920b5397cb427179fb042604eec4a78d6380341ab700e70b9190313ea5fc10fb94471a072fa8ad567e4d652b1fa2c3b6 WHIRLPOOL 153cd8da3506e0e3397a06b4341e90b2dc55170bb432a21d66bf425895deef5bf0611bdb181beefc29fd18648d60b827d9e453bca827c26305f55ffb01319f18
 EBUILD netbeans-javacard-7.0.1.ebuild 4961 SHA256 566bc7e3275c97d0fe3d68c843b53aee641548ec39a8143aebd56d248da3c32c SHA512 5973c8d4254943473209b0881c0fbe40ac6b61563d508e58adc248dd40c8c2d6b742bd6c1667ee11fb404f9d2e62f08a8e4d822a2a3db9fccab254f73828c3b0 WHIRLPOOL fd1e08943ce754a2abfe8c8b83954399287500ce574a46fe0d76f94b300fd2a5978957f94a3ac1d85781330248a46fefacfbae25db95669c3de910145ef96424
 EBUILD netbeans-javacard-7.1.2.ebuild 4970 SHA256 15ff13152b140edaa549ea6515949d99cdb2a4656918566179836ab2277f01b8 SHA512 b7e52b477f6ba645084034eb27e848fb48361351937fc45455bf4b7d74acbdd257427ec589286f0edc71cc98c8cdb114e55988b6d3dc92143e13f407e3b45a52 WHIRLPOOL 85ab6dc2c230ea89fd19d7602ac24e3d2b0f226590998e6a6e277c24ef60a7e86874f7e95e90921d255e84f05e04ad1998ee7361b4d26c6f14828076792a933c
 EBUILD netbeans-javacard-7.2.ebuild 4718 SHA256 d173c848e825b342a52073ba16b7784016f92124d4bc3b5ad8beebb7a7dda772 SHA512 019183c236c59ec2b961445c49643c6da0b376048f1be1d58677a753890bcb03db126f6441221c7572a74fe45c4c27aeee4acb38db620f9203ad04ae8ff2c426 WHIRLPOOL f2a10183045edd22ef4419b630cedafc093b326eb593178a0f50e8d82ebb25ab732fb8c561d49969073d9fce551c5b9150fb1900b49458ed53f0234baa29a78e
@@ -67,5 +68,6 @@ EBUILD netbeans-javacard-9999_p20150716.ebuild 4982 SHA256 b6eea82f27093239c6f22
 EBUILD netbeans-javacard-9999_p20150720.ebuild 4982 SHA256 7b1b75221ebd2124c6dbad22fe0e2ad28e931466d8eed8e36245676e12aff790 SHA512 c75c7c02deb05c8d099053c817d2152ce38b52e9f4848a520927a293d93955abb6930bce86b5230278e029dc357530fd71abb0fc131fd4f46ddc4fb32c6dc278 WHIRLPOOL 6e35a19e226d7c93dfe7fbd671e1030aa66676fdfa1f47ada99844fa22507062c347021bebebde4147a25a350b94efc999e3ae24e6acb6364782121fad4d5cb8
 EBUILD netbeans-javacard-9999_p20150727.ebuild 4982 SHA256 eb7097c9a06603ec6790a6b0619a6404d90289d16780ed561f1ee3cd29fc649e SHA512 cf8b28238380b878e30866ee8f99b05a6aba864f6e78a03f5adbaf2750a901405231217b978d12a03adc0ae9d0e2695cedbcc56265dea130ef2909893cf13b9b WHIRLPOOL de2c3e36394be10c0a11d72ad6b6f592215a46d2c6cb7f22aab0a9a454d56d0f5e175e02aa8f4abe08392d96e7c1462b8e34c8d1f01b5636b214ac5179d31f63
 EBUILD netbeans-javacard-9999_p20150728.ebuild 4982 SHA256 feee309dffa69933a33d82682e665c8e5338d3a7f37c3383b58f52ca234005c3 SHA512 e8008556703c03fc00d2ed1927afb59bd059a4dd210ea1a4719b7b7419cd6e955e91b583c5a5a86867e77cda811e6625715056d4fbca758d5d0421bd565d8751 WHIRLPOOL a663b90e74066ce4922ec382240d1e80430de2ebc2fa6389b86f31fafe5735e7fcbab00a12393d7b98a697bdb75fc3226aa0f198f5885bd1fc363483f92d7e83
-MISC ChangeLog 176230 SHA256 2432d40a8d9ba91b81ee864a760354ca3341462fd13d8e4dbf42d60ba75edb75 SHA512 842de14fe886a1d47f2a685a8fb8cbd413b4b5612332c24981cbdb778b0ecf240c9d44763a11a4484ec189b6a8378f033203476887792b24be6a57a0b7b9b456 WHIRLPOOL 12a294c49a5236b6b31c1a42937094d1ee3e5f0e280624fd71ee9cd35937ad97df68c66c66fc47907caf7e49842dbd77afdb8193bfbf02c4cd56e8f131af156b
+EBUILD netbeans-javacard-9999_p20150730.ebuild 4982 SHA256 433c1c35a0d23a8faa58d46e23355516ffa41ac6148af40e8c41dc7792eece38 SHA512 069215542b8e4057bb293e534e6e31a49d823fee4b78571ea1cd6f3b1e7ed34219ea41ab5a24e8202084c94489953966b14641b76922bc227cd9fe8bf64dae10 WHIRLPOOL e9aadf14f77282e811a9ecba52ce9bd5af5240fcdbccd471221131a2d97fbd65e20dcf1a89a0784f57db9e243cf66ae1b3cef7f67f049f29fb16e4729df73133
+MISC ChangeLog 176408 SHA256 819ed6267ff32cac3f3a79ea583a44bfd23c86a870eb4068839a4fe7ba060953 SHA512 996faeb28bf25fbd0d24a1172c81d4a6ad29cb521223c923eb59aed8bd510acb6d9af8bf2f1408f13d7074e8e9b0d5f76d439379ab7e2d436065b3edd94d871c WHIRLPOOL 849257052efb48ceb7a1632656c00ab5df4a0b20b9e01335d78f5a24a25b80acb0f5273f09d54c4b40e5367f3fc7dc509f663e66f89ea8c6d0bd3d0af8084810
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150730.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150730.ebuild
new file mode 100644
index 0000000..f0ce249
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150730.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-07-30_00-02-28/zip/netbeans-trunk-nightly-201507300002-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 02e2fcd..222f37f 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_p20150730 (30 Jul 2015)
+
+  30 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javadoc-9999_p20150730.ebuild:
+  updated to the latest sources
+
 *netbeans-javadoc-9999_p20150728 (28 Jul 2015)
 
   28 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index 2c3a781..cdc1147 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -41,6 +41,7 @@ DIST netbeans-trunk-nightly-201507160001-src.zip 208623275 SHA256 9c548527eb28a3
 DIST netbeans-trunk-nightly-201507200001-src.zip 208844011 SHA256 d913ef4e2aa53c81f799f9054b63f985be8273acbd4e73f6114c1ac9ac925413 SHA512 8bd91ec800079104c0bb74c79d7259722daf9d84d1119fdb768f25fe5acf6bc2833e4cebcb95ff015ed67d4a5d7c745e80faa88b8d66e241f03fab4c7136f407 WHIRLPOOL a6bf8042418478cf40773a6d4421e0570c26fe57bbe9d76e83e6d2b5fcb97dc364d6b164ea57cb69ed5a5063a783230404380cf9e5d8d5e88c62055ccfc28bd6
 DIST netbeans-trunk-nightly-201507270002-src.zip 208903918 SHA256 522afa33b0389ef48a5deb3c91ba3c4aa1ca4acf710e2c316479e6892aa3d39a SHA512 078b84e423f0769fb1a2c14bb092c50dd2f1901126b5f3c7b11700858c71b43230281799c248eb4198a22fad17f5a7c34baedd3aac241e2d07d91c72a1aad861 WHIRLPOOL ae082652979d1ba8f26a6001e6402f587809b2586406f93e42eb9b7d38e4216e290167888ab5d6836ff9a712d555cec66c9f54afea7ca6171dee6cf56c7c0fdb
 DIST netbeans-trunk-nightly-201507280002-src.zip 208905091 SHA256 502a75b45a6d7c2421fa6629cede99d70bb69b19287083ee9ed9cbcd9540343c SHA512 b94b76f709f931ecc1414eb80c1791bada942e7a6a7b2cebe4749453de1c17f929ba497b961a7ea9837057986a463f1d335dc7f2ab460f99c1fb168604d07196 WHIRLPOOL 119f4bb30844c9655760a23c0a48ddbc5abf32c07652165d508061b70f37861c123127735d14be01f506da65d072701514d5a4adb678fe8748f62762bcda6052
+DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae2846b93e0836ed96caddf2d425df5bab2a004b0417879a36e4dd3 SHA512 04e2e8f58102752a45b089cb70c62e6b920b5397cb427179fb042604eec4a78d6380341ab700e70b9190313ea5fc10fb94471a072fa8ad567e4d652b1fa2c3b6 WHIRLPOOL 153cd8da3506e0e3397a06b4341e90b2dc55170bb432a21d66bf425895deef5bf0611bdb181beefc29fd18648d60b827d9e453bca827c26305f55ffb01319f18
 EBUILD netbeans-javadoc-7.0.1.ebuild 5814 SHA256 68531c51838c95012830f5ae09e2386ea3179c2b31bfd5191f67993e3b3dbe2f SHA512 3bfe0ecc46f371d2553b031a5699229fb874dad1e94415635558b7d46b6764c31337d03444753e687b19a7c0976c68cb72007ccc82df7d1e5848a81f241f80c3 WHIRLPOOL 6571f7a73c262b3b67407840523b79eecc14bad9678cff05fb32a2811049158400870de51bbcef97ecb3f18f8ff59f965bdca8e788918d53822b92e2f20f75f5
 EBUILD netbeans-javadoc-7.1.2.ebuild 5855 SHA256 af28efb956ac3b7147e254ca3083dfaab11b84ea42e20677ebdd18aa29ff87e0 SHA512 ee06c552782170b51cfe70d603792b4240aef6064ba0a5074f394701a43285ed1e4030f539622c616be3175dab013e791c1a3a1193ad379193f5fa3e92eefa40 WHIRLPOOL dfcc63d6c9fcf094e2998ce1c08e29b4d4acbefbe9bea6498c2e28f84576f628da50164a1e0ab3ff5528720fe54cae71f2f5e6f84aedca5b639f13053464e6c1
 EBUILD netbeans-javadoc-7.2.ebuild 5805 SHA256 20d01deae745a7e8d84ffe55ca63ad74342bd8528c0dd15a20aac6570a1a83e3 SHA512 3947f1ab3efc236b8faa14736406ee3e537bbdbe377ea1bbd4f1eafa06a36d2863f8700dc7c84e6c8501abdf130a78e87ad6a0f52c5172bf0ab52f288617bc86 WHIRLPOOL 8301cce0679ed5f68a09e2e968ab2ba0955547f438758b042a04744539324fd79d83d853dfb8b48421f6dac616362cf1a9dd2a0e0ff8763dc2e12a470d16b95f
@@ -70,5 +71,6 @@ EBUILD netbeans-javadoc-9999_p20150716.ebuild 6234 SHA256 aba548a950327415f43096
 EBUILD netbeans-javadoc-9999_p20150720.ebuild 6234 SHA256 e95b71c3b5023733ac618f2c37ec49637cbe777959c42e5c04591608aa4f4877 SHA512 96e8b08f2f23fb4f7fde2998b786cba9f5e51041e3bd5aee17d5b3f8775abe781c4c903e8b82e8ef33a93e47d237a34c4d69c6090e8ca174a52c80996a22a5b1 WHIRLPOOL 073a47c75b5f81dcc0ac1767c502ea0b23727839475cfead985ca58c7d9d1b04ef78db4016be9ee5b1a902eefcae840cf94d8f7d6e262721bbc8189cb7ee5f4e
 EBUILD netbeans-javadoc-9999_p20150727.ebuild 6234 SHA256 8f7b74e7988100e5df19e5739f30bda40c43cb5909148bc2befec724548b88fc SHA512 2a2a1de7cdb57e5180b0161db4d9b86925418901c79b92c94cb859b3f464d4f0383fe326fef3031c932a2936897aa657dfeb9d9c28c172d8fa2567cd10fa4156 WHIRLPOOL 1a491e39339e92dde73faa2e29fadfa49166e7297b33b67ec1e439026b8817ff583c0afba639ee1617b2c0e7245aa47733f5799c23a44ff5eb07808c51c16f7e
 EBUILD netbeans-javadoc-9999_p20150728.ebuild 6234 SHA256 b332ce72f528179ed2376bf7c2067122c582d6e54531966efcec5f4d77dac790 SHA512 f58aa0e59a8ac7809fba2c5fc2ef7b02e03cfdbcfbe0a3ad16f966ebd071789a6577520a89bf24e4687409138a2612374ac69aae720285233a2373af4f342b59 WHIRLPOOL 00046ba80d80360ae8da7fa5c207f4488b3ea2c09fae5ebbfd6663cece8a913f3512a016a2c3b3ed90f21f2f593ecbbf592f5ee6b483841d22f1c79cffffcdc7
-MISC ChangeLog 173856 SHA256 cede4d46bde4d40c31263a4011e19f498491e668b1861f284c568dafd5db2214 SHA512 b759169b76afa9417009e5300aee00bd3856e6e1b1f464ee13187ef0a140c0c4af5e4705c8e099f4feefdd7803b3e176b6ab6b78512a03e0f701f796fecd5b66 WHIRLPOOL 877f1d575f3af2b2e02bf1a329ff1dcf799b5f05667428280f3da1d4a8aaf91c573a27cacdeeb53d918f55910094834966e0b408f559bf92eb270d08862c00a5
+EBUILD netbeans-javadoc-9999_p20150730.ebuild 6234 SHA256 0942cd98e72ce51fbe9c9271bd5eee2758da5209680ac383f3b9b8705ffd39c6 SHA512 c309e015422b5133e4eab29692b5c2a299f72d0602c5d3c1de15bf442fa2eb66eefa3b3f1c2656053d809552992893a004042c74c28e2fa4273b24ee3c7bcd14 WHIRLPOOL 02698f286e7bc743163d51d5fdc5a7209d67f14a31a78030ef1edc2db2924cb0c7b204c4b8ed9d6f5938c3f5168afefc00447cd0e453b6bad5f8c0f05782f365
+MISC ChangeLog 174032 SHA256 c6d2f7f9d5e2ec05332b1b28b7a6e21ccd2a209260eede8a5795fca712101070 SHA512 b3366d843ce64c45a9de21ede769d7966f26214a1fa9670ce3aa4e1da913f186cfa668ab7a1357161774161025bcf7dce23fc328c4f46e037d7fb2bbc3943faf WHIRLPOOL 880d1c1bbc6d47eda02b91f59566fa7cd1a44d63d879c2911c71cae90993e97aa168303fc03e472dafe150d8d0851eb1bd670438dce7346af9cfd9379151048e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150730.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150730.ebuild
new file mode 100644
index 0000000..20da833
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150730.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-07-30_00-02-28/zip/netbeans-trunk-nightly-201507300002-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 ef15d86..028f162 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_p20150730 (30 Jul 2015)
+
+  30 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javafx-9999_p20150730.ebuild:
+  updated to the latest sources
+
 *netbeans-javafx-9999_p20150728 (28 Jul 2015)
 
   28 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index bbe92ac..f855bc7 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -41,6 +41,7 @@ DIST netbeans-trunk-nightly-201507160001-src.zip 208623275 SHA256 9c548527eb28a3
 DIST netbeans-trunk-nightly-201507200001-src.zip 208844011 SHA256 d913ef4e2aa53c81f799f9054b63f985be8273acbd4e73f6114c1ac9ac925413 SHA512 8bd91ec800079104c0bb74c79d7259722daf9d84d1119fdb768f25fe5acf6bc2833e4cebcb95ff015ed67d4a5d7c745e80faa88b8d66e241f03fab4c7136f407 WHIRLPOOL a6bf8042418478cf40773a6d4421e0570c26fe57bbe9d76e83e6d2b5fcb97dc364d6b164ea57cb69ed5a5063a783230404380cf9e5d8d5e88c62055ccfc28bd6
 DIST netbeans-trunk-nightly-201507270002-src.zip 208903918 SHA256 522afa33b0389ef48a5deb3c91ba3c4aa1ca4acf710e2c316479e6892aa3d39a SHA512 078b84e423f0769fb1a2c14bb092c50dd2f1901126b5f3c7b11700858c71b43230281799c248eb4198a22fad17f5a7c34baedd3aac241e2d07d91c72a1aad861 WHIRLPOOL ae082652979d1ba8f26a6001e6402f587809b2586406f93e42eb9b7d38e4216e290167888ab5d6836ff9a712d555cec66c9f54afea7ca6171dee6cf56c7c0fdb
 DIST netbeans-trunk-nightly-201507280002-src.zip 208905091 SHA256 502a75b45a6d7c2421fa6629cede99d70bb69b19287083ee9ed9cbcd9540343c SHA512 b94b76f709f931ecc1414eb80c1791bada942e7a6a7b2cebe4749453de1c17f929ba497b961a7ea9837057986a463f1d335dc7f2ab460f99c1fb168604d07196 WHIRLPOOL 119f4bb30844c9655760a23c0a48ddbc5abf32c07652165d508061b70f37861c123127735d14be01f506da65d072701514d5a4adb678fe8748f62762bcda6052
+DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae2846b93e0836ed96caddf2d425df5bab2a004b0417879a36e4dd3 SHA512 04e2e8f58102752a45b089cb70c62e6b920b5397cb427179fb042604eec4a78d6380341ab700e70b9190313ea5fc10fb94471a072fa8ad567e4d652b1fa2c3b6 WHIRLPOOL 153cd8da3506e0e3397a06b4341e90b2dc55170bb432a21d66bf425895deef5bf0611bdb181beefc29fd18648d60b827d9e453bca827c26305f55ffb01319f18
 EBUILD netbeans-javafx-7.1.2.ebuild 3593 SHA256 76a29b37765000745794e6ae20c6b8528d8637507a257ffef3bef2ce648f05cc SHA512 a04618bda036e6652c7208f90a4dd91e07e75b85243580263f6ec846425ab907a87c318117990d4e8d9044bcd7a0ca8b63bc32bdd0d84e5373a10e67a77b79c0 WHIRLPOOL 11acad585f7315ae6b4edd53c764167567a948cb0e2037d95f2f4de34765909b71d095540c054f4cef3ba70224d294b42720536566e445cbdd06ebf2ad903841
 EBUILD netbeans-javafx-7.2.ebuild 3576 SHA256 3441b901a5074013351bc6c7ba6c424455e2affe52e448f2cfac0058c82345e2 SHA512 ee384d6e4ac767ade82b5d337d7a1c5d2b463c15a7596d91e1a850b37349f88d7867a0ffa11a118c48e2ed463f38dcfa791ec42b3fe85ea1e6bf7c4b27f9b073 WHIRLPOOL 15c7d20f2caa39c6cfcba2f846736754b049483f135ac90ced399672932a6a73467f0b4016550c3b2d8583be20d1467486f5652111893ec16111095a3e9c941c
 EBUILD netbeans-javafx-7.3.ebuild 4476 SHA256 9f268a852d45f37f9d22c3bb58d36be17f438e4b4cb5105d88ac4404731facb3 SHA512 3fa0e48e949d0df0a4404c04379623529f73ff15259f4164fddd10afb9faa046ceed16aac1a7b14728af89bf3a4ed7037638fb7e7e932a64cc71e84f7ecaa44a WHIRLPOOL 0395ca679fa41610c61dceb6ac018d7a76b62c08ca740de2fa2d98523f8e5f840a2d0a8c357b674d171841f93d980b536a671a1f12b5261d402c03b691ac6504
@@ -69,5 +70,6 @@ EBUILD netbeans-javafx-9999_p20150716.ebuild 4723 SHA256 715e41cf71b9d3d22a76fd0
 EBUILD netbeans-javafx-9999_p20150720.ebuild 4723 SHA256 a2264c5ce0e692c4fae8ef902bf16735d1f32ba7082a40ff44d60bd6d6f3f0ed SHA512 4bdacd879f547c7cc179e67aa405910a8437d019ac92feac2d269946b01f5241630b7fa188000ccef2700ed8f0c099e288abd881639e7e34bad4545f0c295c68 WHIRLPOOL f42f267d71d3c1bab3eb385f6e8ee73871f83ef0e64cb328cfc08a99e4f8b65522b4fa1b183ed92aee634d7182acad6ac0c64ec4a951e253b3334a8b70d84b1a
 EBUILD netbeans-javafx-9999_p20150727.ebuild 4723 SHA256 12523f9becc1ffbbbb42c86585d0b35f935256b93e38c762935a757e36cf1ccc SHA512 f3a347c42d7a5040101ac3f6bf24dd5193eb9505d152836b82a7532fd876de398f0bc12556d0f10ebce437bb0f7c57ab8ec5b0e10542de686f52a06bf3eefd6d WHIRLPOOL 0a3dfd96624850ea1f5e43d0a776bac05ef9a5be0e2111df90fed7665e09f46bc14d391aeb0ff082988c752eb0aa33f7aa0978777c7a8fc4404c9f51f6ffdf14
 EBUILD netbeans-javafx-9999_p20150728.ebuild 4723 SHA256 18f5104d26209089ec53c5c6ea3aa5da3b1435db0b12ffc686e0128c5f2f5fd3 SHA512 501b61d8142f58daf359cae9e8ab4d610b06ec4a8e5a0b6876c41b36ed9e689b4cfe8de4a1b18e4fca7071a31c8231f9d3e7913f0d0dfe8119d44e60304e051d WHIRLPOOL f2e14fe995c4858cd9b1c7979d7a30c4bacc0ed15d2abdba6b52c772239e74571e0109a8c04734215c006334b8be90cfe2d660e31058344db94dfcd0377a7b66
-MISC ChangeLog 158349 SHA256 fadb556b4ce0032f3acf8808fa0c7cf73c0f9d44d35a4390c04269a52ba3c8f8 SHA512 b37c63a11fc902debf2df43033eaf3a5f0d35543ef656bb2d6a78afaf75941026b876025fb6bba4796bac8b0d9e708f59d00a0e671927da45ad0215aef01e9b0 WHIRLPOOL 22da03f249fc37b2e4a0a131ea6d6e3960b86cc9db0cf880f50b1fc3d9ee30f1275ac3a5dace7f4b7296b538c7c49c5fa10e2ce58bc4b3c1d3aafe38e26a945b
+EBUILD netbeans-javafx-9999_p20150730.ebuild 4723 SHA256 42aff9ca84192bf7713b7c1cfc295f11e264772596ff85afcb966f0e3d912c24 SHA512 d7c398a361fea8834dde4824e952bb772b97b71bfa135abbad030e941774c30fe5276468c2f822ac255b6d3c5992d76490ec0409a1adcba47f842948b21e7404 WHIRLPOOL a89cad33b2fa11e5265a413ca4de49ac7b064ee097a8aafcaba78d9be40ec43b16bba3984f65a40b4d0fffa5508424b84d6065331b35787c5f393a6c050b4eea
+MISC ChangeLog 158523 SHA256 a74f70ac29169adeb4b6aa0def08d9869d064f9fe17b14dad0a24685f7ca5f9d SHA512 1adb8ecadf942c92ca89194212cb4dc1307a6109c07cf11dd3d45cb0a2ad3f8212befe05795de66fd5cab166c291dabf33ff90538d9290460c231980f72b0975 WHIRLPOOL 05564758b09809765ac9f5dfeb021f52c17c1dd9ac4908c4787072631a6a093595cb8713f525de3faa2a88b8422a35ca22f60644c1878bc114aabebe4b793525
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150730.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150730.ebuild
new file mode 100644
index 0000000..dd165dd
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150730.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-07-30_00-02-28/zip/netbeans-trunk-nightly-201507300002-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 eca4042..f23e8cd 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_p20150730 (30 Jul 2015)
+
+  30 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-mobility-9999_p20150730.ebuild:
+  updated to the latest sources
+
 *netbeans-mobility-9999_p20150728 (28 Jul 2015)
 
   28 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index e952007..3e79089 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -44,6 +44,7 @@ DIST netbeans-trunk-nightly-201507160001-src.zip 208623275 SHA256 9c548527eb28a3
 DIST netbeans-trunk-nightly-201507200001-src.zip 208844011 SHA256 d913ef4e2aa53c81f799f9054b63f985be8273acbd4e73f6114c1ac9ac925413 SHA512 8bd91ec800079104c0bb74c79d7259722daf9d84d1119fdb768f25fe5acf6bc2833e4cebcb95ff015ed67d4a5d7c745e80faa88b8d66e241f03fab4c7136f407 WHIRLPOOL a6bf8042418478cf40773a6d4421e0570c26fe57bbe9d76e83e6d2b5fcb97dc364d6b164ea57cb69ed5a5063a783230404380cf9e5d8d5e88c62055ccfc28bd6
 DIST netbeans-trunk-nightly-201507270002-src.zip 208903918 SHA256 522afa33b0389ef48a5deb3c91ba3c4aa1ca4acf710e2c316479e6892aa3d39a SHA512 078b84e423f0769fb1a2c14bb092c50dd2f1901126b5f3c7b11700858c71b43230281799c248eb4198a22fad17f5a7c34baedd3aac241e2d07d91c72a1aad861 WHIRLPOOL ae082652979d1ba8f26a6001e6402f587809b2586406f93e42eb9b7d38e4216e290167888ab5d6836ff9a712d555cec66c9f54afea7ca6171dee6cf56c7c0fdb
 DIST netbeans-trunk-nightly-201507280002-src.zip 208905091 SHA256 502a75b45a6d7c2421fa6629cede99d70bb69b19287083ee9ed9cbcd9540343c SHA512 b94b76f709f931ecc1414eb80c1791bada942e7a6a7b2cebe4749453de1c17f929ba497b961a7ea9837057986a463f1d335dc7f2ab460f99c1fb168604d07196 WHIRLPOOL 119f4bb30844c9655760a23c0a48ddbc5abf32c07652165d508061b70f37861c123127735d14be01f506da65d072701514d5a4adb678fe8748f62762bcda6052
+DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae2846b93e0836ed96caddf2d425df5bab2a004b0417879a36e4dd3 SHA512 04e2e8f58102752a45b089cb70c62e6b920b5397cb427179fb042604eec4a78d6380341ab700e70b9190313ea5fc10fb94471a072fa8ad567e4d652b1fa2c3b6 WHIRLPOOL 153cd8da3506e0e3397a06b4341e90b2dc55170bb432a21d66bf425895deef5bf0611bdb181beefc29fd18648d60b827d9e453bca827c26305f55ffb01319f18
 EBUILD netbeans-mobility-7.0.1.ebuild 8655 SHA256 992e214ff2926e2f0db623d96b717bf8f8e4ceb47e96e69b3c6b8f67d6a8d130 SHA512 d51bc003f4b637cfe71c9f49a96427e535596542ac195a9621bc4f92c04a6f720a87fac6eb267732f869ba105f263d9d36f848b54a89c734b6a68a78ed323808 WHIRLPOOL 515da7153b12c3b5779cfad16e3800b4d26ba4b174027d9a7b06a26754fad065751c7eda137ba6199315d024a322d59e7ea39a1b2f4244ea75b30770ac505791
 EBUILD netbeans-mobility-7.1.2.ebuild 7543 SHA256 bb3f1245ad68133798fa507f06dd1ffbc1d55f6ba38f4cccc29ff0240e5b5f22 SHA512 41f663977a0716c5449db597d5f90054717ff3579a9137a910d1943d3e0b39379c34c0d9aa9c98d231037a042074c8ecf5fc62c018cd7cd5e8680734ff854c51 WHIRLPOOL c3c6feb41ce3df356f617ca80530673ac653cdf50da0aead00518854d0850d6420333529aa6591e15ddd4053249191fcb47100c5f39a804352722e54f802bae4
 EBUILD netbeans-mobility-7.2.ebuild 6571 SHA256 58af97ca9a6adc56fa6abe91777a1ac35a3a9b7d68af1e73c23a45dc5631abb2 SHA512 ac42c3a3daa7d55c9c13d1c99dd6880d5d99741f80cfceb683da27e30c70d6228d9434571f2405d0dbbf27d2203e3f877da6347794b07b98331edd1631d3a69d WHIRLPOOL 5a6af3cbcd08180dcdf708a038f3119faacb9c78532b4bb1945c7260fb0a8232af57745e41a73311fafffe185c969e0c88ac34970caab7708313f53417695374
@@ -73,5 +74,6 @@ EBUILD netbeans-mobility-9999_p20150716.ebuild 4418 SHA256 b49139ddfef1e74bfcd73
 EBUILD netbeans-mobility-9999_p20150720.ebuild 4418 SHA256 07916e46805042f524506c4b9d8194384470e66cd877f19b44c832cc4b9ab7fa SHA512 4fe6fabdab8d70404816b2f216ecef1e8a270372134affb77e92a083df78ed5aa21961d790a6ffac5f2d389c30eb4f0d6d774280fa380ee3a525bce166f302ed WHIRLPOOL ede40a18383ae49bde0c79279e79711b377974e855738230f5dc63776797dda9419872fbe9672beff09b1f4af80a260ad379e77c3c5333e86c39a4ae84a73dbc
 EBUILD netbeans-mobility-9999_p20150727.ebuild 4418 SHA256 a9db20c3f3c34671f1d942f184e28c5162f8607bb28dafc13dcd8971791a672b SHA512 628e99da220515b0527f2f2bd0553df35f03b38d85089d67b774465c55461ce4ab109cfea464573d6d16e75505d0b62245df23b30380958a0da335ef5885c698 WHIRLPOOL c14cae94be28a95127b6fe516aefcf5b6d00fae9978dbf7a2bf760861a9a155d637b7ced0a9ca8307c6858737a59d4953baf4f807bef92a69762ee82e3240072
 EBUILD netbeans-mobility-9999_p20150728.ebuild 4418 SHA256 007145639d8dbdc39a9aed1e00c4b735cf87f56cc0fa540502a5f2001962324d SHA512 59424251379dc398c32f4da7a10ff09b05801c2ba92100e886c01abda5bbc086606d396008fa5d679feb9504ccc2fdc8a636836d87d7baf721b34d9dc55cdbdd WHIRLPOOL c01af890a60af0d92eb765e07175f4004066b972b0f0d7acbf789827f77d6b1ae03d6bd7fb0685f2c73207111e6acaa6851eeb34d59efb5adaf5444a2bf71486
-MISC ChangeLog 176371 SHA256 ae061fb325459596b61f3ebc25305bda5c5c284b80dc9bc6386ec26472432d8e SHA512 8e162cf22cf4919728d1ce03e0b01511bea846358c40d8467fe72a2d1a7048bec02327a5aa128cbe164f20c416dc47a059b42d822a2092fc5cf3bb2719f8d58e WHIRLPOOL bf0ccac5477416883c315ce13a1fa6afbab9ead12609bcd284868f191c77c46f575f0224d141af41ba7adb66a7121323c4c3c5d51e3535fffec7fbe1c6a36d8f
+EBUILD netbeans-mobility-9999_p20150730.ebuild 4418 SHA256 90ee43a5d568d434912f06248dc2d0046d72a82d6c3cc07eb1c3c2bd481b68fb SHA512 ef10f2482ec138aba5e55f517b7b35e479f5ecbc7459590a2138923f3cc83f5c0e1d29a765669f5d4babe11bca397bb758f01ed782a21c173eba00c386d145ca WHIRLPOOL 34c7a476cd5160f5571780c3904f8dc55df99d331ae80fbe6ce341dec8e605d7b88396feff00455d32925e8e43d52922feb552d17b92271fb9a6f3f763364fd9
+MISC ChangeLog 176549 SHA256 4e737a7b6ac732432a8ea28d3daa2cfe696140a04f3560e57e2f4966f5d423aa SHA512 76d5c74594ccfdd0e04a2190e5c984aa489c2e0c3ad5be888b39f248de6d24511497a929ab6a8fa0a3c8f2dde5fa75cd8c6824a572e81e26567ffd583196d23d WHIRLPOOL c65e19d614899cf26e7c9d75f9197a5529306f9862cf993c1d8e289810959afd64d4b4d51367a08de9915c9bd61200833b4c28ee3d7d26d42bb9cf37bf459242
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150730.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150730.ebuild
new file mode 100644
index 0000000..634eee0
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150730.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-07-30_00-02-28/zip/netbeans-trunk-nightly-201507300002-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 6eafe21..7c12bef 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_p20150730 (30 Jul 2015)
+
+  30 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-nb-9999_p20150730.ebuild:
+  updated to the latest sources
+
 *netbeans-nb-9999_p20150728 (28 Jul 2015)
 
   28 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 5d62152..28011ec 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -43,6 +43,7 @@ DIST netbeans-trunk-nightly-201507160001-src.zip 208623275 SHA256 9c548527eb28a3
 DIST netbeans-trunk-nightly-201507200001-src.zip 208844011 SHA256 d913ef4e2aa53c81f799f9054b63f985be8273acbd4e73f6114c1ac9ac925413 SHA512 8bd91ec800079104c0bb74c79d7259722daf9d84d1119fdb768f25fe5acf6bc2833e4cebcb95ff015ed67d4a5d7c745e80faa88b8d66e241f03fab4c7136f407 WHIRLPOOL a6bf8042418478cf40773a6d4421e0570c26fe57bbe9d76e83e6d2b5fcb97dc364d6b164ea57cb69ed5a5063a783230404380cf9e5d8d5e88c62055ccfc28bd6
 DIST netbeans-trunk-nightly-201507270002-src.zip 208903918 SHA256 522afa33b0389ef48a5deb3c91ba3c4aa1ca4acf710e2c316479e6892aa3d39a SHA512 078b84e423f0769fb1a2c14bb092c50dd2f1901126b5f3c7b11700858c71b43230281799c248eb4198a22fad17f5a7c34baedd3aac241e2d07d91c72a1aad861 WHIRLPOOL ae082652979d1ba8f26a6001e6402f587809b2586406f93e42eb9b7d38e4216e290167888ab5d6836ff9a712d555cec66c9f54afea7ca6171dee6cf56c7c0fdb
 DIST netbeans-trunk-nightly-201507280002-src.zip 208905091 SHA256 502a75b45a6d7c2421fa6629cede99d70bb69b19287083ee9ed9cbcd9540343c SHA512 b94b76f709f931ecc1414eb80c1791bada942e7a6a7b2cebe4749453de1c17f929ba497b961a7ea9837057986a463f1d335dc7f2ab460f99c1fb168604d07196 WHIRLPOOL 119f4bb30844c9655760a23c0a48ddbc5abf32c07652165d508061b70f37861c123127735d14be01f506da65d072701514d5a4adb678fe8748f62762bcda6052
+DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae2846b93e0836ed96caddf2d425df5bab2a004b0417879a36e4dd3 SHA512 04e2e8f58102752a45b089cb70c62e6b920b5397cb427179fb042604eec4a78d6380341ab700e70b9190313ea5fc10fb94471a072fa8ad567e4d652b1fa2c3b6 WHIRLPOOL 153cd8da3506e0e3397a06b4341e90b2dc55170bb432a21d66bf425895deef5bf0611bdb181beefc29fd18648d60b827d9e453bca827c26305f55ffb01319f18
 EBUILD netbeans-nb-7.0.1.ebuild 5106 SHA256 3c68751bf5face5f80e2d7dcedb7466e69343f2d06c0a4dd30a722a987fbb207 SHA512 d79343e0ca8655b074a8f96b9898e4bc0123d60e346602ba8d7a239597993cadb33a036b43862ef1a39630e4f0ba7e79892d8b2eed8b30535f12a5d0b9f4b581 WHIRLPOOL 9f2cd645e34fbcfa8f0059fbda4f355f411aaff7966121360dfe5b3c769966c5a4586bbc04142b279e3a3fa323bc4b51a6349cf3eafe89063db44fcae58ef119
 EBUILD netbeans-nb-7.1.2.ebuild 4977 SHA256 265f9e4a9490937a65632ddaef48e3a731154b07b9ee5f9536a991181fc2fcbd SHA512 65d1065993dba3b1fece428beb1b75f17d89eddb08aacd2cbf5ecd3ee5ca844e75e9100c324ecdeeed5b138b1da4ab8cd5a4598e584a17545ffc2c52ea763779 WHIRLPOOL 9b63f2b5671bd38d24ff6b280de37fc19c74170bf80c22818da5e8af415a85211c6cfcf690e68d7697c41a1b749a3c7b48ec9b362782df140856f892d381e360
 EBUILD netbeans-nb-7.2.ebuild 4960 SHA256 bef2020a6e0d722ca77c0931b9a06014cedc822f14a21d8d916200e358dcdfb8 SHA512 988d902bbef52e123b5800e56049210d69c4dd6dbeca80396aeac58c70d90b76da65b338e664368ea3f9a3973b7b94ffd0a47a77b01be53452c2cc04c4067442 WHIRLPOOL a27fa8a1a066499a3fc2cb82e955b6b18b1725889b088ea1e94528cde3ec58f3b46c1e757fa597af6ad4ba96218dacfacff9561799f46add316e233d46127d28
@@ -72,5 +73,6 @@ EBUILD netbeans-nb-9999_p20150716.ebuild 5003 SHA256 b00228b46ca63dbcb93a7c3348c
 EBUILD netbeans-nb-9999_p20150720.ebuild 5003 SHA256 e188ad5aa924579f2e8b20c5642973c70c76898b8e2ff6ada9dfdc6ffd09cd8b SHA512 3f5c17afef6888e92a1f52fdd90fff1354e734dc26e4ca44199fd2c9bae85df2ca56196bbaa9e774015967cbb755ea1e1a1b096a1060e26de17bc35eea34b5e2 WHIRLPOOL 165f7045b5acff4a70ddc2f8965dbbd33d022e9597bf035ac9db5921934afd10f26d2c61b6ea84812287785439ea46d51220b6cd5cf732ff45e1e25c70be3513
 EBUILD netbeans-nb-9999_p20150727.ebuild 5003 SHA256 58b7035c69061b34d640b584a8e5858558cc9a95775161c33a0a0f1279869d0b SHA512 4b2c7807d9e50fd72ff7f05c523e15d15cd0542dbc3f7ca02c994b37176befa45436dd55b538b92fd3f77a93b298764d7d81077313d4374c6f8f664eb733a9a0 WHIRLPOOL b5423e11ecb6af13a5a9e3a84be028623a928f364dd1d74ee8d43ae7a2a796b99870f388bcd8d741d73396b78ccf1d7d6f6c57df3d33df0b0ccca3decdadaf84
 EBUILD netbeans-nb-9999_p20150728.ebuild 5003 SHA256 0ec5d396fa06208ed27c7d54c22c5c165fa64b489d464727d58b9634c04845a8 SHA512 c0434601ed6b72a22cd64864d35afb19e6a14cf20627c943d6c35912b831d5f9cf6eb5ed829a24facd186d44134178df80d9123f4fe62ec0bd373abe0ae79274 WHIRLPOOL 024018c5f6e338d5dddbbee3b0a0a2c026dd5713791c76526da8356ef51819b8063ce5a7ed2e63ef72346fc8115ff9befa4a96a5aa72b28002ce175e4366a3ed
-MISC ChangeLog 164637 SHA256 35e2a2aa5470d731a656854e5ee22ab896c22e20036e40e8ffca5a74eade05f3 SHA512 3858cba50847e33586a5919fb53c1f3c8aff39a8618a85ce9486cdb0b8d7d58efe0ce39f4dd386acbaa062c83a6d33c80a3c28b1ca1aeb0638088d3972495240 WHIRLPOOL 38e1480b7a20c9ecf0a6388a21da9a7f800e5e64f22d819c77cc21cf9ec3d7aeb38c4a8651a3cff2b5180181b5b5cea02c88b98cb31f0161419bca69557c391a
+EBUILD netbeans-nb-9999_p20150730.ebuild 5003 SHA256 2cd87115aa8d82423528d11c8da122d7a1910749a0d3eed508a88d63ffa446e5 SHA512 41c00ab01418dd96618dccb8980af262bca11313641ccadc8b84f652c12a6dd6d79589cff2be7d92eafc0d6a840dc8baa6ea21ac8a1c414edf2287ca09f19ede WHIRLPOOL 27f7df29330ef5dd8a1c9cabb2b04128ead1814ee5df34b03fb2db130b3a86136a810b00396a543a4b9d01f51657a3041dddaa8c1dc544d6d1f0e93446021c36
+MISC ChangeLog 164803 SHA256 150f17787f5f3e44f64abe741a424fd8a00e5e4e60bff90b1473fb580b101f6c SHA512 617b14fcee847a555711d86a322f8392e2de4e741097451501704794b662ae6014eedd5204ac631e2fa957237b2511fd72a24bbc376f61bee68dbca360af4443 WHIRLPOOL 819fb9076feee0784b128b3b34db9627f8efed79ba41fdd12dacdaa759273ba1ae0e115f01853172f8897ec756bc0a41ef6ffdf53519141fea706350bc1438c1
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20150730.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20150730.ebuild
new file mode 100644
index 0000000..57111fa
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20150730.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-07-30_00-02-28/zip/netbeans-trunk-nightly-201507300002-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 1ffdb43..9013a4d 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_p20150730 (30 Jul 2015)
+
+  30 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-php-9999_p20150730.ebuild:
+  updated to the latest sources
+
 *netbeans-php-9999_p20150728 (28 Jul 2015)
 
   28 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index f0a010e..d55516d 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -47,6 +47,7 @@ DIST netbeans-trunk-nightly-201507160001-src.zip 208623275 SHA256 9c548527eb28a3
 DIST netbeans-trunk-nightly-201507200001-src.zip 208844011 SHA256 d913ef4e2aa53c81f799f9054b63f985be8273acbd4e73f6114c1ac9ac925413 SHA512 8bd91ec800079104c0bb74c79d7259722daf9d84d1119fdb768f25fe5acf6bc2833e4cebcb95ff015ed67d4a5d7c745e80faa88b8d66e241f03fab4c7136f407 WHIRLPOOL a6bf8042418478cf40773a6d4421e0570c26fe57bbe9d76e83e6d2b5fcb97dc364d6b164ea57cb69ed5a5063a783230404380cf9e5d8d5e88c62055ccfc28bd6
 DIST netbeans-trunk-nightly-201507270002-src.zip 208903918 SHA256 522afa33b0389ef48a5deb3c91ba3c4aa1ca4acf710e2c316479e6892aa3d39a SHA512 078b84e423f0769fb1a2c14bb092c50dd2f1901126b5f3c7b11700858c71b43230281799c248eb4198a22fad17f5a7c34baedd3aac241e2d07d91c72a1aad861 WHIRLPOOL ae082652979d1ba8f26a6001e6402f587809b2586406f93e42eb9b7d38e4216e290167888ab5d6836ff9a712d555cec66c9f54afea7ca6171dee6cf56c7c0fdb
 DIST netbeans-trunk-nightly-201507280002-src.zip 208905091 SHA256 502a75b45a6d7c2421fa6629cede99d70bb69b19287083ee9ed9cbcd9540343c SHA512 b94b76f709f931ecc1414eb80c1791bada942e7a6a7b2cebe4749453de1c17f929ba497b961a7ea9837057986a463f1d335dc7f2ab460f99c1fb168604d07196 WHIRLPOOL 119f4bb30844c9655760a23c0a48ddbc5abf32c07652165d508061b70f37861c123127735d14be01f506da65d072701514d5a4adb678fe8748f62762bcda6052
+DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae2846b93e0836ed96caddf2d425df5bab2a004b0417879a36e4dd3 SHA512 04e2e8f58102752a45b089cb70c62e6b920b5397cb427179fb042604eec4a78d6380341ab700e70b9190313ea5fc10fb94471a072fa8ad567e4d652b1fa2c3b6 WHIRLPOOL 153cd8da3506e0e3397a06b4341e90b2dc55170bb432a21d66bf425895deef5bf0611bdb181beefc29fd18648d60b827d9e453bca827c26305f55ffb01319f18
 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
@@ -76,5 +77,6 @@ EBUILD netbeans-php-9999_p20150716.ebuild 4423 SHA256 1f541bb5a0df7c8189d15dae5a
 EBUILD netbeans-php-9999_p20150720.ebuild 4423 SHA256 4aa288a1604921bcc28d5ab311ff5ff5d4751db9cb80e109d3059452213aca02 SHA512 8ede41c7347eed27552e08e23045014136be148f14657e1c227fa2f6ef547fcdf7354b1d062e78f680b87ecfb64165fc98915a819bc6de77e8d1b3b309efbda8 WHIRLPOOL 42408f0a12884826dddfcbffe85224a035fbda3c6bd176b568f2e7392414a885c18663867c637f06ee8b715e9e9f82c20faa6f466374860e45d556cb5c01c1cf
 EBUILD netbeans-php-9999_p20150727.ebuild 4423 SHA256 450bb08288ad87c1a2642988172baca403d7506e376b8c02654a0329c4e1309f SHA512 13d373ea8ba686bea9e95447006f106554063579ae6734e151b4d0bef285d40aa7b4e69da3cb6592d64de6c5743b27afd6b612be22879b8320da35bc59f02019 WHIRLPOOL d85908e748eea560c3e54eecedd91cf986db16af25293162635c94d6f8fa049353bc80a6c37e7d691b52b97abcc5a9f4823fed694c036f8c28b935445e5c2b2f
 EBUILD netbeans-php-9999_p20150728.ebuild 4423 SHA256 b62c543abf980d2c71170057e19797778210b709ae02b30bb91e2310f6e6bda2 SHA512 e3a9909aa3395e3d11a03be42b2e6ebcf69e6041c861897af83f2f419b16e60800e0f83c56053692a0c8fe199f45122e798059c9ec60c8729fbc138feadd2d0f WHIRLPOOL be12752ec1254f389ecd786b28823885a40570ed68f91e0da813baf969375c8e8e066ff67a45fac30a6c1128ec223628b302a6b04413d74ec4cd9ee164716198
-MISC ChangeLog 164469 SHA256 a85cdb0f0c921f848d1dcedffcddffe55562047bbbff3a969a08d4d94686f27d SHA512 7f75a93b9f241fb9656f4bd6513e4bd80e82441c0506f1868b54f6ecb8a2ec971b48a719beb4528ccfc0a55b2b0784ee8fe6e67885196c2df3b1041bb46dbff4 WHIRLPOOL 02176a469a4e140c14f8c875e745590a259b554e78e3a3f10570ffa2ce4dcd727a41b789c5f147e163db16f3ef3bc258afb1928582de19dd23a1b926bcfe6de4
+EBUILD netbeans-php-9999_p20150730.ebuild 4423 SHA256 529764502cff24b10ec331e0ec36caef96d6bc14c1ed80cc4e45bd32f6065ecc SHA512 bc9b0e132357a2048b6c8a7c7b8a277dd3d56f0e07ed78aac740994318dfbb2eb1345a2dceb7396eec850a15c50939a86bcacabab0c829f29ad37ebe8c526aa5 WHIRLPOOL f22577e2296949e14861b089dc506080641f933a934e54ba8e2e569ce7afbd1f9fe76f7a4a98c1077cd0dc30df2858eeda44fe916c493842f5efae442912ba96
+MISC ChangeLog 164637 SHA256 24df76cb374d7a5f0a6ce5ee63dc2a2e267f62f2641f3ba1d6c0392924411e03 SHA512 c16ee9fe40260b41d951d2980c4b732b30682e70129ac56503ff550ee41a2e3a0653dc70acbc061fb51bba4b3fa390f0c82688ee7c18377fc307babd04dc59e2 WHIRLPOOL c76c6b3aa42716254dfbf8797a1089345ded9d56628819f9beb58b81ac710a21b382118733c51270d7351e7d2b3b367dde045d562e5184e0f5ca519686f9f79f
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20150730.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20150730.ebuild
new file mode 100644
index 0000000..8c541f8
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20150730.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-07-30_00-02-28/zip/netbeans-trunk-nightly-201507300002-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 9b923fa..18eb1b8 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_p20150730 (30 Jul 2015)
+
+  30 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-platform-9999_p20150730.ebuild:
+  updated to the latest sources
+
 *netbeans-platform-9999_p20150728 (28 Jul 2015)
 
   28 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index f05d5e9..dc163f4 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -61,6 +61,7 @@ DIST netbeans-trunk-nightly-201507160001-src.zip 208623275 SHA256 9c548527eb28a3
 DIST netbeans-trunk-nightly-201507200001-src.zip 208844011 SHA256 d913ef4e2aa53c81f799f9054b63f985be8273acbd4e73f6114c1ac9ac925413 SHA512 8bd91ec800079104c0bb74c79d7259722daf9d84d1119fdb768f25fe5acf6bc2833e4cebcb95ff015ed67d4a5d7c745e80faa88b8d66e241f03fab4c7136f407 WHIRLPOOL a6bf8042418478cf40773a6d4421e0570c26fe57bbe9d76e83e6d2b5fcb97dc364d6b164ea57cb69ed5a5063a783230404380cf9e5d8d5e88c62055ccfc28bd6
 DIST netbeans-trunk-nightly-201507270002-src.zip 208903918 SHA256 522afa33b0389ef48a5deb3c91ba3c4aa1ca4acf710e2c316479e6892aa3d39a SHA512 078b84e423f0769fb1a2c14bb092c50dd2f1901126b5f3c7b11700858c71b43230281799c248eb4198a22fad17f5a7c34baedd3aac241e2d07d91c72a1aad861 WHIRLPOOL ae082652979d1ba8f26a6001e6402f587809b2586406f93e42eb9b7d38e4216e290167888ab5d6836ff9a712d555cec66c9f54afea7ca6171dee6cf56c7c0fdb
 DIST netbeans-trunk-nightly-201507280002-src.zip 208905091 SHA256 502a75b45a6d7c2421fa6629cede99d70bb69b19287083ee9ed9cbcd9540343c SHA512 b94b76f709f931ecc1414eb80c1791bada942e7a6a7b2cebe4749453de1c17f929ba497b961a7ea9837057986a463f1d335dc7f2ab460f99c1fb168604d07196 WHIRLPOOL 119f4bb30844c9655760a23c0a48ddbc5abf32c07652165d508061b70f37861c123127735d14be01f506da65d072701514d5a4adb678fe8748f62762bcda6052
+DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae2846b93e0836ed96caddf2d425df5bab2a004b0417879a36e4dd3 SHA512 04e2e8f58102752a45b089cb70c62e6b920b5397cb427179fb042604eec4a78d6380341ab700e70b9190313ea5fc10fb94471a072fa8ad567e4d652b1fa2c3b6 WHIRLPOOL 153cd8da3506e0e3397a06b4341e90b2dc55170bb432a21d66bf425895deef5bf0611bdb181beefc29fd18648d60b827d9e453bca827c26305f55ffb01319f18
 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
@@ -90,5 +91,6 @@ EBUILD netbeans-platform-9999_p20150716.ebuild 9244 SHA256 30af9582164db48f527ef
 EBUILD netbeans-platform-9999_p20150720.ebuild 9244 SHA256 6329530818769a03c46d45d4671e551288d0cb7fe01d70b75d91c229bd86f275 SHA512 3f949af202ff0eef4e469bdc1ac5774589349bee88c8230fa652aee7970ebed3b9f3ef99028da2b1b525ceca940bb89146d19addefe07145213b47544de3cdb4 WHIRLPOOL c93c2009d3571f0f4c547c5bd9d95d6084263ebf56132a2122ed4737be195abd2eedea8df76d51b2e134b5ebb9eac256065f17fc3d81be2e86168730ae1de9dc
 EBUILD netbeans-platform-9999_p20150727.ebuild 9244 SHA256 63397251acbd1137bb08bf2fabc2b6760a6b5e9e412f5bf80fc977e235030e38 SHA512 51e7814845e00af407fd26971c0486d3efc40d2a0312ac5736d63587529022f9b75a4b4d1c3a220c8e715259e9e11a2ffa12411527236c28363c9ca51aa107b1 WHIRLPOOL 07302e7582831a5708adefb3e54756e4c239377d88702c47978523f9982c1ded922013a9a705b34a5c4c360e71d9dc884c5fe36b5a9e7f4a21fa5bb4a43863d2
 EBUILD netbeans-platform-9999_p20150728.ebuild 9244 SHA256 e0a5027ea47218dd0892ae0f98c42ae2cf76af65c391e5fb53670fa2bf9bd09e SHA512 6ee37adae01eae7dab0c7c082a3ed4634dd12102b2d6c405eab7d1fdfc4b838e78489cbe0c0b67fc81dd44a48c37ad22df3a65f6f93df9294f786209d5f60135 WHIRLPOOL f01c821be3932e8e664d1bb39a054c1300d83335adfb095762f04f2ffd5dc3fc07aa6ebc41b15506359f2d4b2314ceab58f13da023031f841237357ef32633f4
-MISC ChangeLog 176967 SHA256 e94dd084775cf034868140d91f6eb5dc19e42758a051f0eae4976a5b6c8015fa SHA512 8c46cc4e43d600ebe3b48258e8f21b7d312989ee8b92bb060312a61b6da81cdc5c638649bf5792daba4ad23d119a114afaef2832e7dab02a0b993e04dd6ce74e WHIRLPOOL bac08da933663a64e1aeed21af3a8ef7d2881668faf91706f3ad36af349eb6188204b570c69b734306ad59c0c461c8fae91b554b063a7f132cf7a69895bd2cdf
+EBUILD netbeans-platform-9999_p20150730.ebuild 9244 SHA256 4c7b1a2af829ad060267af4a62f1b5ac8335bd94ae876b6fe097b67b4be6e833 SHA512 080fa5cb0e3cb5be3f8f163df35cdef24a70a89d9e2b768d1cb3d487d1861e8a0ab0c7ad19291e10aa01b2faa53e7ab7ca95ecf1b133f715b5a7aa59aaac97c8 WHIRLPOOL 78514736f031a22efe2fbb059e7f928485ade6a175089e95bcae9f57bdb50fd2fc4930568947061c4b6a8dccf938f68beb3c4cdc2729298f2e95ec6c4c7467b3
+MISC ChangeLog 177145 SHA256 63a6bceeb9e4791b10acb223d74096400bdb52fbc1a4858ad76df9f17d3d2b41 SHA512 902fa29d60160a54ea4a3658ff21630fbff89e5d2fdc46d2e33b171d101e0dcac8bc710c4dea4113497df7bcde79dfa32e450f183ef2337196951d7d68ceeff1 WHIRLPOOL 5501dfc5459481711ddd041c6e088da44cf1c8ac308901f32f1c723641edb23b7de1787b0cda1d9b44f14bcc95df473c47e24cd3014b06b8bd5cac350d07d729
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20150730.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20150730.ebuild
new file mode 100644
index 0000000..5d51001
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20150730.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-07-30_00-02-28/zip/netbeans-trunk-nightly-201507300002-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 1d6ffd3..0769ebc 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_p20150730 (30 Jul 2015)
+
+  30 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-profiler-9999_p20150730.ebuild:
+  updated to the latest sources
+
 *netbeans-profiler-9999_p20150728 (28 Jul 2015)
 
   28 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 02898f3..19da543 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201507160001-src.zip 208623275 SHA256 9c548527eb28a3
 DIST netbeans-trunk-nightly-201507200001-src.zip 208844011 SHA256 d913ef4e2aa53c81f799f9054b63f985be8273acbd4e73f6114c1ac9ac925413 SHA512 8bd91ec800079104c0bb74c79d7259722daf9d84d1119fdb768f25fe5acf6bc2833e4cebcb95ff015ed67d4a5d7c745e80faa88b8d66e241f03fab4c7136f407 WHIRLPOOL a6bf8042418478cf40773a6d4421e0570c26fe57bbe9d76e83e6d2b5fcb97dc364d6b164ea57cb69ed5a5063a783230404380cf9e5d8d5e88c62055ccfc28bd6
 DIST netbeans-trunk-nightly-201507270002-src.zip 208903918 SHA256 522afa33b0389ef48a5deb3c91ba3c4aa1ca4acf710e2c316479e6892aa3d39a SHA512 078b84e423f0769fb1a2c14bb092c50dd2f1901126b5f3c7b11700858c71b43230281799c248eb4198a22fad17f5a7c34baedd3aac241e2d07d91c72a1aad861 WHIRLPOOL ae082652979d1ba8f26a6001e6402f587809b2586406f93e42eb9b7d38e4216e290167888ab5d6836ff9a712d555cec66c9f54afea7ca6171dee6cf56c7c0fdb
 DIST netbeans-trunk-nightly-201507280002-src.zip 208905091 SHA256 502a75b45a6d7c2421fa6629cede99d70bb69b19287083ee9ed9cbcd9540343c SHA512 b94b76f709f931ecc1414eb80c1791bada942e7a6a7b2cebe4749453de1c17f929ba497b961a7ea9837057986a463f1d335dc7f2ab460f99c1fb168604d07196 WHIRLPOOL 119f4bb30844c9655760a23c0a48ddbc5abf32c07652165d508061b70f37861c123127735d14be01f506da65d072701514d5a4adb678fe8748f62762bcda6052
+DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae2846b93e0836ed96caddf2d425df5bab2a004b0417879a36e4dd3 SHA512 04e2e8f58102752a45b089cb70c62e6b920b5397cb427179fb042604eec4a78d6380341ab700e70b9190313ea5fc10fb94471a072fa8ad567e4d652b1fa2c3b6 WHIRLPOOL 153cd8da3506e0e3397a06b4341e90b2dc55170bb432a21d66bf425895deef5bf0611bdb181beefc29fd18648d60b827d9e453bca827c26305f55ffb01319f18
 EBUILD netbeans-profiler-7.0.1.ebuild 3222 SHA256 b1bab800a27c30aaea26b8ff5ab21abdd1bec16b9890133429eca9ea77c018fe SHA512 d6198f44a06561b7e2598fdd6a37f8a3dc13c38f63dfbf6a86a083adbf71e9c62af87cb4e1b5b8dd2dc99feeeb99a7afcbb8f7747c378ad92c71263cc91a6c54 WHIRLPOOL c62613f511636b1f0393ac32c6b50641cdf7df9f9fdc95fd5acbe1a602ffe42fdabb556f989552b05b0607a5ad9d324a2019440c3ae66c50995ef3fc8775f385
 EBUILD netbeans-profiler-7.1.2.ebuild 3231 SHA256 94d87bf6f86add3bdc27f9f20084f35fe584fc2bd697acafa8c23cce16a0d1ee SHA512 dcc8da918a6b6e07ccae513fb4296d16891e205b49098fb8269d16beb9b1367b1920797cc78053b83f4321c1b69faa393365265c72213bb2abfb9d3f84f66319 WHIRLPOOL 18325a1df836e7242838920483c41d43f37b9dae8322d36a2a562b414baa0dc76971f581204ce76a6d64196dd60643089e8704da69617590cda61ce54ce82e8d
 EBUILD netbeans-profiler-7.2.ebuild 3214 SHA256 ddcba9ba672ad566ef256538fc8631ae691aa7c6574269199f26df5382c37f4b SHA512 1bb7eb95381861b8265ab366fe3c7a9b99971d1c4600eb6c7bffb521f4cebb32bcf3d662f82c811d47fe95e77cd39e48f3665f0fcabf9145eb171c2746d89684 WHIRLPOOL 7f74c2be9ec4e7ff419086f1da3b1a12b1c187102def004316ef89ed28f30da62542ed3409a51473a8d9d68d18a30de36b1d0307cd8eeb7e580668fe896c5aa5
@@ -64,5 +65,6 @@ EBUILD netbeans-profiler-9999_p20150716.ebuild 3478 SHA256 6f40291db08fcd12052d7
 EBUILD netbeans-profiler-9999_p20150720.ebuild 3478 SHA256 c0888c3929788a7d0242efa8edc5326c916af113c640a826fb9507b174d526c1 SHA512 df81ef176e9ea4c528d2b1af4cd411017a5d7a813c6f9b82f9bd8bb0cc1ee5fba85341910469f6e5a3bffe0ed56d2c6f00a3fe70a41c5b776c604f695c0117c6 WHIRLPOOL 89116d6eda26fca60e4d0071b40f938b44430e288e92c5c87a73927d60a2e5e0288a1bb39068d61da979aa7a908870fb45b39871d932c47ee3c25ac115142a9b
 EBUILD netbeans-profiler-9999_p20150727.ebuild 3478 SHA256 239113d4d50fab0fdfa954ceba9e26a35882f0cb93a9fbf5e686e2875cbdda90 SHA512 3a4f9f61c65feefee9cdfee70d3672b38d090d966b38c1239bcb020d81f3c78805185084e915f96d57317d74572c2277a466e09fb8756a071505916b5641711a WHIRLPOOL 3537f6229c9c1f72dfe8ada1081c0ebacb844bd3e45720182720f7b9c292830070f66e713e3c5fc33137a0fc3adf57e366fc274ac2fa125646864e21d49e5962
 EBUILD netbeans-profiler-9999_p20150728.ebuild 3478 SHA256 27dc4756600f70970b5433e3bf97f380c9cb8f848bbfe8a871ec4726e6ab13c0 SHA512 1334884b28e90a0d1cb0651cb6df12447b5e623ac56922ab326f79a82b0bffcf1b5bedae4486547cbf11cad35c50eedc3f8d821143c8c3cf50d7d47e479188f3 WHIRLPOOL 81a3290fbee37ae9bf0e6cc9d43085efe5044e73728c611d27819d3e6db010a39e0429108d5dd9a7907d5b0f7092924832c625d7974e5e075c28ed37f889ddff
-MISC ChangeLog 176428 SHA256 0475cbfde6686352b576f717e208513dc63783185d3aa07aa92c1f27d8c9137c SHA512 a5757295c8d74477e0824f13aec0640e2c1e24c87b387dd8da5f6d0db29fdb7ebca969b43be40664f26c73f5425c617fbbe09480f2e8540b63ff28e646812a3a WHIRLPOOL c5563b910f827005bc1216ff8fb2b83b3faab6db8cbf2a12bd9d94e6a8ee284c03676208555cbd53808d635212a1fa99cd4cb25b7304def87713e4b507f4d6ba
+EBUILD netbeans-profiler-9999_p20150730.ebuild 3478 SHA256 6cedf01725b36d273acbff3bdd6c5ed2e5192ac3aca58a4b34906120c2c3a508 SHA512 5a6a6452fd225b9e83f3918616e00469d2ef974842fa48ed1e47328ff19fd8042c3dea951219402a671d257f2a3bc1e5834d5d79e1d64ae7c7ef8704fb6c98a5 WHIRLPOOL 517675e0b9a26558914f968da5ef45a89a1b8b62053a5d9c59ba91c2549eeb1008788c04004d66ad0311e35048284393588f92882d92426fa487eb45be1f3231
+MISC ChangeLog 176606 SHA256 7780935eadf8d15d2a180e52e1374fb73dc88506e86197ff41731ba99ae2bacb SHA512 0f911989abc35b863923b512d68ab31286a96253e2098d4a1f47685835bbe12e5f509448115e98e0c0d602616a55e1b60f26e26e4c9ebc27fd8b46d8c60e7e9f WHIRLPOOL 32a2df538b23caa199286180ffa1529438cd02ed8796bd058d416a58f8db8105256b05794d7be40fded0f90011293fe592e2e1bd1902ee8940e7a06098b68206
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150730.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150730.ebuild
new file mode 100644
index 0000000..924ecab
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150730.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-07-30_00-02-28/zip/netbeans-trunk-nightly-201507300002-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 21267ba..fb86aec 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_p20150730 (30 Jul 2015)
+
+  30 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-webcommon-9999_p20150730.ebuild:
+  updated to the latest sources
+
 *netbeans-webcommon-9999_p20150728 (28 Jul 2015)
 
   28 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index 3b4c5f0..65db196 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -41,6 +41,7 @@ DIST netbeans-trunk-nightly-201507160001-src.zip 208623275 SHA256 9c548527eb28a3
 DIST netbeans-trunk-nightly-201507200001-src.zip 208844011 SHA256 d913ef4e2aa53c81f799f9054b63f985be8273acbd4e73f6114c1ac9ac925413 SHA512 8bd91ec800079104c0bb74c79d7259722daf9d84d1119fdb768f25fe5acf6bc2833e4cebcb95ff015ed67d4a5d7c745e80faa88b8d66e241f03fab4c7136f407 WHIRLPOOL a6bf8042418478cf40773a6d4421e0570c26fe57bbe9d76e83e6d2b5fcb97dc364d6b164ea57cb69ed5a5063a783230404380cf9e5d8d5e88c62055ccfc28bd6
 DIST netbeans-trunk-nightly-201507270002-src.zip 208903918 SHA256 522afa33b0389ef48a5deb3c91ba3c4aa1ca4acf710e2c316479e6892aa3d39a SHA512 078b84e423f0769fb1a2c14bb092c50dd2f1901126b5f3c7b11700858c71b43230281799c248eb4198a22fad17f5a7c34baedd3aac241e2d07d91c72a1aad861 WHIRLPOOL ae082652979d1ba8f26a6001e6402f587809b2586406f93e42eb9b7d38e4216e290167888ab5d6836ff9a712d555cec66c9f54afea7ca6171dee6cf56c7c0fdb
 DIST netbeans-trunk-nightly-201507280002-src.zip 208905091 SHA256 502a75b45a6d7c2421fa6629cede99d70bb69b19287083ee9ed9cbcd9540343c SHA512 b94b76f709f931ecc1414eb80c1791bada942e7a6a7b2cebe4749453de1c17f929ba497b961a7ea9837057986a463f1d335dc7f2ab460f99c1fb168604d07196 WHIRLPOOL 119f4bb30844c9655760a23c0a48ddbc5abf32c07652165d508061b70f37861c123127735d14be01f506da65d072701514d5a4adb678fe8748f62762bcda6052
+DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae2846b93e0836ed96caddf2d425df5bab2a004b0417879a36e4dd3 SHA512 04e2e8f58102752a45b089cb70c62e6b920b5397cb427179fb042604eec4a78d6380341ab700e70b9190313ea5fc10fb94471a072fa8ad567e4d652b1fa2c3b6 WHIRLPOOL 153cd8da3506e0e3397a06b4341e90b2dc55170bb432a21d66bf425895deef5bf0611bdb181beefc29fd18648d60b827d9e453bca827c26305f55ffb01319f18
 EBUILD netbeans-webcommon-7.2.ebuild 2665 SHA256 9328ea550dfeca5be5c2b03aa5f512d451f1673e49a40994155fca0b2fb2f79d SHA512 d8b80b79e78769a70d01605a79a8a91f7e839d4138b4cbf28cafca6f56ae3d7003c2f5f40aff77bbe3f2882f43a7d7dca3f0428f0f2723a42ae5b49e4c71ffff WHIRLPOOL 31254cbd2fc6cfb2d1bed4d22958595dbbf73032439f19e684463efbe466ee80c144f77ab00ced7a07815b1cdc1d45a87ceda83e7a2fd20ac2ce65e45d30a093
 EBUILD netbeans-webcommon-7.3.ebuild 2986 SHA256 327c0a73fb20778d9fbe4a12024fa065e4102a7aff3fcbda7448874656a46420 SHA512 3d270e940424b3bcdc8c7f8ff2016d33eb55420ac4037f4e406b688c2acea1b07a04625772265ac293d80c0d1afe3bbe6f865051ed9234b700619bd0781d8b39 WHIRLPOOL 5bc288949ed3aa9c3c4cd4cd33b817fe317754229ad30e80da8cfea817bfb77e988a1d6d3280aaef90619968e0309fad212deff0f7970f04438494a893a30a5b
 EBUILD netbeans-webcommon-7.4.ebuild 4727 SHA256 54a0b63527001da34a21ae3ed69c2cfbf9a446ee69bda4bb6ac5ebb939ebb68d SHA512 96895c972cf7092426ec8bc06dccc6ab4f33334da4e67fd4da01e586801110bda8d955f2f29ecd93b8bb58ae64c4af4139e9954a784c10dec925e2beaeab2394 WHIRLPOOL aa7b3b59d315bd37553052470b1f56f435979569e5ef033493cf6f93c29827f2ecd30f6b874f07a0cd8824469c6546982ac3ed360bf3b6cbf211d95943a3398a
@@ -68,5 +69,6 @@ EBUILD netbeans-webcommon-9999_p20150716.ebuild 4997 SHA256 249e14a760055b1ce9b0
 EBUILD netbeans-webcommon-9999_p20150720.ebuild 4997 SHA256 91e604769563217f79e1ed5205ba141444e1cc3f1a18f49ee191234b0775ea8b SHA512 b030a851c192979d54cc193720e49a76f5ed95a09ade40762a30b2efbbac914e9eee32688cb5e7219e98974bb658a3e2b3381fa82edec92faa9d9497d9f37dc3 WHIRLPOOL 8b1d04121a4b1c0fc1ac3dfd1b39e88c8edfbb3e7cfad5c45e3facde97f3c6486da65390a79453f2a493db55d18d6b9f43823b16a23a17426e6763a6f6ee7693
 EBUILD netbeans-webcommon-9999_p20150727.ebuild 4997 SHA256 c442b3c0a0514d63910e087a46391b4c8ba4568ace1dfa4242a5653a1a24a343 SHA512 ebcc1e9fe14b2811cd2982cf8080d60d08e8abb648cb9d03660a45c8e560a32f26ade1601920f6db5d986d80901829352ecc4220c3521eb713ec954b0e3c6cde WHIRLPOOL 202ccea43c5c6f9044ceb6cc1e8e303f29445496199dfde3251d1ac2f019caece58735cdf2f46bc7547dec78e063dcba620a0d5d7e2c76e80008588966ebd351
 EBUILD netbeans-webcommon-9999_p20150728.ebuild 4997 SHA256 b203c75d68961f3909be3c8760862463f4c70aef82363d97360cf22c811f9ead SHA512 db5567323d1be210f756c72023462d165eb7c8c002e86d2a6a7bcbf92ea2a1da7feba65f1578bc2f74d98bc71c37c635b9b764d62c2e1f32770ec2db8b29ed7d WHIRLPOOL ed298101217ea0794f574e98886d842cf2010ad571898b0350dce223d0f8ebdde59cd344f52516d3243f9285634cf32d90222f619f2a8bf1c8d188e7847a38f2
-MISC ChangeLog 149615 SHA256 663bfabb8eb3e7d0257b34d084a7ef03b766ba5edaeb538a49668d11dfe86356 SHA512 48c79e019bd9654564a7d172db3e42ff916ff4b5f607ff4e41f22f4e493cfa42c0a21258c9450fef7c77fa9fba5ec42ca38587722d3fc2fb00570026ae21ef27 WHIRLPOOL 43f7dc3ffebbf9a4d206cbf178e350c0e8f5c2579227e43a7ef7d6f5b47284a9455ed8cc4d7fcae4a4d7b74f698773d89c622cfbf56a1220ab060c4bae79fd50
+EBUILD netbeans-webcommon-9999_p20150730.ebuild 4997 SHA256 b8f8c9af064a8c03f3f208588350f36769d39dbc88586553cf370209c84f6d78 SHA512 3e0697243af0ade43e1b2fea73177221a3f2ebdece51d7e638343f027a5631ab8cd330252586d13fad8ff2ec1e9e492af6e7d82e4574c62735bf67c63b2b7fd4 WHIRLPOOL e36d77cb8044ac6550dd852d577b911a336a6e69f05327369468deca4291ebf8ce76c2d882a1af7a541257a2dd9303bfb2bb968840ecf12ebcbaad268eaabc52
+MISC ChangeLog 149795 SHA256 e095e7696f7c61aa57c3e35190e686a1927043853fdf2ee489cabe85bc9412cb SHA512 d015b56a767fbe22716a6059a3d3ae68298cef4b989750665e0c5e6e79e3fd9eecda119bd670789f9948c2d4911aa84eeafe74394ad3190251c9e21644388778 WHIRLPOOL 4265db09f3e159700bdccc0b08161c6f359d29dc7b8baf761314f1dc935da2695719cf6765bb81047dd68aec6979e6e24b701f74513831468b855a93b11bcf4d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150730.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150730.ebuild
new file mode 100644
index 0000000..57791dc
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150730.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-07-30_00-02-28/zip/netbeans-trunk-nightly-201507300002-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 eb93db6..b9ef848 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_p20150730 (30 Jul 2015)
+
+  30 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-websvccommon-9999_p20150730.ebuild:
+  updated to the latest sources
+
 *netbeans-websvccommon-9999_p20150728 (28 Jul 2015)
 
   28 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index de2eaea..52af141 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201507160001-src.zip 208623275 SHA256 9c548527eb28a3
 DIST netbeans-trunk-nightly-201507200001-src.zip 208844011 SHA256 d913ef4e2aa53c81f799f9054b63f985be8273acbd4e73f6114c1ac9ac925413 SHA512 8bd91ec800079104c0bb74c79d7259722daf9d84d1119fdb768f25fe5acf6bc2833e4cebcb95ff015ed67d4a5d7c745e80faa88b8d66e241f03fab4c7136f407 WHIRLPOOL a6bf8042418478cf40773a6d4421e0570c26fe57bbe9d76e83e6d2b5fcb97dc364d6b164ea57cb69ed5a5063a783230404380cf9e5d8d5e88c62055ccfc28bd6
 DIST netbeans-trunk-nightly-201507270002-src.zip 208903918 SHA256 522afa33b0389ef48a5deb3c91ba3c4aa1ca4acf710e2c316479e6892aa3d39a SHA512 078b84e423f0769fb1a2c14bb092c50dd2f1901126b5f3c7b11700858c71b43230281799c248eb4198a22fad17f5a7c34baedd3aac241e2d07d91c72a1aad861 WHIRLPOOL ae082652979d1ba8f26a6001e6402f587809b2586406f93e42eb9b7d38e4216e290167888ab5d6836ff9a712d555cec66c9f54afea7ca6171dee6cf56c7c0fdb
 DIST netbeans-trunk-nightly-201507280002-src.zip 208905091 SHA256 502a75b45a6d7c2421fa6629cede99d70bb69b19287083ee9ed9cbcd9540343c SHA512 b94b76f709f931ecc1414eb80c1791bada942e7a6a7b2cebe4749453de1c17f929ba497b961a7ea9837057986a463f1d335dc7f2ab460f99c1fb168604d07196 WHIRLPOOL 119f4bb30844c9655760a23c0a48ddbc5abf32c07652165d508061b70f37861c123127735d14be01f506da65d072701514d5a4adb678fe8748f62762bcda6052
+DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae2846b93e0836ed96caddf2d425df5bab2a004b0417879a36e4dd3 SHA512 04e2e8f58102752a45b089cb70c62e6b920b5397cb427179fb042604eec4a78d6380341ab700e70b9190313ea5fc10fb94471a072fa8ad567e4d652b1fa2c3b6 WHIRLPOOL 153cd8da3506e0e3397a06b4341e90b2dc55170bb432a21d66bf425895deef5bf0611bdb181beefc29fd18648d60b827d9e453bca827c26305f55ffb01319f18
 EBUILD netbeans-websvccommon-7.0.1.ebuild 2692 SHA256 a18cf7fe0a1e38749826cb12651be06c210b038be50117647496ee6cbd184cda SHA512 32b32894713d7235ebd03446c5c411d22eb8701b96e3d3ac54eca78b2abc833babf279085cea3b74bb7bddc6d89a283a21c58a0b0462042ddd10e22dfcadeb84 WHIRLPOOL 59c18168245767acd1f8e53046f8942698237aa6fd903a669c626b7f17cf3d39247b7ae57f2984562230267885a4b6a62be43dc8a330f1dfeb2cc7acbbd7d3c6
 EBUILD netbeans-websvccommon-7.1.2.ebuild 2701 SHA256 3b2a1cf0d32db3c55b66d1c6b8c4ae2ad5487d3fdb27752468ce5c860f9b9515 SHA512 b9be64755f00157c2d6984887b8c0fdc1e34470f21df1fd72b3e399d3ec894af01c9b79fd604778213ac2086a6c96bf66366e8c2c8bf97f7fee23d16ceb36974 WHIRLPOOL 91559de8c8f6391c3c69888854778a91a1a7e0052ae69eb9762bcbd64d8bc5587fb84ebb55d7d0375da5a7855aa8672abfd035b6a38b3eeb5c23a4cd59b3cdce
 EBUILD netbeans-websvccommon-7.2.ebuild 2684 SHA256 8bf8cad1e0469713c63280620fed089600191230f501a78b834b010f8fa9b3e9 SHA512 fe885f92a7c6cfac532c8e40e4df6283253c43294e9d82ee4d0d070425496eee3792479c268b46bf1fd484f753ca1f21e7ca38a5d71816b6d4fd219082e8e276 WHIRLPOOL 9d2d622d4a800470c874d8751e9c2055e0a4ef72ad01a01aefda4e95a7f295d55fc95fdb55fdd1f631212e1f610bdc7a6b4ee631b92492bb85f73b0d9fb4ba26
@@ -64,5 +65,6 @@ EBUILD netbeans-websvccommon-9999_p20150716.ebuild 2727 SHA256 e4b7a4c956e6d15b3
 EBUILD netbeans-websvccommon-9999_p20150720.ebuild 2727 SHA256 1b440027dc51a19fc97080a4e0ab3ecbcb71c044c68cc51381e486c3aa08af66 SHA512 12755b784942be74345b9feb0ba412a078f197e78f72ba41f51939d0f6457f14d5d0b495699e02bb6052c5b41b3659a1d7f0f1f862a4f4c23555565f0a39ca84 WHIRLPOOL 83c44b423d1f02d9273c9c2bec4d98c6253d7221c1165f2fccf741880d6ffb704295646a3a3a82a4b837ad87209e6aa96817b4779d8efbfbe984384b085058cd
 EBUILD netbeans-websvccommon-9999_p20150727.ebuild 2727 SHA256 d7dfba9ceedfa99cf0ef6d45862023a4ad4ff60749b5bdf271f3c18a6c183247 SHA512 ea69184b4a5fd1a7547539aff9e361f1ef6ef83bd694316a4c0e1b9ddfee0ecd6ab67cb5104bb8d869cd5ef1a430a9ae30729a1106b72a095dd2d56736302205 WHIRLPOOL 7cb790b171987ab256d2026f79ccb541a0994e1632fb53363e61d5804d1fcf436654698af07bf06b3da2719b6ab84791552993bd05185bcc3218967fc10dc7c8
 EBUILD netbeans-websvccommon-9999_p20150728.ebuild 2727 SHA256 2a38ad4d04d10d58d582461b6c8577a32c6d6aa53172cb7441a6f5340bb02067 SHA512 5d02593f62e1f499d8f0c75d038318874a6375a8c46ebbb29b54419943a57d3d6757d5bc00d0d586fcf040815653d089a277158c2fd8a6bb3357fd8a8a3fca21 WHIRLPOOL d233836407dd556bf6d809b8eced4d7a8690ddcdc01cc1672c4cd4e8d850b85edfb166bfee96f17457498960a84bfa080f7d120b521773aa66b1a7d7ac509cb4
-MISC ChangeLog 185094 SHA256 5643136d48ef3371ffb903ef74db4517edc8c054a100fbbb5ae058635855cd4b SHA512 ce3e544ad245b4917c00425b678c592c6c0707a010bbe9559696d4129c75809ca26de68cb228cfb21ce18cbe71df165a46c5cb41522b1a51a36b52db54e1fb11 WHIRLPOOL 2a682c927597eee503997b5ddb37abaeb5c527f0013efa7c8e9191c6482c27065b0683cd0629aa2737f6198c7c71a76aa1cca47b8a56aaa688171252f5b33e53
+EBUILD netbeans-websvccommon-9999_p20150730.ebuild 2727 SHA256 8d99e2f17a20dd763fd0bc9672244399e1c6b596f0a0e99083192def8c411754 SHA512 10ded8ec821aa2c9dda659020a5e3da35b55079c205ca96ce2b82e8cf92a572e3f8b410c8e4d7668c635c6dff0ffda329f8b6844ac7fe5948ce9885a408f39b1 WHIRLPOOL c4764d1fa23c667e83d53ba9750d049ebc9fe0e33dd15569db2ce9635f7a3a503f64231ef105051a86d86450dab26c2197f9a75e77feffb55c92ffbdd86c2356
+MISC ChangeLog 185280 SHA256 392866922a4981a31753b84b53232803e8c89aa6932e5b3e7dd1713fa7e44dad SHA512 6b2d0a72e7555348412dc4653827d70306822fc7dd035f3c95813f82c6e8b179aaaf4184301b6d12b1af227f2a3e6aeaf4f23c35a3028a1aa191be2aa63cfa96 WHIRLPOOL df3d055b023a0c09c0ffa23fd4a9409c4c630e58b72c423ce34c410bdccba9961c884213c1e49e37b6ef7d4d39636d5d9464c07667d8a1f44d68609ba062305e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150730.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150730.ebuild
new file mode 100644
index 0000000..54f3d97
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150730.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-07-30_00-02-28/zip/netbeans-trunk-nightly-201507300002-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 fc573e8..062d0c1 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_p20150730 (30 Jul 2015)
+
+  30 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-9999_p20150730.ebuild:
+  updated to the latest sources
+
 *netbeans-9999_p20150728 (28 Jul 2015)
 
   28 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 03e5c09..595b58e 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -43,6 +43,7 @@ DIST netbeans-trunk-nightly-201507160001-src.zip 208623275 SHA256 9c548527eb28a3
 DIST netbeans-trunk-nightly-201507200001-src.zip 208844011 SHA256 d913ef4e2aa53c81f799f9054b63f985be8273acbd4e73f6114c1ac9ac925413 SHA512 8bd91ec800079104c0bb74c79d7259722daf9d84d1119fdb768f25fe5acf6bc2833e4cebcb95ff015ed67d4a5d7c745e80faa88b8d66e241f03fab4c7136f407 WHIRLPOOL a6bf8042418478cf40773a6d4421e0570c26fe57bbe9d76e83e6d2b5fcb97dc364d6b164ea57cb69ed5a5063a783230404380cf9e5d8d5e88c62055ccfc28bd6
 DIST netbeans-trunk-nightly-201507270002-src.zip 208903918 SHA256 522afa33b0389ef48a5deb3c91ba3c4aa1ca4acf710e2c316479e6892aa3d39a SHA512 078b84e423f0769fb1a2c14bb092c50dd2f1901126b5f3c7b11700858c71b43230281799c248eb4198a22fad17f5a7c34baedd3aac241e2d07d91c72a1aad861 WHIRLPOOL ae082652979d1ba8f26a6001e6402f587809b2586406f93e42eb9b7d38e4216e290167888ab5d6836ff9a712d555cec66c9f54afea7ca6171dee6cf56c7c0fdb
 DIST netbeans-trunk-nightly-201507280002-src.zip 208905091 SHA256 502a75b45a6d7c2421fa6629cede99d70bb69b19287083ee9ed9cbcd9540343c SHA512 b94b76f709f931ecc1414eb80c1791bada942e7a6a7b2cebe4749453de1c17f929ba497b961a7ea9837057986a463f1d335dc7f2ab460f99c1fb168604d07196 WHIRLPOOL 119f4bb30844c9655760a23c0a48ddbc5abf32c07652165d508061b70f37861c123127735d14be01f506da65d072701514d5a4adb678fe8748f62762bcda6052
+DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae2846b93e0836ed96caddf2d425df5bab2a004b0417879a36e4dd3 SHA512 04e2e8f58102752a45b089cb70c62e6b920b5397cb427179fb042604eec4a78d6380341ab700e70b9190313ea5fc10fb94471a072fa8ad567e4d652b1fa2c3b6 WHIRLPOOL 153cd8da3506e0e3397a06b4341e90b2dc55170bb432a21d66bf425895deef5bf0611bdb181beefc29fd18648d60b827d9e453bca827c26305f55ffb01319f18
 EBUILD netbeans-7.0.1-r2.ebuild 6736 SHA256 e808fba2ddb516270d93b5cf67cff60d98b37ca58a158878f2e3b3ad696cfc82 SHA512 653fb585d9eaa20fcf88d778a7f34d63c9f29f2af2153a432fcab6d977ef9619c699b19587a48b148ccf717f4b31a43859b81cff80d5d84ad273c5fa16e8f565 WHIRLPOOL 257f2466c3ad198a05db9d5e377cad2707f8a4daf1f421e516d7435670a85fd4bb5f6b3ab657ebda8cc23937e1b4e1f4acce8cccd85bccddc5a7b1f9abbde0ce
 EBUILD netbeans-7.1.2.ebuild 6976 SHA256 4222e248dfb664ccfea85d4938ad691d3685f32d8e9b33289d1dda088057261b SHA512 cc0a20bd542b61621fe08d5413611f7bcbbebf0c37d5f67c590c31324e74eb5594e72efacc86d843ff3abffc98c4859c2733c63ce6f993baf51e24d69197b64d WHIRLPOOL 30fb7b0cbf22fc39a8dabefd27a0073ce73e62ef082d55839fb7f815bb73bc5c3c24c3418ce175f355d7c64138ef7e9616da41c68b3b57a70353d16c6113daf7
 EBUILD netbeans-7.2.ebuild 7057 SHA256 29140b2779f1a24722499605101c286d05415b4f97d2363afedef711cc586067 SHA512 0776f530f9530c533b13019f7b34fc664990a16926bcff768d0a9f3b9035de82dcd2ed66425ad8da27c65aa69fe3e6be966e0a1ee1bc222949e5d42e14f7f7f1 WHIRLPOOL 9fcb95348171fb0bd8d794b80b51b2e3ce36fd84ccc81653bdd0172cbfa99791e527b33c895ebf7b4d81c228f17d4afab367eb55ceffe28df835b2d09dc8f778
@@ -72,5 +73,6 @@ EBUILD netbeans-9999_p20150716.ebuild 7216 SHA256 a339248845bcb70c35e33ad9ea246c
 EBUILD netbeans-9999_p20150720.ebuild 7216 SHA256 9a2755db57eb691856925b8ec9eb7a8a7c58386eea3afd8568066dcab47b97d7 SHA512 25d5a2fa02de171be48b7f82d732f2deecb22feb0ef24f02a473e87e9571c0c99bc897747d77cde9fee03447486c2ea056c4d0d84bb43f382d5534d4cbc0ca22 WHIRLPOOL 14d93c6ab678f875e61ca20dc6f1e909a2c2ab96a5a54487cb5da9b9cc636602f4aa0cf9e6129d996a7e1d0c42f44ef044d3020427e3cc5d2ac7c142697e8d72
 EBUILD netbeans-9999_p20150727.ebuild 7216 SHA256 300cbb2876cddc1c505df00599323ea1f4445b385cdbd94d5573527ea388c76a SHA512 512a7a2710f000140bce1fa1d97e56da25ea51ff658f734c3e1455459e9aa4630b476b42f06038da52005c4ee8c0c2bf30eaaa872425ec8ebbc77d4465fa8d50 WHIRLPOOL a5875667dd786c4f3d23d39a6f198a043370998aa228da37c3c6acae086e191be1ebadfb7b7d3af2fbd79ea570c9219b6ce9f9a992e182dec6fbb6246266585f
 EBUILD netbeans-9999_p20150728.ebuild 7216 SHA256 c622194a12148dc8908b9e6c5e1921a38c11b05cf4871c62eca5288e4f8e0f61 SHA512 04a4b2314602cd924b0685b41806ad96b00bb77e3db49449651211ea5a2649ff8d72d23cd2d67c788c3c9d71e3844d459a7622afc321754674b39d03b67867c6 WHIRLPOOL 4e8ccbfcd6db7c1e217635d9a63977f222bfe1913b2545d7f79f610efd21dd6e67a62e850bf78fca5ec328ee4411a3df91d247f480678564b13d049a1557fc21
-MISC ChangeLog 157054 SHA256 23c1c2cd49515be7e7bb674d0c603b33884ff954bf9cb28d14f46cddfe23810b SHA512 ba7e6c1142a8f90277c5bbca1d395b56943a05eabdfc414d3cf393b7b12d51526c0021dc676c5334cf3d65a2212955f901b46ec04efe31bd6244acaf699cd7a6 WHIRLPOOL 18f865fa2188d9b4099262356c539648c2126327cfb19dbc99467293a381c3f00264dfffa9cb1895dd361065fbeb330bd407162de10d042433f4115fe4176657
+EBUILD netbeans-9999_p20150730.ebuild 7216 SHA256 6a7ea3f6c1c5014f6d58ffe6acb1c1c0e716a4eabe3ae0a68dbebfd89c01cd40 SHA512 079c6fd61313f71288ed01fc34a9da1a03626a1ef0f234b73d001f1aced114bf3c8e3afeff09763497c7df43685f3af5fcc81992b23916cd65b353540964d3ac WHIRLPOOL ff26c1cb12ff64bd275c0bd98e1dd7f6fc081da7840a1b711a245caaf52f13bcd7c2574e5934f7fe5669b6ab66b9b43cb9d672b41fe5257996ec21794b7e1de1
+MISC ChangeLog 157214 SHA256 81bc6702ae7de52bfda8382582f49c03ff4bfabf01e8bfbef00e42981e80f553 SHA512 5a9c6cbbc3a8b4576d4608de9242872f25f4565b3e96b5494d2a3bddc768a72d682d3888b05e8d11c0f128cd57ffc7ca9702b92ceea572d982341e7747a7fc82 WHIRLPOOL ab165a09867189cc57149aeb0ee7e5795da6b966efb2a2952238d1b06b9d65bb34249eb594997df05fa65b4b2d99de9242815c4be18c882bc5e85916cc46d90b
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

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


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-platform/, dev-java/netbeans-apisupport/, ...
@ 2016-06-20  6:50 Miroslav Šulc
  0 siblings, 0 replies; 4+ messages in thread
From: Miroslav Šulc @ 2016-06-20  6:50 UTC (permalink / raw
  To: gentoo-commits

commit:     a0526be1d3bdac9504212156b0ccb12c30399076
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 20 06:49:58 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Jun 20 06:49:58 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=a0526be1

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.3.0_rc1

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 4811c59..12f5b22 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e27929
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
 DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
+DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62d58fda2a89ef87d7a1a3d4080b66aa8330fe9a2156d8ca9b69 SHA512 9d7c92a325761b3c448c0876858865ef49963abdd40099dc9285fe3164709229de780d33ef08379787d05f4701cbda407794e32a33966cb3ef30921f60639674 WHIRLPOOL 080ca294dd6ab79bb8df1f1a9caf54765eeab73b4e7ae38ecdb9eb25c889da44c5583b61296e8f68dbb8e0b0ce30810e580aee3008e1d50bd156ca96184caebd
 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_p20160523.ebuild 3384 SHA256 f76c765f5b6be907e69359208b301b763b9cead85ce3242de7355994bd9ba315 SHA512 af4cbc420ab2e2d4a637be3214b1b24cfea752a548072cae392171f06445e80ef797740ad8dbdff177f499a2b3ea21a25050c83e2949c9e9bef39514133b7acc WHIRLPOOL 8754d4b8749e7f16af2ffccf046e893a9839f0d9a02226c9ed76a8f0608668bd5527dc58fd4e8338c582aec463d46693eb9e11bbbc5ee106ff29c7ee6fd608e3
@@ -51,4 +52,5 @@ EBUILD netbeans-apisupport-9999_p20160616.ebuild 3384 SHA256 bc49b6a8adc59bad429
 EBUILD netbeans-apisupport-9999_p20160617.ebuild 3384 SHA256 a5b5da4b2f4bbac2539b0c0ef9f57e8a7db48468102979be697a9e73573570da SHA512 9d57fdb21863821bc5115d8dffb776045e752f2f74ecbd1db29cc377e21f29ed5a3c7b8e469e0b7532d1218eb75e7d25ed1f95cc680785cee64486ed1e7cb60b WHIRLPOOL be4d9ea7fb35426d8a00fff91dd1f9c8ec6906b9b2ed4e49e23ab592cb3345a066541b58f3b8b4bfe5b26907096253a6a08b977b13c82ade9cacab05126215e4
 EBUILD netbeans-apisupport-9999_p20160618.ebuild 3384 SHA256 653f6024a84998bac9ac3d9a9d6bbec0553361eb662a34a7b775e0ee8e1797cb SHA512 7915f179c34c6eac6a5234d4e7d8705470717281733ff4ac9082fb29127bb6355c9797c844f0d5e49bc7ee83b3212852d8572cacb530f4469409c15fa90f6240 WHIRLPOOL 6791903b7f2b437f8e6122c2b2f3db855ecb918abc9eb14501afb128667201ed803dc748015e3d0d5ed344d7420b98b459dc1d9c8010ea02241c8db552f0c334
 EBUILD netbeans-apisupport-9999_p20160619.ebuild 3384 SHA256 62d7250742c2f06f4115d173a3e43389467575b08a45c01ea0f184e1a554e0ef SHA512 bcac6290b100d2c4816955fda39dcc8aef4775559db5971df90aa669a078708161fc8afbf5ad2f7b1c5c52d058ce52e7df4ccc445688e5eb4fae71f621ef09e4 WHIRLPOOL 8ee0d9caf9d18bf3a81319cb3f4ee6260a49f9ee57411dc05eb1591773edecec136d57a21808dc1c0a1f4de08aeef6e75df8b2270436b1e5553310c46a7c3d68
+EBUILD netbeans-apisupport-9999_p20160620.ebuild 3384 SHA256 dc1efedb045c624a498a39daf4cc8f20d8ab52fc50cbfc868413eb09a73f6ceb SHA512 6c68f25f395d7a2dce5320cefdb859e62ef09e7ab2a44898a90aa8d2be35a71a64ecb2e9179dbe3dbece3a05b7689601a85e07c2dd6cb563f3d4ecf6731cea4a WHIRLPOOL a6b58a07ca8e6dd4de7c9f68a8179522938db0a571f8f3cc11a1fb6f9454ec2759aae3cfa400c76ecabe4b8fb79a40bf84e78e8355cbcdca290bcec7e1c493bf
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160620.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160620.ebuild
new file mode 100644
index 0000000..c42955c
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160620.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans API Support Cluster"
+HOMEPAGE="http://netbeans.org/projects/apisupport"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-20_00-02-33/zip/netbeans-trunk-nightly-201606200002-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 1e0c2db..52c7a32 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e27929
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
 DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
+DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62d58fda2a89ef87d7a1a3d4080b66aa8330fe9a2156d8ca9b69 SHA512 9d7c92a325761b3c448c0876858865ef49963abdd40099dc9285fe3164709229de780d33ef08379787d05f4701cbda407794e32a33966cb3ef30921f60639674 WHIRLPOOL 080ca294dd6ab79bb8df1f1a9caf54765eeab73b4e7ae38ecdb9eb25c889da44c5583b61296e8f68dbb8e0b0ce30810e580aee3008e1d50bd156ca96184caebd
 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_p20160523.ebuild 4790 SHA256 ab62622126d237d801b7908c31c46da75943647053dc767da722c15c36c033c9 SHA512 600b0ca47dda255328befa12d2f615fb1bb4b4c598c2a36ce776bf38ac04a7fa1b037166aaf5bb9a8456c86ff278a20df09f7289a0b186423a78a07b170654cb WHIRLPOOL 47c173f4be068aaab6e855f0e19b58ecca2dacc73d4589f64928bec18aff7c6f9c921f3daa1c4790edbf94d63dd67af68847c93ea6716cf77cdca4d83baa3031
@@ -64,4 +65,5 @@ EBUILD netbeans-cnd-9999_p20160616.ebuild 4790 SHA256 8e81c1d6df927f8e816c79073c
 EBUILD netbeans-cnd-9999_p20160617.ebuild 4790 SHA256 6f942202ab23b8565f06d1c53671d371ed9c41d106507746e3632255b1832e22 SHA512 975cefa161f05caa12a81afeeb413969351e73d43b207e8a1920302baed8e3cd65c6a3b7839c8955153538e04d8f5bb9ff7d5f7bfc022491d405bd415aef6761 WHIRLPOOL ea58a42c90e4050eebc95891602bb07b7c0c212318c9bbf773e69c8e84bd9ba459e2875fc7c3e68e56764d3e7fb336abab1e26a373940a6f2ab89b2e3f79b912
 EBUILD netbeans-cnd-9999_p20160618.ebuild 4790 SHA256 5da83ad7908207f88eb4f8e426a08d5d9f262b502fa3ce43b4a007eb5a071523 SHA512 c5e3c2e204927de2a6aecf8177a65ea026e56c31f1e42cc210efc2347b9926ff85a3d049a2c249bff377c1b9adcd8e8aad8cfdafe89cbaa29afd6377dc212036 WHIRLPOOL 47ba2893a13b8d09214508ef8896285826c5d11dc4ced55b19af1ac029821198a6a543d17669ec6a328cc492a304bfe1a5500f6fa94a785beeeb2f4fc7794efc
 EBUILD netbeans-cnd-9999_p20160619.ebuild 4790 SHA256 bad9a5191965dd8ce7f73f8a87a0cea2bedf32775b93d9c110bb8be6c31d5b0b SHA512 8b843cda21bdc47091ae05b531f3a5c2b953b05030f57f520cc963cdbd53422a18f4a4276f040fda4bd21bfc4722454d68a4400caf10532d7d74c2d46c9ecea4 WHIRLPOOL 6452dfd59f1f46eb96d1e7f365bd3235c81df6640129c834edb8f4f27b07dc9951e35c54f0fd8a852fd5108fe2e8c7029831ecd8e775f0a1f3a201cb4c3c73be
+EBUILD netbeans-cnd-9999_p20160620.ebuild 4790 SHA256 952df2833e6bc5eddac469dba4201975d65cbbc59c9f5033dbb8e5731547e87e SHA512 3b94badd5baea172fbf5e554ee1a17603f3267c2d8e5c1f532369d2249c5ac87c0cbe6c3a5681cda57f812c19cc67bdf1fc22791522c347b2c1277dbdbf473d2 WHIRLPOOL cd6233946c417feec87d84c01348bcf86bdee377a258d15d02748cda28e68bef85ebe093544fecd2805426496e9a85deea42d11efda29e41a356572bd9c4146f
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160620.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160620.ebuild
new file mode 100644
index 0000000..aac1b4f
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160620.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans CND Cluster"
+HOMEPAGE="http://netbeans.org/projects/cnd"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-20_00-02-33/zip/netbeans-trunk-nightly-201606200002-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/1BD2563498D0E0BE1C7B3DD31FAD892B41EC041A-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}"/1BD2563498D0E0BE1C7B3DD31FAD892B41EC041A-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 95ac849..e63095c 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e27929
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
 DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
+DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62d58fda2a89ef87d7a1a3d4080b66aa8330fe9a2156d8ca9b69 SHA512 9d7c92a325761b3c448c0876858865ef49963abdd40099dc9285fe3164709229de780d33ef08379787d05f4701cbda407794e32a33966cb3ef30921f60639674 WHIRLPOOL 080ca294dd6ab79bb8df1f1a9caf54765eeab73b4e7ae38ecdb9eb25c889da44c5583b61296e8f68dbb8e0b0ce30810e580aee3008e1d50bd156ca96184caebd
 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_p20160523.ebuild 2968 SHA256 7658035cfd5d24282c4ee1e79439d51563016cbbcf13f64a87fe67079a2126c6 SHA512 87281290a2b1ba86bb668f709248008b7f3ef1451bc8c2379d60020373290803ef3a43257819d196e45c9321e6e38a10edde69ac160c9bb1a9311f661a54eca8 WHIRLPOOL a0db1e947063e13cec47a9bf0f06960adaa4ddec9411ee1c49053f1b6daf62b8fcffe67e801f64d3d59b5598e16a4a3e354445f689fe9b67caddb97d5e4a2dfd
@@ -54,4 +55,5 @@ EBUILD netbeans-dlight-9999_p20160616.ebuild 2968 SHA256 97e12ba216fa4cc3724ae0e
 EBUILD netbeans-dlight-9999_p20160617.ebuild 2968 SHA256 62289c46af8720570469a22d8bcfa34f84504175a00cf3f95c2f603e28f1774c SHA512 b58ead7b51fc5c991d221438b13ba3980b0097b3663c3b8067198f591906dcedcab594dce486cd3908fb3b62b54e4e471361ceab70b4034249025b9593b2505c WHIRLPOOL 4e26a77ad6964911923c11556b86552bbbcbb87676dc6bfa6a6858ab77bd06e3b1ddc47143085b559dd52e1662d2643f760eec8cd5a79268e79d47c023150bf2
 EBUILD netbeans-dlight-9999_p20160618.ebuild 2968 SHA256 9507130be7074091b9005a2dbaee302eee5782575cebbded01a7f68762df0b67 SHA512 1c89e27252fc78c83369c7cc90fa4deae216c13f9491c3bb9fcfa29f961647b474de92a12458947b0017b84f93821f8f0fe7687403883cb2297e78243b1c0705 WHIRLPOOL 8b3bc81f75a1f3548b2b2523a38e6c5cb496f9bf8a0f0599456e1dc76d49bcc845f114d9370e2d0215aef129047188061b7754148b289fd31363e1d34d7ed041
 EBUILD netbeans-dlight-9999_p20160619.ebuild 2968 SHA256 aa29f6e3e86b05ec8ae1b794f8d29c9c58bda4ca6c3e45142b4a3912ec1f3233 SHA512 66a4f1a5b3787b20e0fbad6bde2011fb106aa2b38dca8e3542b260ded852968dde1ec277fcd31fea3efe5fbe355dfb1e3f7274ca1d1186cd5763edd390ee9a0d WHIRLPOOL 047b83b1497ed9c97bd1fad6577b8eb049f38c2fa55e40622e0150154e8cb296c9d4f001ac8995c668aa6bb7846ea841ce4e5af264ba6b0228182fac1dcd84ff
+EBUILD netbeans-dlight-9999_p20160620.ebuild 2968 SHA256 f9e9572d5d109050da1a7857957af50e573bbcff41866a6d8bbdc257fd421c5c SHA512 da91706cedce1c990c61ab9d1ade8c40371739fa2c8a7ae0347e0572b13f91cbe6d663cf3b0e052b57c3e9c70b42d3d71b2b2fe5276c538b6f14620a772d9d21 WHIRLPOOL dc3b28c17dafd4200d7fad31b8f4380b687cba573d025badf4f433931ae2045ff233b7a14a2648c6e37f27de56590ef68e4bae12fb294d1d22fdbcde556943e2
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 5a79018..e168a62 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -58,6 +58,7 @@ DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e27929
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
 DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
+DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62d58fda2a89ef87d7a1a3d4080b66aa8330fe9a2156d8ca9b69 SHA512 9d7c92a325761b3c448c0876858865ef49963abdd40099dc9285fe3164709229de780d33ef08379787d05f4701cbda407794e32a33966cb3ef30921f60639674 WHIRLPOOL 080ca294dd6ab79bb8df1f1a9caf54765eeab73b4e7ae38ecdb9eb25c889da44c5583b61296e8f68dbb8e0b0ce30810e580aee3008e1d50bd156ca96184caebd
 EBUILD netbeans-enterprise-8.0.2-r1.ebuild 15075 SHA256 41d376117ad1d8d59c8194debfd29dc42f5fd4de70aee12a2134ec143a604dda SHA512 4cd9de88e9a401cc0be88e3e2605abc411c47307818376b2bcc00f9ae570b21324f2bf00fd83e819bfa076da0fb07811fa1f0f9362a6cd0ee05b63221a199000 WHIRLPOOL 73f4518c14430fe7aa3614ebf1b11a06ba0e9bce7479af2770db3a114f149d575a16a655218f757ed416b5149228ac56dac700f5a8d5e034cc838bfa4092e636
 EBUILD netbeans-enterprise-8.1-r1.ebuild 15888 SHA256 d4c04ccfee01a46819020cb7cf8fd8297618f3c0431ae2d9dd7eec8131f988ab SHA512 6c7c39c378cb79d3f382cb80d07710a8c5233aaf0df8fb58889ee6aa6bde73624efa6aa49b43f84105685094a7aff89e4b6367ffd1fd113da27b42d50d07e983 WHIRLPOOL e678e2a6957e428c1b6e51469c0e7cc6a08da2c797f1575b6bb660a7f3281c00f071179de459e27c983304915b005baaf94ad4fae0a4c08162f218bf53b7d821
 EBUILD netbeans-enterprise-9999_p20160523.ebuild 15825 SHA256 986d8870dcb7b14615f3ae22b93c7910f73850579e92383362111fd25194aad6 SHA512 2d0d2f8bb1bb835a27a1b98dd27744ca65a53718df5bb63904da00497af3396fe600fedaa2a5aeb567c39e772dd8da67d8cc8052e937804e29a9f66af7e0548a WHIRLPOOL 65bf7a26ae9992fd9295784b611acd0844b50a6eff201c81ebe563759171a1c09968698b5a23b7dc4307acc55a1d09079c22b52ca5e7a316319cc7d13651e0f6
@@ -83,4 +84,5 @@ EBUILD netbeans-enterprise-9999_p20160616.ebuild 15825 SHA256 67dc65afc49bae3389
 EBUILD netbeans-enterprise-9999_p20160617.ebuild 15825 SHA256 56780f670a4888f18674202b112a3edc91e7787b20c32d56eb4674ec628202e4 SHA512 80c5ee109a86bd4602e78595465fbe6c7bb90eb68a6a37fd56a7555524edd9119c9f9a5e429ba26c6889355f736822b6b8c66b7ce6e05424743c1931f791d372 WHIRLPOOL 933df05eee623d68126fcca4d3cfb503edc2f9934e9e1edfb36bd0b9a189b1b46e39dc6f771dc00ee1d03b12122fa1dfadcaea46d3ce8c86dc6a9757b81a52f9
 EBUILD netbeans-enterprise-9999_p20160618.ebuild 15825 SHA256 86aaa2168888a50c259e778aa3fc0f7fb89f33fbf5d97b134f40bca5f7285b48 SHA512 27b2b2dacf37b6871a1ae1620c2135f9fdf3678da175074671a548aac3b34222a7384cb07200f170c328f1a8010227bf4e33cd0ae99d04a59b0cbde895644ff4 WHIRLPOOL 96cab73b30091d39104fee7102b661b4d4958856a663e2727cf948f0aab39f1734e7c9bb90c9be6aefb8ab6dd7c24e40f4051f55277146465398111c9a55d577
 EBUILD netbeans-enterprise-9999_p20160619.ebuild 15825 SHA256 8aa66ace0e3d555df5d838047d3399909fb2c8463fb7ee5c91041ab297dfd677 SHA512 b956046db574db9e871e50a89986dd9f4a8e59c98e2989c30d660979b2ee061b4f51c700feb9b016d26785b8240ffd3dd388ce9b310cffd5e93d709da66c7fcd WHIRLPOOL 6c5fdd9f5edcfe5b17eac1352b3866230a01e44bd619bdb625f8700b5548d30e3a531561dfc05dfc9d5e3f0dd8733d5e029f75819a3913f3707d1d816b8c584a
+EBUILD netbeans-enterprise-9999_p20160620.ebuild 15825 SHA256 189acebbc23a0c6121320e1d1332763bf4d0f92e05e0c6084b5a59b576a7429c SHA512 aa88ea33097d1956471cb935c1c02195f2711cd33f3455edd523aeecba55bce3fcf4981855eafb0b054b7aef5de688a95904b7a03089610fcef6e12cee914e76 WHIRLPOOL ebd9d115aca175a4d4c2c995cd570b02746d99016e78cc0b5ca9f744187ef322a29e40db95401fec80bc6a47ddd38e29f4fac1f53c194c6abfcc9a4ba63cb3c1
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160620.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160620.ebuild
new file mode 100644
index 0000000..9305f6b
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160620.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Enterprise cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-20_00-02-33/zip/netbeans-trunk-nightly-201606200002-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 3c0aac8..e34ed59 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e27929
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
 DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
+DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62d58fda2a89ef87d7a1a3d4080b66aa8330fe9a2156d8ca9b69 SHA512 9d7c92a325761b3c448c0876858865ef49963abdd40099dc9285fe3164709229de780d33ef08379787d05f4701cbda407794e32a33966cb3ef30921f60639674 WHIRLPOOL 080ca294dd6ab79bb8df1f1a9caf54765eeab73b4e7ae38ecdb9eb25c889da44c5583b61296e8f68dbb8e0b0ce30810e580aee3008e1d50bd156ca96184caebd
 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_p20160523.ebuild 2913 SHA256 96364969034db64a7702340b43441479c115d6bef57f57a16444e55a2e5f7edb SHA512 1721c2b13533f4f14eb97f39574c9e6e97eb1993fb59b807e0aa042f2b5520607a3b4e7e7e7b66127a45cc66d02f9d217f7ba78c0e88f3851aa6ec302211b5e9 WHIRLPOOL 4818b2d9650dbce3a37720a4798aced5952fcf539820b04c09dc82286413a21aa7c0aea19b3cf28d2d52ebf9c8f569670a52793d61b03de4b04b7b671ff91861
@@ -51,4 +52,5 @@ EBUILD netbeans-ergonomics-9999_p20160616.ebuild 2913 SHA256 fce9bb6e0222b4c2fc2
 EBUILD netbeans-ergonomics-9999_p20160617.ebuild 2913 SHA256 c46bb6c3ff85b87c2a108179e3769a714563e11aedf9bff5ae40aee92ef79cce SHA512 4ebc0b801d5893ace81523940ccd7346e83c6c72ee042ab3d9456ca79a7270e808df1e79208dc2f17a9812572788406ed1cd855e00b3392c2a30c60d90fbe9a0 WHIRLPOOL ee4d9e994d314909b195c20c87f4e27d850d98f45bd70e77d78c425bd6a68fe20ba7857c59ea235e8bab371bd3e9a77efb0974c461431ba94f20e8ddcb58c360
 EBUILD netbeans-ergonomics-9999_p20160618.ebuild 2913 SHA256 51abcc43a1da22812105d97b46765c303c30b77921914a9f6fc39016df64c628 SHA512 9e807590dd855c39bbd3e5060eb3103e67393d5c5d45ae7c4abedd120d8088a04492b350100b58009bf2433550bdbacb715e4a3f2c5e996e135819ec301d7af8 WHIRLPOOL f08a3145cb2d6c146a53307d57c695afdbdb1798c70c25d3cf2a47a2b8d1391d4afe86ade356b3b505f8b39b9c5b61ca53ed942492bb7c8ec928e4a6c4fcdaa1
 EBUILD netbeans-ergonomics-9999_p20160619.ebuild 2913 SHA256 895a2f0d66ca9fc0fd9e034320052d8b58e6148d87a43bd347f2ca26d38c522a SHA512 372439cb2f326dd38e8dda1692ade104628b4735e3a3b5d07736afb6ad701e37c8d6f322a4ca9dea70573ef4cba01a5f020a8f9e27447f682fed15481e6c9173 WHIRLPOOL a79e80bfac86cd7c1b102a50d67a27c99818e0abe65783243e8bf7e74d6ed38116fb1ed9301cbb5f4948e204f01ce3031e7bee4046e0637a87e16a684ce2a640
+EBUILD netbeans-ergonomics-9999_p20160620.ebuild 2913 SHA256 ae0de72df0662eac1276984c40e34b19a1d4f6132bc2ad5e22dbe321395023c1 SHA512 b00900b401130b60ebca16c66c1b25603810acc6475eb9997931d7609027d5d6598b9ee792dbf682a126bf7a2a2f524625f5721e8aa941767cb61abf88bfe1c0 WHIRLPOOL 9e131cf6d46eb2e7353c7d8059dd900674751f21e34c66f4a5fbbcefe08933e1454324a069c882133e738d77891a63cbe14514e84c1915aef942af56b24e0148
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160620.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160620.ebuild
new file mode 100644
index 0000000..ab99120
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160620.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Ergonomics Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-20_00-02-33/zip/netbeans-trunk-nightly-201606200002-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 bba3de9..1dc05f8 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e27929
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
 DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
+DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62d58fda2a89ef87d7a1a3d4080b66aa8330fe9a2156d8ca9b69 SHA512 9d7c92a325761b3c448c0876858865ef49963abdd40099dc9285fe3164709229de780d33ef08379787d05f4701cbda407794e32a33966cb3ef30921f60639674 WHIRLPOOL 080ca294dd6ab79bb8df1f1a9caf54765eeab73b4e7ae38ecdb9eb25c889da44c5583b61296e8f68dbb8e0b0ce30810e580aee3008e1d50bd156ca96184caebd
 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_p20160523.ebuild 3377 SHA256 712e59370d3b3926be6b8db5b6b5dd49c56c4f265ae63abc8b68a1ecdcb77f9d SHA512 d9706a5a1dc2b42be4964a3890b057acb13be0e4cb1b3a4e66b8b2ad4efb54f784be20def8dc56baf4ab69b5b5fcff67679bb58d05539ea4f26e735d01cbcb0d WHIRLPOOL 6ca5380f5ae2a053bf5d289c740c8228d2030b1114179bfefdaf63c694874d235240af46e6925022749f585eecb255b050e965379683326ed439baa38c3a8e2e
@@ -55,4 +56,5 @@ EBUILD netbeans-extide-9999_p20160616.ebuild 3377 SHA256 447b2b78d1f38e712a2c7d5
 EBUILD netbeans-extide-9999_p20160617.ebuild 3377 SHA256 650a3c69d5596d9f9267c7bef4ba1c4828f29d5844034cd53c5a56ba62764808 SHA512 f289b63b0acb3ca9bb0b6a0a62e7f59c0d785abde50e4956d852cd3e96b4fa48c70aa527f3a51f66f1d7873126e47e5020869974d477c3fabb8040a28a226c48 WHIRLPOOL 69eb2225d12d239a936ac012fade59ab8c0ca1db87598b15bb4697ad2bb1c18a9caeb0b2e0cc629a2321f432a417808599941ba184ea19a1f494b8d9b6e8450e
 EBUILD netbeans-extide-9999_p20160618.ebuild 3377 SHA256 0b89a7a67e28521b8429075d00b0a9b85ab6c1a765bf405901bd9b7a131f5794 SHA512 118708e266fc7341513444f9514ed311b9177a71d2de79dfcedc4a526e81028486f6fc40d5b85d914fddac123eb33a946853c68d485d0a0772eaa47db85ce7d4 WHIRLPOOL 975bdcd0a9ddab72b094ef1a1341e120e349e8cdb1d791075c7dbfac1efa7ec9946711dbb26110716f4cf014411ae9c7132d84eb36ae7a24cea4a0479864db5f
 EBUILD netbeans-extide-9999_p20160619.ebuild 3377 SHA256 8218ece1f0dfc76088617f60dc1389b5833dd952901a3d4796cbfe9439834395 SHA512 a5773c99fc8a3546ed2a080f2342503a4bc2ba985b9a1ec549cd126da4df72cd0b8ec7c7b436caf1dd5e7306a5a4897943b2545305aea183426e551dac61e302 WHIRLPOOL 1ac9f80566d306ed1df60833007ac3c6bc1c46283aa3532b43e16553d0ec0a6287bbeb582a9ac014001985683656d292717b11fafc1b79b0942b0c18978ba4f4
+EBUILD netbeans-extide-9999_p20160620.ebuild 3377 SHA256 99510df57abd7eb44da5619c2ddea2e3bb9d57e12f05cf87eee6d20671ca76b9 SHA512 f5eb18495c90a14211550d37ef4a560635e97a05274cd15bc7f74a772ac77def18e96b53091614563e8ca0bde555f9ed1b8cb0eb0372cfbb528074333915036a WHIRLPOOL 67c39375c7f4ecd75a7fd01e2eb25e577a92b67c4182b4cee29dccec38947309f4761f37e960b421ead1b90ca93268bcabd11a2db7a8b24f4270bd41762d32e1
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160620.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160620.ebuild
new file mode 100644
index 0000000..b6db662
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20160620.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans ExtIDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-20_00-02-33/zip/netbeans-trunk-nightly-201606200002-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 c5bc782..06c9849 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e27929
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
 DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
+DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62d58fda2a89ef87d7a1a3d4080b66aa8330fe9a2156d8ca9b69 SHA512 9d7c92a325761b3c448c0876858865ef49963abdd40099dc9285fe3164709229de780d33ef08379787d05f4701cbda407794e32a33966cb3ef30921f60639674 WHIRLPOOL 080ca294dd6ab79bb8df1f1a9caf54765eeab73b4e7ae38ecdb9eb25c889da44c5583b61296e8f68dbb8e0b0ce30810e580aee3008e1d50bd156ca96184caebd
 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_p20160523.ebuild 3416 SHA256 53858a9940b83578c2efc16b35fd63ce2520fc1cc58f8bf7b93e28383ace5820 SHA512 3501a897b4c3618b7d98b90870b80f4a03fb6e8bdb5c3b2b78b1c2aaea3321ab8cf42fde5ed5d89cc4180a34f13f5e8b7218e04cd8fd34c57500e61aa1c59631 WHIRLPOOL c5a388e0b7e1901be94bce3079b106b9947d6bc57a1020ae8bd4337dd448f97a7d7198d419936cbeb4250285ce02ef4f4e9cc2f3758aa60ecfa82a59cc253c97
@@ -53,4 +54,5 @@ EBUILD netbeans-groovy-9999_p20160616.ebuild 3416 SHA256 42300c18c16b927900009b2
 EBUILD netbeans-groovy-9999_p20160617.ebuild 3416 SHA256 2cce6a5f1d074a83eacba1e5bf12d0ed5fd9d0edf2f194942e0774da0df25067 SHA512 9783839e20b93290f354823135874a736dcee8fe48eac63819dfaa13d1dc05f10f2be1e663dc4b6120408adae3ff994e7d443897ed8fe280062e0b21908824d6 WHIRLPOOL c8d6418b606dca59de0bb60606fb182d69ba9829731276a42201d612c4537338ef19b75c837fbd3c916204701f7a7c179786fc35048a4c76063947725d04ba67
 EBUILD netbeans-groovy-9999_p20160618.ebuild 3416 SHA256 1520a2c04fb828d423e531479d79a367b550acbd4f180f3ad1f2c60d44143271 SHA512 d5be892dae22077a07622f9338822ff4118ca8009da4947be99ce289cd7cbdfc49589453bc8e12d6e5f03601176ac683dc444530366d9fdf4b07b556b194e573 WHIRLPOOL a5353a0543c341f6bfc2c4cb1763ad7e5a6393596d9c28fcbda81bc37edf4f32e017f06879d8fb0739445a6ab692737693005783cad9d3e8a6f16151e67229aa
 EBUILD netbeans-groovy-9999_p20160619.ebuild 3416 SHA256 b99f21addf291e4d4e197d424f37322f16ea656df1b39cb1d435a0f224d0d698 SHA512 a2a68139e97d1cb61f0996b63daae1d7ac74039c06d2a287085f66bcd73a16b0b0e745abce478b7f49f8b3146ec7dd9aca1cd44c17ad84e35770a0fb2dab6bc4 WHIRLPOOL 71519ff4e6e6fc14c760c753948294eaf201e5bf67918629cd51293367ede03f62f30dcf86386eefdf0ca8d29ae773656ee27d60f2b0b707dda111e745dcfdd4
+EBUILD netbeans-groovy-9999_p20160620.ebuild 3416 SHA256 e9d9d62161cbfd589ca3a3fd99e9f74cb513fa68ac10cb19b9de400b4cec3c2f SHA512 65db3d5e678caf69f6dccfaa42e2d4a492dacaf98952b71d708eb161af840b547171a13852fb6a5e7dab750db6bd0b1efad8576d00440c505c882ed5ef5a79b2 WHIRLPOOL 2b0b67c7592676890d8a0bdd3f736b28e92eea10b43d8d99215f7887673b7bd966d311d832decbee29c4cee93cf76c5f3f19f84d7c86cf69ee73003b602cfbee
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160620.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160620.ebuild
new file mode 100644
index 0000000..dad5422
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160620.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Groovy Cluster"
+HOMEPAGE="http://netbeans.org/projects/groovy"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-20_00-02-33/zip/netbeans-trunk-nightly-201606200002-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 9938c97..a524c18 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e27929
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
 DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
+DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62d58fda2a89ef87d7a1a3d4080b66aa8330fe9a2156d8ca9b69 SHA512 9d7c92a325761b3c448c0876858865ef49963abdd40099dc9285fe3164709229de780d33ef08379787d05f4701cbda407794e32a33966cb3ef30921f60639674 WHIRLPOOL 080ca294dd6ab79bb8df1f1a9caf54765eeab73b4e7ae38ecdb9eb25c889da44c5583b61296e8f68dbb8e0b0ce30810e580aee3008e1d50bd156ca96184caebd
 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_p20160523.ebuild 4126 SHA256 d5ef830ffc8ea2ebda13a6eb51a1942489e7e0106cf7d363eb3b071330444cfc SHA512 a7023bdcf6b1ae87bc33b28b02974d0f1e068354a94f3995ccfdebc396a08efbd752a87a52d76b64c21b8092c665ba0c9b2b9e3a781de2286b9ef2eae3a96842 WHIRLPOOL ccbec50327b9a2a6f910850f5efc53bddab511f59727e1d18cb14696d0852bdbf40c4dd542a3191d95d7072a7bf420939a622d4bafb94a3cf67b2ab301882636
@@ -56,4 +57,5 @@ EBUILD netbeans-harness-9999_p20160616.ebuild 4126 SHA256 ba685f70140f5011e7cfb6
 EBUILD netbeans-harness-9999_p20160617.ebuild 4126 SHA256 54c77b47df014cdd74a352e0884110d11db27744e0725b26ad90c408d748ff5f SHA512 c4389f5c8c005b220f27e7fc7f4f607a92780f476946cfcf6e8108f44b263c73c48fcd30dcafb87e801e1c7ce5365d3888591ed170b85550cabc0086511a2036 WHIRLPOOL 8925bae5a670d7ebb456e15614d74e548ae37728039541cf8242ccc151ab2c4dc729ba01179ed68d21d447d229acba1b2f77312fec119a7940a91264c4706408
 EBUILD netbeans-harness-9999_p20160618.ebuild 4126 SHA256 78c646271692572f5f2ee7955d01147f3494279156ebd01aaf185f014937075f SHA512 c3851f73072dbf358970f524bd150acd10a7dd9da4a95d9d237ae6e4b89518bc2becea4d0049202bdb7d7baeddc9461d6b7d2d9bb84448df8b67a81566dc5f30 WHIRLPOOL 93e91bb9a47850a72943bc0bf9aea25e2e51eb293be7c52f58b016bf98710120fb039ebefc452a2681402b71e06cde8ada423541bae611b5b8b4ec46e88e19ac
 EBUILD netbeans-harness-9999_p20160619.ebuild 4126 SHA256 fa85ceff556cf477ff9e03abaa0efa3914a4999fed15849b2566d2049091b68d SHA512 acd36f4e9d684e03f1fe4fd36a054dadd58d75e209a619d3fcbc422f4029a8558d48a67a73af1748010e55d8e9ebca7a74b57b3f42e3008ed3279acd20c1e5af WHIRLPOOL 7f680cd3a1113af287495b71fcb09099476d787527b0ec73a8e40b823c520c6dfb5151442b93a6fcf143b8b07df7e03c0baa86cfdbcf012658f7821c43331793
+EBUILD netbeans-harness-9999_p20160620.ebuild 4126 SHA256 b780bdd9c4558c4822f7a815f3a4b1ffc2e9ac0a08bd2fa82eec870b1717f7ce SHA512 f0e5d2e950bcfbf15ca373da493210ae0e28ec7f42ada50e9afc0907ad5376e07b4047beaee823abb226740dab1edfdabe146b891688876edaa9801943d372f9 WHIRLPOOL 21acef74d7cd58deeeaf783f50f50669ca532be9b9e7214a63ada8b1ad5024e24cbe90930d15aab139c11ed99a48be1e52ad33404864461f4ea23b2e1f6d7242
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160620.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160620.ebuild
new file mode 100644
index 0000000..6ff2084
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20160620.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Harness"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-20_00-02-33/zip/netbeans-trunk-nightly-201606200002-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 c811588..0d90a5f 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -166,6 +166,7 @@ DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e27929
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
 DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
+DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62d58fda2a89ef87d7a1a3d4080b66aa8330fe9a2156d8ca9b69 SHA512 9d7c92a325761b3c448c0876858865ef49963abdd40099dc9285fe3164709229de780d33ef08379787d05f4701cbda407794e32a33966cb3ef30921f60639674 WHIRLPOOL 080ca294dd6ab79bb8df1f1a9caf54765eeab73b4e7ae38ecdb9eb25c889da44c5583b61296e8f68dbb8e0b0ce30810e580aee3008e1d50bd156ca96184caebd
 EBUILD netbeans-ide-8.0.2-r2.ebuild 29330 SHA256 4822cbe26fc19685164c35d69e75bc20578ca8a5ce3394fe97bde6acc721fd2d SHA512 552f35cb1aa5429beb70c72a0cd2a3aa3a006f5870ec4084e88632a39e2ccdc05d0b2b15a87f26c72cdffb3c9a6fa0a124a8d501edeef9aa9580396922071e8d WHIRLPOOL 4c9bce3ca21d5ae61ef9392b9282c2dff9de7f82f2e83d2944a2906ca2180ef0ffab59489bdbb6afc7ba88d5143d77b47a0cf6b219a5a4d385b68afcacd3fe6d
 EBUILD netbeans-ide-8.1-r2.ebuild 30301 SHA256 892f20531352d85b5b72b1c85352eefa444917b515b0b564f04c4f91d1e654f9 SHA512 50af4873fd3ea7755b0d33b086be7e07766b6c009a46ec3954a67a1da9930378bcf9da6d18b7e60078b31af4b36ccf060f22378a8ef26b3829ccf30a529dd023 WHIRLPOOL 1024af16e7cae7f4728dd37f88031be33253b7c62548a095d3e827abeccb6c183d34ce312bd1a0f808f0d107aff217e4b81b7a17eecc6842e1d914d7061df2c9
 EBUILD netbeans-ide-9999_p20160523.ebuild 30761 SHA256 93157f7392922803c69db9d37f246c546acb4c757ea944c8a3c5425bfea0db37 SHA512 017df530f8c63e592530c534a028b11ec82a606bf2311c2abdeb33b0b3851a8d3fff499635fff3ae4ef8775a175996475de40932786f35cdc84cd4ebc109fb8e WHIRLPOOL 271c02baa53e7c6303949260fd460b181430371b1f99de3ba91cabc858eadd8fc875fde7b59c7b2eccac3befea9df16eabc68c92b44b4d112e226c8322ce0358
@@ -191,4 +192,5 @@ EBUILD netbeans-ide-9999_p20160616.ebuild 29867 SHA256 8b9b24d96cfb1fdbcb17529ba
 EBUILD netbeans-ide-9999_p20160617.ebuild 29867 SHA256 53d1bb1a38af2096acc8bcac092971c9ebd87550525700a860154b2bcfc09544 SHA512 c49056bf2adeac686404a08dfc22b73016c74ea5318358c4e43f890f8ebd8ec3d7c97f1727706b39a7a9c17ee8a2869b42f4beba95dcb2f57a314d85f7da31c3 WHIRLPOOL 99eb56bea610a3694210d633255efaaca9e6511d7ac1045a2e161875e347220bd0222baeb46772d1fa2252303b99af92f5240977fbfeb84b7280bd707c221f45
 EBUILD netbeans-ide-9999_p20160618.ebuild 29867 SHA256 0ee16b306ed43c6046e732889a414601d54d0c9d3f0bfbcb7e991390cac2acee SHA512 d1866d8d43925d4d4e15918edd8507dd2e464d5e4ca3060b5bde092d4e382a60a99f6caa75a5998d29e5f20e5c1a8353a461083ac4c6c50395c101d40ab9f3cf WHIRLPOOL 13d7d144d301659be57474188e2ef5c2ea824818a248c64a981296f88f93e1437f54ec5a8c2325b8594d407ec3d357b5cfb307aadfebac8989c1ed7540d5e300
 EBUILD netbeans-ide-9999_p20160619.ebuild 29867 SHA256 72ddc326ea660a16eab2730a23e574c7299e7c950400b03d88b67f9112a80fae SHA512 28b30a234da4b930cd64b3fe7c94cdad5ba5f0c60aef4b4824fd13b2acf67b96473502e619b191ad1f7860b4249efe85518f19db0a19e06c6d526f227ea031db WHIRLPOOL e08860541343c964a569b0b4a53f657b476cbb693ddf6ad34f74878f500fbfae58cabc626c4b1eb389c2fee7d08eb6c0cd19bcaed7ca2fa48ce2cba1550bcae2
+EBUILD netbeans-ide-9999_p20160620.ebuild 29867 SHA256 3b66da71001f5525582f0d86751a8c7cce67f2749d495a171f26244ca77f74d9 SHA512 f0a62c77c8200579bb3ca8c9b05633233be376186cc306a7a7eddfc133470d49bee97a8d9a12670d3cbff3c5cf29387da6fcdfe2c370645472e82a39dd7dda4b WHIRLPOOL fcb971c153644e5645a3e182136d7b1052107d690b7f7ef49142ebe15ee43feb04dfbee62f5d4b2d9b55eaba8644bb01492300605909fce77b8f4e5a1ed8ef36
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160620.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160620.ebuild
new file mode 100644
index 0000000..838eedc
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20160620.ebuild
@@ -0,0 +1,374 @@
+# 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-06-20_00-02-33/zip/netbeans-trunk-nightly-201606200002-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.2-1002.jdbc4.jar
+	java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar
+	java-pkg_jar-from --into html.parser/external icu4j-55 icu4j.jar icu4j-4_4_2.jar
+	java-pkg_jar-from --into html.validation/external iso-relax iso-relax.jar isorelax.jar
+	java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
+	java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
+	java-pkg_jar-from --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.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 9a33a03..fdd9e62 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -69,6 +69,7 @@ DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e27929
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
 DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
+DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62d58fda2a89ef87d7a1a3d4080b66aa8330fe9a2156d8ca9b69 SHA512 9d7c92a325761b3c448c0876858865ef49963abdd40099dc9285fe3164709229de780d33ef08379787d05f4701cbda407794e32a33966cb3ef30921f60639674 WHIRLPOOL 080ca294dd6ab79bb8df1f1a9caf54765eeab73b4e7ae38ecdb9eb25c889da44c5583b61296e8f68dbb8e0b0ce30810e580aee3008e1d50bd156ca96184caebd
 EBUILD netbeans-java-8.0.2-r4.ebuild 13298 SHA256 d4172dfdec5afecb1cd099e18a21aa872c7822bff40b192b5f4ec4d35e6e0ef8 SHA512 48ae6f7141117fbf58123ded750d76f2e7311211a6be3b62bd491349817460da11f781ec5694da91584315547c32008f568fac3bfb406dbdb5ed7fd825ff694e WHIRLPOOL 73fb68aec003707c14b2b390c2de80f24e1e5413cf7e16cf7e661af47c908e2d559214580379e45e21d316767987ac906b5a119a61ae39f03c3d01dafad49b7c
 EBUILD netbeans-java-8.1-r2.ebuild 14814 SHA256 1f49212c90fcaa9a6483f19bb60c963520f20aa08c2a509aa19cc7fda12e4564 SHA512 2d6b225f5d32f0ce1801124808b0cc2101f16a703540877c4818be06694742cfa262c3a2e7018761254f9244a7992eb7fe9bc15cdb20f6f4cb83958789c0ef42 WHIRLPOOL 8557163a46ea91a47efec3c272b8a8a0f2acbf9eaa8f6c280d0ddaac6dd8b2185f06716ab12ebf76fb87fe6c05ab1a14bfd281875ebef586f1304d2162e5f2dc
 EBUILD netbeans-java-9999_p20160523.ebuild 15656 SHA256 2b3a09ae5c051ba6dfddd8f26957bedf50f55c8a74d8728baf51a476bd2af091 SHA512 c6c6d42f52a27624ff66b3bec4741d9bcebefdbd68b6a4051cdef7a8059f15f298bb22146c36a8156b21b944d830754cd9af1f8619b8cfcb21ddac20c9c84893 WHIRLPOOL 67a7d364ac48ad8e964bdb0e5b1aecd88caba1c17661fca12eb6187f63be86874041ddbe6fe7c132008d6d4436b66dcb4d7a9701adf882fbf967f90282d69de9
@@ -94,4 +95,5 @@ EBUILD netbeans-java-9999_p20160616.ebuild 15656 SHA256 08c0f6f91c18424f71499886
 EBUILD netbeans-java-9999_p20160617.ebuild 15656 SHA256 f1ba76130306bd36c5597fc7c8740a77a8c0e1fa792ec156d09bf6f9f10c2d5d SHA512 b939e5395a6dd40732b6c3cb77ea268d85b2b8d770b51c548c338199bcb465da3f62d61dc5be92b6334407caffad7eb38b78a6ac4a949903f4b5a44d821aaebc WHIRLPOOL 511e61adb044b844b4b94d77b688805542a56183e8246033a98209e3da291101c7b0d0327f3aaef9c3d5e490647f2d43bd99a1bc3db7edbaa4458d01136b3e21
 EBUILD netbeans-java-9999_p20160618.ebuild 15656 SHA256 13adf4d265715f0bb5b5c5e79f54dbec9614b10fc45e8319383ab144845b38b8 SHA512 84dccd5265065aa22b9341c1a1250298aeea60f729620e8b6e0024a594a846f98014691555c830f0e18c927081975d401210e545d64359a0d1849e04e01089ba WHIRLPOOL b51a03a19924419ddeb089a55f6ceef3ae15cc3153edcabd2eaa527a10d282aed3d5020115d2c9a0361d54ab5293b91ce2e459d6732ae6d11a3d80808379f404
 EBUILD netbeans-java-9999_p20160619.ebuild 15656 SHA256 3bd997ea34c3a2730eec6737f828a40937d2bb1324f03c04b7f42f5d50c02da7 SHA512 25e233c71bbc75697c71ce5fa0e86e77af2e76a1a5a4ce8602d20d6833d54b72882d38958325de4e8d31b9a5a0622eb2a1b25fac543d20f4c8f4c1673af55815 WHIRLPOOL 34b056b95c30d25525e2e83d22df79a006bfb47e4ba706c80d06ec0375c8b521dd7b265a01c0def667453ce523254046ca54c2a6ba7548f97de75167813ff8f2
+EBUILD netbeans-java-9999_p20160620.ebuild 15656 SHA256 0edb8c9338d57eacca6858cb23266dd8187eef09230b7c8081db95d1b91ac438 SHA512 159296a9bcc5c43113dcb63de8ea5ecddd3506deaaaadf056dc646ea7581b6094553cd4d3af245985e3858e741612366cd2457b23ac60aa0fc70923593f3b8a2 WHIRLPOOL ef5308676c781c3f86ed41244b28970ec073c90ca433101c3cfbf3957fc72c29a2e5ee628cc84b12fb62b0d366f26b144e7bc3405d47a5dc3e1ecef1bebd53c2
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160620.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160620.ebuild
new file mode 100644
index 0000000..4e08405
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20160620.ebuild
@@ -0,0 +1,280 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+# Maven cannot be unbundled because it depends on exact maven version and exact content of maven directory
+
+DESCRIPTION="Netbeans Java Cluster"
+HOMEPAGE="http://netbeans.org/projects/java"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-20_00-02-33/zip/netbeans-trunk-nightly-201606200002-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/47E8B11BBA8D4796ADC351499A07197ADF03383B-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}"/47E8B11BBA8D4796ADC351499A07197ADF03383B-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 8d86e31..7d19b08 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e27929
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
 DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
+DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62d58fda2a89ef87d7a1a3d4080b66aa8330fe9a2156d8ca9b69 SHA512 9d7c92a325761b3c448c0876858865ef49963abdd40099dc9285fe3164709229de780d33ef08379787d05f4701cbda407794e32a33966cb3ef30921f60639674 WHIRLPOOL 080ca294dd6ab79bb8df1f1a9caf54765eeab73b4e7ae38ecdb9eb25c889da44c5583b61296e8f68dbb8e0b0ce30810e580aee3008e1d50bd156ca96184caebd
 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_p20160523.ebuild 4971 SHA256 7e6466b0a6131ed1c651e55ed200b91818c210938b94c3beb0ba466c86324c61 SHA512 39a9364bc7f94872dde339d22c497386eaf4f109a53a93b68db928ef73545572a3cccbb04c81ac1cadd286c18e25b0209d33fade71de9e7f9569f6acf70837ef WHIRLPOOL 1e49e2c1149bb8f77cc5ab5a1b2402d523de4d9d16f4df9ec236ed09878f0c3580c94e5b66e5b3e4dabacffbfab220a693411c5aa2b0d4fa04bf40a21487026d
@@ -54,4 +55,5 @@ EBUILD netbeans-javacard-9999_p20160616.ebuild 4971 SHA256 07f957fa622b72df3ad27
 EBUILD netbeans-javacard-9999_p20160617.ebuild 4971 SHA256 7a35bfa0469c5816d703c6257b7709a94cec814e9de015fc4a28784853450f2b SHA512 0d5b689b13a8411fe202633106f1cd01c9256aaff08830f02fea57a71d74c2b7fbf0fa5149cac6981b15d6e8e9249f67866112caf82d711d3842509f22e19126 WHIRLPOOL ff6ada3f72944ae39de506eb7408fcbe8e856301660e9dcb463d66223b031462693690d8de8bc63d1330eebc5fdab921c708244b9d77292012f3606bed342b6b
 EBUILD netbeans-javacard-9999_p20160618.ebuild 4971 SHA256 6164ef9dca6e4ed2cb6ea614cc1cc6fccb82195381066debae97721167521e2c SHA512 beb6a099d330493b054f5bcfd719946769f7f70d86c2fbd105192c0ab0b195409fee4612e29c02e826faa7ee779ff42cbc42b927551d4a81498ad0e8a3de91f4 WHIRLPOOL a6f6406df960c4fd20c0ddf2a94f6e1e3aa881bfb08b7ac8c16bd4e85b3b46c809d6de299e7ca9f2d1802a4b73cc5a597b451b61422e7df3908490b5456b1bc3
 EBUILD netbeans-javacard-9999_p20160619.ebuild 4971 SHA256 da2b8a275b12e9f6f7918b161ba774af404273911eb844373f57856d81a410a5 SHA512 02291d90b6dc7666da421ff44aefb37d536a11113b3a631ad0cd16c3b0f210804240a4d540e823d5f78ce5d2b952557db92f1aa119f06cd20b48a44d8ace88ea WHIRLPOOL 3deb5220853462938a593d9cd8819e3c7de12b5e3ccbb2d4340ae691218f1c2512d8854c3bb70d506f65fb5ba1da24b47acd31b0b587363f820d75198b1197d8
+EBUILD netbeans-javacard-9999_p20160620.ebuild 4971 SHA256 b15d354298a2102fec7660874828f8dc01540e6d92a1c8104eeddef7a6baf638 SHA512 d06898bbc2d416b5d645a830f6447dd40f20b079d74fc37149c3c4557436f42a442b69add7c56dbdb4c0d326fa65befb4cba5c1a810354959118009a5b49353a WHIRLPOOL c240bfbe1ba3b5d53b70d860f01f80e37097cef0e800badbe46fb4579d453453602428220ed677893efec671b3089dc30e308a5cc843b700c2e366665dfdb7dd
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160620.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160620.ebuild
new file mode 100644
index 0000000..78185c5
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160620.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaCard Cluster"
+HOMEPAGE="http://netbeans.org/projects/javacard"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-20_00-02-33/zip/netbeans-trunk-nightly-201606200002-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 c589f92..1868a9e 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e27929
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
 DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
+DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62d58fda2a89ef87d7a1a3d4080b66aa8330fe9a2156d8ca9b69 SHA512 9d7c92a325761b3c448c0876858865ef49963abdd40099dc9285fe3164709229de780d33ef08379787d05f4701cbda407794e32a33966cb3ef30921f60639674 WHIRLPOOL 080ca294dd6ab79bb8df1f1a9caf54765eeab73b4e7ae38ecdb9eb25c889da44c5583b61296e8f68dbb8e0b0ce30810e580aee3008e1d50bd156ca96184caebd
 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_p20160523.ebuild 6293 SHA256 7e336bded2bba4190c934e3dd27cc4cc2d3216b0b82893bb2ac03343f09cf73c SHA512 9765972bce05fa120ea3c0ca871c67b5244b83d683b5efa00f988336583a402fb15d2f49a420bdae6c68c804f6409e3c61ced1d6954d6b11307c013fe8d03053 WHIRLPOOL 7709fe1fe1cacfe952610db76da279be25ac5ddb40ab141c1426fa0076ccd77c97399b9343f1d48456cc9128924cfc4137c7f1c52e2d9ac7cec5bdc1ab7c97c5
@@ -53,4 +54,5 @@ EBUILD netbeans-javadoc-9999_p20160616.ebuild 6293 SHA256 2c773464b6cd2f9afd9556
 EBUILD netbeans-javadoc-9999_p20160617.ebuild 6293 SHA256 504582e3479edad515e71f6b756148a2395a200c29afd83421ae0d6dbf16de7e SHA512 c3d760188110a73276340eec8fd34325f1534643eab08b204aa0e2ed3499f6b7c24380748e6f954f7e3c256e32308b4b2c89205af9e293518ef8017942c99f39 WHIRLPOOL 3627b38ebb65fb3026d78047d7237907c25812d61af56a251b4c18ac83904c3fd69e2a83f26cba47f0b8db42fa28a4ae2e7a3f79863ad85710e10d9116fa7313
 EBUILD netbeans-javadoc-9999_p20160618.ebuild 6293 SHA256 77a9eeecc11fdb8a1c1f6df2a4caa5830c9b0bb5b1794927dcade36c7ab5780a SHA512 65a1f8bbb00c4958007ccc600deb304cd2414958829f858653516ca96acc8c5538e6bd81526f3bc3f284425c5d56f0068f5f6e14533e39fae003a79640622a6c WHIRLPOOL b4a11cba5e873dabd84b5904435c0b87404c570fc9192dda6aa08ec1373135a0784d8cdfc57891e97d86afa00235e4978c144b680b71491f6fd1ff68f14e835c
 EBUILD netbeans-javadoc-9999_p20160619.ebuild 6293 SHA256 e4fd24198b55e0e7e6513655178c5cf0543c13bf1eef1bea66da2a58f1fd4e48 SHA512 8baf00c3d0779adaa3e3bb495e239498637d71b55dde2b06fae72591ef05e40389da597114c8706e218c890a58ce7805d7da3a2bbaab018b51f60a72c5935afa WHIRLPOOL 2523655dd9f19bbf20c62768b66c15892ab7f7d24d00a48051a5226de2648985ad6c65b931ab8de4864ad8b95951a09347e88452ffa1d0b94c80c8f0e4ffdd78
+EBUILD netbeans-javadoc-9999_p20160620.ebuild 6293 SHA256 70827ae80a9f11fba41fea7f8b864271cffc1bb62a2e8f107d42b4e097576629 SHA512 fcd643106204d563bc6964706486c20485d2f4c09e8b73e3106513df2ad321def5da1a74d4910feca844ca0082fd3da9926585c5d5b0d0d29752224c54ce4d67 WHIRLPOOL 3bdc516df2db74f1164e24c370badcfca7e94d6ce57d8ce3120b628cbd377f0ae69f3d190b4d090ed6cd08bf394b5d6defa228dccfee145050495d083ed12766
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160620.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160620.ebuild
new file mode 100644
index 0000000..2f286e1
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160620.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaDocs"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-20_00-02-33/zip/netbeans-trunk-nightly-201606200002-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 052cf4c..46e403c 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e27929
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
 DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
+DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62d58fda2a89ef87d7a1a3d4080b66aa8330fe9a2156d8ca9b69 SHA512 9d7c92a325761b3c448c0876858865ef49963abdd40099dc9285fe3164709229de780d33ef08379787d05f4701cbda407794e32a33966cb3ef30921f60639674 WHIRLPOOL 080ca294dd6ab79bb8df1f1a9caf54765eeab73b4e7ae38ecdb9eb25c889da44c5583b61296e8f68dbb8e0b0ce30810e580aee3008e1d50bd156ca96184caebd
 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_p20160523.ebuild 4717 SHA256 0f0ce84ebcb9f28cec7ed57b2c5ef667b5d9d385b509db7144b6397bfa123e27 SHA512 afe887a0835853b4c9583461e05c02c8fe433c78385f3d9aa99eaef5192636380c5255230a04f49a8a54367dddd1eec8be26a5b7eacdc42088c505aac3b6248b WHIRLPOOL 16a696c48032092f3a9b7479020676096631f08d199e3a975609a9441c2f4dee937bdf0c26fc16a843ceb89cd9a0a43293e32509d03330941cee243a95de4845
@@ -59,4 +60,5 @@ EBUILD netbeans-javafx-9999_p20160616.ebuild 4717 SHA256 e628c45fab98d8ca675391b
 EBUILD netbeans-javafx-9999_p20160617.ebuild 4717 SHA256 bec98089dd32623bb722f0e5fae1d1093eed93c6328724890acc3840721ff82b SHA512 943cb92b0edc45a56437fb965548f23459a01d566dcb770a6447abacea000006239383e18762e02350d3a0d82dea58c8cd28c495f04ff5410f44dafa6c9ce31b WHIRLPOOL 2014ca5abde56477180de6eea17d521304da913e46fa85b149bdb58d856b435235a8a142110cff3c3632b20846f064b340622b657d52f6c420e6d02394cd2cbe
 EBUILD netbeans-javafx-9999_p20160618.ebuild 4717 SHA256 daa849216b3d786b7549c4e1cf9a7327e234a9e760a9172cfa09a5e006214ef4 SHA512 e43cf9518b97e144c41f32fdec62f09e5c44f31a8223e7f25ad13221c2c09c865a1f7bc5c715f03123ece908a666f42d04b05f9d670ceeeff0d967496e43678a WHIRLPOOL 468bda70a15ad5b812dd83afd453b540dc759006af5fe8893ca68fdfc18c4c87ddef05b945c588b5e90bd30879d284b4e8f31c4d1d89aa3d9add0bf251f19865
 EBUILD netbeans-javafx-9999_p20160619.ebuild 4717 SHA256 d4b6d29310536b5dac6b03087b40f8722308608487aecad11cd037b1303b7a33 SHA512 58a789051b4c644ba58e9fe1b29a980ca904b9b16b00b0ee4de0886360e41748dd5f06825c43b18226c1b2f4bb7a8e7984213a045b2426ef61fc7e2c855beea7 WHIRLPOOL 0203b08c2c7a115b1bd2c80b1486e826e141be1671677da97fa5a556e704e6284c77b386bdba2e25b29dd63cea30a223f4de71ddd0c41f0356e61fff56466165
+EBUILD netbeans-javafx-9999_p20160620.ebuild 4717 SHA256 89bab6c932266ab6153969ea62d1f1447da435e62876207712b890275b341b4b SHA512 e4b58499d1d96c364a3019bf4907dc6bb37721828ed94a9b12f6ed13af522fcb0b24d75f2064b370f2133fc0882375587a066f835168d9921c85440f64a12c1a WHIRLPOOL 905f429b965e9768618140fa6d0b63534a8a26a132cb21392c13eb00ac6c4106177b78bd0ff160f3b69af8b34486c3ff9efbeacfd3a6fc90dfdd06fe98ef2023
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160620.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160620.ebuild
new file mode 100644
index 0000000..821c8b6
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160620.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaFX Cluster"
+HOMEPAGE="http://netbeans.org/projects/javafx"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-20_00-02-33/zip/netbeans-trunk-nightly-201606200002-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 5b90667..5ebfa1e 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e27929
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
 DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
+DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62d58fda2a89ef87d7a1a3d4080b66aa8330fe9a2156d8ca9b69 SHA512 9d7c92a325761b3c448c0876858865ef49963abdd40099dc9285fe3164709229de780d33ef08379787d05f4701cbda407794e32a33966cb3ef30921f60639674 WHIRLPOOL 080ca294dd6ab79bb8df1f1a9caf54765eeab73b4e7ae38ecdb9eb25c889da44c5583b61296e8f68dbb8e0b0ce30810e580aee3008e1d50bd156ca96184caebd
 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_p20160523.ebuild 4412 SHA256 66cef64387a3a46d02ce0498ec523a7f7ff6853758ca8e4f84a9365183e49fdd SHA512 fd724754c9f3e622198535fed41cb512334b2820e0e388a2046fd234bead4b95ba62529fb496d16cd4da44b353f2a1662fc7f1ee1aeb81a2341c8413dea17033 WHIRLPOOL b1818e12e5e1ab9375bdf263205f58a34fb1ac286c75f76294573661669893cfe5ccd46736c9d4b1bfbd3093bd0d59ac44112435540e3d6b0bf41c4f7b6070a0
@@ -51,4 +52,5 @@ EBUILD netbeans-mobility-9999_p20160616.ebuild 4412 SHA256 7d70a21c94bfbe2ac070f
 EBUILD netbeans-mobility-9999_p20160617.ebuild 4412 SHA256 0d0804132eda64caaf465327c65f1e8de1e775a0f976c66a22578cb9c9189751 SHA512 27af844d92d75ae3ebc7687986962cc540e7ae54fcb9c2652e59ed97e9c1733c5f403bdcae6574264e3b697244389240c38b12f6497119ce262cec0270bb4a1d WHIRLPOOL 06d75b57a0038cd40d309888cec18f6c599b5efe9f386d8965527c169013470ac77940372195dc1f38bfa31940be23925d5e661f5cf4d267a48cf012b561ace7
 EBUILD netbeans-mobility-9999_p20160618.ebuild 4412 SHA256 8c5d5d6ed13d9d190c8c88adcbd1db60970f8146c22795eb25ccd63bf84f7576 SHA512 b639cc11e906fd525c5bd1bb6b21979961473cc6cb0f807ab92843700459e83553e68c54f12864240ab065a28b65855ed35db2ec6df7e8c328c168c12f379cd4 WHIRLPOOL b285f04364c855a623deecba8fa0062a4964a68b80327dbdaaffba42f9d170f18fb4b4e5d9eb45187b3655d85295ce81777c6521e00de6638cad7186c416090e
 EBUILD netbeans-mobility-9999_p20160619.ebuild 4412 SHA256 efc0216499f91514fe2cd70b64071a93548275acb68fd489a16278b178b36957 SHA512 464084eed61bf2595c51e3ccfe7069cb4c73f0c82feb5793e102a55820401e265e4932bd7a022f12c6d2f7ec10c37d926ceb1fdd6ba203a5b35d8baf2094a774 WHIRLPOOL 5d7f3f7849980405d94dabe56092d37008aff55202a7565123f3e6d97abe55d3a1addd6e91e7704590184ef77557789490969f06e94de75ed243b7fd09ae763a
+EBUILD netbeans-mobility-9999_p20160620.ebuild 4412 SHA256 e27fefcc1095fe6ddb39b68f53f2fbabeb7535b6c3b0029737817a1acabc98d4 SHA512 ff612db2a4a8ff53bdbe804a0c2a803008a5f63e8560b8de0807ec9ecd23ec40f9a8791bc01f4b8e620ed3f8beeba9a1d25f6831e6440519c6c5120465de5329 WHIRLPOOL 99c2d4ed69999afb8b41330c965e0d6391c6849e79b0dd6eebe9ca04a4ce568f744937dfdedb08db73048fb920d8d0687cba0f419e5b31d91bf6b0d4566e1bcf
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160620.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160620.ebuild
new file mode 100644
index 0000000..84d8f2b
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160620.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Mobility Cluster"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-20_00-02-33/zip/netbeans-trunk-nightly-201606200002-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 11b4c66..8e60ad0 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e27929
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
 DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
+DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62d58fda2a89ef87d7a1a3d4080b66aa8330fe9a2156d8ca9b69 SHA512 9d7c92a325761b3c448c0876858865ef49963abdd40099dc9285fe3164709229de780d33ef08379787d05f4701cbda407794e32a33966cb3ef30921f60639674 WHIRLPOOL 080ca294dd6ab79bb8df1f1a9caf54765eeab73b4e7ae38ecdb9eb25c889da44c5583b61296e8f68dbb8e0b0ce30810e580aee3008e1d50bd156ca96184caebd
 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_p20160523.ebuild 4111 SHA256 14fad1b53c7b898d270fe8da33bb5c8976ce0fccd41c1daefb8a3427b5d1a417 SHA512 e09498992c0c5c8380db80e0b8ec6325f7eabc37803c5df33a373488a67ead0fa1fe2295fe1e0f0d5d3d179e87e6d0edae81c9dbc79cc6095a00fbfc70ff0f37 WHIRLPOOL 6a0107571264e484b13d94e345babbd1f5dd8bfd3198b0caf9f2169bb6f27bcbb874f71200b49f2487831addf42c0e61b611e8d46086d82d82af91f8b1f0dcdb
@@ -54,4 +55,5 @@ EBUILD netbeans-nb-9999_p20160616.ebuild 4111 SHA256 9c0a7c74d266bb8aa461bfed365
 EBUILD netbeans-nb-9999_p20160617.ebuild 4111 SHA256 58aecc413430db5e6e3b57a4df8c5a41df696e8ee65a02d47b3b47bd5d7dbc36 SHA512 b1f801278966dd6dca307bfdcd1869fe3ea0bf57b6d659796a5b621dc45383f494169fe4720385bea686fdac25b79d66b7d340cff24b2e913ac4b0f324c99374 WHIRLPOOL aac34438f88088635720a759f8e52d313f226a6ab6d4b7b048504122e3db0dd8e8dfd85c124bb8005edc81b89b8b5c337ed2b093222b82240010cf6b8c47b08f
 EBUILD netbeans-nb-9999_p20160618.ebuild 4111 SHA256 7b78f15bff2355ae9d2cdd4afb1978acf599c8e17b4f356d22821c53ae9df9bd SHA512 fc5a11eb4d2d1eca9ac072c3d2385be03683eb9454139c10f73e5fc741bc902ab4b31075e5527838820cd7761cd687ac0f7e1b01e169966df68c1224f33ef478 WHIRLPOOL 2ba1cbc43820231c4963123a3fb23ec8c2d4e5035bbc92b4096c079d43ded251a8e496d6da3fedcf336a4e1e49f8f63336ae8c5cc615086317b08e6d0edc9ace
 EBUILD netbeans-nb-9999_p20160619.ebuild 4111 SHA256 ff3b55348cd8c24c7edc1be9b698a3c4e7b2c53f0e8218b3f39ada013d6e994b SHA512 d201de03963aa3d7196193a87bde1d112ea5034212ef0e5a5fece5cc71432f579fb0b3367da5c1da937fbd611124d715c97bdb02e708e896b3244f85810d27e9 WHIRLPOOL 445f10d9f4e19125ee9757d3e24c027ec6a6cc58b7eebf81afe67c804931798d063bea65b1604bce83cc24d53e840f3f114d6138d0bbf31650d82a883fa1a7eb
+EBUILD netbeans-nb-9999_p20160620.ebuild 4111 SHA256 d1bbd78991d6cbeabff33d603d2f52800d263fa962c763dd6f1cfed40048fa36 SHA512 b0a96c8531448cf4a94600e6e7ac226e21983d384ccb0876febe8da1ea67b968598b6850e63f5587d25b3b1dba1e48bd0b1e1c7e36488f4264f89533672abbc6 WHIRLPOOL 2ecaf22bd0e38fed32373e0b760106355de19bdaca7b25b19e7652cb56071ed58a2744972527f8962db134f54e32d5a9e820db203ee17856796662b511420e8a
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160620.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160620.ebuild
new file mode 100644
index 0000000..d36d50b
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20160620.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Branding"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-20_00-02-33/zip/netbeans-trunk-nightly-201606200002-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 39215db..d1ee927 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e27929
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
 DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
+DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62d58fda2a89ef87d7a1a3d4080b66aa8330fe9a2156d8ca9b69 SHA512 9d7c92a325761b3c448c0876858865ef49963abdd40099dc9285fe3164709229de780d33ef08379787d05f4701cbda407794e32a33966cb3ef30921f60639674 WHIRLPOOL 080ca294dd6ab79bb8df1f1a9caf54765eeab73b4e7ae38ecdb9eb25c889da44c5583b61296e8f68dbb8e0b0ce30810e580aee3008e1d50bd156ca96184caebd
 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_p20160523.ebuild 4418 SHA256 065110929f1b98668efb050cd946ea03fb722c77cf68cdd0153a949e1fdad040 SHA512 ad45b8b46fe9da9ed7a3dd6ecb95fee91893fc4f019902090899ed3f91995d788e5fbcbeedd78bd9064d0417ac2dadba7eb83026f82fb470d284d5e5255915f7 WHIRLPOOL 3101dcf33233602cd30230931865a1b4bb3bc056e141bc4d32239b525b7ec6e745457ed2fe535dc05a878ecd6bd107cc053ddda330fead0493434df257e82dc0
@@ -56,4 +57,5 @@ EBUILD netbeans-php-9999_p20160616.ebuild 4418 SHA256 be0e2c81d9c13822532e29b2af
 EBUILD netbeans-php-9999_p20160617.ebuild 4418 SHA256 4f6fac16dfa6338a6c58f16b8bd57d0c3db7d4367e3f40c4d1b45fd7fa7c3c96 SHA512 e986bdc678f578913778b2de557e7699813260e63995b85924ac86a5e51d89cada43ae73e0c84be88d564359d37b65d609d9a4bcb5eb25d06ccb3ac68ec82d7b WHIRLPOOL b4f901927295c97ece9b6488b3db7023fc173fdebb371eff84943ac7b008daabcf2885350e0efa26c9a9faea28570d6324eda75bc5abf42169ac6548e970f195
 EBUILD netbeans-php-9999_p20160618.ebuild 4418 SHA256 de42362981145792e82ba982195d079844dffb942f0695b7aa6dfdba1f56abe7 SHA512 816b47ab6b259a3c5633852833415ba25bbb906b75b7ab92fb21d17f912755a7bb3f5dfbb04c34ae3d8ae67551ffaf29d52aa2db671b50d4a5d26dbf8a62f0c8 WHIRLPOOL f059d2115d3e0f1ff8ebac72face5534ecf9b34f6c6165cda0358628075cd6249425a0d6acbd9cf5a2a0374bfa4e8995240d0441a76bc20c85431317ff45b19b
 EBUILD netbeans-php-9999_p20160619.ebuild 4418 SHA256 53e05c163c65dca14ea563179c50dbe9b39c0538e22b24658ba3ee1d5b07544e SHA512 d7754a50c1ea296f22ec0c9472d94aeb14d2913a185020a30f179cf2613ade4595e6cd1fcbc4f155ee26e247b01ef288b91a3b2df488af561a77dc94d15acdbe WHIRLPOOL 46c37aaae176ddf638c3f25a6dae2eaaf10193f5bafea257dd6260f332171734646b5421189b7bfe133024f714fa52f8d4760b049c10961977f032fc0ab3f578
+EBUILD netbeans-php-9999_p20160620.ebuild 4418 SHA256 3a9b143d6f707b717a3de6651f8ad4c3ab409b3be518a9f10793420b27c3fe7e SHA512 6f0098f87e3824b172165f5827eda882e8bb7bf3db0c7cca24d69614cc503f740bf68bb3d2bec4ec0977d7a60cb155e9ae93afa4f4b9846ca009e46b77ffbc60 WHIRLPOOL 12ed304091ec5a6ad088dd1750652d72a9ea5c077a877336dbd28bd87c643d6ce33267a43435e71cab5c9a47a83b3ce63524b0e4dc35a10e8e1869a8d485012e
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160620.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160620.ebuild
new file mode 100644
index 0000000..63ba20b
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20160620.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans PHP Cluster"
+HOMEPAGE="http://netbeans.org/projects/php"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-20_00-02-33/zip/netbeans-trunk-nightly-201606200002-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 18bd8bf..d3081dc 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -52,6 +52,7 @@ DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e27929
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
 DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
+DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62d58fda2a89ef87d7a1a3d4080b66aa8330fe9a2156d8ca9b69 SHA512 9d7c92a325761b3c448c0876858865ef49963abdd40099dc9285fe3164709229de780d33ef08379787d05f4701cbda407794e32a33966cb3ef30921f60639674 WHIRLPOOL 080ca294dd6ab79bb8df1f1a9caf54765eeab73b4e7ae38ecdb9eb25c889da44c5583b61296e8f68dbb8e0b0ce30810e580aee3008e1d50bd156ca96184caebd
 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_p20160523.ebuild 9520 SHA256 548daae60d4bb9ca1ce8ab78ff211dea563354611d72ac084fd4331bc9226376 SHA512 644a0e2a32802d79d1af225b68e2c987c7e1a0a5c2817eb43d571fcaecfc0f944d6d8355994b03be94bd3ac031f4528f8fbb0a6ce1b19c0204b8548acc65f17e WHIRLPOOL 770e419ea5972f69a735e5ef0f58572204c4c91a4f016309d9a03ce90bac042872ed71f1133eb36944e4b3c0f49fb14b5fc29d0a584e5e1caed19f84ca077bbe
@@ -77,4 +78,5 @@ EBUILD netbeans-platform-9999_p20160616.ebuild 9520 SHA256 f83b9f7c44432d294cf85
 EBUILD netbeans-platform-9999_p20160617.ebuild 9520 SHA256 ff87e2a2d5058688522f5c1106ba3628ec611e76fb4da967f593b4a867ac0026 SHA512 fc57543271cfbf583fc9308570bd7e9a851567228f13a5b8cb088f65a3678758e6da91394a9a9b16f511fe12656350b3e3dfd13f664e5455ae637947cb5bcb8d WHIRLPOOL 14443637c8b536d3adc1ca73b9efcf10f4cdb52caa884f0aeb2645779ec0c14a60e9e18ed6b070f3d6151bdedde8b08a34cf18bfb32c6c1dd1d49ffbb3841b1c
 EBUILD netbeans-platform-9999_p20160618.ebuild 9520 SHA256 9652f01d9264a93f13fa8f4883463888d62e915bb686e6a94ec72916b1d711f2 SHA512 98024f0152fb694b9137e8c98ef47bf73195f4824102ac9a50b2ac9924410998385c0362f208e13183f09391eb7bcccedb4f2312c21ccd324f5fc1c9a9072258 WHIRLPOOL 0c1c39bfe455f2a92d0ba3d31e8c9fb1dae528a653dcbc3feca755fd810f218495ce5088f8d0600f10f28f4bcacc2c6d64b36bd2101bf7a9fb56a2d357e1c598
 EBUILD netbeans-platform-9999_p20160619.ebuild 9520 SHA256 2bea95f0cf80a2f2f9d4063051704f828876b778ca9a0f4035d13f62a98ed19f SHA512 52efd3b75e7944200a54dbdaf70f449d84323f836393c34917570e1cadf938dee225e1396c5ae86f1f3f92de9dd0b9619338d51f61d5127b9c09d67076fd0a7f WHIRLPOOL 5b00e32a4a57a4f7d375239beabf897cd65ac9e4c00e10a45b26e6c9c1ff6beeeb4697bedf0e11b1bac5db0f4dbc1d9284cc922ec843d89688b64c9c8821f2d8
+EBUILD netbeans-platform-9999_p20160620.ebuild 9520 SHA256 b3b9097df1ef8e45811ab16ce9b54edd6dc4d19aff461e3b22fb8e6982efec60 SHA512 dc382b0c54a0f2a1907b336536c08929b49d8c0826a94772426a19d4536082379536d7963ad31599f63b750aca1e859692760551125b35c9471f80cca9dbd296 WHIRLPOOL c578c6654c62718fba0f0cab39b7657c7d9eadea4108f44d73d869fb0f8cbc0d51fff66b0f41f4fbbfeba0c0d4c5dab52bb06fbd0b05918ee18a42f8eff5284f
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160620.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160620.ebuild
new file mode 100644
index 0000000..9304190
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20160620.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Platform"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-20_00-02-33/zip/netbeans-trunk-nightly-201606200002-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 0933092..7cc6028 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e27929
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
 DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
+DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62d58fda2a89ef87d7a1a3d4080b66aa8330fe9a2156d8ca9b69 SHA512 9d7c92a325761b3c448c0876858865ef49963abdd40099dc9285fe3164709229de780d33ef08379787d05f4701cbda407794e32a33966cb3ef30921f60639674 WHIRLPOOL 080ca294dd6ab79bb8df1f1a9caf54765eeab73b4e7ae38ecdb9eb25c889da44c5583b61296e8f68dbb8e0b0ce30810e580aee3008e1d50bd156ca96184caebd
 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_p20160523.ebuild 3472 SHA256 ba49671f4804d13ba9a60ddb0acb135211adf79eed11c74b3050bb1fa23b0e65 SHA512 008c86783d471332012053dbc3ffc0d884b6d3f85e139200e099e4a6d9d9e5f969d9e24c0443d73de78e3819b3042895637b3a12980ecc5ecc498ebad34ce6c6 WHIRLPOOL b56023e720ea5f8cc1d6ea9d3fc4afdcd40b417066a60d3c01ce24e1130073fd4601712c9867d4d513a993a8e4ea12d99552c3a351f1942f60e024e3da3928a1
@@ -51,4 +52,5 @@ EBUILD netbeans-profiler-9999_p20160616.ebuild 3472 SHA256 0a79f7add54314b729773
 EBUILD netbeans-profiler-9999_p20160617.ebuild 3472 SHA256 164f0b9ed984dc7e5151268f12e5870b162da4a943b97c06b7a1de70b78926bd SHA512 7dc16e0c9aa0bde8a5b412fe12b075ca0dc540f8e032041cc4ccf0bb8e372138cd6079efaf492da9c7944ad013283dedc2ac68c9c4f567de62a7b3e719f8af8f WHIRLPOOL 0d8bddb982b919887499350d7c1233b1d7aa4987ac3b5b5cd51291e8200e3a24916058036898fb73a270c27be0aab70b60237d482cc8ceb4b3521bfbf800ac9c
 EBUILD netbeans-profiler-9999_p20160618.ebuild 3472 SHA256 068ea21c8310f9cb3ba14844998c483e7eb3913779e86591a5ffd6aded6ed223 SHA512 c9070398f317594bddc982896f1112c46ea63434a80a66dfa906c0e5c6475a41b087b4a073895fab308a9b805cec0adf72757f2875888f8e3263a4707e6617e6 WHIRLPOOL 3c2eba6a28fc2d81d98583d3a0b60a0fa2392a4fe3a38978eeb2cca72e524fd12071d99c34583d4d10cbbbd56f2c72464c244504782eb48f6374b97a4c5e1ea6
 EBUILD netbeans-profiler-9999_p20160619.ebuild 3472 SHA256 19af1b1244f0e3ffb19c71bdf9eaf6a3c73793f70ea79e2822d3574fc9a3ed0f SHA512 2e503b285d681f996ee71bf7b9edee711566a8c30a6c7df68984c08ae33058215fd2df41df4667f4c9714a68d039fcf743c57722f6974658bc469b226688efc8 WHIRLPOOL 27138ef985f80a5b6ea94e127e7b00c693c8002912202c623e337c121a2cad02cb9380a503872e08623db6ae72c9f3aa32b4e63be2ebe2a2de593dc62298fe26
+EBUILD netbeans-profiler-9999_p20160620.ebuild 3472 SHA256 2783d740b452ef41f7a254e2980990f4ea2260ccd9863f1e5bf107f6a1ee0222 SHA512 0d965efab8a7f720c2ea49db5312d9157cbd3263d228220ed8fb8e34b4cbbc01e759a1edd21379c79a7925c0fb03d5b4102762c82f6a4c4a016fbc635fa090e6 WHIRLPOOL 1a113912e4d62d5bef5c299a54cb6d64b20650202d601afc2e88c1066ca4931afe4429d57569c0500e423c6467fad8e3db462294d18671c86e39fd8b74d10bfb
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160620.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160620.ebuild
new file mode 100644
index 0000000..6dd70e7
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160620.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Profiler Cluster"
+HOMEPAGE="http://netbeans.org/projects/profiler"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-20_00-02-33/zip/netbeans-trunk-nightly-201606200002-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 1246946..385fc00 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -45,6 +45,7 @@ DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e27929
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
 DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
+DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62d58fda2a89ef87d7a1a3d4080b66aa8330fe9a2156d8ca9b69 SHA512 9d7c92a325761b3c448c0876858865ef49963abdd40099dc9285fe3164709229de780d33ef08379787d05f4701cbda407794e32a33966cb3ef30921f60639674 WHIRLPOOL 080ca294dd6ab79bb8df1f1a9caf54765eeab73b4e7ae38ecdb9eb25c889da44c5583b61296e8f68dbb8e0b0ce30810e580aee3008e1d50bd156ca96184caebd
 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_p20160523.ebuild 5343 SHA256 3a6128a2eadec995b2309f20585928d25c20da6a8ac3e2d0bca609f0440def57 SHA512 3f7afc253b15372d2f3bb0e03a0a046e73a33dcff1790cc7cdeb5ee14712e80992bba65f29977bb183baa9c70117e2d57d3fdccb25abbc0ce50f2dd9b133b8c5 WHIRLPOOL d64563313b65313cab7b282042c11efa238b5ec4881ac081c13f74483a5c29fb67112f0be004b272131ccdb84570873b1b44a177f252d698bb1187a00c4b60b2
@@ -70,4 +71,5 @@ EBUILD netbeans-webcommon-9999_p20160616.ebuild 6242 SHA256 97916f4e9a9fdec59e7b
 EBUILD netbeans-webcommon-9999_p20160617.ebuild 6242 SHA256 5f72901783a18ff4ed6b3fac43340f96891e0ceaa356b5789326f5750f451b91 SHA512 3c839a28bfea0387458fc11fb519f295b16af57a3cdb9f7697dc421740d51deb0e2741682a20d48857f145d84b061a4a9caad636eaa5c1935ed0694e3ac9e02c WHIRLPOOL 0668921f14ca28ef06d4e242f5b2703b6c6f948dc0a4e923cd4976c06b5f6b62723e57b8170aa9dcd5739fa774da250129aa06e3d277a84b297cc12cf20c6632
 EBUILD netbeans-webcommon-9999_p20160618.ebuild 6242 SHA256 4c6a8e293a215d95438690e10906451ba65722879839b8cac25841bbeda15052 SHA512 56732c679fe0aed2736d18b80d5b02732ca6bd1bc2bbdccda9fb69efd8fac177b99fef7af0394d21454caae00aa0db3a42b5162eb7c17d6afe7f83c5ff079781 WHIRLPOOL 3ddb3fd896dd1f9b7cbd9b1b0704de566654de9b602da19bfbfced50e2a491d6b9a55c8c00b4e321468b1729df591c3a241ef8aba034604aca7ecd824c5f82e8
 EBUILD netbeans-webcommon-9999_p20160619.ebuild 6242 SHA256 81033852b76d0de2e2031c3dc1cc4bc1149a297b12d53a871a715bbb77e58c72 SHA512 9fc9deb4ba086076c38c75bf4edeed787fd851e5cd6f9dee53d57dda5f63ba7a6f5b295c7f81e9408fa674817901c51c4a22089eef5f483ae8f9499cbfe422d3 WHIRLPOOL c8c3c187f5668db4bc1fb3445e11e706ffc6a32f912f6b98f4d2a3f4b90aa6f7c50d8a03a1386683215716b2bf01dc03b1be2872eda891921a73a1d058c909b8
+EBUILD netbeans-webcommon-9999_p20160620.ebuild 6242 SHA256 50f813cd9c83364d9fd5abc794f22c989db21227bdf74248629d3292920cc527 SHA512 5450578b8b3a630ec895ebf47d2b79b69228d04ee23035b1d3cee1879442cf36796b1673dea0fb988416ebf55b3d705fdba9f56ce46ba6b62712c6cee8ecf4c0 WHIRLPOOL d96192bac5d21537c42a3a334e95da4c67a166328c844a9bc00203969d093368f7b1a5fd4ce950e8a9715455442d51440801766efc397aaefe0975087c72e8fa
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160620.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160620.ebuild
new file mode 100644
index 0000000..f9a4abf
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160620.ebuild
@@ -0,0 +1,132 @@
+# 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-06-20_00-02-33/zip/netbeans-trunk-nightly-201606200002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/092933967C86940E386EA1799F1CDE4A4E56F0F7-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/070F24B74BF12B52351FF7A9B3F7A074E5117BC8-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}"/092933967C86940E386EA1799F1CDE4A4E56F0F7-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}"/070F24B74BF12B52351FF7A9B3F7A074E5117BC8-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 c96ef9f..2cd6a73 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e27929
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
 DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
+DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62d58fda2a89ef87d7a1a3d4080b66aa8330fe9a2156d8ca9b69 SHA512 9d7c92a325761b3c448c0876858865ef49963abdd40099dc9285fe3164709229de780d33ef08379787d05f4701cbda407794e32a33966cb3ef30921f60639674 WHIRLPOOL 080ca294dd6ab79bb8df1f1a9caf54765eeab73b4e7ae38ecdb9eb25c889da44c5583b61296e8f68dbb8e0b0ce30810e580aee3008e1d50bd156ca96184caebd
 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_p20160523.ebuild 2721 SHA256 3894da4198193139caddba90fc1cd337a26f0bd4753bf5fe937322c5605a7760 SHA512 6b616dc392093a25e2f09be5796bd11873a84bbef8f52360ed1a3a3fded05a4fef0e505c2ee852ec8f6c1118b6f540e862647b3a2d1964e997f6dedc529ca860 WHIRLPOOL d7538ce8e0305952466829d1020b8cc6ddfcc4ebc9c6de573c0f3261714e16f1c342860835b5c23a6c6ab6fe3abbd1b55d282d59afdeeddf60c9d11027cd7738
@@ -51,4 +52,5 @@ EBUILD netbeans-websvccommon-9999_p20160616.ebuild 2721 SHA256 81077dd1a92ffef3a
 EBUILD netbeans-websvccommon-9999_p20160617.ebuild 2721 SHA256 186fef19c7a144fa1510325c057f4cab763b4ea4621c262a158427137cddab11 SHA512 95a2e8994cf1b1edd76b4edba9f7fd097847c01e05be8c6ac4fabb4542784f4fc9717c6d1792387d88d62f9c4b1db5df08c28199c174e328942a247735b37657 WHIRLPOOL 6b1ae669c3ba7bd5bd912edc957f85b878f1d7674978313e9d58462ef554d605062d1523f359380d73069ada48b9705325a69e231773c2bf5db693d597381838
 EBUILD netbeans-websvccommon-9999_p20160618.ebuild 2721 SHA256 816eeeaeefd9971b1c732002cf4aef4b57268a19531062079efaa4ba061821dd SHA512 e306d2913fa902117784b9fc751a5bc2797df99da151fc7040f0c1f7b4e82543fe6ba78efa9c7e760c8f8f23c0c155f178139462da6bf0fdc74848b809d4b657 WHIRLPOOL 47fb5927886c92149008b8628a85bb5411d8f65b0841a7b4f544f40ff203d795b159d5586d511cc7a2cee075bb9264587c617e8fda61696782080603ef4a4da1
 EBUILD netbeans-websvccommon-9999_p20160619.ebuild 2721 SHA256 b3ea72eea2daee4050d15be4651ff7737eaefb858c8377a6e0157f771c99cf0f SHA512 84eedceb57c9426e208bf963849c1c795518f3226374b74e112c34f37027b9927a91d7ece6ee519f92bc2feed8620acd74447d8255df180d61780d2d068bbea7 WHIRLPOOL c902df360ecbab629270ca75265d2358af4276d2500f3af92333503d123512fff1467ff4d34dc135d38180e73367968c2a289fda058348c8728f7625d86b3da2
+EBUILD netbeans-websvccommon-9999_p20160620.ebuild 2721 SHA256 0fba571efa2cbc1777d55e545c9a35a6540b58e5021ccec5a054c6d990140b72 SHA512 893210316b18abb14b4e3ee3c6d8ea86a00f21ffd9f738f9f4c0538d698b20920e7209ffbeb69fc878c90c996608e0c37cada6cc6d7117731d91b853ef0cbb2d WHIRLPOOL d8c6e50f126f595292409989b2ee7312935765c1094f17aadec335f81687b80c5698c88b7b2ba154bb7eba5ed497a06692f8a39d15b3d00dd62f9051b235201a
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160620.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160620.ebuild
new file mode 100644
index 0000000..ab545a6
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160620.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Common Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-20_00-02-33/zip/netbeans-trunk-nightly-201606200002-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 394b0ae..96c714b 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e27929
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
 DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
+DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62d58fda2a89ef87d7a1a3d4080b66aa8330fe9a2156d8ca9b69 SHA512 9d7c92a325761b3c448c0876858865ef49963abdd40099dc9285fe3164709229de780d33ef08379787d05f4701cbda407794e32a33966cb3ef30921f60639674 WHIRLPOOL 080ca294dd6ab79bb8df1f1a9caf54765eeab73b4e7ae38ecdb9eb25c889da44c5583b61296e8f68dbb8e0b0ce30810e580aee3008e1d50bd156ca96184caebd
 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_p20160523.ebuild 6939 SHA256 0d0b635cf7e170090dcd191409e58e06ed8b4d61dd0038b790b38bae2c960aa3 SHA512 833856b2801b06d168bab5303974f440f895590ff86ffa483cd68eb83bc566c098d7c124ba2fac72dde62e1372bd06f15beb79d4dae6013d5d7723f3caf9d793 WHIRLPOOL 59256e6640d1e4c063fb1d7808ac515abfb2e112cedb15522be19ee3bea6010693f38943aa0eb8e0ae3ec5e82bcfebdf4464a6bb50cd414c8f1e166777099196
@@ -54,4 +55,5 @@ EBUILD netbeans-9999_p20160616.ebuild 6939 SHA256 d9ed9644003dfe397e89f927b0377b
 EBUILD netbeans-9999_p20160617.ebuild 6939 SHA256 9ec68f98e1a55cbdbef4c612cb04ceb415be5a934090bff531861141cab85511 SHA512 526c74f5d20aafdd5aa2c52bb5915608c4d9c89be5c3b1db37b29602ca8dc2ae8a6012c14ff13099e63a5b2356dd04b5d185f2eda68c6ac182c1c7e014db7482 WHIRLPOOL 8479fda2e78eb352c65d9618a5f9b0abf70e40c186010530d275d72df9a031b5591483fffdbfa108759c7de3134e162bae814e34be1b62a63b948f553124bd4d
 EBUILD netbeans-9999_p20160618.ebuild 6939 SHA256 115c177d4137f3b54438b94d1ea5c2a374a1bcb8b851589c699bebfcf2ead4a7 SHA512 0a4190e0dd4210ea6ac423669cc550028b43ec4e2112238788904f7458506cf4d050a6b0152c4855d7632fde76980e7ad4ceb2b34c2f2c49b9a3a63099ea6436 WHIRLPOOL a81bee366bab0a973e741a09bc315656cd34c9e175c4d6af541f08c7a71d04f4c18634fae2a8efb0e8384924b7c922d00f490dafc20628d8ccd4428717d8eb69
 EBUILD netbeans-9999_p20160619.ebuild 6939 SHA256 da8991b33d26229f4c62b77cdbe12cf66306c2d891c109f7c471857248cecf62 SHA512 d5ef59d47f653b5fc5484c834d5571fded1d98645d0364790b6bce2e0f11f86133aa2649c7ffd8089769e6d2e2fff32025f8fd60cfd5385bc03d731321d00a43 WHIRLPOOL 3c55665ad0770d827d63709124f4bd70d61b7c3e099acba84fcdebff685427cb118322750d175baaaeb0a376e5251bdef7df2b935bd6640eebae4db52dac496c
+EBUILD netbeans-9999_p20160620.ebuild 6939 SHA256 8d7f89bd84e5979e27ac02ec9d644b8735a29ac19227b954ce8d5303cd9977ec SHA512 062c9d78fe2a6ad5d43248f2358ebb5351bc6f9b81ee430c914bb7f92d9ad0743312ec65b432e176900a6b8247b81ecc4b8ae11dbeb80be149f9482a0824a5be WHIRLPOOL bccb4c83212e26a002127747691ade7a7302300e8695e0a7a4caa312da4ea0a1e36a95a6c22288f2f2eeb32e72f6379ab9cc4b52eb43df28557b54cbccd15ee7
 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834

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


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-platform/, dev-java/netbeans-apisupport/, ...
@ 2016-07-16  9:02 Miroslav Šulc
  0 siblings, 0 replies; 4+ messages in thread
From: Miroslav Šulc @ 2016-07-16  9:02 UTC (permalink / raw
  To: gentoo-commits

commit:     b1b403b5f148ae4cb37256b8251760061f471fb6
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 16 07:30:44 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Jul 16 07:30:44 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=b1b403b5

netbeans: removed obsolete ebuilds

Package-Manager: portage-2.3.0

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index da467f6..0acc7ae 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
@@ -31,7 +30,6 @@ DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 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_p20160614.ebuild 3384 SHA256 dbe70b440097697475f0437a79bd2e49084ed5ef06b83942923c9644c77397df SHA512 170f9342d1ac1fb191c99b726f489c18c88c74695fdf2687c9259e86e8ffdae7ec6afb2ab38d4f8ba9460177352f51b2650d52e051a5b136cf389c325b362986 WHIRLPOOL 191e8b000a1f0383d4100e3cb3f0f7f1866550b5a27707174b6b9f676a84927e9515385c98f586a9356ac45646ac06fd580bc487b34688d0c7634351c4a8998c
 EBUILD netbeans-apisupport-9999_p20160615.ebuild 3384 SHA256 de31ccbcdeeba9d8d40a157baa24b6dd6ca5225e548bea0a8cbe266f6d55d2f7 SHA512 22c669ec757606e538630f99d779c2bb36bc72776352a64a53446ab5cbad913851996e72edd770d58e5657a5805ea5a1b49c29bf4b3359c4c7085dbec3d229be WHIRLPOOL 3c9998371f14697acdc37052ab4b2046e2d9b25e2db3860fd4f901bef2c2f44c45ceeb01fc927bd0fe6d0a5f82423c9c713a10bfec73954e09e0d962f1713f9e
 EBUILD netbeans-apisupport-9999_p20160616.ebuild 3384 SHA256 bc49b6a8adc59bad429c2eb36d051e35f84001396efc0f0f408e283c74ed3a40 SHA512 90f065ec7fb3b165c2fde3a74a75a403e484fce94e1a06b1fedb213955177c8ef405289f6f9a4fa9b082ad00ac8ff3918c4c5c7eb2cd6e0789cc72db844bbc78 WHIRLPOOL 5d754d206a00ea0688b06d70711d91a9e4a3f342f27f846e46810c8cb5c1af60a2956bc0c838b84c9ecdc1f36d0bc897f2a5f811897290a5ada6f8298ab38129
 EBUILD netbeans-apisupport-9999_p20160617.ebuild 3384 SHA256 a5b5da4b2f4bbac2539b0c0ef9f57e8a7db48468102979be697a9e73573570da SHA512 9d57fdb21863821bc5115d8dffb776045e752f2f74ecbd1db29cc377e21f29ed5a3c7b8e469e0b7532d1218eb75e7d25ed1f95cc680785cee64486ed1e7cb60b WHIRLPOOL be4d9ea7fb35426d8a00fff91dd1f9c8ec6906b9b2ed4e49e23ab592cb3345a066541b58f3b8b4bfe5b26907096253a6a08b977b13c82ade9cacab05126215e4

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160614.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160614.ebuild
deleted file mode 100644
index 1288ca3..0000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160614.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-06-14_00-02-33/zip/netbeans-trunk-nightly-201606140002-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 2efdeae..6f9f890 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -16,7 +16,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
@@ -44,7 +43,6 @@ DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 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_p20160614.ebuild 4790 SHA256 f910b56ea3f91aa0fb754e8299f13e6631bd18da7fc8e9c3f00831b89a0df2f0 SHA512 7b45e035b786cf35794cbb0c85c86093059a7e2c92b34d9e971ce000e115de24ca4406e251cd0ffff4595db77cded21fafa1b97145cec498e90de36987d3f734 WHIRLPOOL fea295483894adf1bab479af2bab61fd2e3e39178a830f11dbe9344d3f7a3c1824ce6c2d6ef8572864330650cb6bde24f74ad06de9fb9a92a2fe9428c916f189
 EBUILD netbeans-cnd-9999_p20160615.ebuild 4790 SHA256 38f8572e229753c2eabed5ff296b679373810d8e323042e8d49e24085cbd3bb6 SHA512 415b919ee8c2b67260497f46ff2ab743651869cdef9ca572c1560b6a18e8cd5593b96c72c501d235817231e575dcb5c90e6073cf6a645396e334acf39b210779 WHIRLPOOL 65a20532a537e9d5901188a73797c14f554437c113ce0c2e1ea9d20862bc1eb13df54110c395c03d2d003d0acf364cad0e4578ff69da0f7548ad5197475840d8
 EBUILD netbeans-cnd-9999_p20160616.ebuild 4790 SHA256 8e81c1d6df927f8e816c79073c2d50464893b359e1fa7353f81f9d29817544dd SHA512 07297874102c79c5c1e5d7e5d7f52ac3f9964912a937a5b0294656a13f0c93b5757ad684b688960b6b795439bd4cc3bf5ea69b56cc2b1b685a73035f083a646c WHIRLPOOL e03629cd10ec0ff49252650cc82046d95f90e54178a1cc74ffd116000f55deb4a84cc96491d68bf11781f9b1f0ed9c819c7cc7544ce607b591265ad916b30fb8
 EBUILD netbeans-cnd-9999_p20160617.ebuild 4790 SHA256 6f942202ab23b8565f06d1c53671d371ed9c41d106507746e3632255b1832e22 SHA512 975cefa161f05caa12a81afeeb413969351e73d43b207e8a1920302baed8e3cd65c6a3b7839c8955153538e04d8f5bb9ff7d5f7bfc022491d405bd415aef6761 WHIRLPOOL ea58a42c90e4050eebc95891602bb07b7c0c212318c9bbf773e69c8e84bd9ba459e2875fc7c3e68e56764d3e7fb336abab1e26a373940a6f2ab89b2e3f79b912

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160614.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160614.ebuild
deleted file mode 100644
index 80c812e..0000000
--- a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160614.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-06-14_00-02-33/zip/netbeans-trunk-nightly-201606140002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar
-	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
-	http://hg.netbeans.org/binaries/85FD13415B0553D6421F4BBA5FE0F587B9748B20-clank_0.3.6.zip
-	http://hg.netbeans.org/binaries/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}"/85FD13415B0553D6421F4BBA5FE0F587B9748B20-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 9dd7147..6a3e6af 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 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_p20160614.ebuild 2968 SHA256 d9fb867992793fee5e3b85f4ddb5cb978e3ac10769c027379bace490e21147e0 SHA512 a9fddb6baadb4a8de720821b224a14181e4e6c22f3a86762715084d350d3fadeffd3af5f1019acb8d0f3b3011985469b1959663203d12a1e520026c1b250761d WHIRLPOOL a97207fbc04bbd0be11bb873dce959dee17efe580ae9b2227c99dc5259d8c3d8679946ea85a047bba0a64720488a21e271410393a84c3f80e422f3a67d8354b7
 EBUILD netbeans-dlight-9999_p20160615.ebuild 2968 SHA256 13d25ae9bbe7ad583f2ce72c81401572196e7c1815e938d7cee740af7b2a9d03 SHA512 e2c9882371a4213af2b9a21c406e8cb2a466fdae19a2d009e21a5d87e1aea4f3acaea75feb0be54c7d4c9ddc0a865c21331385ec0a0cf016b88b234e4e7ec8fb WHIRLPOOL ec3edc855681661988eb21a0a5ef3f1a5eeeb556b63fff360e20f494a8f52a8753e7bb1724a9c45e87a3ec2ea9c3dc347039e7172c0b9361c3b75cc489cb2d10
 EBUILD netbeans-dlight-9999_p20160616.ebuild 2968 SHA256 97e12ba216fa4cc3724ae0ecd226dd8193562c10109bef67d11ab13f25bf772c SHA512 dff90f1f42c224a0118393227edc0cf29b6c46bc8dbe8a147c30f66a6b7bcf3913387f4b3bf563a52de2f1a2e26677e6ade96bf3286bd5cce08b20430ff54047 WHIRLPOOL 91c2a62d695a76d9fef57c9cc0fe4aeaf2c911aab4114a62f7f9bad1bd40d5871608c00fb0eef449bdaee32feee39ec847f69b9e0cf98cd1e49315a88299c318
 EBUILD netbeans-dlight-9999_p20160617.ebuild 2968 SHA256 62289c46af8720570469a22d8bcfa34f84504175a00cf3f95c2f603e28f1774c SHA512 b58ead7b51fc5c991d221438b13ba3980b0097b3663c3b8067198f591906dcedcab594dce486cd3908fb3b62b54e4e471361ceab70b4034249025b9593b2505c WHIRLPOOL 4e26a77ad6964911923c11556b86552bbbcbb87676dc6bfa6a6858ab77bd06e3b1ddc47143085b559dd52e1662d2643f760eec8cd5a79268e79d47c023150bf2

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

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index a5b8276..3acf6db 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -35,7 +35,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
@@ -63,7 +62,6 @@ DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 EBUILD netbeans-enterprise-8.0.2-r1.ebuild 15075 SHA256 41d376117ad1d8d59c8194debfd29dc42f5fd4de70aee12a2134ec143a604dda SHA512 4cd9de88e9a401cc0be88e3e2605abc411c47307818376b2bcc00f9ae570b21324f2bf00fd83e819bfa076da0fb07811fa1f0f9362a6cd0ee05b63221a199000 WHIRLPOOL 73f4518c14430fe7aa3614ebf1b11a06ba0e9bce7479af2770db3a114f149d575a16a655218f757ed416b5149228ac56dac700f5a8d5e034cc838bfa4092e636
 EBUILD netbeans-enterprise-8.1-r1.ebuild 15888 SHA256 d4c04ccfee01a46819020cb7cf8fd8297618f3c0431ae2d9dd7eec8131f988ab SHA512 6c7c39c378cb79d3f382cb80d07710a8c5233aaf0df8fb58889ee6aa6bde73624efa6aa49b43f84105685094a7aff89e4b6367ffd1fd113da27b42d50d07e983 WHIRLPOOL e678e2a6957e428c1b6e51469c0e7cc6a08da2c797f1575b6bb660a7f3281c00f071179de459e27c983304915b005baaf94ad4fae0a4c08162f218bf53b7d821
-EBUILD netbeans-enterprise-9999_p20160614.ebuild 15825 SHA256 d45bebf7efdd045025a381bcedca4eda37cecdf22d691de1cd2e7977323ecb9c SHA512 cbd1cbb9c1dcd385ae77c37397b5c7fc5f127341ace488426f07652a480d42b538ce717149c8127de6f40993c45cd9be63b89b1435bff23e40c962e55b255f5d WHIRLPOOL f0f3c2622970c8a6096be2be4191a3fc3844c1ae06e48bb4b1e3de36d0f5576b4022a53cca6328298e5c76af0c8be28d1878ad53656f205c782cd81d0be15e96
 EBUILD netbeans-enterprise-9999_p20160615.ebuild 15825 SHA256 77130d68e119327f47c3e16278b052ac6e00ddc71921fe1908239d257bc08e4c SHA512 e075f331c8fa7e4b571b55a3b0fe38bc6a22936c427e4b021202c2b988636480afefe02a3090b8e674db16e7e2f6977fea8b71298a91d735ec801edf1607129a WHIRLPOOL de35a519d1ce77e7250d09db059f605bf056b43e8826309160f171c03f2c26131fc8cbcd653c20a157a57d993363853461c9dab68b3dad8bc5466d975e267992
 EBUILD netbeans-enterprise-9999_p20160616.ebuild 15825 SHA256 67dc65afc49bae33892ba44c72db823f25ec47f1334f36dadaf31b979d9b601d SHA512 33f20491ea4b39b6f82a6ff0c2df31d58b4b462aa0c3c9b151ea1bad1854ca3653a4f9369bf926d7368b33c88cbb42b696ecfe099d6ac7b165a4c61e56eab5e9 WHIRLPOOL e6c6ccf8b36c2ad1f4349cd37a08c0b656e9204617d8b8b94ae29e2ea37ab6bfb8fab9c8c6421783a51db36d6a25e33d9e3dd3ed78060224e6a5c14b9fe32a4f
 EBUILD netbeans-enterprise-9999_p20160617.ebuild 15825 SHA256 56780f670a4888f18674202b112a3edc91e7787b20c32d56eb4674ec628202e4 SHA512 80c5ee109a86bd4602e78595465fbe6c7bb90eb68a6a37fd56a7555524edd9119c9f9a5e429ba26c6889355f736822b6b8c66b7ce6e05424743c1931f791d372 WHIRLPOOL 933df05eee623d68126fcca4d3cfb503edc2f9934e9e1edfb36bd0b9a189b1b46e39dc6f771dc00ee1d03b12122fa1dfadcaea46d3ce8c86dc6a9757b81a52f9

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160614.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160614.ebuild
deleted file mode 100644
index a32473c..0000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160614.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-06-14_00-02-33/zip/netbeans-trunk-nightly-201606140002-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 e773070..febc7d2 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
@@ -31,7 +30,6 @@ DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 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_p20160614.ebuild 2913 SHA256 a09074eac38df267941db2bbe9e4257e31c00eb1c11836eddd3385dec43545d5 SHA512 72cb8b2542a77a2f74be708f94da431dac6fbbc44d8b4ad710f5030567650b1b17c6f51382f4d42d12b836b6f516ec6cbd18484ebb66b91a07454dbaead4bf06 WHIRLPOOL fa239076a01850a48e0b8aa3e977aeb604369e13c74daab5750452fcbd8e0684fcde631ecda9d30c49ca2e6bcb844a8c90156625165e127f18004b3545d219ea
 EBUILD netbeans-ergonomics-9999_p20160615.ebuild 2913 SHA256 3c42247c47f213d0c42462475abd5af56ec3f9613cf6644ce22568b14f16bce3 SHA512 a0447f785548e62ff069fb34ad869e9ae6b215a297106bddc92c8fc730e89b1ede3c89aa826f6dc241d055a930b633036f59824a1a625cd5df0f2159fcaaf9ca WHIRLPOOL f69500e7df23bdd63a1de8b8f857ab285ff6c209e07cf0c212cd98758030c375bc23059a782c6ab6d65134007835a47a4f2350567a12890e2ab37c0f7d185f27
 EBUILD netbeans-ergonomics-9999_p20160616.ebuild 2913 SHA256 fce9bb6e0222b4c2fc245c634bd247addb6268179796cf6811c5db1a12f5d31f SHA512 4111d7b14ef8c95dace4acb4cea3ae38b1bdde6d99ec2f86d44c96ba17fcf4edbf6414bc0937785571eebd9c3ed1fdf077845d8e6a7efafd9417afd3b2365563 WHIRLPOOL 85b439aac7d6ca7415407c8d5d43a39c7cdbcdd3796d712eb7a4d21d256ef584b045c47c49c80ce11ea068a1598df7874c81595054836d6e9b897c123d01fc24
 EBUILD netbeans-ergonomics-9999_p20160617.ebuild 2913 SHA256 c46bb6c3ff85b87c2a108179e3769a714563e11aedf9bff5ae40aee92ef79cce SHA512 4ebc0b801d5893ace81523940ccd7346e83c6c72ee042ab3d9456ca79a7270e808df1e79208dc2f17a9812572788406ed1cd855e00b3392c2a30c60d90fbe9a0 WHIRLPOOL ee4d9e994d314909b195c20c87f4e27d850d98f45bd70e77d78c425bd6a68fe20ba7857c59ea235e8bab371bd3e9a77efb0974c461431ba94f20e8ddcb58c360

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160614.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160614.ebuild
deleted file mode 100644
index a5b7078..0000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160614.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-06-14_00-02-33/zip/netbeans-trunk-nightly-201606140002-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 964cace..de27a12 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -7,7 +7,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
@@ -35,7 +34,6 @@ DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 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_p20160614.ebuild 3377 SHA256 d522cbcac07c2ede87676cc6cec8de2e0ec79ab2cf7a9af63e9037e79dbac8cd SHA512 22e12e42ca768088bafd4de682787ac99c5e25d7263a17a6d94f6c3674175e8524e1dd6f0d474649a68db752c6f4f4cf0bb7860bc7bf2d57ae37f78964224ce0 WHIRLPOOL c1d657889ab53d84bd893e7569a33788ba6aa805d13822784a3809b6446619cd4c51ed464202c4815ba7c1a25739d13065df03207e8c7d2d201957700ba4718d
 EBUILD netbeans-extide-9999_p20160615.ebuild 3377 SHA256 8d94127171b624564fd15690bf330653ab9776df1870ae3bf93ddbe7fd0574a7 SHA512 b76381372c6c69d566550314e9874d31022bcd45cbceb7ba92b9545fcd4a2d33d283d9a49cf96da87ef944f5d986da7e9eede27b65fa01fa283aea3ab592696f WHIRLPOOL 665d893795540a46647b7617287abfdf494e30ab2d0bf17d60dd1b38cbcc3411701ffa0de858f17bf7d18a161e9505531eab6f0366e47b7fd1d0a0040a972cee
 EBUILD netbeans-extide-9999_p20160616.ebuild 3377 SHA256 447b2b78d1f38e712a2c7d503718b2dd0e3cbe8b4d541519b4be7e4c483403db SHA512 f83bd4312fbeeec6d9c092372338f5d26006b4c4b751912a1ceeccb0f9c9775cc6aa4492d7cdd7fe4437a980a02a404ddc0c7c820e4a20b09bc73a65e3073d96 WHIRLPOOL 906bb9f17627a4c7a65fb3d3dd6b4a40db770f3af0dac7d4a999c9ef08b925e39a03d147eece3ba98b23f79e1a488e4a3f2a7aafc8794de22bbc9bf359e1825f
 EBUILD netbeans-extide-9999_p20160617.ebuild 3377 SHA256 650a3c69d5596d9f9267c7bef4ba1c4828f29d5844034cd53c5a56ba62764808 SHA512 f289b63b0acb3ca9bb0b6a0a62e7f59c0d785abde50e4956d852cd3e96b4fa48c70aa527f3a51f66f1d7873126e47e5020869974d477c3fabb8040a28a226c48 WHIRLPOOL 69eb2225d12d239a936ac012fade59ab8c0ca1db87598b15bb4697ad2bb1c18a9caeb0b2e0cc629a2321f432a417808599941ba184ea19a1f494b8d9b6e8450e

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160614.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160614.ebuild
deleted file mode 100644
index ea9d933..0000000
--- a/dev-java/netbeans-extide/netbeans-extide-9999_p20160614.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-06-14_00-02-33/zip/netbeans-trunk-nightly-201606140002-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 c9c7632..4521468 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -5,7 +5,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
@@ -33,7 +32,6 @@ DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 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_p20160614.ebuild 3416 SHA256 bb3506928773eff23710b353e022829d16908261b90296859d14195a074e23ed SHA512 a62ded04dfe943cdc45b6ba665667e6af3c69d79bc4f79131fb494b6c8103b6e27ea0a61da5e6120bc2e20af899bf98650f856884bc4955fe672d457ff6eb3f2 WHIRLPOOL 5261a809c997890f47f4cf1d284052236396c3c44a038cecdf3621cccea71b212e60c61c3cd011909231666a8919b5da5339e28e6d8929fc0bf530008aba12a3
 EBUILD netbeans-groovy-9999_p20160615.ebuild 3416 SHA256 9ad41132854e17cae83f0c6cc0ec2604bb4d368ed9b195efa27ccc5b7b961b27 SHA512 de54af5750d40b878cff37bd4348be7f3cc28d7eb5bb0893cc337e42e0a53aff96f74b7890e49dab89e848f3ce2f1bd59d634732c9765361b022d85530942a23 WHIRLPOOL 2a8be1c11da9c54ce93d646a7a4bb51470c04f4fe708ec07196fa25d81691bbe1d09466b611021b876804af1acc57bd51caab06d81ae6de37736ed200ed2d4fa
 EBUILD netbeans-groovy-9999_p20160616.ebuild 3416 SHA256 42300c18c16b927900009b2318221ea59ce65006f0b4e99198fa587cfb3a24e6 SHA512 2701a9599d82a38687a322ab46269314d6048c763e85f0f51baa4401c6cdc46543e61555ab50899e9fab0685b34f0a5ea5028bb55bf228771bf586043882b5f6 WHIRLPOOL e0a9fc0909903b0bb78f98981f99c1cf49816ef9f0848f6bc0837378651805e43b3b5bd649def230421215663aa0491c704e5975828e190e52e0b79997232af7
 EBUILD netbeans-groovy-9999_p20160617.ebuild 3416 SHA256 2cce6a5f1d074a83eacba1e5bf12d0ed5fd9d0edf2f194942e0774da0df25067 SHA512 9783839e20b93290f354823135874a736dcee8fe48eac63819dfaa13d1dc05f10f2be1e663dc4b6120408adae3ff994e7d443897ed8fe280062e0b21908824d6 WHIRLPOOL c8d6418b606dca59de0bb60606fb182d69ba9829731276a42201d612c4537338ef19b75c837fbd3c916204701f7a7c179786fc35048a4c76063947725d04ba67

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160614.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160614.ebuild
deleted file mode 100644
index bb7d632..0000000
--- a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160614.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-06-14_00-02-33/zip/netbeans-trunk-nightly-201606140002-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 faea93f..aea43d6 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -8,7 +8,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
@@ -36,7 +35,6 @@ DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 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_p20160614.ebuild 4126 SHA256 c7e7e97ed46d14108eeea2887caf99c3fcee44b1964ad7ad2b76c052c5b820c2 SHA512 4603e234af04f12ced14c9f918e0433de9d6c1a0fb6c20b75b30c7ae27565995e5b20674ff4b9a30cbbbca6a2939dd0b4d17fc02a8c82f7a4ba9aa58bb7edd9f WHIRLPOOL 9bf9e2d84ac48c7cbe85cda87bd3147ad1903f391cac071dbb6391d3e79b2f3b1654077e3eb5b93aedd2304ac1b511eb94cf89c9989c0efcdf103f7ae1388757
 EBUILD netbeans-harness-9999_p20160615.ebuild 4126 SHA256 45d0d3cd6ef47cbe49111aa6cb0d58b0514fa0c13e0a2225b25153042a52b1fc SHA512 bc058ad6920b0e7eaaa4e55fe0174a450b6eb92e5b1602ed18bddedf5a90f62d231bf8d9651296fe92d97c6a4565a47130ac139d54fceed2f6ba4ff71328ec1a WHIRLPOOL f0c579b1403ad36e660b6f7759b231067163a3cd268b927457b2903daadb33c2c38801cc9775a750d6d39662b7afe2c56acd590a072138787fd4ab1dda023438
 EBUILD netbeans-harness-9999_p20160616.ebuild 4126 SHA256 ba685f70140f5011e7cfb66445933d498b4686d1cc897a52fb32d69cead6c63c SHA512 24f7d1debcbe39415a24d1adf8caca164eb1f8e83db091b67b169b8651ac72d16f5e3e32f7bad1b90e21bb80e533c0c7ce9da42255afec1813244a251746d428 WHIRLPOOL 45a2272c65a31ecf8762970c943c173272857b9529d2e18180fac419a58125bdb248a14bbd7cca38efa64cdcc4d50d927efa45f0f1a5f3223964bf0b51a77082
 EBUILD netbeans-harness-9999_p20160617.ebuild 4126 SHA256 54c77b47df014cdd74a352e0884110d11db27744e0725b26ad90c408d748ff5f SHA512 c4389f5c8c005b220f27e7fc7f4f607a92780f476946cfcf6e8108f44b263c73c48fcd30dcafb87e801e1c7ce5365d3888591ed170b85550cabc0086511a2036 WHIRLPOOL 8925bae5a670d7ebb456e15614d74e548ae37728039541cf8242ccc151ab2c4dc729ba01179ed68d21d447d229acba1b2f77312fec119a7940a91264c4706408

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160614.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160614.ebuild
deleted file mode 100644
index c7ef2a8..0000000
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20160614.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-06-14_00-02-33/zip/netbeans-trunk-nightly-201606140002-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 20f9fa6..d4148a0 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -43,7 +43,6 @@ DIST 50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3
 DIST 531746EBE57071AB7F8CCC7ACB0E806F25893916-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116.jar 36658 SHA256 9ef04c1391e6ecc2e3909da3dec67762973582b1868254bec4ad54e6fbccd2dc SHA512 0a1e63b993c863edfe323b3954b57aaa306bb4a57eabd53ff3ca14e0986895340f4746fe2cdd2fa9bbe6ee479bc7cab537fe5fda5f200cdcb8e9c1018b37dde2 WHIRLPOOL 54f0c2c78a5a5c216734b618e34e484921b3ddfec46b7347c061d343c24a83bc2118ba2061833bd18d2ef7cede7b3f063c31207191c79dda6c4a4ac82cad6ef6
 DIST 53AFD6CAA1B476204557B0626E7D673FBD5D245C-css3-spec.zip 4326311 SHA256 973bef3f019ec6b7416385f04c12c6723aa0e3f56a78b4b07a1e93c608c491f3 SHA512 7e82ec998a5a4d75dbec4578686d96d0a35007a9e6ad64fc3b0c7017195a345b4c290080c9e59b15d931d371427b6ac4396ed3e6d25400bf94d488620a5bf814 WHIRLPOOL c44029ecec06162090774bb9e597fa2fe829f5d4743a663a6548d63e5a533dd5009a42785ed6d6cc7b202b15132b19f6bc0900a579e8beedc844e6cf2ad9de13
 DIST 54AE046B40C9095C2637F8D21664C5CD76E34485-org.eclipse.equinox.registry_3.5.200.v20120522-1841.jar 184236 SHA256 44d773e8e3ee3d8674b56817bb57b1fd253a2f3ad1385c8007c986349d90e3b7 SHA512 7e27d8dfe0732b73fd1540d01f03d25d053698d84378173447355370dbcb60b7712f150d89b2c9812ecf5a8c98873b5c9ed7ec439289223c9f858a3c8184aa07 WHIRLPOOL 88eeda5e9a993136ba84b4353ff8e5bf9484924963687eec946bd7f68c6b596ea3a80c80a704c03b7ebec22f3c1df1cc52f706ff5ee0185bd635c6bf954a3b54
-DIST 5C322A10E13FADE0451263035B7AA26B63AAFA47-validator.jar 2268266 SHA256 5bd219b1d4c14a852de3e0642fc93d352ad14be30073ed8efc7f1a5cd4b60c89 SHA512 ccaa282403a8836feeb482e8354a7cdf94714e5735370e1c77b91edc4437fb28000dde0f9e749d1d4cfda478ee0790c7fd7de1a042cc7a560aee68501a7e0ee1 WHIRLPOOL 45a2dfd9760c75c3dd2c8878cf0a0dfca150cb7a7e294b72ff128fd79e0cc223f34312a8fe996c5c81ba086fa9d102c1b128ff1dea63ad600d13c58019d9f0b2
 DIST 5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.jar 262880 SHA256 692094ca77705073e741eab891cf7626c3dca7a33890bd466743cb77d88186f9 SHA512 b464f7ab0b40e2d8b74faea161fea7d164ce07e66f63fc9e52d9394b0662e392f1b45d11e4c5fcc9378dbb4f06230d4e1dfb64ac153a00803b7c02408dfeaf92 WHIRLPOOL 6e9c89e577ed4fd5ed278f72829757fb5e58445125e5db46819db160b760318d6c9adb8e0d006d1a3557634e389aab71d2addd3f43bc4dfe93af5cd33c6fe1bb
 DIST 5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar 95460 SHA256 6e06091853ca7325ad37f2e15bc779ad1be6905df37262fd8b73542805fa3721 SHA512 e436bdfb4e9ae0b6e0be52fe76439213cb685749b14d03d7d844c4515394aaaf4b4e85e6fbc9e00c401afd71ded5de7c9dda0088379c3b8564c1d73c709ae445 WHIRLPOOL f76a73be4860db6aa570c904bc740b4d2e57f0ba1f8d942dc1cd4c2926c823bf97dfa2550c160253da1e1c1376c369cec3e6b7a7dfaf7b14b741e52610877fa3
 DIST 5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar 14867985 SHA256 34965cccff7a320a50d4750dd81093bb7e2b68c32ab349721f24993353d05509 SHA512 f753f748564abec974d236190511222523957fc0ec91b18155d926844eaa5c9aa63053cb155c85f562b9558e164214aef11c74c30aca123a352a02e2cb4e5a31 WHIRLPOOL c5df15f4a86e293a4ceae96f6d75b6e6684f2a443c38f3ff3bbfd414b995452675b80148fe39c6c0ef5d23a8d2b627c7f71124b74a0dc9c5c4ceb15274da42f0
@@ -143,7 +142,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
@@ -171,7 +169,6 @@ DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 EBUILD netbeans-ide-8.0.2-r2.ebuild 29330 SHA256 4822cbe26fc19685164c35d69e75bc20578ca8a5ce3394fe97bde6acc721fd2d SHA512 552f35cb1aa5429beb70c72a0cd2a3aa3a006f5870ec4084e88632a39e2ccdc05d0b2b15a87f26c72cdffb3c9a6fa0a124a8d501edeef9aa9580396922071e8d WHIRLPOOL 4c9bce3ca21d5ae61ef9392b9282c2dff9de7f82f2e83d2944a2906ca2180ef0ffab59489bdbb6afc7ba88d5143d77b47a0cf6b219a5a4d385b68afcacd3fe6d
 EBUILD netbeans-ide-8.1-r2.ebuild 30301 SHA256 892f20531352d85b5b72b1c85352eefa444917b515b0b564f04c4f91d1e654f9 SHA512 50af4873fd3ea7755b0d33b086be7e07766b6c009a46ec3954a67a1da9930378bcf9da6d18b7e60078b31af4b36ccf060f22378a8ef26b3829ccf30a529dd023 WHIRLPOOL 1024af16e7cae7f4728dd37f88031be33253b7c62548a095d3e827abeccb6c183d34ce312bd1a0f808f0d107aff217e4b81b7a17eecc6842e1d914d7061df2c9
-EBUILD netbeans-ide-9999_p20160614.ebuild 30761 SHA256 30b50c2919bada65db42cf59d9aec1f5504b737328841f732a6303409588e5e5 SHA512 d17a89889482a47a4adc1ba4591326b0d636003e9072e10cfd44cd2db3ca9776a75a60f1e05f885112a2b455747305221e6294ee8f0c7c0913990ae7d341dcb6 WHIRLPOOL 5f22361aa02682952e56470cd7b25002d8df215b496d5f88cd6bc822f3f1b50980efc98dfeeab1b9695c3804313ebae8351457c5f78065fcfb4355ae6e5be88a
 EBUILD netbeans-ide-9999_p20160615.ebuild 29867 SHA256 deefa732a92c591d90b9f66e4fe8b45d5271fe7bfded15548739333d1e38dfef SHA512 37585bd9ab2835d224d7bc29dcb94f507ade86bce65252e392fce238a43e9f599c8f0cb5b20d417cdc472b52454b7beee2c8787eacc265d83ff9640860c36b94 WHIRLPOOL 629899b8ad623ea8f2106e4cfe35dd8c1b29c8ca0e302bf71f7193eeeb6030a4bc3ab3ad224f0334478ddd02adb16419075f818d8e67f3a42261462bf6650b09
 EBUILD netbeans-ide-9999_p20160616.ebuild 29867 SHA256 8b9b24d96cfb1fdbcb17529ba0a216216a7ce3dde5bc7e76415fb10990696e1f SHA512 d96b51929d51e09d911d60a847313e1b06769985ce8490a7fc43cd83ceab0fee33b3e86836c9752585e5b2334d8b5db5501f3a50bee4b4a357ca6ab33f55b8ed WHIRLPOOL febf90375b1aa59cbaa5747b03973cda730f8826c36eb6528dc6491a0ef029bad1b40b5ad3e486edf1cbfd76ffbbfe7294a9ea7a41cdf378045e7b1687d5d70d
 EBUILD netbeans-ide-9999_p20160617.ebuild 29867 SHA256 53d1bb1a38af2096acc8bcac092971c9ebd87550525700a860154b2bcfc09544 SHA512 c49056bf2adeac686404a08dfc22b73016c74ea5318358c4e43f890f8ebd8ec3d7c97f1727706b39a7a9c17ee8a2869b42f4beba95dcb2f57a314d85f7da31c3 WHIRLPOOL 99eb56bea610a3694210d633255efaaca9e6511d7ac1045a2e161875e347220bd0222baeb46772d1fa2252303b99af92f5240977fbfeb84b7280bd707c221f45

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

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 71ae426..72dc160 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -40,7 +40,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
@@ -68,7 +67,6 @@ DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 EBUILD netbeans-java-8.0.2-r4.ebuild 13298 SHA256 d4172dfdec5afecb1cd099e18a21aa872c7822bff40b192b5f4ec4d35e6e0ef8 SHA512 48ae6f7141117fbf58123ded750d76f2e7311211a6be3b62bd491349817460da11f781ec5694da91584315547c32008f568fac3bfb406dbdb5ed7fd825ff694e WHIRLPOOL 73fb68aec003707c14b2b390c2de80f24e1e5413cf7e16cf7e661af47c908e2d559214580379e45e21d316767987ac906b5a119a61ae39f03c3d01dafad49b7c
 EBUILD netbeans-java-8.1-r2.ebuild 14814 SHA256 1f49212c90fcaa9a6483f19bb60c963520f20aa08c2a509aa19cc7fda12e4564 SHA512 2d6b225f5d32f0ce1801124808b0cc2101f16a703540877c4818be06694742cfa262c3a2e7018761254f9244a7992eb7fe9bc15cdb20f6f4cb83958789c0ef42 WHIRLPOOL 8557163a46ea91a47efec3c272b8a8a0f2acbf9eaa8f6c280d0ddaac6dd8b2185f06716ab12ebf76fb87fe6c05ab1a14bfd281875ebef586f1304d2162e5f2dc
-EBUILD netbeans-java-9999_p20160614.ebuild 15656 SHA256 1ba3f88c10129a6a5281b5f86325b61db5b1e7442ce489646ad58fbee45304c6 SHA512 df6debc471a80eb2072d8ea47c202fb7b252337ac35430d7129ce677d3784a7b40f60dbf4f4dd51245681a19b42015a61d381051aa13ceae314441aeb6634a08 WHIRLPOOL f7292f71a19506b6c07770284fafa3847b9c838ca7637e10c5a2f3cb16eae1de5ef87d12b0c2fa037e24b6e495d8bbd0cb8b2204777d243c088610cd3b9fc080
 EBUILD netbeans-java-9999_p20160615.ebuild 15656 SHA256 a0ea8d9fc4cf1291523171539a231d4cbd07648322e17581a7d791c6445b2f0d SHA512 ff9e71cd78220f7bdb3d4e440df486ab9ed9098d0fc9b0fabfc16e72d7ccc8c854220f8f5a398d7b0bf72bdeba3217371159e5b8341be7b8cdddee2efd0bbff2 WHIRLPOOL 8c466b554976cfc879fa45bfa2c2b92e60351fae6956d1b6ed3937d1899cb5c36b2c6d00e50adca89c3b69a97f4fe361b3c2f6de3e9aed14b8706442b56d95a8
 EBUILD netbeans-java-9999_p20160616.ebuild 15656 SHA256 08c0f6f91c18424f71499886f549d99a9f4f21e83864a1211adcc7001376140e SHA512 911161fedfb54ac9de79add222f1aa548907163cdb845302c8f720ec68009485c1b1c042c36e92dac1246b645d3c5c6bb4a7ba694c3dfb66b1374e257ace34e3 WHIRLPOOL 951e258428cbe2c789709c064c5bbd1bd8fed80551b0b37ce31749cdc13c10a618a16d89196123e18147f53a0cbb2714961fae0f48affe122089a000728df34e
 EBUILD netbeans-java-9999_p20160617.ebuild 15656 SHA256 f1ba76130306bd36c5597fc7c8740a77a8c0e1fa792ec156d09bf6f9f10c2d5d SHA512 b939e5395a6dd40732b6c3cb77ea268d85b2b8d770b51c548c338199bcb465da3f62d61dc5be92b6334407caffad7eb38b78a6ac4a949903f4b5a44d821aaebc WHIRLPOOL 511e61adb044b844b4b94d77b688805542a56183e8246033a98209e3da291101c7b0d0327f3aaef9c3d5e490647f2d43bd99a1bc3db7edbaa4458d01136b3e21

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160614.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160614.ebuild
deleted file mode 100644
index 35be0ea..0000000
--- a/dev-java/netbeans-java/netbeans-java-9999_p20160614.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-06-14_00-02-33/zip/netbeans-trunk-nightly-201606140002-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/AA575D7D97D3261048FD3E4ECC1B3F9DAA3E707E-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}"/AA575D7D97D3261048FD3E4ECC1B3F9DAA3E707E-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 3f89ec3..903f1b7 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 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_p20160614.ebuild 4971 SHA256 a5f78b5059b09a0f38537ac49de89254f02395395513f1bac38b95bbb2151694 SHA512 80f779b18a7590db2aa2eead52a365a156c0cf18eeb678241cfa9ec1be54f63e8e76a1b95fb090a9c5bc15fbb1ce7272eba84665199d84fe910269ae135af253 WHIRLPOOL dfb6c912706f4df2e57f01f92e0e0bcc93f175455863987ed86144d12b8c60605ce98c35c8ea0dfbba1d0ab1d61eda22fdd147a93ea2cb923ae14ccd7475643a
 EBUILD netbeans-javacard-9999_p20160615.ebuild 4971 SHA256 ec2ef842558671cca4b85256ba7691093d68be09be62cb83961a6916c3ea64a9 SHA512 29f73d3b8f17bb7aedd4a53aa835c32f9a9cb121b421b770bd120bfba565bf27a2f056ce774ca49a6304943cff4f5bc3c4f59fae2208aa1d16fb7f89537a858a WHIRLPOOL ef4f09d20f2578209cf02d5409b04a70a3c6a9b60ce41c63c409e0cc13cccddd52f792e70329ae1daa44eb32c53e45472fdb8260e88cb5a748deec33c269e1a0
 EBUILD netbeans-javacard-9999_p20160616.ebuild 4971 SHA256 07f957fa622b72df3ad275babb74f734076fb2a83c6a5b5329ba29ca80743f1c SHA512 ebb4663e2e49a6966d4bc4cc83a9d34f689e857504e096f834c5b6d63379427d2860e2c14f668e528fc1f5a4d1818524a0e62f07c4231acb38bf0c1bdf3e9ec8 WHIRLPOOL 94ad39967a7f66f3bef4f6a14233f3729a1cfd356ee2a533e3f519bf3d1bbf87f574d19fdec4ae284ea2798a1a78b21092058637b93a56389a6475d232a8486c
 EBUILD netbeans-javacard-9999_p20160617.ebuild 4971 SHA256 7a35bfa0469c5816d703c6257b7709a94cec814e9de015fc4a28784853450f2b SHA512 0d5b689b13a8411fe202633106f1cd01c9256aaff08830f02fea57a71d74c2b7fbf0fa5149cac6981b15d6e8e9249f67866112caf82d711d3842509f22e19126 WHIRLPOOL ff6ada3f72944ae39de506eb7408fcbe8e856301660e9dcb463d66223b031462693690d8de8bc63d1330eebc5fdab921c708244b9d77292012f3606bed342b6b

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160614.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160614.ebuild
deleted file mode 100644
index ce6cd1d..0000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160614.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-06-14_00-02-33/zip/netbeans-trunk-nightly-201606140002-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 f0229b3..041fd73 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -5,7 +5,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
@@ -33,7 +32,6 @@ DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 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_p20160614.ebuild 6293 SHA256 fb96bef4686e43ad7801343e059ba7f214662c0ed37a0afece60c0214be66afe SHA512 0255b3ec42bf7deb1e44b50b1eb9982214979112c844b635be23fdc2bd0a72f2baa4ea5819620deddf42f9f828f846e8c232df91def62b2a3512a4a9596ad176 WHIRLPOOL c1341eb9644a5606e8dada9b702a112c9fdb71d7b8df80b22530a6917d7661cb55291838cebe8aed28028634b7fb71aa6c7bc18fb278ca63bc8929425954a609
 EBUILD netbeans-javadoc-9999_p20160615.ebuild 6293 SHA256 e663d34186e5722da7122ab2e9f9c663e79c3852c279722f87e824fc5d83ddf0 SHA512 0bc4681fe0e5a4235123854ca7cffb8ae4b61293efe4a91037ac070db05b6c457daffe525db4e0b3a92ecb11afc430057e9b9fde24ec4ad15e113928286dc6a4 WHIRLPOOL 3fd1e201f5b55b95156f1fbdc109320547fb7fc6973ecf935d274d456fea07deb54a2d894d5e7116a4e21c4f2353bdcdf59fb4e64fdf43fd9b7e0ced39696877
 EBUILD netbeans-javadoc-9999_p20160616.ebuild 6293 SHA256 2c773464b6cd2f9afd9556359c8867d46da873a0d451c14b9b7ded53bba33c0f SHA512 9a960a89b1cc5e6057cdc1e4e4c61b563221aa08321c5465a10883315d4d5b57b07cc3b6baeda3725489ae8f2bc776492003f73218327d2559000c31a3d71593 WHIRLPOOL 25a47193598296e46ba636bd2025ff31fcb9a9f24b6c54c1237710d641485024b7c807b5c6b6d2a8c7010c138b5494f0dc0766ccd3fb0470ff8cef05321f6110
 EBUILD netbeans-javadoc-9999_p20160617.ebuild 6293 SHA256 504582e3479edad515e71f6b756148a2395a200c29afd83421ae0d6dbf16de7e SHA512 c3d760188110a73276340eec8fd34325f1534643eab08b204aa0e2ed3499f6b7c24380748e6f954f7e3c256e32308b4b2c89205af9e293518ef8017942c99f39 WHIRLPOOL 3627b38ebb65fb3026d78047d7237907c25812d61af56a251b4c18ac83904c3fd69e2a83f26cba47f0b8db42fa28a4ae2e7a3f79863ad85710e10d9116fa7313

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160614.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160614.ebuild
deleted file mode 100644
index 164565f..0000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160614.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-06-14_00-02-33/zip/netbeans-trunk-nightly-201606140002-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 4471f1f..14306cf 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -11,7 +11,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
@@ -39,7 +38,6 @@ DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 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_p20160614.ebuild 4717 SHA256 2cd838ed81c37b4fc5d18f884908c7edbbbe4302fd0fb54d665f49b5552f3c70 SHA512 67027e9d8a697355c9cfe54f7177f47bfd81fd19c4e78f1176c0cb3edaa1b0858dfb741e532aed0c0b4010eef026e41c0b65407e2f7384328d4b7e1e1c385e0a WHIRLPOOL 44d6f03da201d4716bfda59086ec9514525f42c7978356d331e0d01222ec217944f375ed57eb0fb1d5ee479b8fe9626b3284273c56d087e538e500d693fbf8db
 EBUILD netbeans-javafx-9999_p20160615.ebuild 4717 SHA256 7c25503a4f1a7cfeed68365182858e64c56d3a0d637edd767d014d29479ba363 SHA512 a162349dc2231c53afe41b0423d9a43234546e85a4b65197d3dd10dd21e802d3fb82bb125dac7bd09855e87ba016eb0b5b34fc27f546e631ab19257434fc5700 WHIRLPOOL 4df48ff0bf2c2b4c6abd11a92e42b32542cebb8aa3eb3bea9ced715f8226917bc5e97b5be5e23b5ee70b586ad1465e96840b123388a1804d83dd458748a41fb3
 EBUILD netbeans-javafx-9999_p20160616.ebuild 4717 SHA256 e628c45fab98d8ca675391b8e46fce8c880eef550762477ee056bfef8a79f02f SHA512 6fb2fec0939dcbca63afca2983ea2112abfe87664cd79c82c66e6a9c8d3a0f25494674818b11c8462c6a0a1e3b8a4ba9320f34f885aa80d374cb40059110ea7f WHIRLPOOL 716244f2d572cd2426fa104e85b70ba6540ad49e4b26dbede8520fb3f0c233d2fe7239df61bbfaddc75f36ce1f5bf142542629ae96192a480924ae70b8379ef1
 EBUILD netbeans-javafx-9999_p20160617.ebuild 4717 SHA256 bec98089dd32623bb722f0e5fae1d1093eed93c6328724890acc3840721ff82b SHA512 943cb92b0edc45a56437fb965548f23459a01d566dcb770a6447abacea000006239383e18762e02350d3a0d82dea58c8cd28c495f04ff5410f44dafa6c9ce31b WHIRLPOOL 2014ca5abde56477180de6eea17d521304da913e46fa85b149bdb58d856b435235a8a142110cff3c3632b20846f064b340622b657d52f6c420e6d02394cd2cbe

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160614.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160614.ebuild
deleted file mode 100644
index 794d4de..0000000
--- a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160614.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-06-14_00-02-33/zip/netbeans-trunk-nightly-201606140002-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 0217f44..e8c74ca 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
@@ -31,7 +30,6 @@ DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 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_p20160614.ebuild 4412 SHA256 05399dedeac13996dd0aa1666e129cedf066d7f785438005cf7aff67e78bd966 SHA512 f9695296f0d06105faf5ca02cbe9884373ea585fec0a6f6eb3d1727ae608c84c83b5abaef7f4a5b742ebf358e9e43860b9400d08af529c71b74453337648e271 WHIRLPOOL 8a8f9950d746d6382e1f3af3f8650de708c376307245c7dad88c06976e02e33d2c009b15ebb38095711ad9a7013682794f000871c7c4a34acc139d9f2171e3a4
 EBUILD netbeans-mobility-9999_p20160615.ebuild 4412 SHA256 2b9b9dfcb8549b1d1d8032067c58c92638f1a7213b79c19a134bf0ccb519beab SHA512 06499a42dcdccc30faf8c54bbd76571c25002cf604471098cde9895c6a910d0fa78a2ca685280de1df9c50731c5798acf25e536651bad72a354c7387f9e5740b WHIRLPOOL 2c60b0549f413c6336ad5f05c13e0dc69111f0e0f68eac72c8e87f99b184e53d429ae7afabbf106086fab21e116d9a550ae14786089bbce3d8b423b194a5fb5b
 EBUILD netbeans-mobility-9999_p20160616.ebuild 4412 SHA256 7d70a21c94bfbe2ac070fef47455ef64eecf7c40149c5ea98bc8ab092c761dd6 SHA512 8fdfbc149f0623305cf695524c9df1be32f719e88cdfd2b8e962ae0509f38e1d42830f2c3b21c9975857beee640f0002fa783913c4718225cbb889fe17e63592 WHIRLPOOL 8803909f1ae5ce69df65943aefb944a58fd5cdccc4bc38b2da98eabfd5d66b0239a288b874903ca461cafb133f48caef7b362b846dd91bff5af1fd0eb66dde8a
 EBUILD netbeans-mobility-9999_p20160617.ebuild 4412 SHA256 0d0804132eda64caaf465327c65f1e8de1e775a0f976c66a22578cb9c9189751 SHA512 27af844d92d75ae3ebc7687986962cc540e7ae54fcb9c2652e59ed97e9c1733c5f403bdcae6574264e3b697244389240c38b12f6497119ce262cec0270bb4a1d WHIRLPOOL 06d75b57a0038cd40d309888cec18f6c599b5efe9f386d8965527c169013470ac77940372195dc1f38bfa31940be23925d5e661f5cf4d267a48cf012b561ace7

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160614.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160614.ebuild
deleted file mode 100644
index 6d900c0..0000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160614.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-06-14_00-02-33/zip/netbeans-trunk-nightly-201606140002-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 5e23927..aa6d168 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 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_p20160614.ebuild 4111 SHA256 168a3c8ffa6c109af93f44dd247c652e7156cd763c3019553593d972a8e7498f SHA512 4d244ab7198d01106cabd4fa91729b93560b88a1430e11fff80507963e8cfebcf5a97ea42bd3486646f885634956eeb65440a045b9bc31fe817c29cd9e12382f WHIRLPOOL 71092e3fee7de0b4f2c99959d6e8b3967441913322de20a69216020d5c718850dcd95bf7b17b30b99f031b2752c7619720b909751674ed7a020cccca20138782
 EBUILD netbeans-nb-9999_p20160615.ebuild 4111 SHA256 cbd3ccf2f982bd007679f72177c71708d3e4affff56b5caf182d230678a39268 SHA512 617801fe4c79ca5b04f1c3c789006cc7abcf60bc941a89aab9199ef6c748659f671facea943daccdadef98e60b5bd9fffb924370388e4ec249c5857c5a29074d WHIRLPOOL 0bb78210d9985dc2381c61d247db93ee31af441f7a6dd835efbb787836673ae3492f8447ed4a8ea6f52786cf38c83b9a19198de405698aeda7054fc1344339a3
 EBUILD netbeans-nb-9999_p20160616.ebuild 4111 SHA256 9c0a7c74d266bb8aa461bfed36528139ac313badb56474aef83def63b132e2fa SHA512 da8ccb62f620a11f03eb5328963fbc4ba0d27da3b804571153e972ed764c6c074db06d0716a36864de29dfad096417324ef2bc90f191d302a3dfad4b0f0c36e7 WHIRLPOOL dc8c22b7a0eaf9d1d39cfee2d3c309b9670728a0c70bb791ac7de88c9a62d67c47a5ae581e1f6cfcded486d906953b968523a6a5ba95963165159c6aca8f86f7
 EBUILD netbeans-nb-9999_p20160617.ebuild 4111 SHA256 58aecc413430db5e6e3b57a4df8c5a41df696e8ee65a02d47b3b47bd5d7dbc36 SHA512 b1f801278966dd6dca307bfdcd1869fe3ea0bf57b6d659796a5b621dc45383f494169fe4720385bea686fdac25b79d66b7d340cff24b2e913ac4b0f324c99374 WHIRLPOOL aac34438f88088635720a759f8e52d313f226a6ab6d4b7b048504122e3db0dd8e8dfd85c124bb8005edc81b89b8b5c337ed2b093222b82240010cf6b8c47b08f

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160614.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160614.ebuild
deleted file mode 100644
index 8369e08..0000000
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20160614.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-06-14_00-02-33/zip/netbeans-trunk-nightly-201606140002-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 a7bf7fb..03a69fd 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -8,7 +8,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
@@ -36,7 +35,6 @@ DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 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_p20160614.ebuild 4418 SHA256 e7ef557d65dcde17857e167cc87bf0b35ee7d093964b2b4d663d4f70a8b30ea1 SHA512 77177aad36984e7bd6122386a03c73744364dd133b9f802a04dcf86352852f3ad6babb95c821b500bee80468edb069cf7fcbc465012bc6fff264e5b326bac693 WHIRLPOOL e37568e6e866c28d778a5ee9b391155706f57351d45d84104a8522035d7da01c12e9d7e8f63a7df4dff86123fd8159bc408ff17a6c4877a670dd15b78becc8e6
 EBUILD netbeans-php-9999_p20160615.ebuild 4418 SHA256 51ea0af18c35dfdc1290c76c2445def40a5922a7190c6a227ed9551e848815b8 SHA512 74e8867810f6e532ee878a89084093945300be7be7017f59ef12e117bb78c9b95a8b0a87094b9336e655553e8343d907228aefcb54984c79f3168463c339637f WHIRLPOOL 7d649f3a2c96d096debd7d5d388d48b3c69e599d4ae6e391e0beff2aef6d548780335975b976a9a6f50c4f64a8297f1951f62547bc0a9c2df23952cd17bb19c5
 EBUILD netbeans-php-9999_p20160616.ebuild 4418 SHA256 be0e2c81d9c13822532e29b2affdb4aeffc939c1ec71b4fcdf370cd4b02a5906 SHA512 70f69ca728886934fab8b04c42313811bbd816cd61ae44e37fee858ee12340ba58aa04a6fd279013fb98cd6ecf76d4a9b01fb57420cbbfc9bcbd4e3718576748 WHIRLPOOL eacc775c4342a397bcbbd735fd96c7077ac9a7681ac0bbcd26c982cc878cd042bc952a24fdf15d5077563571a9bf83563fe606839bca4460423b77166ceb4bf4
 EBUILD netbeans-php-9999_p20160617.ebuild 4418 SHA256 4f6fac16dfa6338a6c58f16b8bd57d0c3db7d4367e3f40c4d1b45fd7fa7c3c96 SHA512 e986bdc678f578913778b2de557e7699813260e63995b85924ac86a5e51d89cada43ae73e0c84be88d564359d37b65d609d9a4bcb5eb25d06ccb3ac68ec82d7b WHIRLPOOL b4f901927295c97ece9b6488b3db7023fc173fdebb371eff84943ac7b008daabcf2885350e0efa26c9a9faea28570d6324eda75bc5abf42169ac6548e970f195

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160614.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160614.ebuild
deleted file mode 100644
index 509837a..0000000
--- a/dev-java/netbeans-php/netbeans-php-9999_p20160614.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-06-14_00-02-33/zip/netbeans-trunk-nightly-201606140002-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 eb6bec7..11931af 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -29,7 +29,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
@@ -57,7 +56,6 @@ DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 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_p20160614.ebuild 9520 SHA256 34c12f5c7aa190b190167e66abd35129889b96aeb20bac129d928376fd779d52 SHA512 beb785b098ee1d071e04100149652b597035da0ed399d42221e9a1c3cd9685b2235d2e981bc483b7adb436fefdbab0c5ba82440ce5afdad5d2f6e5551c1b1547 WHIRLPOOL b070f13d5e28fdb2efccbfbc38910ddb210a63e029cb746e6e3e0832157bcec51d12f2a7ddcfee0479c9f8dc35ee2c6edd86c5f2f911cd58cb0fad170628578c
 EBUILD netbeans-platform-9999_p20160615.ebuild 9520 SHA256 1d1ed4c8dce312810a9e608d5ab1b7f77e69f34a74a65baa6d85e39a50ba46ee SHA512 49874508e382242f2a795978cf9f53eb1f727bf57e3d7d8f1a9cf30bbc4664b62fc50126c95a8ebc92a006b3319be04631ba98d3d51073d817542efb2baa0c5a WHIRLPOOL 22c4f8f6910c84eff5e90740429f249af9d71d5353dfedadffeb18e2c71e6c1739192bd301b36bbb5677e0ed3d10a5671056715aa15bde6955a21ab920944fb2
 EBUILD netbeans-platform-9999_p20160616.ebuild 9520 SHA256 f83b9f7c44432d294cf8560514c6280f9df7a22a64fca6a3f69157a1273716ae SHA512 930a7cb047b4b92df4aff7510c2893f9e99071f716533aef2c3b8d56335788b16f6d1d3840fff4f76972aeddbc92a28ccf0cf55432216cb0e38e88017194c353 WHIRLPOOL 9cf1d9a31d4509ded199cf19ba04f237421d2b5c8cd14d209db9bc1e02d9dc3e6548c167be1569c058d40aa64982742ee65bdc5bf8cdb3bcad14aef45bed9e3c
 EBUILD netbeans-platform-9999_p20160617.ebuild 9520 SHA256 ff87e2a2d5058688522f5c1106ba3628ec611e76fb4da967f593b4a867ac0026 SHA512 fc57543271cfbf583fc9308570bd7e9a851567228f13a5b8cb088f65a3678758e6da91394a9a9b16f511fe12656350b3e3dfd13f664e5455ae637947cb5bcb8d WHIRLPOOL 14443637c8b536d3adc1ca73b9efcf10f4cdb52caa884f0aeb2645779ec0c14a60e9e18ed6b070f3d6151bdedde8b08a34cf18bfb32c6c1dd1d49ffbb3841b1c

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160614.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160614.ebuild
deleted file mode 100644
index 60dc1cc..0000000
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20160614.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-06-14_00-02-33/zip/netbeans-trunk-nightly-201606140002-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 3bd02c4..7661edb 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
@@ -31,7 +30,6 @@ DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 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_p20160614.ebuild 3472 SHA256 65c683a2ef961b65bfc2599f294282b07fe90feb73e51683b91f789c673f1cec SHA512 8f50dbed2ee3ac960959dfd3c60a2bdcb850df700106ff217300f1b69bd228b1cdaa7d1f2d3f4c4c6105b77baf94e103838aa14886a444df755a92498ee884ba WHIRLPOOL 87092590a879d7d7b85b3d50a01683446f6be47e4c9ebfb5e3bb61ae5d5de9787464be90ba0f5f3941dc8544e2a83bf8cc1f87d63de89394def145d3751f6940
 EBUILD netbeans-profiler-9999_p20160615.ebuild 3472 SHA256 b62578b82c4f0349d88f66fbc2b80aa3e63fbaddb6df027ece9faaa5ecf4d8de SHA512 b2aa116ca625e88af4d40480c58279d9a95db1b59429ecf77b51bef4e77bcef90ea9e61caa5e914f7fcfdec2d95305009aa465c1229ace5013340bc2a505b62a WHIRLPOOL 87778ff56273c20f89e8823bd9af1f73937dac33f2f1d8c36d9ed0f8f63a676059b87940893604e0c2c523b73f17e6812a40c66552b3b626651b1c82c0ab6a32
 EBUILD netbeans-profiler-9999_p20160616.ebuild 3472 SHA256 0a79f7add54314b7297739d89959b9ef694a02b25cc05fbd58d1ecabc897c478 SHA512 7da2bdc3361d044e5598b39620afb5e3f0ae819704a9f216a1e976898acdfdf780ab4b3665d0de2ccc63cd07cc8def0c893d55341d4f2c0e80bdf597d2ebc0a2 WHIRLPOOL 3fffc019f02cdb1f7bf7e95e5535e880d0734387225f51c8254ec10aa5c1a30faa8fee470d77b99519552347c585ff033aa9adeec583c9025396c82a50aa6b30
 EBUILD netbeans-profiler-9999_p20160617.ebuild 3472 SHA256 164f0b9ed984dc7e5151268f12e5870b162da4a943b97c06b7a1de70b78926bd SHA512 7dc16e0c9aa0bde8a5b412fe12b075ca0dc540f8e032041cc4ccf0bb8e372138cd6079efaf492da9c7944ad013283dedc2ac68c9c4f567de62a7b3e719f8af8f WHIRLPOOL 0d8bddb982b919887499350d7c1233b1d7aa4987ac3b5b5cd51291e8200e3a24916058036898fb73a270c27be0aab70b60237d482cc8ceb4b3521bfbf800ac9c

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160614.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160614.ebuild
deleted file mode 100644
index 1f5935a..0000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160614.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-06-14_00-02-33/zip/netbeans-trunk-nightly-201606140002-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 92a925e..d16ecbc 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -28,7 +28,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
@@ -56,7 +55,6 @@ DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 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_p20160614.ebuild 5343 SHA256 fa14ab0bdff82d49cdc43b56e9be63884e409653e63863a09643683f92728e69 SHA512 70eac3c9ada4f71141995b3bd9d45406f501209f78e3122d9a28945f58d1d6c94596799859773c14d2330b99b80d2ae00162fed2b1d97eb75a9d37bbdd571160 WHIRLPOOL 54c802c71a488301d00830f372314b8cd856110d5bf9be28c83ff5fddf1c92e9c23cbe936777cf5b50ba0e566e12b3abfa5a63a53b0dc993c5bbfeabf16389ae
 EBUILD netbeans-webcommon-9999_p20160615.ebuild 6242 SHA256 4029ad34c29e02d5318199b04385bdc4b7422dc64be5be72ce201ec564b24b84 SHA512 a66ed0318446484412dae4f8e68fa09e68ce88d5a5c2ca61947922db72c17374f15298466642eceb519ba57cbdde32763554c0f75b0561105146e46f98dea8cc WHIRLPOOL 9c1a7ea661c1fed670b08ca4366f2b7f7204a78964b9fc7429aabad70b4c08784190ce17caa9fd74ce447bc0d606a74182af16aad1fb443d59cef855aed4fb93
 EBUILD netbeans-webcommon-9999_p20160616.ebuild 6242 SHA256 97916f4e9a9fdec59e7b691d3bfd060cdd27ad063603917748f4633600d3bf22 SHA512 eb0c50d2b5d5c9ef0b7c5eebf65f1b49f47fd3b5c7993c58edc6ddebb311a6786cbd106a22ee3a3d0f2f09d511e50fd8f57373fbee6f6131695d6a414d6f21b9 WHIRLPOOL 8dc26451a04a6e954adafd15eb1e0da5684964ce603ca59806df7e88141d439c52dc224ca83019ed4146781e9ad0089a9c1729ec9144abe308a2c88a349b54ce
 EBUILD netbeans-webcommon-9999_p20160617.ebuild 6242 SHA256 5f72901783a18ff4ed6b3fac43340f96891e0ceaa356b5789326f5750f451b91 SHA512 3c839a28bfea0387458fc11fb519f295b16af57a3cdb9f7697dc421740d51deb0e2741682a20d48857f145d84b061a4a9caad636eaa5c1935ed0694e3ac9e02c WHIRLPOOL 0668921f14ca28ef06d4e242f5b2703b6c6f948dc0a4e923cd4976c06b5f6b62723e57b8170aa9dcd5739fa774da250129aa06e3d277a84b297cc12cf20c6632

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

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 9109731..7ecd52c 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
@@ -31,7 +30,6 @@ DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 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_p20160614.ebuild 2721 SHA256 43c6c3327630f57e63eb4f8467ffd7471564c361db7efd919880eabfa4c36c55 SHA512 9f7a1df1b4db9a3bb9a596f4b39271d8f67d0946daf66c2202c2eb2c938ad75522aacb22f0fc4e7e663187c76d7fe8e104abb573234543f9ef6d742ff775f40f WHIRLPOOL 697a9ae0f0bd427cb98d7df3f59c896f42fde5c8bfaa0fc1202a0a0aaffa8baf8ca2dbc1eb9bd8dc49085233c0c2408b922cbfc9e776cd1e5293416dcaa3c6ef
 EBUILD netbeans-websvccommon-9999_p20160615.ebuild 2721 SHA256 21d8538d3d06d7b2ace4ec26f90c713af219f8deedf537c553d08093e540c140 SHA512 0c457d3d4894878dc046c1b0f1d463189749397370fbbe82d1f117d7b8cbb5467f4648c792f0b3165e57df40c43beead1e1e408a897ea69b4b98e67a7e1b4b85 WHIRLPOOL 0f9d06a4122427fa3674b2c43d7078adc57580ab1bca2011a3053402ab8aa39bd2e2c788c05bb90a3005f490ed7a2da59016218d0fe4e9ef73b645b669bf503f
 EBUILD netbeans-websvccommon-9999_p20160616.ebuild 2721 SHA256 81077dd1a92ffef3a8c864094861350ddc3229ffd21168d8b74220047368ee6f SHA512 4a854355fac57d38b25fcd580a31fbda039cbb56265b39f2302773c13063be0df4d26140a9c3f8182488a8e8263ccba4cd495ccdb6fa9a9e2281cef5e0a0c1e2 WHIRLPOOL a04413646aeef0b1ec4f5f4434db18da805a1e1a970081797e94882cd58b8de1457911b134422e09f108098d4c2f66e7995024434fb1b5fbea5a3e430f378cbd
 EBUILD netbeans-websvccommon-9999_p20160617.ebuild 2721 SHA256 186fef19c7a144fa1510325c057f4cab763b4ea4621c262a158427137cddab11 SHA512 95a2e8994cf1b1edd76b4edba9f7fd097847c01e05be8c6ac4fabb4542784f4fc9717c6d1792387d88d62f9c4b1db5df08c28199c174e328942a247735b37657 WHIRLPOOL 6b1ae669c3ba7bd5bd912edc957f85b878f1d7674978313e9d58462ef554d605062d1523f359380d73069ada48b9705325a69e231773c2bf5db693d597381838

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160614.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160614.ebuild
deleted file mode 100644
index 73aa362..0000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160614.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-06-14_00-02-33/zip/netbeans-trunk-nightly-201606140002-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 de2004b..d138cd2 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99e
 DIST netbeans-l10n-8.0.1-20141110.tar.bz2 12065358 SHA256 542d325cbc6e0e617f6076e964e37803ec322b6d0ee4724a6d2127f2f480fb24 SHA512 28242dcbe7bcbc6a9abce15dfe6fd6140a275a417d96ff28228315bdc0ce8110ede899a1815e2fdf9115b48221d50cd3ff5b71a15d36316d04d81f66e9c0cac4 WHIRLPOOL 0318caea3463d3f7bb8876774b1cc9467dadd9bc36497a9304ed12900e2fabdc4dcdfec0b9eaee27bb36c39e9caff3743c5a42ad4c3a432205a716832688c4d6
 DIST netbeans-l10n-8.1-20151105.tar.bz2 11945028 SHA256 33e86aa7315021d28fdb64790233327d7599c98bcf3ab9d936b6fe924884325a SHA512 eb3163eaa8add417a0e8ac3ed4923a6e4992a80eaac00a01eed24e0e1ceb8a5cbd308659bcf0e5e1192ac8e84a79ea36744ad6b2589d60891b03b37102e9435d WHIRLPOOL f214a865bfd8c54341fb9d538da6db4d9b24906b0d94b3ee6cbf4a525e8842d28e852febb2f34c4c31f989d1b6baf750480bc2f04d94bcd7a8bdb8c9553ef590
 DIST netbeans-l10n-9999-20131010.tar.bz2 12440242 SHA256 64c48605820ec1f35e38c34b48cc16cd40c053d085d50819d4b4e9a80453dfa9 SHA512 7d4d61fa61710186fefd90721598ec635db7c6249ce6fc484fd5813636220f163b60230349c984c398c87e083d2d629c531fe5b4cea3752ebbcaa9823b701a02 WHIRLPOOL 10506e3a3004d6c0ab17b05507f72db2c25d2713c3233a7f5478da27d3b1261b5fb6d5f71cbf369858668ca2d1219dad1900c6c42d3f250adcc935e846e56b09
-DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
@@ -34,7 +33,6 @@ DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 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_p20160614.ebuild 6939 SHA256 cb99d4d210d9182f615ea6efccfa8d1f554819868d90546b2cb6b63943d18f07 SHA512 750df96437c696707693d497459d78be7a17612a9ce6a05101c89c1fc22e1c0f10e9873365927752d4c176c6afbee3bf23831c4fd2d9756d7e7b16e2a7b1ad34 WHIRLPOOL 2988a435623d33ad4556ba94fc0d20f2c0b58d07209527e8f7a19cc803d5d564bac16377046f2232e712ffe514b26467ffbb3a9a0998176dfedeee05cfb9e33a
 EBUILD netbeans-9999_p20160615.ebuild 6939 SHA256 4e9b67afb9bedbbdeaeb62ddd37ec86c7835b355ce8d4bd5c6b83168ad579a66 SHA512 ee04262337546be1262b1681c06b0b3a6bd3e14cca8a1302e9c893692cbaa89fba8aa987e1b2b486c975c3bafa752ba058d3778859a66549706fba3c13e17972 WHIRLPOOL 08104a8ee13a828a46627c9b65d2d73fa7ad4c75d86d9e88594dfd8c14ca8296c00d3c69832aa703d92949039f8e1283aae71c5ef5b87208a5382d121f8d0866
 EBUILD netbeans-9999_p20160616.ebuild 6939 SHA256 d9ed9644003dfe397e89f927b0377b4b22a64925bb0d020b468bd8ccc9022a8c SHA512 ad6e3c3edb1895a91803a3f4d4c778db104e639d599cc454efbca25b9290dd47e0b1a7ddf8a5b727518482a7013030fdeaa0664d3da4f7ddfe144d75a3c3fb17 WHIRLPOOL 2bc6c33a2bfa39f3194590bfcc4e187bf0e1cc0c36b4a17e9a8cc82512f44c051690b411ef270d8ddc7bc63cf6688c0ecb83ecaf8da68ae7a760675c326fa6b5
 EBUILD netbeans-9999_p20160617.ebuild 6939 SHA256 9ec68f98e1a55cbdbef4c612cb04ceb415be5a934090bff531861141cab85511 SHA512 526c74f5d20aafdd5aa2c52bb5915608c4d9c89be5c3b1db37b29602ca8dc2ae8a6012c14ff13099e63a5b2356dd04b5d185f2eda68c6ac182c1c7e014db7482 WHIRLPOOL 8479fda2e78eb352c65d9618a5f9b0abf70e40c186010530d275d72df9a031b5591483fffdbfa108759c7de3134e162bae814e34be1b62a63b948f553124bd4d

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


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-platform/, dev-java/netbeans-apisupport/, ...
@ 2016-09-28  7:40 Miroslav Šulc
  0 siblings, 0 replies; 4+ messages in thread
From: Miroslav Šulc @ 2016-09-28  7:40 UTC (permalink / raw
  To: gentoo-commits

commit:     771716d7b40940859ab65211eb4e455ac90b0a86
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 28 07:40:14 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Sep 28 07:40:14 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=771716d7

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.3.1

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index a72fee7..d437bed 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201609240002-src.zip 218005040 SHA256 9967b7b3ac0f93
 DIST netbeans-trunk-nightly-201609250002-src.zip 218005446 SHA256 c28a4ee7eaa239ca0171799ce66ac1261fb1c94bc3657947637fbe57626781cb SHA512 2ac14c669ff9f1783402e5cbd14ffe3bd35f8b884dafe26265893b97098aa6251433b893dd9ab9790cb4fe133ce5c783106140a9bc005d8f9cb77c4fd4afd7c8 WHIRLPOOL 8ac171a5414bb283c7dd9010fd8fd186e0ae703a4b991713393021e24df41aefbb458a7e03c380b70b839ecf68d271db80079e87da42355f81e1ecc5aa122eb8
 DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1bf5de335c280b679d32646b7740176e0e3e91bdac284bc6fe66 SHA512 fe60ff01cdb7e1e8b044c4e9a51446198d8401180a66fa32f8d14953ec3d719e215e5161193253edc21c00bbca7f23af5903d4d59f5e4a9f5fb28d3be2aed235 WHIRLPOOL 4bbc58439fec5202aa774f3aa0057258aef8f9a259ed1aeab5110038462a727523bc27a845f05aa31c230cb730a988d5710735eb87f72bd53e434d21ccd4be21
 DIST netbeans-trunk-nightly-201609270002-src.zip 218005716 SHA256 c3fa3dc736f783a83a271884081217462cc31d4da6bfd1e7f069e4c5a3bc4a16 SHA512 ecb4885fb30f811901b1c443b4ca15952f1baf8926da411f6c937b8240af0adbd4fc42701b75f8e06a510d7dac9e393b5b799034885f07b3eccb0ef54f83af70 WHIRLPOOL 617347cc777545dfaa08b0731bc0e8aa2d363fa227c73914e79ad8a56e1d3ed8c224cb0560173a86c77937ce4174993cb31fc323d223fb91719ed32a75417496
+DIST netbeans-trunk-nightly-201609280002-src.zip 218005761 SHA256 367daea36555b453b8f12f89d0e75d20583869e3469f00db3c1c8c401e6ccfb1 SHA512 0eafbbedb1c1ea0ddfa1a52e235b7d681fcf9d1601a1ab07d42790bc5d02be3dcd8f0c3a7f71ad8e05f3450b3fdb7fcbd7810429ab5169c56fc777dca0e68e9c WHIRLPOOL 537016c960469b05459c054d4557ab710fd51f4cfe30bb5ff84ec1385bbc038a731eb44bd5d0dfb1426fe59bd4b4ede402242cb1d3dc138aaf0ed2dc80456c19
 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_p20160829.ebuild 3384 SHA256 6945ea971f3d7a987f06ff1622bdbdd9b15b3362771db75b3740194ca4a8b2a7 SHA512 c257f30aae0bb4df1de514d1e1ef1369a4648c4095f7793943dcaebcb418307a63864b0ee6a6f7417ff37042de83e4541fe4a8db9a92d2a30734b27289f5bfbe WHIRLPOOL 920bead5f863c9a08cc3008498ce69c0e802618d8a7e7b21a5c5952948201df08674a047d471d4fc17d15aaf3f999831e0b8839bf5e3ffb41b85f6893dbc93c9
@@ -59,4 +60,5 @@ EBUILD netbeans-apisupport-9999_p20160924.ebuild 3384 SHA256 56f6eee2992edee7dc2
 EBUILD netbeans-apisupport-9999_p20160925.ebuild 3384 SHA256 9adae9ca08c2b8353904235f76f162f7edc96bdb9b99b86633603fc6d0cf1ee5 SHA512 2cfac579c33690eeef9b104a75a2b8530a6cd94823912949e3f708cb14a91c7840912f15c4ce941fedff238a59df2f69d4f37e4a38aff8caf4b568be03e9586c WHIRLPOOL 7fa96bed4d8eb3da8a77d6832ab3827f7048071d1069ae3d77675a1687fa4f9801720d6b10d03fd8ec57935b97edc12c40c07e3eb808fa093f952cb6328dd57b
 EBUILD netbeans-apisupport-9999_p20160926.ebuild 3384 SHA256 771c2da22fee5c91df9bdfdb3406f80da4386161c4db81194ed39f8d1d7d2e24 SHA512 b15b7d0ec44e96a6f5c0c56f1025097489eaef34de9242273a779195898f209b7386c5ac12c0e691c5d7094b84091711dced845366953085c6bac85c28e36553 WHIRLPOOL 4addbdfce413d761e8d8386552c7de6a7342dad8db8ca2f702f55e5582cfbd23ce1d47e0b66ee4238027b7d79cff4c4b427fc7846f178485caea6746d104aee8
 EBUILD netbeans-apisupport-9999_p20160927.ebuild 3384 SHA256 636a496edde6e504c09aa6add8349f18845205d71f3dcc51e309b328ebfb2018 SHA512 2850f81407eda458e3eaaae2d95c94d69c8a2ff4f9267e567b74d58cb52579a6a83059e8b464abb231be5338f75ff490f5328807927dacddc36893bc2bbc6d3f WHIRLPOOL fcf05ece52271dbee90a21f6486331817ef6e06330e84d492afb81ee77f6ef1eb9783a94d9b2e899a5b4af1d083161c2cc5cea834433c85d78d567ea94a85482
+EBUILD netbeans-apisupport-9999_p20160928.ebuild 3384 SHA256 9b7e4db2fe5e2fc29254ad38509f889c72ffc93612d94dc2adaed27369c6cf7f SHA512 891809ff925e8fb0f89bc5c9d6177f833b7045aa927f1316fd91c8e4a735d8b409f6961e3ab535dd537b4e36b3c689d822a08799162035dbd009c768762a5059 WHIRLPOOL cadd652708faa7f5c7d6c0a6ecef7cacbf93b2ebc5d8d20eb0585191fe3b21f397a03e4fd226ab18bca00bac8dfd9364968e6c02d0137a2c633b046683c4fabf
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160928.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160928.ebuild
new file mode 100644
index 0000000..c3d7589
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160928.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans API Support Cluster"
+HOMEPAGE="http://netbeans.org/projects/apisupport"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-09-28_00-02-33/zip/netbeans-trunk-nightly-201609280002-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 0641d91..7c5264e 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -45,6 +45,7 @@ DIST netbeans-trunk-nightly-201609240002-src.zip 218005040 SHA256 9967b7b3ac0f93
 DIST netbeans-trunk-nightly-201609250002-src.zip 218005446 SHA256 c28a4ee7eaa239ca0171799ce66ac1261fb1c94bc3657947637fbe57626781cb SHA512 2ac14c669ff9f1783402e5cbd14ffe3bd35f8b884dafe26265893b97098aa6251433b893dd9ab9790cb4fe133ce5c783106140a9bc005d8f9cb77c4fd4afd7c8 WHIRLPOOL 8ac171a5414bb283c7dd9010fd8fd186e0ae703a4b991713393021e24df41aefbb458a7e03c380b70b839ecf68d271db80079e87da42355f81e1ecc5aa122eb8
 DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1bf5de335c280b679d32646b7740176e0e3e91bdac284bc6fe66 SHA512 fe60ff01cdb7e1e8b044c4e9a51446198d8401180a66fa32f8d14953ec3d719e215e5161193253edc21c00bbca7f23af5903d4d59f5e4a9f5fb28d3be2aed235 WHIRLPOOL 4bbc58439fec5202aa774f3aa0057258aef8f9a259ed1aeab5110038462a727523bc27a845f05aa31c230cb730a988d5710735eb87f72bd53e434d21ccd4be21
 DIST netbeans-trunk-nightly-201609270002-src.zip 218005716 SHA256 c3fa3dc736f783a83a271884081217462cc31d4da6bfd1e7f069e4c5a3bc4a16 SHA512 ecb4885fb30f811901b1c443b4ca15952f1baf8926da411f6c937b8240af0adbd4fc42701b75f8e06a510d7dac9e393b5b799034885f07b3eccb0ef54f83af70 WHIRLPOOL 617347cc777545dfaa08b0731bc0e8aa2d363fa227c73914e79ad8a56e1d3ed8c224cb0560173a86c77937ce4174993cb31fc323d223fb91719ed32a75417496
+DIST netbeans-trunk-nightly-201609280002-src.zip 218005761 SHA256 367daea36555b453b8f12f89d0e75d20583869e3469f00db3c1c8c401e6ccfb1 SHA512 0eafbbedb1c1ea0ddfa1a52e235b7d681fcf9d1601a1ab07d42790bc5d02be3dcd8f0c3a7f71ad8e05f3450b3fdb7fcbd7810429ab5169c56fc777dca0e68e9c WHIRLPOOL 537016c960469b05459c054d4557ab710fd51f4cfe30bb5ff84ec1385bbc038a731eb44bd5d0dfb1426fe59bd4b4ede402242cb1d3dc138aaf0ed2dc80456c19
 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_p20160829.ebuild 4790 SHA256 f7746423ecd033715e809822b187f4b4d8887747b08df4e7c7d10bcdf9c31251 SHA512 d36d72c0c5be22fb2efef9ac776a3e637536a0933eea2cdb61e465330ef78f6f0c9f9a84a74b99d59a246da670c1752adc0fe1cc1ba8a069774d5ffbb402b234 WHIRLPOOL dc311eb8666cb7544de448807a56fd12d62e07655224d26bd9d75e943db2d6711b248d692e87d546aa54a385c18884e46d7191758a8fe28801130fc21f8d9db4
@@ -74,4 +75,5 @@ EBUILD netbeans-cnd-9999_p20160924.ebuild 4790 SHA256 7d6cede657826e5c4693a39cd6
 EBUILD netbeans-cnd-9999_p20160925.ebuild 4790 SHA256 81e7ee738833c0d2b46a950d9ea6757d112a45fea31fa9fe452b42b6eba254b1 SHA512 20a87b4fc5b85e7f8ac3a22fd1939f8a2c3ac36f1c6628f8112225966554f28eae1d956d351637a2dac8a38ce973734ed2fc1ccb26cace4ba673f78b6d160dcf WHIRLPOOL a7f78d991dc908b439b2e93e6211877a5f930cb54d66e12252d105d1c1a97c67b4471fd4817aa26035a852a510fb94400de5ef3cb9dc90bcfcab389e187bb82a
 EBUILD netbeans-cnd-9999_p20160926.ebuild 4790 SHA256 7bd407102c1d13ae3f07c1fe80c291475814751edb7eb62520d69c4b0f98a665 SHA512 c7dcc7d8613a983cec598a3d46c07484c434eef1e44322af7473f85f54e24454510b166458a84aeba78dcb8198b5b9c6040d41df94abca5850ef536ee6a7c625 WHIRLPOOL 48714414808c9bbf662a55189e68fa171e60aa46f64c59383ef0e22525961cf9eae6d9103b1c01e3a5bfcfdbaf1a28c67b419d37d04be70bc40ef2f6f8f68da9
 EBUILD netbeans-cnd-9999_p20160927.ebuild 4790 SHA256 2e66724369a81ce14f4d19a2ec37ec576097eeb410f9bc798d4505631b1302eb SHA512 5ea19f8dc610f3ff4fb78506e865d747aaddcf429ddbdb8ef380a36fd063cdf1a0eb72936c0182fb858ecd7aca59fb7bb3f699496cecd9c45d17c5e3fd499ec7 WHIRLPOOL 93ea6fffe4de232080c4a7e10f7d9e91cf666ddca52ba1b6127a285d2ff22f500f7df6b997ca5d116441f7512f6a0a6e433ddcb6aaa021b68621bd05c76c4b76
+EBUILD netbeans-cnd-9999_p20160928.ebuild 4790 SHA256 7bb2507cfb5975098f2336d41a4f5bcb9795baee634c1440d7d39c59b938bfd4 SHA512 09fbfccc5b7b4ae3f2827b0ee91217c9e755e960353ada9b0a9c767433caff33c24399a663fa675c98a7dfe70eefd739d962e338fc33ef8e90c5485158abdf6b WHIRLPOOL 5ab968503818f037c615f1b36cad69fe89bd1724ebcde14bfcd67e95d2fee21d0f77140846cd5fda46d6957dcdfa2d3fecea79b86cefb67107f8daf9f5cf9337
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160928.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160928.ebuild
new file mode 100644
index 0000000..04217ac
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160928.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans CND Cluster"
+HOMEPAGE="http://netbeans.org/projects/cnd"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-09-28_00-02-33/zip/netbeans-trunk-nightly-201609280002-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/F20EEEDF4FE6B93B180387576FB780EED9F79C66-clank_0.3.9.zip
+	http://hg.netbeans.org/binaries/43A82EB3CE61B9B0B1C60586C7D84729BD5BE3E0-cnd-build-trace-1.0.zip
+	http://hg.netbeans.org/binaries/E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip
+	http://hg.netbeans.org/binaries/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+# These files are for remote development and debugging
+QA_PREBUILT="usr/share/netbeans-cnd-${SLOT}/bin/*"
+
+CDEPEND="~dev-java/netbeans-dlight-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	>=dev-java/jna-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}"/F20EEEDF4FE6B93B180387576FB780EED9F79C66-clank_0.3.9.zip libs.clank/external/clank_0.3.9.zip || die
+	ln -s "${DISTDIR}"/43A82EB3CE61B9B0B1C60586C7D84729BD5BE3E0-cnd-build-trace-1.0.zip cnd.discovery/external/cnd-build-trace-1.0.zip || die
+	ln -s "${DISTDIR}"/E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip cnd.remote/external/cnd-rfs-1.0.zip || die
+	ln -s "${DISTDIR}"/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip cnd.modelimpl/external/open-fortran-parser-0.7.1.2.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-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 2ade72c..eec4673 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201609240002-src.zip 218005040 SHA256 9967b7b3ac0f93
 DIST netbeans-trunk-nightly-201609250002-src.zip 218005446 SHA256 c28a4ee7eaa239ca0171799ce66ac1261fb1c94bc3657947637fbe57626781cb SHA512 2ac14c669ff9f1783402e5cbd14ffe3bd35f8b884dafe26265893b97098aa6251433b893dd9ab9790cb4fe133ce5c783106140a9bc005d8f9cb77c4fd4afd7c8 WHIRLPOOL 8ac171a5414bb283c7dd9010fd8fd186e0ae703a4b991713393021e24df41aefbb458a7e03c380b70b839ecf68d271db80079e87da42355f81e1ecc5aa122eb8
 DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1bf5de335c280b679d32646b7740176e0e3e91bdac284bc6fe66 SHA512 fe60ff01cdb7e1e8b044c4e9a51446198d8401180a66fa32f8d14953ec3d719e215e5161193253edc21c00bbca7f23af5903d4d59f5e4a9f5fb28d3be2aed235 WHIRLPOOL 4bbc58439fec5202aa774f3aa0057258aef8f9a259ed1aeab5110038462a727523bc27a845f05aa31c230cb730a988d5710735eb87f72bd53e434d21ccd4be21
 DIST netbeans-trunk-nightly-201609270002-src.zip 218005716 SHA256 c3fa3dc736f783a83a271884081217462cc31d4da6bfd1e7f069e4c5a3bc4a16 SHA512 ecb4885fb30f811901b1c443b4ca15952f1baf8926da411f6c937b8240af0adbd4fc42701b75f8e06a510d7dac9e393b5b799034885f07b3eccb0ef54f83af70 WHIRLPOOL 617347cc777545dfaa08b0731bc0e8aa2d363fa227c73914e79ad8a56e1d3ed8c224cb0560173a86c77937ce4174993cb31fc323d223fb91719ed32a75417496
+DIST netbeans-trunk-nightly-201609280002-src.zip 218005761 SHA256 367daea36555b453b8f12f89d0e75d20583869e3469f00db3c1c8c401e6ccfb1 SHA512 0eafbbedb1c1ea0ddfa1a52e235b7d681fcf9d1601a1ab07d42790bc5d02be3dcd8f0c3a7f71ad8e05f3450b3fdb7fcbd7810429ab5169c56fc777dca0e68e9c WHIRLPOOL 537016c960469b05459c054d4557ab710fd51f4cfe30bb5ff84ec1385bbc038a731eb44bd5d0dfb1426fe59bd4b4ede402242cb1d3dc138aaf0ed2dc80456c19
 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_p20160829.ebuild 2968 SHA256 a98a009495c7fce4f058deb98a0eeb1523bde7a92b2876178bf8c7da71c7fb33 SHA512 e26c577e9736f9868901e73b60765ea1ecc809f25495169a5eb094713980847e9f45ab6e414cd7dc2a4fd7e3a9fd2a2166331e2ea97f104f3beb6c5769de7959 WHIRLPOOL 99b58e1920fbfda4d583bfb97408e1dbc41b54fd652e9890c6dd4634dda9c928cba46c773b940a6c0f8de2a6ed5e53e3853ae35517688f1829f19db51b938cb9
@@ -64,4 +65,5 @@ EBUILD netbeans-dlight-9999_p20160924.ebuild 2968 SHA256 e3b9717643ad382c86ea5dc
 EBUILD netbeans-dlight-9999_p20160925.ebuild 2968 SHA256 f292966685da526331c5f86b1ecec8ac2c2802b9a1bcd3ba66abcce9b75978ca SHA512 5b06ef05d1d6731652f585ec7aaf08cacab9edd75810b472a5f019700621326a5d39de59daf2108124d95fb98b90f393ee8f73d80f69b42a65b5be9c588ca6e7 WHIRLPOOL 8e91eca8ae1d73f066a3b67f0c7eb515916319890c2c3f69a9659a687ca1e05f692641b815cd519cb64230db8eb9b4d9f0f543e34d15876023faba85b658230a
 EBUILD netbeans-dlight-9999_p20160926.ebuild 2968 SHA256 442fa86ddf28e4d285fd499c9ce5edb4497f14c671bdebbc00a1bfc97a43814d SHA512 0196eafd8de535192afb15c6a0bd218b52ddde092f83d869b0cc8c43ce9c9ff3139c61e2d61b8682921fbce8728a73357d5af41b8d8ec13858a50c2a4bf4dfb7 WHIRLPOOL 2a4f1b7c62b8db7455a570b6f06a65ae33ba13bb2cb5e8f1b9eb143f3ca7e5f55d7433d96eaa3a3ee6160ec6faed3d2595e7cd03680efc2be1761cb92527ce46
 EBUILD netbeans-dlight-9999_p20160927.ebuild 2968 SHA256 c72fdb7133cfc553745f920b4b5286fec2137bcfb8faec3c3765fa4ea18f3d55 SHA512 358f9949ab34a98becf23e21a0e35314803c3107ab3a6598c98097a8dd81449260dc3b8420e7cd8d0945167f41fa7d74de21868456fc8b3a1b11515b84be729f WHIRLPOOL e387ee52a739b428845b2cb755bccb17e03321c9942f8adb2429c65fcc13e14e5dd6767d4d80094cafec6f77c2b90e68e15e26ae0689f066719214fc3db1fe4e
+EBUILD netbeans-dlight-9999_p20160928.ebuild 2968 SHA256 5c03af545be242a52aa6550caf810c3f85e3e31cf8d31a099aa008250f3ff2f0 SHA512 bae06c4cce74079523fb2d7f897124a7163de7a98ace4e8d8ff288d5a259f6029313e52b6871600826add10aa25a078599857bc34a4196da8a47d0f35837d9e6 WHIRLPOOL 15b77ef866033221455136f8409d578d42a66f69c72342b867dac836f2b7f62dd56cdf257a784b615f83bfac2e75cc7dce03e47d5396ebe96ccf644cb77a5586
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160928.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160928.ebuild
new file mode 100644
index 0000000..b9d0de5
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160928.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans D-Light Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-09-28_00-02-33/zip/netbeans-trunk-nightly-201609280002-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 66fcf49..d92171d 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -62,6 +62,7 @@ DIST netbeans-trunk-nightly-201609240002-src.zip 218005040 SHA256 9967b7b3ac0f93
 DIST netbeans-trunk-nightly-201609250002-src.zip 218005446 SHA256 c28a4ee7eaa239ca0171799ce66ac1261fb1c94bc3657947637fbe57626781cb SHA512 2ac14c669ff9f1783402e5cbd14ffe3bd35f8b884dafe26265893b97098aa6251433b893dd9ab9790cb4fe133ce5c783106140a9bc005d8f9cb77c4fd4afd7c8 WHIRLPOOL 8ac171a5414bb283c7dd9010fd8fd186e0ae703a4b991713393021e24df41aefbb458a7e03c380b70b839ecf68d271db80079e87da42355f81e1ecc5aa122eb8
 DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1bf5de335c280b679d32646b7740176e0e3e91bdac284bc6fe66 SHA512 fe60ff01cdb7e1e8b044c4e9a51446198d8401180a66fa32f8d14953ec3d719e215e5161193253edc21c00bbca7f23af5903d4d59f5e4a9f5fb28d3be2aed235 WHIRLPOOL 4bbc58439fec5202aa774f3aa0057258aef8f9a259ed1aeab5110038462a727523bc27a845f05aa31c230cb730a988d5710735eb87f72bd53e434d21ccd4be21
 DIST netbeans-trunk-nightly-201609270002-src.zip 218005716 SHA256 c3fa3dc736f783a83a271884081217462cc31d4da6bfd1e7f069e4c5a3bc4a16 SHA512 ecb4885fb30f811901b1c443b4ca15952f1baf8926da411f6c937b8240af0adbd4fc42701b75f8e06a510d7dac9e393b5b799034885f07b3eccb0ef54f83af70 WHIRLPOOL 617347cc777545dfaa08b0731bc0e8aa2d363fa227c73914e79ad8a56e1d3ed8c224cb0560173a86c77937ce4174993cb31fc323d223fb91719ed32a75417496
+DIST netbeans-trunk-nightly-201609280002-src.zip 218005761 SHA256 367daea36555b453b8f12f89d0e75d20583869e3469f00db3c1c8c401e6ccfb1 SHA512 0eafbbedb1c1ea0ddfa1a52e235b7d681fcf9d1601a1ab07d42790bc5d02be3dcd8f0c3a7f71ad8e05f3450b3fdb7fcbd7810429ab5169c56fc777dca0e68e9c WHIRLPOOL 537016c960469b05459c054d4557ab710fd51f4cfe30bb5ff84ec1385bbc038a731eb44bd5d0dfb1426fe59bd4b4ede402242cb1d3dc138aaf0ed2dc80456c19
 EBUILD netbeans-enterprise-8.0.2-r1.ebuild 15075 SHA256 41d376117ad1d8d59c8194debfd29dc42f5fd4de70aee12a2134ec143a604dda SHA512 4cd9de88e9a401cc0be88e3e2605abc411c47307818376b2bcc00f9ae570b21324f2bf00fd83e819bfa076da0fb07811fa1f0f9362a6cd0ee05b63221a199000 WHIRLPOOL 73f4518c14430fe7aa3614ebf1b11a06ba0e9bce7479af2770db3a114f149d575a16a655218f757ed416b5149228ac56dac700f5a8d5e034cc838bfa4092e636
 EBUILD netbeans-enterprise-8.1-r1.ebuild 15888 SHA256 d4c04ccfee01a46819020cb7cf8fd8297618f3c0431ae2d9dd7eec8131f988ab SHA512 6c7c39c378cb79d3f382cb80d07710a8c5233aaf0df8fb58889ee6aa6bde73624efa6aa49b43f84105685094a7aff89e4b6367ffd1fd113da27b42d50d07e983 WHIRLPOOL e678e2a6957e428c1b6e51469c0e7cc6a08da2c797f1575b6bb660a7f3281c00f071179de459e27c983304915b005baaf94ad4fae0a4c08162f218bf53b7d821
 EBUILD netbeans-enterprise-9999_p20160829.ebuild 15825 SHA256 d948ea9be53b33a5a2df9651c71b9fc344f174c23aeec8aead7c9e1fdec637f6 SHA512 56367a3d941b121ab9813908dfaabfa27a1cc3abbc73b85f59c6272d1ba05a37f964b9c5c2fbdfc51dbd1367c9ea10d565b8127b7dc6396073d4bd72d0b63f9b WHIRLPOOL bf503f0bbfb2fdd1492ce95c3ca73a9202ed451884b620d05ab2158414f492ecf4cb9ff28e8f703cd4d0676e5ea4e339e1593856008e55b41d6c19ca76ad38e5
@@ -91,4 +92,5 @@ EBUILD netbeans-enterprise-9999_p20160924.ebuild 15825 SHA256 33b99b02fd4eb2aaac
 EBUILD netbeans-enterprise-9999_p20160925.ebuild 15825 SHA256 d240c82720431379bfc01d78ad7b917930130ee39f40e7a117a18a9723e0d45a SHA512 4315f4f6ff63c8f2067ae10ecfc17b902b160fbfc6d433abcbee28c19f917eda2c056d7e64d2e6b2e792cad31cadcaff1f82e3804871fd656f4e00c421421e58 WHIRLPOOL feb517578d620f329c4bc3e6f12b93f20b4b12c31b0a921b13859775c881b75aae91e2d42d3edfddf0008bf087bb08a84f8dc1b7da4c54a58558e61d73f541b4
 EBUILD netbeans-enterprise-9999_p20160926.ebuild 15825 SHA256 a7b01e9a811866fc5b2d3c5c1345785eea58e084a40f93b6b44c0e76980e9c52 SHA512 edd6fbc4abc3b75e5b084915dab1c593774211543d1c1f9a768f01b710c352f4b20135b2cd08842586484bbf64d43f697c6c53f5436d32579649863d919a0324 WHIRLPOOL 580ccfd373133c11dab77021dc200fd96eddd99677f6790fdb0333b99752bec4f0a5e5294f5191c9ae83372846e82ac9f8d1792323901f3937519d0fa2094a2a
 EBUILD netbeans-enterprise-9999_p20160927.ebuild 15825 SHA256 f60122c0ec3908c8e741b83cc79ccae73ab38b62cac34e54af04d4dedab90d82 SHA512 c13fb7a3dfeb7fce38954da3a7296a31a2767be22cb78899bc628f2c8590cf56f3a6a1ae4b9b10175680e1d1f23958072480d5b1f0e435cce48855055df65178 WHIRLPOOL 1eb1774d1f2d6f4cb1ed354df86eb5625b74dcee187aa651d1898109e00e279626bc68938d1538036e6e9b4c4784a14f990570ff195db5a4182489e161cde9c9
+EBUILD netbeans-enterprise-9999_p20160928.ebuild 15825 SHA256 639ff6ade943b26adb19ba0ac543cdb7508cb410ea5808e9070af40982a7aed5 SHA512 d3fc7961b4595f0432d968eebd11dc781804bf54beea61765be0cfad33aabd1fb3f208ff6e492ee5becdf5d9325e4b7fca0a6f2b0f3c7f72c5fb82718ff981ab WHIRLPOOL 33eb1522221ddba70cf0966f2af4c042ffb48c344daf6fb8aba450b90a7777b792c559dd80133120999b53dc219c234854f55a74c9f6df3408d72088257c4cea
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160928.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160928.ebuild
new file mode 100644
index 0000000..430f239
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160928.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Enterprise cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-09-28_00-02-33/zip/netbeans-trunk-nightly-201609280002-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 f1114cb..8d6f0dd 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201609240002-src.zip 218005040 SHA256 9967b7b3ac0f93
 DIST netbeans-trunk-nightly-201609250002-src.zip 218005446 SHA256 c28a4ee7eaa239ca0171799ce66ac1261fb1c94bc3657947637fbe57626781cb SHA512 2ac14c669ff9f1783402e5cbd14ffe3bd35f8b884dafe26265893b97098aa6251433b893dd9ab9790cb4fe133ce5c783106140a9bc005d8f9cb77c4fd4afd7c8 WHIRLPOOL 8ac171a5414bb283c7dd9010fd8fd186e0ae703a4b991713393021e24df41aefbb458a7e03c380b70b839ecf68d271db80079e87da42355f81e1ecc5aa122eb8
 DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1bf5de335c280b679d32646b7740176e0e3e91bdac284bc6fe66 SHA512 fe60ff01cdb7e1e8b044c4e9a51446198d8401180a66fa32f8d14953ec3d719e215e5161193253edc21c00bbca7f23af5903d4d59f5e4a9f5fb28d3be2aed235 WHIRLPOOL 4bbc58439fec5202aa774f3aa0057258aef8f9a259ed1aeab5110038462a727523bc27a845f05aa31c230cb730a988d5710735eb87f72bd53e434d21ccd4be21
 DIST netbeans-trunk-nightly-201609270002-src.zip 218005716 SHA256 c3fa3dc736f783a83a271884081217462cc31d4da6bfd1e7f069e4c5a3bc4a16 SHA512 ecb4885fb30f811901b1c443b4ca15952f1baf8926da411f6c937b8240af0adbd4fc42701b75f8e06a510d7dac9e393b5b799034885f07b3eccb0ef54f83af70 WHIRLPOOL 617347cc777545dfaa08b0731bc0e8aa2d363fa227c73914e79ad8a56e1d3ed8c224cb0560173a86c77937ce4174993cb31fc323d223fb91719ed32a75417496
+DIST netbeans-trunk-nightly-201609280002-src.zip 218005761 SHA256 367daea36555b453b8f12f89d0e75d20583869e3469f00db3c1c8c401e6ccfb1 SHA512 0eafbbedb1c1ea0ddfa1a52e235b7d681fcf9d1601a1ab07d42790bc5d02be3dcd8f0c3a7f71ad8e05f3450b3fdb7fcbd7810429ab5169c56fc777dca0e68e9c WHIRLPOOL 537016c960469b05459c054d4557ab710fd51f4cfe30bb5ff84ec1385bbc038a731eb44bd5d0dfb1426fe59bd4b4ede402242cb1d3dc138aaf0ed2dc80456c19
 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_p20160829.ebuild 2913 SHA256 ec8672e62b3c57e3b9bf9328ab4c601077d9fba1afaeba42f3572a8c79f9a6c3 SHA512 fc8824a32cd6cd204445511b541407ca6b98cf551d6df693f241735eb43a4d99a324ebaf2b5a376d8a2b2ddf937bec113249131522aead2906dfe4f391792ae1 WHIRLPOOL dbac8b6ac0b7a01ac92b5bad3b825fc76153efac113ca64e31560832f64fa97b148523bed61bad378d33c79055735314c3bd22a86f41978c8b7107a71f61daef
@@ -59,4 +60,5 @@ EBUILD netbeans-ergonomics-9999_p20160924.ebuild 2913 SHA256 61224ec52538c88240f
 EBUILD netbeans-ergonomics-9999_p20160925.ebuild 2913 SHA256 b5657a417a004ea422fef4a08694ac0ecc14ded61ce113cd9267b3c2e3cbdf33 SHA512 d72902ef022afd1c8ad808ac30ffaa8d37b1f2e98626bacb1d3414b879fcb105e076edc67fb0453c5d08d1a9c9bd1c2fd9b9ad18059f55612b17ebf4ebd407fa WHIRLPOOL 47f539da25ebcc1c09e12f49276fad53e16e09d78680f44a587d8804c3ee94f146aaa25956d37b37c8101ef38716ce6a53d45857066435d557b8e960b66dd075
 EBUILD netbeans-ergonomics-9999_p20160926.ebuild 2913 SHA256 6e95d664324346fb5fab10c257cde60a718b7ff8ee0c461ad014a1a409280e11 SHA512 d4b498e3fc4731969051ac9debd0f670a0dbec4c0941ee16f33c59623c5690363cdb6fe7736d63068ede4099e610be808aa937560b7a8360396ef021e54e6941 WHIRLPOOL deff5610d1c1000f78b82723610429c625b0d659795148e5d9b07514bc0737721023028c8a443a7832d7b9740b6a26f9b07639d3cc5cac32bead0328fb91141a
 EBUILD netbeans-ergonomics-9999_p20160927.ebuild 2913 SHA256 e6268fac9f9c0b6873337140148803d7526fe9b02297bd11446524556f0d4bef SHA512 f0f792b1393b2a27cecfe576284af3ceb99d3801006145eace0314d3b5cc5c195fa6e1e135168da5f1c9904e14b4157b688b6b52c810a61dbdca2369d3fcbfb6 WHIRLPOOL 42ee5cf1048d92ea9eca4ffddd1f57617714716b9bcdde8ecaa6eff2ea1d82740d8e973f51bd80c6aee0d218edc080c677de17eee4394423f4b10469b9188ff5
+EBUILD netbeans-ergonomics-9999_p20160928.ebuild 2913 SHA256 fae3ad7b93a6a089fb13cec8bec50d17c3220ae676bf9afb62204168606e7a75 SHA512 dcdcc9e29f981b09928a439cb8fb3fc5aaef2e87c49497e512c6665a8e9205c1645fd284467f53f57b9b06c2270a068e3eeb5504806c4e79b464d43281512554 WHIRLPOOL 4fe54dcdb17eb2fe8e51e63083a556035d3e9a626f0bac1a8b8d122cd411e7d0f6c496babf7a0c1c8e4fd7dde869f4f00b74e25ce637c72eefb61a158a070a15
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160928.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160928.ebuild
new file mode 100644
index 0000000..cf5549d
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160928.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Ergonomics Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-09-28_00-02-33/zip/netbeans-trunk-nightly-201609280002-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 ce5426f..c055d9b 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201609240002-src.zip 218005040 SHA256 9967b7b3ac0f93
 DIST netbeans-trunk-nightly-201609250002-src.zip 218005446 SHA256 c28a4ee7eaa239ca0171799ce66ac1261fb1c94bc3657947637fbe57626781cb SHA512 2ac14c669ff9f1783402e5cbd14ffe3bd35f8b884dafe26265893b97098aa6251433b893dd9ab9790cb4fe133ce5c783106140a9bc005d8f9cb77c4fd4afd7c8 WHIRLPOOL 8ac171a5414bb283c7dd9010fd8fd186e0ae703a4b991713393021e24df41aefbb458a7e03c380b70b839ecf68d271db80079e87da42355f81e1ecc5aa122eb8
 DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1bf5de335c280b679d32646b7740176e0e3e91bdac284bc6fe66 SHA512 fe60ff01cdb7e1e8b044c4e9a51446198d8401180a66fa32f8d14953ec3d719e215e5161193253edc21c00bbca7f23af5903d4d59f5e4a9f5fb28d3be2aed235 WHIRLPOOL 4bbc58439fec5202aa774f3aa0057258aef8f9a259ed1aeab5110038462a727523bc27a845f05aa31c230cb730a988d5710735eb87f72bd53e434d21ccd4be21
 DIST netbeans-trunk-nightly-201609270002-src.zip 218005716 SHA256 c3fa3dc736f783a83a271884081217462cc31d4da6bfd1e7f069e4c5a3bc4a16 SHA512 ecb4885fb30f811901b1c443b4ca15952f1baf8926da411f6c937b8240af0adbd4fc42701b75f8e06a510d7dac9e393b5b799034885f07b3eccb0ef54f83af70 WHIRLPOOL 617347cc777545dfaa08b0731bc0e8aa2d363fa227c73914e79ad8a56e1d3ed8c224cb0560173a86c77937ce4174993cb31fc323d223fb91719ed32a75417496
+DIST netbeans-trunk-nightly-201609280002-src.zip 218005761 SHA256 367daea36555b453b8f12f89d0e75d20583869e3469f00db3c1c8c401e6ccfb1 SHA512 0eafbbedb1c1ea0ddfa1a52e235b7d681fcf9d1601a1ab07d42790bc5d02be3dcd8f0c3a7f71ad8e05f3450b3fdb7fcbd7810429ab5169c56fc777dca0e68e9c WHIRLPOOL 537016c960469b05459c054d4557ab710fd51f4cfe30bb5ff84ec1385bbc038a731eb44bd5d0dfb1426fe59bd4b4ede402242cb1d3dc138aaf0ed2dc80456c19
 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_p20160829.ebuild 3377 SHA256 626ced6297160a5a078e2dd4d92c76d39cb60a7d5737813bb257e84ec8946a4f SHA512 a900efe79b93d70a21cf15e41e5e4fe5e1ab915de1b45c390e7a96cb1c843a6076f5893d2696d3917e30de0fb157ca37c689cf2b5c9c8c10ddde564ac7a98802 WHIRLPOOL b12c00856ab2fe3de1b7fbce2ea53469064089b9bcd545cf05c541a92217ad83f81b913ecce4ac182f105c4d2a1414777b03e538a95d43ee3a05225353de8b53
@@ -63,4 +64,5 @@ EBUILD netbeans-extide-9999_p20160924.ebuild 3377 SHA256 6f9b9a99e5ed252857da842
 EBUILD netbeans-extide-9999_p20160925.ebuild 3377 SHA256 9e5453dda5a782896276d5714b49e0c146bf0fccee8d130c8efced4b9a5870b4 SHA512 bec86fcb0437b6fa5e96d6a782ce180c51f5d006f9037ad4c8b97d769262a76603b6edcf169140e53c47ad760ffd0b6d31e133bad7b2ba2d00edf64fb3b30332 WHIRLPOOL f668144cb08cf9b699f32920191341af440751ec0d0859098361cde785bfe438e6e7474fa2c5a9d14ab02abfda9f81339d774d73f999783483ecfe9cf676bc05
 EBUILD netbeans-extide-9999_p20160926.ebuild 3377 SHA256 fb8ced417507b492bacb8c3b37a8932308f7fbf130076223aa744eb5f2ae85b6 SHA512 5f02a37a7f08b731236941c7c88aea7e91d09dd8308ed20973ebf2bf273c523c77ce5fee0312126912bbbf5e20a302dc7f009d79aad5af09a2a13f8d7c30488a WHIRLPOOL 912e4abd795abeee284f541a68ae03ebbada6da02abf0d525b4b5ad54423fd80eb31818b3688bf4da757bcfac073fdb68a0559e2416d68df1e62864e63b07b23
 EBUILD netbeans-extide-9999_p20160927.ebuild 3377 SHA256 cd105dba267eefb6ea10c543aeed183298f0fd9e66d4ce5cbd852018a0ebb568 SHA512 aee152ff7b227397db70c89029b7f088573ec520ba925baa55ff30e3cc86c75e5af6dc836921f286c97210274da6c7f8066cf2821f261c38ce453221e493184a WHIRLPOOL f0819ba3d8801239c142050b54446a6ea52321f0332ea46b4503e14dcdc66d96af838039e1c336a5ff50daaf3947337d577d9a53cd05c33b815e6f09f5f0b6f8
+EBUILD netbeans-extide-9999_p20160928.ebuild 3377 SHA256 1b642bb170f699bf881ab2f6e752be731ac7de49acdf2f9d49fbfe332ceef38b SHA512 5ffcf9f7d818e04cfb3b9453ea5c73a8d67f624395737e8c28725d88245134026e68fa4c96da97d0254c3387273f54060011ebe5f83a7433aa8664e312511690 WHIRLPOOL ab43663afee03f60305e9a14024a5eb3ac3c2bdc911b7201789d1eeea78a3be4eecefd3965b205e445ce199ce96de9a4e9e0edfa064794905a46d89a34d64ee1
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160928.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160928.ebuild
new file mode 100644
index 0000000..daf9d5b
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20160928.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans ExtIDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-09-28_00-02-33/zip/netbeans-trunk-nightly-201609280002-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 b617dac..f55db5d 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201609240002-src.zip 218005040 SHA256 9967b7b3ac0f93
 DIST netbeans-trunk-nightly-201609250002-src.zip 218005446 SHA256 c28a4ee7eaa239ca0171799ce66ac1261fb1c94bc3657947637fbe57626781cb SHA512 2ac14c669ff9f1783402e5cbd14ffe3bd35f8b884dafe26265893b97098aa6251433b893dd9ab9790cb4fe133ce5c783106140a9bc005d8f9cb77c4fd4afd7c8 WHIRLPOOL 8ac171a5414bb283c7dd9010fd8fd186e0ae703a4b991713393021e24df41aefbb458a7e03c380b70b839ecf68d271db80079e87da42355f81e1ecc5aa122eb8
 DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1bf5de335c280b679d32646b7740176e0e3e91bdac284bc6fe66 SHA512 fe60ff01cdb7e1e8b044c4e9a51446198d8401180a66fa32f8d14953ec3d719e215e5161193253edc21c00bbca7f23af5903d4d59f5e4a9f5fb28d3be2aed235 WHIRLPOOL 4bbc58439fec5202aa774f3aa0057258aef8f9a259ed1aeab5110038462a727523bc27a845f05aa31c230cb730a988d5710735eb87f72bd53e434d21ccd4be21
 DIST netbeans-trunk-nightly-201609270002-src.zip 218005716 SHA256 c3fa3dc736f783a83a271884081217462cc31d4da6bfd1e7f069e4c5a3bc4a16 SHA512 ecb4885fb30f811901b1c443b4ca15952f1baf8926da411f6c937b8240af0adbd4fc42701b75f8e06a510d7dac9e393b5b799034885f07b3eccb0ef54f83af70 WHIRLPOOL 617347cc777545dfaa08b0731bc0e8aa2d363fa227c73914e79ad8a56e1d3ed8c224cb0560173a86c77937ce4174993cb31fc323d223fb91719ed32a75417496
+DIST netbeans-trunk-nightly-201609280002-src.zip 218005761 SHA256 367daea36555b453b8f12f89d0e75d20583869e3469f00db3c1c8c401e6ccfb1 SHA512 0eafbbedb1c1ea0ddfa1a52e235b7d681fcf9d1601a1ab07d42790bc5d02be3dcd8f0c3a7f71ad8e05f3450b3fdb7fcbd7810429ab5169c56fc777dca0e68e9c WHIRLPOOL 537016c960469b05459c054d4557ab710fd51f4cfe30bb5ff84ec1385bbc038a731eb44bd5d0dfb1426fe59bd4b4ede402242cb1d3dc138aaf0ed2dc80456c19
 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_p20160829.ebuild 3416 SHA256 915f8dbcbe1387e92c2a8a2942867855dda0d88fb46c8040ff0738e232debf69 SHA512 a013161b6a0ee8e4fbf29342632484efe5496fa492b8608380a89b3b073d1abdab3ff400ee0ac08456d6ebb62a0bfd3ce7dca80242eddf2609308764a3bc3a16 WHIRLPOOL 1f4ec2e318489afab731cd2411434725d5a75eab00c43de0ae6b027d78729810098a0c939175292fde30e8c878665e9e3b479c4d168f503630d62900943c7410
@@ -61,4 +62,5 @@ EBUILD netbeans-groovy-9999_p20160924.ebuild 3416 SHA256 b60699eaa885c6023e115a3
 EBUILD netbeans-groovy-9999_p20160925.ebuild 3416 SHA256 991bc8c336b889e17d18ee182f94e9f6067507c66f615b973df1717403370a77 SHA512 4b53d91ecb7506fc0bd5ed56d22480479a191f8c36c2ce216a40a9c54713223ba1176a2503af23ef6d92cdf779eb3608d8d1d92bdac34ebf07e5aba3c15831ff WHIRLPOOL 6725e3d8167581cb2e81560e9a052a329bd578684be359c2670ccfb4230b503d19cf434f29560474957b14e24f2d5ebbf0366ca5077f56937e6ea27334bba700
 EBUILD netbeans-groovy-9999_p20160926.ebuild 3416 SHA256 8c6a6cddfc53bcba95fa0be454a7478a5fddd0347c9782ceed112fe927680084 SHA512 f36802baac899088894be71e5f19c4574b19c62b72bb59507b388d3e5e0aa96d21c2421445d3b9659b38db49e6451c1da8f1e38fa1a8e0d04b2819223317eeee WHIRLPOOL c2e41146f079ec1837db8c2d5d97c3c3e706c9537a914080fea9eb56268df7eefc4b2f52f521eb9a19c559d3542b19c5c02feeac8decaee2af8d4605c941de9b
 EBUILD netbeans-groovy-9999_p20160927.ebuild 3416 SHA256 0b8aa3d0b9bcd985d729cffb1f397f90be4da9c80fc00386cbadd4b237018c34 SHA512 d5ee7cf21114da763d1276fc8abf19ad4a85a1ca8a9f2a1e74edcab32216d2dba59588b94a4f1f3935c57060a26ba3b39e9b324123c1a7e61e3edbb12d2988b9 WHIRLPOOL fac4a8ba14fa95968c58625f56f4aa3d3383c7b9d9e97b5292703b2df7de921230918b11139b68b14d4a52d39ec0b1d6419c275122b8a619619ed08de7cf1ed7
+EBUILD netbeans-groovy-9999_p20160928.ebuild 3416 SHA256 1e56272f239177762c943eb2128022a4b4de05314d405631af75119f9ae668ff SHA512 20a81407f39e23c333e400d9f3b567adb5ec1ddc08a37fe6b38e8933b239b27be5994234dc945d66b0e7a990b0ce1d968460afe923acb6b58224de7d11d5684c WHIRLPOOL 062dfeb9e0840b94b2928947a76e69531691a699b0a484bdf980848612b6ca6669891f838632f12a59a36a80f209c181ef15900a38150da80485974d4f67e820
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160928.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160928.ebuild
new file mode 100644
index 0000000..a4b37b9
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160928.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Groovy Cluster"
+HOMEPAGE="http://netbeans.org/projects/groovy"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-09-28_00-02-33/zip/netbeans-trunk-nightly-201609280002-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 ba48453..ad7235a 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201609240002-src.zip 218005040 SHA256 9967b7b3ac0f93
 DIST netbeans-trunk-nightly-201609250002-src.zip 218005446 SHA256 c28a4ee7eaa239ca0171799ce66ac1261fb1c94bc3657947637fbe57626781cb SHA512 2ac14c669ff9f1783402e5cbd14ffe3bd35f8b884dafe26265893b97098aa6251433b893dd9ab9790cb4fe133ce5c783106140a9bc005d8f9cb77c4fd4afd7c8 WHIRLPOOL 8ac171a5414bb283c7dd9010fd8fd186e0ae703a4b991713393021e24df41aefbb458a7e03c380b70b839ecf68d271db80079e87da42355f81e1ecc5aa122eb8
 DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1bf5de335c280b679d32646b7740176e0e3e91bdac284bc6fe66 SHA512 fe60ff01cdb7e1e8b044c4e9a51446198d8401180a66fa32f8d14953ec3d719e215e5161193253edc21c00bbca7f23af5903d4d59f5e4a9f5fb28d3be2aed235 WHIRLPOOL 4bbc58439fec5202aa774f3aa0057258aef8f9a259ed1aeab5110038462a727523bc27a845f05aa31c230cb730a988d5710735eb87f72bd53e434d21ccd4be21
 DIST netbeans-trunk-nightly-201609270002-src.zip 218005716 SHA256 c3fa3dc736f783a83a271884081217462cc31d4da6bfd1e7f069e4c5a3bc4a16 SHA512 ecb4885fb30f811901b1c443b4ca15952f1baf8926da411f6c937b8240af0adbd4fc42701b75f8e06a510d7dac9e393b5b799034885f07b3eccb0ef54f83af70 WHIRLPOOL 617347cc777545dfaa08b0731bc0e8aa2d363fa227c73914e79ad8a56e1d3ed8c224cb0560173a86c77937ce4174993cb31fc323d223fb91719ed32a75417496
+DIST netbeans-trunk-nightly-201609280002-src.zip 218005761 SHA256 367daea36555b453b8f12f89d0e75d20583869e3469f00db3c1c8c401e6ccfb1 SHA512 0eafbbedb1c1ea0ddfa1a52e235b7d681fcf9d1601a1ab07d42790bc5d02be3dcd8f0c3a7f71ad8e05f3450b3fdb7fcbd7810429ab5169c56fc777dca0e68e9c WHIRLPOOL 537016c960469b05459c054d4557ab710fd51f4cfe30bb5ff84ec1385bbc038a731eb44bd5d0dfb1426fe59bd4b4ede402242cb1d3dc138aaf0ed2dc80456c19
 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_p20160829.ebuild 4126 SHA256 f0db647af3fa24d48fc76405c19e20dcdaac75ca0a5e0c49d294bd8b87b573d2 SHA512 40764f17d61c0dfd040ae2820a59cd166d2a1d3b1be66cfaa9f83b1037e004a73adadcd375ffef70d5981356498bd892f21d36eec222f3d2d2744ccd13fb2636 WHIRLPOOL a21e0350d1b3d4aa579b10486eb46d8ebb408d63011e1fbe1086d68d4da13bf3b05fcdb05c41d4f634fbaa93d09f94d0ca516aeea52f60982ea27112c3c7c90f
@@ -64,4 +65,5 @@ EBUILD netbeans-harness-9999_p20160924.ebuild 4126 SHA256 32efc3a297338be15357e0
 EBUILD netbeans-harness-9999_p20160925.ebuild 4126 SHA256 f4bbd910a15ff60cc95e2955110815f460d7105dcd06a09f4402a655fdb59fc1 SHA512 ded7c1f78543fe31ede86ad3564d9446ba6cc433461597b2a2328f160fb10109e5fced8b1b40d9405299f19d29f8a68e3fe065bcf70a7621bba74f6055e059fa WHIRLPOOL 48d3ac1d7e368f0c02aff72a619dd7c8a276868ea3a2fde29d55ce5e40749dce94897f0ae28ddc14b812af33f03f332d29efcbd6b5f8104f1f470c30d8ef4f2f
 EBUILD netbeans-harness-9999_p20160926.ebuild 4126 SHA256 267948ab29fccaddf9386e4ea0720588208b652eb9441007b64c84f18cc6f3dd SHA512 7dde963638e9992e59fc84cf314e68dcebc2b4cb72fe4668d3e923eaf5fc8e8c0cc138d355d115561739449c71c6b6f6505aa2ea416e17c1b0976e457a2c5644 WHIRLPOOL 6c624c6c9238f8aa2440a1c99abee7d9c38e03e4e693f07b58725d1f0599d7346d862dfc540c4cd13668703b1aaaa8cff2ad0328bc163b6d17e5de65589701b2
 EBUILD netbeans-harness-9999_p20160927.ebuild 4126 SHA256 1658f30d2b5efd99471add88d294e1186bd263349e7ebe9ce7bcc0bbd66e5750 SHA512 13c24a43405bb160085542f039a38cba4e5faf1b5162c696267663a5a9f6b24807f9a6096ebc1144840795888edd953c2a623e11def08986aede8f8069be78ad WHIRLPOOL 414e240897a20dd1ee04a89a18b166a2b7b7d09cbd9e4baa85912f87f7c83a4cdc4c63c433d4abbcf9f2b7f5563dac4035b1b82269950f3a86c806d6f41a058d
+EBUILD netbeans-harness-9999_p20160928.ebuild 4126 SHA256 a8adfc2758e4ef42acdd2f0c33e2fbf06e5312a76c33531f6a90977fd91de1b9 SHA512 3bdd778efbccd1b455cccfb54ee5e4023798b2c0cb8a2c15e1f011bce008f7fb6506000b0798a4b1a6b88d72e96aaba9a3f8fb149703b8701996bcbec063f039 WHIRLPOOL e61e674fd8445ca5dcea54f2af592a9fc1a8487752d0518e8c4d14c72ed2cf3469a0a11c62641cea3daf289c87f39ac9d0fc76f842f9613e5e12f5c8ab47b7b8
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160928.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160928.ebuild
new file mode 100644
index 0000000..7586611
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20160928.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Harness"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-09-28_00-02-33/zip/netbeans-trunk-nightly-201609280002-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 f777f65..73f4f9e 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -169,6 +169,7 @@ DIST netbeans-trunk-nightly-201609240002-src.zip 218005040 SHA256 9967b7b3ac0f93
 DIST netbeans-trunk-nightly-201609250002-src.zip 218005446 SHA256 c28a4ee7eaa239ca0171799ce66ac1261fb1c94bc3657947637fbe57626781cb SHA512 2ac14c669ff9f1783402e5cbd14ffe3bd35f8b884dafe26265893b97098aa6251433b893dd9ab9790cb4fe133ce5c783106140a9bc005d8f9cb77c4fd4afd7c8 WHIRLPOOL 8ac171a5414bb283c7dd9010fd8fd186e0ae703a4b991713393021e24df41aefbb458a7e03c380b70b839ecf68d271db80079e87da42355f81e1ecc5aa122eb8
 DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1bf5de335c280b679d32646b7740176e0e3e91bdac284bc6fe66 SHA512 fe60ff01cdb7e1e8b044c4e9a51446198d8401180a66fa32f8d14953ec3d719e215e5161193253edc21c00bbca7f23af5903d4d59f5e4a9f5fb28d3be2aed235 WHIRLPOOL 4bbc58439fec5202aa774f3aa0057258aef8f9a259ed1aeab5110038462a727523bc27a845f05aa31c230cb730a988d5710735eb87f72bd53e434d21ccd4be21
 DIST netbeans-trunk-nightly-201609270002-src.zip 218005716 SHA256 c3fa3dc736f783a83a271884081217462cc31d4da6bfd1e7f069e4c5a3bc4a16 SHA512 ecb4885fb30f811901b1c443b4ca15952f1baf8926da411f6c937b8240af0adbd4fc42701b75f8e06a510d7dac9e393b5b799034885f07b3eccb0ef54f83af70 WHIRLPOOL 617347cc777545dfaa08b0731bc0e8aa2d363fa227c73914e79ad8a56e1d3ed8c224cb0560173a86c77937ce4174993cb31fc323d223fb91719ed32a75417496
+DIST netbeans-trunk-nightly-201609280002-src.zip 218005761 SHA256 367daea36555b453b8f12f89d0e75d20583869e3469f00db3c1c8c401e6ccfb1 SHA512 0eafbbedb1c1ea0ddfa1a52e235b7d681fcf9d1601a1ab07d42790bc5d02be3dcd8f0c3a7f71ad8e05f3450b3fdb7fcbd7810429ab5169c56fc777dca0e68e9c WHIRLPOOL 537016c960469b05459c054d4557ab710fd51f4cfe30bb5ff84ec1385bbc038a731eb44bd5d0dfb1426fe59bd4b4ede402242cb1d3dc138aaf0ed2dc80456c19
 EBUILD netbeans-ide-8.0.2-r2.ebuild 29330 SHA256 4822cbe26fc19685164c35d69e75bc20578ca8a5ce3394fe97bde6acc721fd2d SHA512 552f35cb1aa5429beb70c72a0cd2a3aa3a006f5870ec4084e88632a39e2ccdc05d0b2b15a87f26c72cdffb3c9a6fa0a124a8d501edeef9aa9580396922071e8d WHIRLPOOL 4c9bce3ca21d5ae61ef9392b9282c2dff9de7f82f2e83d2944a2906ca2180ef0ffab59489bdbb6afc7ba88d5143d77b47a0cf6b219a5a4d385b68afcacd3fe6d
 EBUILD netbeans-ide-8.1-r2.ebuild 30301 SHA256 892f20531352d85b5b72b1c85352eefa444917b515b0b564f04c4f91d1e654f9 SHA512 50af4873fd3ea7755b0d33b086be7e07766b6c009a46ec3954a67a1da9930378bcf9da6d18b7e60078b31af4b36ccf060f22378a8ef26b3829ccf30a529dd023 WHIRLPOOL 1024af16e7cae7f4728dd37f88031be33253b7c62548a095d3e827abeccb6c183d34ce312bd1a0f808f0d107aff217e4b81b7a17eecc6842e1d914d7061df2c9
 EBUILD netbeans-ide-9999_p20160829.ebuild 29849 SHA256 a6f7fab5c9676f4258ba58360ed0232e8dfc97aeb3b98fcf37f6c9c8930ec093 SHA512 bb800f90796a6980ee8fabdf5f7af898d020a841f35031dfc47c050275e3e1c65cb240910aefe729161a73f9a547b57f520147e70f7a2d8837bc22c8e3525819 WHIRLPOOL 0beb8336aafd5b5bdb28c8c6693ac63f83c8c0ecae44553a760d649edb92d061016053d50df09a01990ee2f78ed434808b3dbeb8ce2807273422ee5f05fc9008
@@ -198,4 +199,5 @@ EBUILD netbeans-ide-9999_p20160924.ebuild 29849 SHA256 59be043e33e4b2ec60fcf7c16
 EBUILD netbeans-ide-9999_p20160925.ebuild 29849 SHA256 ae5d98af63c51862bd99fcd40617272c9005182c31ad5eb5f66300d308c63852 SHA512 c281ce86266c9494e13f6a03c172a32f28c87c85756aef76dc3f0fcedc440211c37e207f08778aa941d20e8934dbad7c3dfb41e623d6d8408b7e8783e6172b78 WHIRLPOOL fb50a5db3f69505a53a1b9e60dcfa9c079fa0b850455193d28040aba0fc3e9d5fe9a0be7237542cc534a95e7080abad60488dbe967951eba246070c49b37d298
 EBUILD netbeans-ide-9999_p20160926.ebuild 29849 SHA256 cc2a1c1130713980fd872ee3bdcdc0c1c7ba94b152c4477c31cb0ec406dd5bd2 SHA512 eabe67954084946ca0f77909496cfa3d4b4a1de839d00ef284d7d0618afd4d83d03f17b89396c0094b4793570ab4c50bcddd4f4917c84db8261c82d606f8c8a2 WHIRLPOOL 34aeabb2c42a2b81a2abaf83e779e5c4e04a5f23f34afee6c560faff1d54399175aa7997286666c4135dbce7973a92a4aca9feaabace9548275c6656a6eea03e
 EBUILD netbeans-ide-9999_p20160927.ebuild 29849 SHA256 5640d9de18f51fd75577c6c1da71e4dfc279217833cde89057f41da40f5ba082 SHA512 d65bd99f152ff60f2613e3070e6e408c67faaa72b93e090e6ec3f91311d251d347490ee5919d3f4834a3a4237e76be2c657384636244e317b403782b0faffc5a WHIRLPOOL 6f5bf57778d460fb62f9de9c6c6de7542620b9975ad19cd400519b13551d78fdf9d450c8ff92261bd1c8ef228adec4b052aa8686b84f097ba1c86f05b408387a
+EBUILD netbeans-ide-9999_p20160928.ebuild 29849 SHA256 67f3c25c7bb79e09e1167b0af48e56903abebdd773cacc7a98fbf342b7505768 SHA512 adcc54258693bec02dbfef133b887725168db184736e4ccb1d3fa67d2f13f078b2502eddccb56a73a64ccabaa44780db1de9329f272685b3c388dfb0a6af59c6 WHIRLPOOL d2d623df2c184e22fd9fb31c39f0ead52f31b96edb13b8e47e835f1e6196424c2f2ea8e5251ba441674692088b85d577bfafaab975ef84fa3e4f25454c1cab5c
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160928.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160928.ebuild
new file mode 100644
index 0000000..07ff88d
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20160928.ebuild
@@ -0,0 +1,374 @@
+# 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-28_00-02-33/zip/netbeans-trunk-nightly-201609280002-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 ce44b33..a1f182c 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -66,6 +66,7 @@ DIST netbeans-trunk-nightly-201609240002-src.zip 218005040 SHA256 9967b7b3ac0f93
 DIST netbeans-trunk-nightly-201609250002-src.zip 218005446 SHA256 c28a4ee7eaa239ca0171799ce66ac1261fb1c94bc3657947637fbe57626781cb SHA512 2ac14c669ff9f1783402e5cbd14ffe3bd35f8b884dafe26265893b97098aa6251433b893dd9ab9790cb4fe133ce5c783106140a9bc005d8f9cb77c4fd4afd7c8 WHIRLPOOL 8ac171a5414bb283c7dd9010fd8fd186e0ae703a4b991713393021e24df41aefbb458a7e03c380b70b839ecf68d271db80079e87da42355f81e1ecc5aa122eb8
 DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1bf5de335c280b679d32646b7740176e0e3e91bdac284bc6fe66 SHA512 fe60ff01cdb7e1e8b044c4e9a51446198d8401180a66fa32f8d14953ec3d719e215e5161193253edc21c00bbca7f23af5903d4d59f5e4a9f5fb28d3be2aed235 WHIRLPOOL 4bbc58439fec5202aa774f3aa0057258aef8f9a259ed1aeab5110038462a727523bc27a845f05aa31c230cb730a988d5710735eb87f72bd53e434d21ccd4be21
 DIST netbeans-trunk-nightly-201609270002-src.zip 218005716 SHA256 c3fa3dc736f783a83a271884081217462cc31d4da6bfd1e7f069e4c5a3bc4a16 SHA512 ecb4885fb30f811901b1c443b4ca15952f1baf8926da411f6c937b8240af0adbd4fc42701b75f8e06a510d7dac9e393b5b799034885f07b3eccb0ef54f83af70 WHIRLPOOL 617347cc777545dfaa08b0731bc0e8aa2d363fa227c73914e79ad8a56e1d3ed8c224cb0560173a86c77937ce4174993cb31fc323d223fb91719ed32a75417496
+DIST netbeans-trunk-nightly-201609280002-src.zip 218005761 SHA256 367daea36555b453b8f12f89d0e75d20583869e3469f00db3c1c8c401e6ccfb1 SHA512 0eafbbedb1c1ea0ddfa1a52e235b7d681fcf9d1601a1ab07d42790bc5d02be3dcd8f0c3a7f71ad8e05f3450b3fdb7fcbd7810429ab5169c56fc777dca0e68e9c WHIRLPOOL 537016c960469b05459c054d4557ab710fd51f4cfe30bb5ff84ec1385bbc038a731eb44bd5d0dfb1426fe59bd4b4ede402242cb1d3dc138aaf0ed2dc80456c19
 EBUILD netbeans-java-8.0.2-r4.ebuild 13298 SHA256 d4172dfdec5afecb1cd099e18a21aa872c7822bff40b192b5f4ec4d35e6e0ef8 SHA512 48ae6f7141117fbf58123ded750d76f2e7311211a6be3b62bd491349817460da11f781ec5694da91584315547c32008f568fac3bfb406dbdb5ed7fd825ff694e WHIRLPOOL 73fb68aec003707c14b2b390c2de80f24e1e5413cf7e16cf7e661af47c908e2d559214580379e45e21d316767987ac906b5a119a61ae39f03c3d01dafad49b7c
 EBUILD netbeans-java-8.1-r2.ebuild 14814 SHA256 1f49212c90fcaa9a6483f19bb60c963520f20aa08c2a509aa19cc7fda12e4564 SHA512 2d6b225f5d32f0ce1801124808b0cc2101f16a703540877c4818be06694742cfa262c3a2e7018761254f9244a7992eb7fe9bc15cdb20f6f4cb83958789c0ef42 WHIRLPOOL 8557163a46ea91a47efec3c272b8a8a0f2acbf9eaa8f6c280d0ddaac6dd8b2185f06716ab12ebf76fb87fe6c05ab1a14bfd281875ebef586f1304d2162e5f2dc
 EBUILD netbeans-java-9999_p20160829.ebuild 15656 SHA256 bc83101c53e23a1d651468baa0d8a2375175b1da0b81691206d811640b70c369 SHA512 3f108ac7aea8be7db61a7a9410d8dd4d6260e76e23bfa7d42dabc6d9ea487acdb0f01be7428a8c690908da82fa43112ac17163d99cf21b75ab0fcaad5df7c5f9 WHIRLPOOL aafff004669eb554dfe6d4b58a8b39ce43690188c0f58e7390c2c487e54deab0563355172af756afbd3cd18bf712daf4821401b6f353593cd1017b794f1a55d7
@@ -95,4 +96,5 @@ EBUILD netbeans-java-9999_p20160924.ebuild 15656 SHA256 3cc988699ac7f9196d181124
 EBUILD netbeans-java-9999_p20160925.ebuild 15656 SHA256 7573b01116277e1ddc6e27d997a1c494f89f0a64b5a12e749e486d19a12b720d SHA512 b4ecb48070850e552a4a85fbf6961971a520b292efc110f359c6d4edb48023c2086baa93cefb4142905842b38363d2877ad02a6fd71f3ddc3eddfd710b424519 WHIRLPOOL f5435c52f608310d0f60a45b9936e6ca9702607d618460fb8dca0f7c22888eec52147b6472b4d5a55ceec4d3c7e3cac966ec8913cdd9b979ce4ac75aaf9ed418
 EBUILD netbeans-java-9999_p20160926.ebuild 15656 SHA256 8a715fd5a5439289acc53c15bda320a1157385184b2584c1463055f691a018bf SHA512 800d593a76d57216ae91813e0b0a335b4b881c7419bb7235c8fe56d66a6566ddb49249268b77a0e635e82f9c70bc7b8081e284db8ab8cd9d20094ddf6485cd07 WHIRLPOOL 7bf8633ce9548f319780d0a03ca59073d63c1c8fe7ffd4b2fbef83bbb4dcd04cd7c3241b86bc6d4016a84fed0f27435e79892acc4e03d604305c636d88a02794
 EBUILD netbeans-java-9999_p20160927.ebuild 15656 SHA256 a0a170edd04cc738d31e792f0b8a90cca2c42127256f3c1194f1a421e1e1a7fc SHA512 ef04445d779f7605de7039b79d4835231ad5b4e4db9c14b9c1e36002ace32abebf1a5adc71adb0a4c7898c25adc879274db7c338d87234324bb3b5b363440c14 WHIRLPOOL f41002b41d91e82ed45a4e2e22204a06dc408ead427e7b24577e69cf623d2844bb8287a30e860c95cb80e901757f2aa1c37d85e1131e5a133d83a52260fa0dc7
+EBUILD netbeans-java-9999_p20160928.ebuild 15656 SHA256 1eefb99fb7afa0fdb272270637ea1d20074075b263c75cece9a0c2fef1d09314 SHA512 7aa14ee3d56935b5e17d93b388aac8d309995aed212158561d3fc8d4dfa6a541b14a81e950a7d008d110f31baf806850efa6f285739cf13b1e7b94e0958cdb0c WHIRLPOOL 27ceade4082e262e9df61e4f397005c3e87c6f54d29a2d362f322d5413f51eda2f889c1252356bb72a8e64831f79e493aee54d8f554b6c6eaef8d13e692d7502
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160928.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160928.ebuild
new file mode 100644
index 0000000..14f8d11
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20160928.ebuild
@@ -0,0 +1,280 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+# Maven cannot be unbundled because it depends on exact maven version and exact content of maven directory
+
+DESCRIPTION="Netbeans Java Cluster"
+HOMEPAGE="http://netbeans.org/projects/java"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-09-28_00-02-33/zip/netbeans-trunk-nightly-201609280002-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 1d9bb39..4a3418e 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201609240002-src.zip 218005040 SHA256 9967b7b3ac0f93
 DIST netbeans-trunk-nightly-201609250002-src.zip 218005446 SHA256 c28a4ee7eaa239ca0171799ce66ac1261fb1c94bc3657947637fbe57626781cb SHA512 2ac14c669ff9f1783402e5cbd14ffe3bd35f8b884dafe26265893b97098aa6251433b893dd9ab9790cb4fe133ce5c783106140a9bc005d8f9cb77c4fd4afd7c8 WHIRLPOOL 8ac171a5414bb283c7dd9010fd8fd186e0ae703a4b991713393021e24df41aefbb458a7e03c380b70b839ecf68d271db80079e87da42355f81e1ecc5aa122eb8
 DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1bf5de335c280b679d32646b7740176e0e3e91bdac284bc6fe66 SHA512 fe60ff01cdb7e1e8b044c4e9a51446198d8401180a66fa32f8d14953ec3d719e215e5161193253edc21c00bbca7f23af5903d4d59f5e4a9f5fb28d3be2aed235 WHIRLPOOL 4bbc58439fec5202aa774f3aa0057258aef8f9a259ed1aeab5110038462a727523bc27a845f05aa31c230cb730a988d5710735eb87f72bd53e434d21ccd4be21
 DIST netbeans-trunk-nightly-201609270002-src.zip 218005716 SHA256 c3fa3dc736f783a83a271884081217462cc31d4da6bfd1e7f069e4c5a3bc4a16 SHA512 ecb4885fb30f811901b1c443b4ca15952f1baf8926da411f6c937b8240af0adbd4fc42701b75f8e06a510d7dac9e393b5b799034885f07b3eccb0ef54f83af70 WHIRLPOOL 617347cc777545dfaa08b0731bc0e8aa2d363fa227c73914e79ad8a56e1d3ed8c224cb0560173a86c77937ce4174993cb31fc323d223fb91719ed32a75417496
+DIST netbeans-trunk-nightly-201609280002-src.zip 218005761 SHA256 367daea36555b453b8f12f89d0e75d20583869e3469f00db3c1c8c401e6ccfb1 SHA512 0eafbbedb1c1ea0ddfa1a52e235b7d681fcf9d1601a1ab07d42790bc5d02be3dcd8f0c3a7f71ad8e05f3450b3fdb7fcbd7810429ab5169c56fc777dca0e68e9c WHIRLPOOL 537016c960469b05459c054d4557ab710fd51f4cfe30bb5ff84ec1385bbc038a731eb44bd5d0dfb1426fe59bd4b4ede402242cb1d3dc138aaf0ed2dc80456c19
 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_p20160829.ebuild 4971 SHA256 6ee1fd71a7bacf2aac7562fbb3475301c2158f35f41925990bcb2a927e9ac31c SHA512 313206273aaa618f7b2043a036da7eb218c718ebd8fe609c03381d28827da0e937ab13a4f60c55b3bc0c25b04b81baea3570f5d27fdd4d4d158a80eac846d221 WHIRLPOOL e5c41a017e7dae48ebe35f8b376684243d01e3a7569317aa0473ef4c1757570189529e64f526cf84a060edb7c75130b09420bf54b4098164492964307c44d914
@@ -62,4 +63,5 @@ EBUILD netbeans-javacard-9999_p20160924.ebuild 4971 SHA256 18a6e7c0a75430a929ee8
 EBUILD netbeans-javacard-9999_p20160925.ebuild 4971 SHA256 985816d124b397274f897bb611479f98cfeabf7dd157c1bab37ecfd5da94563e SHA512 343656a0bdf682f6df34ee77ff0d2e7edff7f8099467dab86d0c672ef3cdfcfc8c0175f76fa91e28e33be10df031ca8bcfa34053bb099bb8a0284f7c488a75e2 WHIRLPOOL 0406fc3f0e605eb4cefdc710da88305f8c4b0ff50caed4c4050406addfe1f57db2732f47c68dfb096b3a7beda6026075f9554e440b7e32c8dd480276f3e3fddc
 EBUILD netbeans-javacard-9999_p20160926.ebuild 4971 SHA256 d32cf3bd8dd10a4954743bb3402311e2f198984761a063f6242900fb79b3ae18 SHA512 c8a16554c0d9de54706da8e011d9d781abbddcf83f18d4ffa09fa80a759a8324e80d7de5c2598b65b5119a5342ce2b261080b6f0f6bf28747580f63a996ec1d0 WHIRLPOOL 46129140437f6399eda2c21639283194469e97a2d11077cfd1af7339eb582076280d2daba67f94b1babb58169551ea58a66e8adc80bc17acf1fa857e2ef5ff40
 EBUILD netbeans-javacard-9999_p20160927.ebuild 4971 SHA256 90870579790314a58611324c4e8be8d8144613479e05d1aee67e9462edf2674d SHA512 3ea1eed13d7ee93540d96eb27fa22e90322e2f4799cc3ce0a74ee8bb8b768154e69b50c2e14eef228ea52e0bb3cd8d50707716a88fe31295b413a23e4f1c8ee5 WHIRLPOOL 803c4c6786572e5080b7c8386fd64dbb1f0a886e75ddd96112f165f6fd67b5b6a17781a94a39644fde193049700d36539541005d2c1934f6da7683fe6b4e27f0
+EBUILD netbeans-javacard-9999_p20160928.ebuild 4971 SHA256 c2436d04e37ff0e72c6ea25cb850f9c9d84e415a2a06291bc0bf288d060587b6 SHA512 4ec5ed5e1e162e0ffb4f8ccc24ea162f71c386fca4d297af31efe11478193e29602de0ccbce4f897626c436a0741aabe7603a6fbc9b6910abcdd4daf5f118045 WHIRLPOOL 53e3a87396c8760c9f5899de68aabb065953b22d9f60cc3e3216687dd08d52dbda6f53db9ca2a22d3e75aa5ad7876673e72dcaa0f849cdd849d34c6e047b9df3
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160928.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160928.ebuild
new file mode 100644
index 0000000..414c9c0
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160928.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaCard Cluster"
+HOMEPAGE="http://netbeans.org/projects/javacard"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-09-28_00-02-33/zip/netbeans-trunk-nightly-201609280002-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 ffe2e7a..0340c54 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201609240002-src.zip 218005040 SHA256 9967b7b3ac0f93
 DIST netbeans-trunk-nightly-201609250002-src.zip 218005446 SHA256 c28a4ee7eaa239ca0171799ce66ac1261fb1c94bc3657947637fbe57626781cb SHA512 2ac14c669ff9f1783402e5cbd14ffe3bd35f8b884dafe26265893b97098aa6251433b893dd9ab9790cb4fe133ce5c783106140a9bc005d8f9cb77c4fd4afd7c8 WHIRLPOOL 8ac171a5414bb283c7dd9010fd8fd186e0ae703a4b991713393021e24df41aefbb458a7e03c380b70b839ecf68d271db80079e87da42355f81e1ecc5aa122eb8
 DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1bf5de335c280b679d32646b7740176e0e3e91bdac284bc6fe66 SHA512 fe60ff01cdb7e1e8b044c4e9a51446198d8401180a66fa32f8d14953ec3d719e215e5161193253edc21c00bbca7f23af5903d4d59f5e4a9f5fb28d3be2aed235 WHIRLPOOL 4bbc58439fec5202aa774f3aa0057258aef8f9a259ed1aeab5110038462a727523bc27a845f05aa31c230cb730a988d5710735eb87f72bd53e434d21ccd4be21
 DIST netbeans-trunk-nightly-201609270002-src.zip 218005716 SHA256 c3fa3dc736f783a83a271884081217462cc31d4da6bfd1e7f069e4c5a3bc4a16 SHA512 ecb4885fb30f811901b1c443b4ca15952f1baf8926da411f6c937b8240af0adbd4fc42701b75f8e06a510d7dac9e393b5b799034885f07b3eccb0ef54f83af70 WHIRLPOOL 617347cc777545dfaa08b0731bc0e8aa2d363fa227c73914e79ad8a56e1d3ed8c224cb0560173a86c77937ce4174993cb31fc323d223fb91719ed32a75417496
+DIST netbeans-trunk-nightly-201609280002-src.zip 218005761 SHA256 367daea36555b453b8f12f89d0e75d20583869e3469f00db3c1c8c401e6ccfb1 SHA512 0eafbbedb1c1ea0ddfa1a52e235b7d681fcf9d1601a1ab07d42790bc5d02be3dcd8f0c3a7f71ad8e05f3450b3fdb7fcbd7810429ab5169c56fc777dca0e68e9c WHIRLPOOL 537016c960469b05459c054d4557ab710fd51f4cfe30bb5ff84ec1385bbc038a731eb44bd5d0dfb1426fe59bd4b4ede402242cb1d3dc138aaf0ed2dc80456c19
 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_p20160829.ebuild 6293 SHA256 87ddccfa705ea33c6371f5ebe16685c8ad47766440e8007aef9550dc01d6c8a2 SHA512 220eb340112b42dc0d83eea08ddb4b86812fd2b803438f1fe65eaac2d49cf140595e0ef71aa668ed6b8fa7fd52a3d1d8ec4eadea273ae639cf6bcaef6c5d8800 WHIRLPOOL fcc327a8fd7f450aa2ad7b9b4dfb1fdc37366619ea915db9a8ebf4e346622418685abfd56c37ef1ea21f723b7b5e33be8f93cc90e2967bd5386fa6909a456a2c
@@ -61,4 +62,5 @@ EBUILD netbeans-javadoc-9999_p20160924.ebuild 6293 SHA256 f22a7a95af4ef902510518
 EBUILD netbeans-javadoc-9999_p20160925.ebuild 6293 SHA256 5d20aacaeabfe9bc8362b7c8473cd04b9654cb68f7c053d934986fa08da775ef SHA512 fcd665df3654411add9ec7c05a31ce4e726889f8259c82d4e91426a004d747f0270e2d0544ba7dc4c71bbb0e568378e3bf96cf2b916ed850bea9f3b040a5205e WHIRLPOOL 9b539c8ee9373756c2088979effb32410af88c52a435748ba2697862952f5f6b3ea90ad0a5457459651407633f4d5b67e228b7eb3dfd0689cde98e71a178bee0
 EBUILD netbeans-javadoc-9999_p20160926.ebuild 6293 SHA256 0eed4465649deb22c778bd7d0e3c835e6f0f6a6c58e665a2fa22094f1dc4b4d1 SHA512 c6e79d32d347147164c4845613b74d52e5be997244635b45da0f2f773b5280907349c9fb7c0121d926ff67d206b9635a642bf1ff122dd484147ae2f1f8848777 WHIRLPOOL cbf4170edb973f66bc97dec536850204057f321eeda17018d9184c752e4bbc2ef32bb99680d29c2fda5408ccbf17c9852731269b5f58b0b6d6729f7b48e6f9ac
 EBUILD netbeans-javadoc-9999_p20160927.ebuild 6293 SHA256 8fe53add602f000cd877f5065fa3cc2dc99176285df4536affed2f28cc7409e7 SHA512 ffb989eba1f261288eaf88bf7daac38e356f24eb06505eb89c0164968aa15529545f568fe31208f77b3d98b2f916de7f5676387de8200fab44d2b44cc2d4743e WHIRLPOOL 1643ab51124c935fc0d858e7ecd99db1325526589a3de9def3317bf0cae1357d5033925c95e910e8a6de99f2c27ee4ec773dea9f7ed83c805f13f88885a7be29
+EBUILD netbeans-javadoc-9999_p20160928.ebuild 6293 SHA256 e2a4fef36770a10ed164a9eb9b19e51dc5c2b0af00a5eca1232d4b3f65cd8d97 SHA512 0faf3ca6fe9fa2b4a893a35c6ff0c028e7712fc815187c3a8f9b444a5a9af662e483e1142ee1d8746e7ac8d45f615700c2a09656097da1f5b1dc1427dcfd15e3 WHIRLPOOL 8b7882dcb4f5424cb772a8a668f23fdc53c317f64802419ac6ccfb509240243e201c9e050d95da0480ceb6107b1f26002e2dee52ba4353f1f85fe8f74224df4c
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160928.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160928.ebuild
new file mode 100644
index 0000000..d12fa68
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160928.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaDocs"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-09-28_00-02-33/zip/netbeans-trunk-nightly-201609280002-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 3e08cb4..54e377b 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201609240002-src.zip 218005040 SHA256 9967b7b3ac0f93
 DIST netbeans-trunk-nightly-201609250002-src.zip 218005446 SHA256 c28a4ee7eaa239ca0171799ce66ac1261fb1c94bc3657947637fbe57626781cb SHA512 2ac14c669ff9f1783402e5cbd14ffe3bd35f8b884dafe26265893b97098aa6251433b893dd9ab9790cb4fe133ce5c783106140a9bc005d8f9cb77c4fd4afd7c8 WHIRLPOOL 8ac171a5414bb283c7dd9010fd8fd186e0ae703a4b991713393021e24df41aefbb458a7e03c380b70b839ecf68d271db80079e87da42355f81e1ecc5aa122eb8
 DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1bf5de335c280b679d32646b7740176e0e3e91bdac284bc6fe66 SHA512 fe60ff01cdb7e1e8b044c4e9a51446198d8401180a66fa32f8d14953ec3d719e215e5161193253edc21c00bbca7f23af5903d4d59f5e4a9f5fb28d3be2aed235 WHIRLPOOL 4bbc58439fec5202aa774f3aa0057258aef8f9a259ed1aeab5110038462a727523bc27a845f05aa31c230cb730a988d5710735eb87f72bd53e434d21ccd4be21
 DIST netbeans-trunk-nightly-201609270002-src.zip 218005716 SHA256 c3fa3dc736f783a83a271884081217462cc31d4da6bfd1e7f069e4c5a3bc4a16 SHA512 ecb4885fb30f811901b1c443b4ca15952f1baf8926da411f6c937b8240af0adbd4fc42701b75f8e06a510d7dac9e393b5b799034885f07b3eccb0ef54f83af70 WHIRLPOOL 617347cc777545dfaa08b0731bc0e8aa2d363fa227c73914e79ad8a56e1d3ed8c224cb0560173a86c77937ce4174993cb31fc323d223fb91719ed32a75417496
+DIST netbeans-trunk-nightly-201609280002-src.zip 218005761 SHA256 367daea36555b453b8f12f89d0e75d20583869e3469f00db3c1c8c401e6ccfb1 SHA512 0eafbbedb1c1ea0ddfa1a52e235b7d681fcf9d1601a1ab07d42790bc5d02be3dcd8f0c3a7f71ad8e05f3450b3fdb7fcbd7810429ab5169c56fc777dca0e68e9c WHIRLPOOL 537016c960469b05459c054d4557ab710fd51f4cfe30bb5ff84ec1385bbc038a731eb44bd5d0dfb1426fe59bd4b4ede402242cb1d3dc138aaf0ed2dc80456c19
 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_p20160829.ebuild 4717 SHA256 7f01aa38f26cbf90052418099112d0fd3af95239fb2dcdb884c216fc8d288ca4 SHA512 4d32df7c07a9a98ff01fc84e294bc943113caeda15b3cf8efa16cdbca322e9df0faaf79679cf2fab1819a294b96ae27e748ca2f51591673d05c5e1531d03bb9b WHIRLPOOL ad3f0f5fc6d3b441d67cd998ae7ebcfb20ffe2124b876a0227721b93c1f69d691b281381f9cf3cf4968a25f48bbe8f05e14258bb520db554ab1e330194964c2c
@@ -67,4 +68,5 @@ EBUILD netbeans-javafx-9999_p20160924.ebuild 4717 SHA256 5ece17bdc2f52497d8824a3
 EBUILD netbeans-javafx-9999_p20160925.ebuild 4717 SHA256 c9a00007c61fb0d9d4272ebed02dc37c989b013eed8f11d026ef54a29a1f246e SHA512 f398b4f2b812f843556813a9dca607c7784b075551b410522cb85921d8db3345a28d36506464106c101979e4819c439e07a96e449f9bb6ba9bc242afe49abcca WHIRLPOOL 4452525480ff069a5f75c35ab96545228466d64c635b45f2b1076c2a238176a0728ab173b3ad98a0109160f00814703331038e169661b49081efe25b3d5f3557
 EBUILD netbeans-javafx-9999_p20160926.ebuild 4717 SHA256 d0d6f965f90ff3fd60a55c49ce0c90aef51871f9e29c9e3a61dca206bd0cfc12 SHA512 8442a0dd4b5837ec94d226e392aaaf97b300e3706556ebb39190d2c7d951737df7944d3aee3520b11f6383d7f72a440947b2a114543be0de57c6b91c66df3690 WHIRLPOOL 7df85fa3f242abbfcd0b06c4a1441129a17b1d2d9531fa0b07d601711cb99be241fe15cf410d61f8bccffe16f5fafdf9608b71a3bb667613df8aa95662c49ff1
 EBUILD netbeans-javafx-9999_p20160927.ebuild 4717 SHA256 c54f67f2dbbb6c46d5469dcada2cd550380352abc5a34e2677feacd40e0f543b SHA512 9cb6da5d3f22f224f6906d1b0df5de2f996dee65ba750e6b943cfc0947f3badaa333a5800f0c9706e93b70c25417517b8d067565fc261b1854b3fad4750d1f1d WHIRLPOOL 634ee42e9decf3a3802d2f60cb90b782032b43546a05f58f8fc5fccabfd0f8f708b6da518a5e3f6620b7f7b8e0e03ef334e831a8a0f32c4bf69e7cc407d2b837
+EBUILD netbeans-javafx-9999_p20160928.ebuild 4717 SHA256 c11743b641116bc97c1497a52442f6ebbc915e9bb7b8c430751d4d9c69392f3c SHA512 097f2ea3047d63e039069be4afa7926f1ccd05fa1036c9c723e596478cb05decd48dc6e1a527d6d21ff76fcae57f5e2d397132e6ff1dc0a7016ec9457305c319 WHIRLPOOL 2a3903a7ed61126d68b810b21c88c9f22d899ff0bf09cf2ab645a9840650a0cb89e2e5fc22e458cef8ce38c6f9fd7b3e4b921a454ebc9a4ed4d61e6402d2cfdf
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160928.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160928.ebuild
new file mode 100644
index 0000000..5747954
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160928.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaFX Cluster"
+HOMEPAGE="http://netbeans.org/projects/javafx"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-09-28_00-02-33/zip/netbeans-trunk-nightly-201609280002-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 cdbf3bf..83fb5f8 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201609240002-src.zip 218005040 SHA256 9967b7b3ac0f93
 DIST netbeans-trunk-nightly-201609250002-src.zip 218005446 SHA256 c28a4ee7eaa239ca0171799ce66ac1261fb1c94bc3657947637fbe57626781cb SHA512 2ac14c669ff9f1783402e5cbd14ffe3bd35f8b884dafe26265893b97098aa6251433b893dd9ab9790cb4fe133ce5c783106140a9bc005d8f9cb77c4fd4afd7c8 WHIRLPOOL 8ac171a5414bb283c7dd9010fd8fd186e0ae703a4b991713393021e24df41aefbb458a7e03c380b70b839ecf68d271db80079e87da42355f81e1ecc5aa122eb8
 DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1bf5de335c280b679d32646b7740176e0e3e91bdac284bc6fe66 SHA512 fe60ff01cdb7e1e8b044c4e9a51446198d8401180a66fa32f8d14953ec3d719e215e5161193253edc21c00bbca7f23af5903d4d59f5e4a9f5fb28d3be2aed235 WHIRLPOOL 4bbc58439fec5202aa774f3aa0057258aef8f9a259ed1aeab5110038462a727523bc27a845f05aa31c230cb730a988d5710735eb87f72bd53e434d21ccd4be21
 DIST netbeans-trunk-nightly-201609270002-src.zip 218005716 SHA256 c3fa3dc736f783a83a271884081217462cc31d4da6bfd1e7f069e4c5a3bc4a16 SHA512 ecb4885fb30f811901b1c443b4ca15952f1baf8926da411f6c937b8240af0adbd4fc42701b75f8e06a510d7dac9e393b5b799034885f07b3eccb0ef54f83af70 WHIRLPOOL 617347cc777545dfaa08b0731bc0e8aa2d363fa227c73914e79ad8a56e1d3ed8c224cb0560173a86c77937ce4174993cb31fc323d223fb91719ed32a75417496
+DIST netbeans-trunk-nightly-201609280002-src.zip 218005761 SHA256 367daea36555b453b8f12f89d0e75d20583869e3469f00db3c1c8c401e6ccfb1 SHA512 0eafbbedb1c1ea0ddfa1a52e235b7d681fcf9d1601a1ab07d42790bc5d02be3dcd8f0c3a7f71ad8e05f3450b3fdb7fcbd7810429ab5169c56fc777dca0e68e9c WHIRLPOOL 537016c960469b05459c054d4557ab710fd51f4cfe30bb5ff84ec1385bbc038a731eb44bd5d0dfb1426fe59bd4b4ede402242cb1d3dc138aaf0ed2dc80456c19
 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_p20160829.ebuild 4412 SHA256 1c18d11fb3069006a7c1fccde3fb6b0ac733b5e1feace665120806e52f2898bf SHA512 878c04a878793e35c664ef969c8553a841e817c4a654e10e9ad48c22aa0862875d8116caf40945c2118297fd51fcb034d4a888fed4e4cba9b86a3ca1693c6bf7 WHIRLPOOL 13940ef22900cfebf8053ef7d8ba8aa212faca1247097baf5cbd7e43eeb31e059ca40439a7f02c0948052e6c243f954f6095a8c67367caae2c4dc84a9e9a824f
@@ -59,4 +60,5 @@ EBUILD netbeans-mobility-9999_p20160924.ebuild 4412 SHA256 1d7eba398aa528fe1281a
 EBUILD netbeans-mobility-9999_p20160925.ebuild 4412 SHA256 1fb12a6509922a5989e7460f8c30a54dd605b82f2383b401ce8606756907965e SHA512 d87b72385f2e68b1ed28789716afd18fcb7629b431b577b6130190063653c1b3115136ae34c339a03aa22927dc7a062c46b8eef565c019a9ebe5aed2bf177a8d WHIRLPOOL cf296cceb5a1337fe09f57da5a827b054d49a4021302ea7b0b587aaecf82a832819f66c2264f42b127926a034d65f39820ce7177a5832e23aa68e4d8940403be
 EBUILD netbeans-mobility-9999_p20160926.ebuild 4412 SHA256 bfe1a303c8d61b0fdbbfe2bb37b3378b03e625b804258e746a48c18988c24e78 SHA512 2581106e071de240bfce525397b5d28699f0aebede2220d960fa4b5925d59845e77c5af6c0f9b548525bf456178a16cda1ce3c6c056f1d0279c3caf758824ff5 WHIRLPOOL 4861ecdc0f40b6f23d05e113a30faafddef7ed2658f4ceb02a48a5d6d5a1d0f6c3f60adbce813ff38913b474aacc8e58b5e153e08067d016d17d9542da76866e
 EBUILD netbeans-mobility-9999_p20160927.ebuild 4412 SHA256 7e7f9936a892be4a45c088f64dc62838821a2416a0534ac4db284fbf5976c23f SHA512 3e9469222c7f189958b9e7f20d6b8b3aa9cf224b0f2a3f79e2389efe0ce058733140910c7fb1504bc9d51f120c80eef907658494643b93e1fccf9322c04974b5 WHIRLPOOL d48f21d76b3c8a6a68833a667c9ee764f94d3690e6f11239ebd3c6ca718629d101c1c9012f78ebc0e4c77e6b1576127dce6a6c082601735bc575532e2a0a55e1
+EBUILD netbeans-mobility-9999_p20160928.ebuild 4412 SHA256 c9a96a1ff20da96138d73f4195ea5cb55a928437bbf1fc267e4e3240930073a8 SHA512 a36d4bee50d7f8bd99812d73e38e1280969a32a1f1bf396891146fee362e9f518265aca54bd7401ae80c93bd0f2ddf6e6182339c4e629d44a4bd952e69023fc3 WHIRLPOOL 4da9819ff45054f9f7785514f2e024fa27993a72f212331c08c8552b68978e6f5f07b2f9a37bb673783f2eb654338dbb659ecf945b53e0c57034b4aca010d42f
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160928.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160928.ebuild
new file mode 100644
index 0000000..6d31479
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160928.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Mobility Cluster"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-09-28_00-02-33/zip/netbeans-trunk-nightly-201609280002-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 76bd87b..fdb29cf 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201609240002-src.zip 218005040 SHA256 9967b7b3ac0f93
 DIST netbeans-trunk-nightly-201609250002-src.zip 218005446 SHA256 c28a4ee7eaa239ca0171799ce66ac1261fb1c94bc3657947637fbe57626781cb SHA512 2ac14c669ff9f1783402e5cbd14ffe3bd35f8b884dafe26265893b97098aa6251433b893dd9ab9790cb4fe133ce5c783106140a9bc005d8f9cb77c4fd4afd7c8 WHIRLPOOL 8ac171a5414bb283c7dd9010fd8fd186e0ae703a4b991713393021e24df41aefbb458a7e03c380b70b839ecf68d271db80079e87da42355f81e1ecc5aa122eb8
 DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1bf5de335c280b679d32646b7740176e0e3e91bdac284bc6fe66 SHA512 fe60ff01cdb7e1e8b044c4e9a51446198d8401180a66fa32f8d14953ec3d719e215e5161193253edc21c00bbca7f23af5903d4d59f5e4a9f5fb28d3be2aed235 WHIRLPOOL 4bbc58439fec5202aa774f3aa0057258aef8f9a259ed1aeab5110038462a727523bc27a845f05aa31c230cb730a988d5710735eb87f72bd53e434d21ccd4be21
 DIST netbeans-trunk-nightly-201609270002-src.zip 218005716 SHA256 c3fa3dc736f783a83a271884081217462cc31d4da6bfd1e7f069e4c5a3bc4a16 SHA512 ecb4885fb30f811901b1c443b4ca15952f1baf8926da411f6c937b8240af0adbd4fc42701b75f8e06a510d7dac9e393b5b799034885f07b3eccb0ef54f83af70 WHIRLPOOL 617347cc777545dfaa08b0731bc0e8aa2d363fa227c73914e79ad8a56e1d3ed8c224cb0560173a86c77937ce4174993cb31fc323d223fb91719ed32a75417496
+DIST netbeans-trunk-nightly-201609280002-src.zip 218005761 SHA256 367daea36555b453b8f12f89d0e75d20583869e3469f00db3c1c8c401e6ccfb1 SHA512 0eafbbedb1c1ea0ddfa1a52e235b7d681fcf9d1601a1ab07d42790bc5d02be3dcd8f0c3a7f71ad8e05f3450b3fdb7fcbd7810429ab5169c56fc777dca0e68e9c WHIRLPOOL 537016c960469b05459c054d4557ab710fd51f4cfe30bb5ff84ec1385bbc038a731eb44bd5d0dfb1426fe59bd4b4ede402242cb1d3dc138aaf0ed2dc80456c19
 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_p20160829.ebuild 4111 SHA256 3a140e3e604be1da276330118439a2e8e02eb2612bad967f36f2b2368b5a6c39 SHA512 082bfaeec04f45a8a1d41a00318eb93a954ac5a5e9c4db94b53cf3fa2f012e37e7030fd34c249e447cf0fc88b7aa2d77a83582651d86e49f7a17e66c9c81a0e6 WHIRLPOOL ef5187023c9a0b3270f22a1bd4e01e7ae3a3ad03f4bd5090d8a3c7a73a594ff7e41c958814e6ea10fbcc523170daf36ba4b734219c0a8a927df6dcd3d98276c2
@@ -62,4 +63,5 @@ EBUILD netbeans-nb-9999_p20160924.ebuild 4111 SHA256 d1e2a04c6bd365cc50021f1d586
 EBUILD netbeans-nb-9999_p20160925.ebuild 4111 SHA256 d41d35fcbe43acfcf01c9483a908ef67a76736e55ff55b625f74d5a3b4a44153 SHA512 8f28f4ea7bdbb3333bc754754f29dd259ebcf01afe8b9a30c9cfd07a05a374ae6afcf234077a6b61211499971dea41c0286c94c597f5bbf64869aa61060b2fdc WHIRLPOOL c64fbd8a29a046ee26f5d8324d78066cfeb5e8e9230a5427f3823a88e15f4be5fb4c84a0a0ac5d5fda4c636169e1aeaa53543dddb3cfa27901f998ec02800176
 EBUILD netbeans-nb-9999_p20160926.ebuild 4111 SHA256 6722f2fb202b782b751ba07221b846e04f988a0bbde15f714aa3ba56f1c560fd SHA512 7e3ea9727f14df5a189e33eed57fe7abae0c7f04aa645042d7f28e08403dc14e4fd9e28dfae7b128374e60b2dcaed89d8a27fdbacdfe110ed9d3fc3c0ef5370d WHIRLPOOL 8fffbad7da54fd3f2f0417b8b310e853c7f252b2478bba9893d8a21378e463737c95c400f06849c6eaf55781886bba8ed9a6163f92419dfe3be7a8aec7fe3591
 EBUILD netbeans-nb-9999_p20160927.ebuild 4111 SHA256 52b16718ad827bfe2cbc31ae42469deeeb2f41ca04f731774e7ee66d7dcf07cb SHA512 233412cc7c6c40ab72a441600bcf93298f0824503e73d3c6c9c02a505788cc7e0039424833341d7e65e6dbe01cebf3ce0a99bbd2bd0ccf19b0d7395310584d29 WHIRLPOOL d599372080af5efba1dcb35094c4940923d7dd22e4609e2360e960bbe5af0c5fb3957abc9f3eedd980f2ca8e16b21596530e989398dbf1a91b63b5c9ae46ff59
+EBUILD netbeans-nb-9999_p20160928.ebuild 4111 SHA256 1d00fa0fe422085e12dcefa695f57ed62234c650e6b818a15fb92b8b8d9caa49 SHA512 9c629ca42ca76ff8fc03f5b0a401e8709556580ec6d3bf1d4fa24c9216aa592c0bf37a2af1c824cb6ddbea397d5a13387a92340c8d26397cc7520a83905d80ae WHIRLPOOL eb14e282fd64e53a96ff9e4c9f0f44e46f90788ae27a9ebb7d380f155d2d20ad4e5bc4e04bd5c753e4b6466ae0f3cca53cea18d6032171640f8188a642612efe
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160928.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160928.ebuild
new file mode 100644
index 0000000..f871f62
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20160928.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Branding"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-09-28_00-02-33/zip/netbeans-trunk-nightly-201609280002-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 3632921..11c8414 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201609240002-src.zip 218005040 SHA256 9967b7b3ac0f93
 DIST netbeans-trunk-nightly-201609250002-src.zip 218005446 SHA256 c28a4ee7eaa239ca0171799ce66ac1261fb1c94bc3657947637fbe57626781cb SHA512 2ac14c669ff9f1783402e5cbd14ffe3bd35f8b884dafe26265893b97098aa6251433b893dd9ab9790cb4fe133ce5c783106140a9bc005d8f9cb77c4fd4afd7c8 WHIRLPOOL 8ac171a5414bb283c7dd9010fd8fd186e0ae703a4b991713393021e24df41aefbb458a7e03c380b70b839ecf68d271db80079e87da42355f81e1ecc5aa122eb8
 DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1bf5de335c280b679d32646b7740176e0e3e91bdac284bc6fe66 SHA512 fe60ff01cdb7e1e8b044c4e9a51446198d8401180a66fa32f8d14953ec3d719e215e5161193253edc21c00bbca7f23af5903d4d59f5e4a9f5fb28d3be2aed235 WHIRLPOOL 4bbc58439fec5202aa774f3aa0057258aef8f9a259ed1aeab5110038462a727523bc27a845f05aa31c230cb730a988d5710735eb87f72bd53e434d21ccd4be21
 DIST netbeans-trunk-nightly-201609270002-src.zip 218005716 SHA256 c3fa3dc736f783a83a271884081217462cc31d4da6bfd1e7f069e4c5a3bc4a16 SHA512 ecb4885fb30f811901b1c443b4ca15952f1baf8926da411f6c937b8240af0adbd4fc42701b75f8e06a510d7dac9e393b5b799034885f07b3eccb0ef54f83af70 WHIRLPOOL 617347cc777545dfaa08b0731bc0e8aa2d363fa227c73914e79ad8a56e1d3ed8c224cb0560173a86c77937ce4174993cb31fc323d223fb91719ed32a75417496
+DIST netbeans-trunk-nightly-201609280002-src.zip 218005761 SHA256 367daea36555b453b8f12f89d0e75d20583869e3469f00db3c1c8c401e6ccfb1 SHA512 0eafbbedb1c1ea0ddfa1a52e235b7d681fcf9d1601a1ab07d42790bc5d02be3dcd8f0c3a7f71ad8e05f3450b3fdb7fcbd7810429ab5169c56fc777dca0e68e9c WHIRLPOOL 537016c960469b05459c054d4557ab710fd51f4cfe30bb5ff84ec1385bbc038a731eb44bd5d0dfb1426fe59bd4b4ede402242cb1d3dc138aaf0ed2dc80456c19
 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_p20160829.ebuild 4418 SHA256 8271d2a5823efb1756378ff76a718dd2784b809d314d8d4eb74cb1c4236fe833 SHA512 fae728c8ceeffb31bb08faa75b90d6f353fa9d0688656cdfb4e6a0213f5f7ecb908286707339851510de55b816ae28bde261d803c879b19a9ba169c30d0e83ec WHIRLPOOL d9efa8e2589288466b34837b7f99bbe97e17b96e1f7d6a04ab275edfa2fbe7dc669c883fcb72c9c3ce6451442391e551561efbb89c1886215ecfb52bc91f33b1
@@ -64,4 +65,5 @@ EBUILD netbeans-php-9999_p20160924.ebuild 4418 SHA256 d480095ff309e7e11d0e825a89
 EBUILD netbeans-php-9999_p20160925.ebuild 4418 SHA256 cf6f2be29f39881a2274ceb66ea96931a3df739f4c8528f5ac908aa1e5fad48e SHA512 5b329fc6f5476002611a9caa55b024a4fa71b33fe3bd00e098ef84579f77b67dd34cb059a157aa7722e2a5954c8b7f9ed65f2d7f992d07f6d33a4d3584bb71de WHIRLPOOL e86e41605873a4074290faeb5e689b1188d32330203273f2b6e808c800c2113fd21fcd2b986ac9e0d40dcff23d3bdbcfd016d920b1621619a71587bda5224de5
 EBUILD netbeans-php-9999_p20160926.ebuild 4418 SHA256 8b475c916f7dd9c7c3c886e419358315b5ed54b1d34874d24339c7c836b6930e SHA512 b1e0118656580b059e20c51fc83c08fb7e673e8e97e7cff8156a58f86ad4cc7135614db8ff1f81100ca96312fa555b616369195d29028a4673ee8ab0f8ee26bb WHIRLPOOL 0d8e4a03e2bd2ee3080ae9d46875f83aab5d83f9932cfce964f9ff1ad9bcad2ceaee862093581683f1b3f323e06dd548be9307a0f900c8015458608a78bdf23f
 EBUILD netbeans-php-9999_p20160927.ebuild 4418 SHA256 81138ba056466fd95ac3222d25d5bc9995acd9bce583ac38ca3de24484d8604e SHA512 aa82363df5107037a20464db471a01080cd2a5952674d094d7b25fdf80eccbdddd7d37f1f21fcfbfc18d01f9e0d71807991acb28a5cadcb1246e2f4bc0fbda52 WHIRLPOOL 7b614b16734059b4e560402da6f7ea06750ebb2e370f35750c2754573923d15fa417b58ce4297bec610c88316cbbf690aa02333c1f97b4a31c176edaacec60c6
+EBUILD netbeans-php-9999_p20160928.ebuild 4418 SHA256 30c0017482e19badcc24378d2de1b96c1c553bb6de25434515aa5ec876f8e3df SHA512 ba6abba825d36b5144736303f3f3406c9f1672d31fa4e5c3e3c25d9510c19c5ee277ba8bc78fdd88424d5ee03e46f1a4da1b814220fa20418518e7026626d744 WHIRLPOOL 748648c2b293a9a364021180fc93a1e5b501d53a9316cd544d62a60291d570c55ad84b45a8a38ab38412d06cca11027245d2e05abd06845c3738c019832f251e
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160928.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160928.ebuild
new file mode 100644
index 0000000..4f45285
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20160928.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans PHP Cluster"
+HOMEPAGE="http://netbeans.org/projects/php"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-09-28_00-02-33/zip/netbeans-trunk-nightly-201609280002-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 51c3a7b..0053230 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -56,6 +56,7 @@ DIST netbeans-trunk-nightly-201609240002-src.zip 218005040 SHA256 9967b7b3ac0f93
 DIST netbeans-trunk-nightly-201609250002-src.zip 218005446 SHA256 c28a4ee7eaa239ca0171799ce66ac1261fb1c94bc3657947637fbe57626781cb SHA512 2ac14c669ff9f1783402e5cbd14ffe3bd35f8b884dafe26265893b97098aa6251433b893dd9ab9790cb4fe133ce5c783106140a9bc005d8f9cb77c4fd4afd7c8 WHIRLPOOL 8ac171a5414bb283c7dd9010fd8fd186e0ae703a4b991713393021e24df41aefbb458a7e03c380b70b839ecf68d271db80079e87da42355f81e1ecc5aa122eb8
 DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1bf5de335c280b679d32646b7740176e0e3e91bdac284bc6fe66 SHA512 fe60ff01cdb7e1e8b044c4e9a51446198d8401180a66fa32f8d14953ec3d719e215e5161193253edc21c00bbca7f23af5903d4d59f5e4a9f5fb28d3be2aed235 WHIRLPOOL 4bbc58439fec5202aa774f3aa0057258aef8f9a259ed1aeab5110038462a727523bc27a845f05aa31c230cb730a988d5710735eb87f72bd53e434d21ccd4be21
 DIST netbeans-trunk-nightly-201609270002-src.zip 218005716 SHA256 c3fa3dc736f783a83a271884081217462cc31d4da6bfd1e7f069e4c5a3bc4a16 SHA512 ecb4885fb30f811901b1c443b4ca15952f1baf8926da411f6c937b8240af0adbd4fc42701b75f8e06a510d7dac9e393b5b799034885f07b3eccb0ef54f83af70 WHIRLPOOL 617347cc777545dfaa08b0731bc0e8aa2d363fa227c73914e79ad8a56e1d3ed8c224cb0560173a86c77937ce4174993cb31fc323d223fb91719ed32a75417496
+DIST netbeans-trunk-nightly-201609280002-src.zip 218005761 SHA256 367daea36555b453b8f12f89d0e75d20583869e3469f00db3c1c8c401e6ccfb1 SHA512 0eafbbedb1c1ea0ddfa1a52e235b7d681fcf9d1601a1ab07d42790bc5d02be3dcd8f0c3a7f71ad8e05f3450b3fdb7fcbd7810429ab5169c56fc777dca0e68e9c WHIRLPOOL 537016c960469b05459c054d4557ab710fd51f4cfe30bb5ff84ec1385bbc038a731eb44bd5d0dfb1426fe59bd4b4ede402242cb1d3dc138aaf0ed2dc80456c19
 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_p20160829.ebuild 9520 SHA256 0f78647b9f0684f9c3c3ccbe995e0d8f3cf77dd8880c8a56381927c23ca71c67 SHA512 629d7cbfe8dbdc867bf7c250a6f52fd4a826a7b1a113be51c5422f9fb24b1a9e9c661195f15cf956adc4e6a53598432628657a82908aed35883f1f7c5a6abc98 WHIRLPOOL cd8a5ab546745c8b630fa9bd80d85a359d181f2b063ace7d6d608027e5e7fbcdef2a2b6690589fbd87836d0d4b07ab450303df604282942bb88946adf45205b1
@@ -85,4 +86,5 @@ EBUILD netbeans-platform-9999_p20160924.ebuild 9520 SHA256 c19e3622ecca069a0de8b
 EBUILD netbeans-platform-9999_p20160925.ebuild 9520 SHA256 6f4396f60eecc37b77e9de2d37753306a460eac7ba4bec8d95cec545f6e8438e SHA512 696419658dfcdc34a53330187959214b4d334479350aaee4ef37895a4ef36650f41c82fc56e8acb48ecf329a0ae6b2cbe88c84bfcc02d6b528a267a9f53be436 WHIRLPOOL ef5e07a32c9ca1e130354d486aa5973ebebd4ba860973546537bff5fed4dd5ea8d9e9417b8218ca1e4e3b01ed37269c5a0e67ebc4edc0d98efce3d911142254a
 EBUILD netbeans-platform-9999_p20160926.ebuild 9520 SHA256 720abf80dd5953c9c6d432088a070f8d39494fb146d45920439cb0a6b9a48629 SHA512 41f7152ba7fd3a641fc67cfeb1000f307d11df38c38486d916bb43a4b005427e2dabaee6a847351e6c47979439ccc8b4b07c6b7665871d259619e7e0f4c119f7 WHIRLPOOL 70a182dfc7056d0be1745fcc1e17f210ab898e09c324e8b29e511f5f7d77c6593ac1d0f8e3854d2c14a39b4083c822b99b378f12509cddb92b729171f8c5b296
 EBUILD netbeans-platform-9999_p20160927.ebuild 9520 SHA256 cb942350637448d88fcd9617b771ce891bdb23e532d26dbf730b7801dbf3cec3 SHA512 3430aaaba058ea5cbb40be1ad13732897108ec58319af8f37d0609bb95a91c21110b9e51132b9f426f64534bdccd10d71d17639f770e0b93785cbf028fcdc041 WHIRLPOOL e4d49fd15e4be3ab97981acdb30f0bf62daab5c7552e30bc9aee6c6c6704eb152cc59200094d4c29adb9c414be51711649789f00564c6fe9ff4c5d003a8b9b44
+EBUILD netbeans-platform-9999_p20160928.ebuild 9520 SHA256 8ef5dc2d48748a9067936595a58c370948a104444a801b070337c3f16831cc20 SHA512 ec0580901fc85ee033553f1cb452bcc3f4dfff0eb66b865e33b8929359f5fbae23ef6686a71c1c6ec958659385f966537902ffe5bfe04a39e1113da09c625ced WHIRLPOOL 60d3f459cbf78d08ba1a99103d0ea6b01ec416bd66b2aea856a2c6f10745533acf1862b54b37ccac874c79beb946cd117e5ca51ad48ef3972f19fb02603be846
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160928.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160928.ebuild
new file mode 100644
index 0000000..8280438
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20160928.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Platform"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-09-28_00-02-33/zip/netbeans-trunk-nightly-201609280002-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 2d2c04b..a85bc1f 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201609240002-src.zip 218005040 SHA256 9967b7b3ac0f93
 DIST netbeans-trunk-nightly-201609250002-src.zip 218005446 SHA256 c28a4ee7eaa239ca0171799ce66ac1261fb1c94bc3657947637fbe57626781cb SHA512 2ac14c669ff9f1783402e5cbd14ffe3bd35f8b884dafe26265893b97098aa6251433b893dd9ab9790cb4fe133ce5c783106140a9bc005d8f9cb77c4fd4afd7c8 WHIRLPOOL 8ac171a5414bb283c7dd9010fd8fd186e0ae703a4b991713393021e24df41aefbb458a7e03c380b70b839ecf68d271db80079e87da42355f81e1ecc5aa122eb8
 DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1bf5de335c280b679d32646b7740176e0e3e91bdac284bc6fe66 SHA512 fe60ff01cdb7e1e8b044c4e9a51446198d8401180a66fa32f8d14953ec3d719e215e5161193253edc21c00bbca7f23af5903d4d59f5e4a9f5fb28d3be2aed235 WHIRLPOOL 4bbc58439fec5202aa774f3aa0057258aef8f9a259ed1aeab5110038462a727523bc27a845f05aa31c230cb730a988d5710735eb87f72bd53e434d21ccd4be21
 DIST netbeans-trunk-nightly-201609270002-src.zip 218005716 SHA256 c3fa3dc736f783a83a271884081217462cc31d4da6bfd1e7f069e4c5a3bc4a16 SHA512 ecb4885fb30f811901b1c443b4ca15952f1baf8926da411f6c937b8240af0adbd4fc42701b75f8e06a510d7dac9e393b5b799034885f07b3eccb0ef54f83af70 WHIRLPOOL 617347cc777545dfaa08b0731bc0e8aa2d363fa227c73914e79ad8a56e1d3ed8c224cb0560173a86c77937ce4174993cb31fc323d223fb91719ed32a75417496
+DIST netbeans-trunk-nightly-201609280002-src.zip 218005761 SHA256 367daea36555b453b8f12f89d0e75d20583869e3469f00db3c1c8c401e6ccfb1 SHA512 0eafbbedb1c1ea0ddfa1a52e235b7d681fcf9d1601a1ab07d42790bc5d02be3dcd8f0c3a7f71ad8e05f3450b3fdb7fcbd7810429ab5169c56fc777dca0e68e9c WHIRLPOOL 537016c960469b05459c054d4557ab710fd51f4cfe30bb5ff84ec1385bbc038a731eb44bd5d0dfb1426fe59bd4b4ede402242cb1d3dc138aaf0ed2dc80456c19
 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_p20160829.ebuild 3472 SHA256 5b2114102e446e49f573fc22e4c19eecdf011d4f9977b4dfb631323c5c963b8e SHA512 6c6ea263812380b2eee414500bc60645866a58d652fd86395ea12b299b3269affb77326e65d22ef042d3731711788694f33e101768d8d5c1d013f4687dbd9b46 WHIRLPOOL c29cdd5e6532efb85854e733f0f4d72c2a66654f7306109ac12963094eb077669caf6ffc895a5312dc3d2ea56f1de8480695dce906bb524f951e75ebbd32d27d
@@ -59,4 +60,5 @@ EBUILD netbeans-profiler-9999_p20160924.ebuild 3472 SHA256 006e19f059e3376b3e98b
 EBUILD netbeans-profiler-9999_p20160925.ebuild 3472 SHA256 e43b448bdeec61574877b722bbe7646e4a66f831c02049a232d4e0eb6b28ed66 SHA512 05e3170d483d28b0b97541d91b7475bdec07b785d4a6d9d72e66a005da8b5ac8469cf823aec1507d10c2d3ff18298164d13d9a134c976fe2d2eb98f2eecf0149 WHIRLPOOL b20da2ed46a3c7362979a9224f315a6715c2f46c2c8da4cb9006b6901ad54abda8caab97db58c0dc16333480658ffd321bd5ade4069f5065a933ab03218b1404
 EBUILD netbeans-profiler-9999_p20160926.ebuild 3472 SHA256 b33dde4f2f495d528fe85a1f662cbea7ee5f071223897a348f93c20c07e91c09 SHA512 8f4ce6c23d1246e1835c1a2cc8c27c164a8ab59277e83d5ead19973b3c543a8ace34d6f4dda2ab531885de9b4d32842efd46746ff8bacf3b9ee4dd89924f6496 WHIRLPOOL d33efef95a034cb4c0af43755989c40daf998630708099a68a17bb6ca8944f1d0f3b31315ebc33e530079ec7f0490ed976944c086ef1a6ad1ddabf3646105228
 EBUILD netbeans-profiler-9999_p20160927.ebuild 3472 SHA256 6d02241cfc5c593fa9e6b498d07f296f6a19fcb7a023842981c1ff8b30504e38 SHA512 3c1e63c276fec847372818204768bbc81d28ef54d1cf2d4f5ab2e7a1419fc9c0d16d770061dc87d22ef3055f475fb4d4a3b1a8a11b8b1f1643e831904a849c19 WHIRLPOOL 75879f0994eae04fd641de0da8f51ca741e67ec03f6107039982909c18d4192aa082412eb2481fa2233f65f6b900c750d0d6b3622d0233f1b2a66377070f6e07
+EBUILD netbeans-profiler-9999_p20160928.ebuild 3472 SHA256 88f0391a224168fca6544af0c3cf370b37f5a616568bda2ff5024fd53bbf418a SHA512 3ada11287b4b0aca78cb3ee03e20f5b4e7ac3e951a1da458e5e0ff9ddbf3249e5e2880f1f7bfa81b4180832d7c3f82aa81bf6372d148721a794a3ccfca782ca1 WHIRLPOOL 144fc9824b74b93292f8c0124e4ed4f825436786c763141f66ce96421b9fb1f891ee6ad4bc69dd0f2556e4abfd48eeb3b7eea0e6f3aaafcc998726f6b2885b5f
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160928.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160928.ebuild
new file mode 100644
index 0000000..5aff544
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160928.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Profiler Cluster"
+HOMEPAGE="http://netbeans.org/projects/profiler"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-09-28_00-02-33/zip/netbeans-trunk-nightly-201609280002-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 eb23586..2b7a635 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -49,6 +49,7 @@ DIST netbeans-trunk-nightly-201609240002-src.zip 218005040 SHA256 9967b7b3ac0f93
 DIST netbeans-trunk-nightly-201609250002-src.zip 218005446 SHA256 c28a4ee7eaa239ca0171799ce66ac1261fb1c94bc3657947637fbe57626781cb SHA512 2ac14c669ff9f1783402e5cbd14ffe3bd35f8b884dafe26265893b97098aa6251433b893dd9ab9790cb4fe133ce5c783106140a9bc005d8f9cb77c4fd4afd7c8 WHIRLPOOL 8ac171a5414bb283c7dd9010fd8fd186e0ae703a4b991713393021e24df41aefbb458a7e03c380b70b839ecf68d271db80079e87da42355f81e1ecc5aa122eb8
 DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1bf5de335c280b679d32646b7740176e0e3e91bdac284bc6fe66 SHA512 fe60ff01cdb7e1e8b044c4e9a51446198d8401180a66fa32f8d14953ec3d719e215e5161193253edc21c00bbca7f23af5903d4d59f5e4a9f5fb28d3be2aed235 WHIRLPOOL 4bbc58439fec5202aa774f3aa0057258aef8f9a259ed1aeab5110038462a727523bc27a845f05aa31c230cb730a988d5710735eb87f72bd53e434d21ccd4be21
 DIST netbeans-trunk-nightly-201609270002-src.zip 218005716 SHA256 c3fa3dc736f783a83a271884081217462cc31d4da6bfd1e7f069e4c5a3bc4a16 SHA512 ecb4885fb30f811901b1c443b4ca15952f1baf8926da411f6c937b8240af0adbd4fc42701b75f8e06a510d7dac9e393b5b799034885f07b3eccb0ef54f83af70 WHIRLPOOL 617347cc777545dfaa08b0731bc0e8aa2d363fa227c73914e79ad8a56e1d3ed8c224cb0560173a86c77937ce4174993cb31fc323d223fb91719ed32a75417496
+DIST netbeans-trunk-nightly-201609280002-src.zip 218005761 SHA256 367daea36555b453b8f12f89d0e75d20583869e3469f00db3c1c8c401e6ccfb1 SHA512 0eafbbedb1c1ea0ddfa1a52e235b7d681fcf9d1601a1ab07d42790bc5d02be3dcd8f0c3a7f71ad8e05f3450b3fdb7fcbd7810429ab5169c56fc777dca0e68e9c WHIRLPOOL 537016c960469b05459c054d4557ab710fd51f4cfe30bb5ff84ec1385bbc038a731eb44bd5d0dfb1426fe59bd4b4ede402242cb1d3dc138aaf0ed2dc80456c19
 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_p20160829.ebuild 6242 SHA256 ef73c787c9210d44569ea262acf6539a9ad9d97bbb0dd5fd9f445478c3828c01 SHA512 8fc9808fa49cf16de3b9ff4df2a1b9ab8a7b2fb088663399fd5622b17edb155deee9fa366becc34bd92ef0034a7c77523aab25fac339a00d80efdc70c919fe19 WHIRLPOOL dffc697f36e1e452d164be4c4eed9ad2510c060838d273e194e6d597cc0c6620215427c79f69c1e1d02e05f3ba5539db2349a83f6af3aff94793762884bf2ebf
@@ -78,4 +79,5 @@ EBUILD netbeans-webcommon-9999_p20160924.ebuild 6242 SHA256 4dc62d25436f2c11ac58
 EBUILD netbeans-webcommon-9999_p20160925.ebuild 6242 SHA256 4a0953ad1b104e36a54d9f0b19e66fff8acc7ab48995acdcd747c026bde68417 SHA512 8d4d9a01bba62762e9468d4c7867edb6012d8d60e8bd640afe4832a6dea299ca3711b6422a3dcd8bc7ed4b2efed7b0363af04dfa705e4da4589e146242165849 WHIRLPOOL f20235dbc34a99d254f411a7709b0324f3f77f59da48b67d067404f8329d4dad312cfffcf052d48e647f23b9c5f4c30037a6654b7cf3b468a902378de894e57b
 EBUILD netbeans-webcommon-9999_p20160926.ebuild 6242 SHA256 f3baceb572908f908e0dc03b5a92ef60477c33561775788fe5d067adba56fb16 SHA512 83d84fa6cb363a95f87ac4f0f18800779bdd0130c4c00c46c7cca813ae4a9ef173a016f9fc2c62450f360cd99bd0f0b8a95e4f31fcb8c6c642eb036718a71f64 WHIRLPOOL b6e4c011d737e481bf47f9086acd6b8e6a957b180319bc261e7a6f16d36dda7e2e2cd23c482e96646f383903f7633d62deb8531edfd098cb210baa6fe67ec5fe
 EBUILD netbeans-webcommon-9999_p20160927.ebuild 6242 SHA256 3dae34fec2d3600651b4aaadf6bf69561da0d91fc0e362c211560bb2fd314e91 SHA512 1e620c59998665debb12cee3975bbc3fbf079f6dd93a10cb88da779317d511d1c4c45f7d19942d4d17c965d2c4cad8b812ba93e08f17ba5d081d392d837e5d8d WHIRLPOOL b68f86572c18df6546808ac0f78865a54a1f25cf9ea5b07be20d95731e9cfae6a04c171cf3de905a9c97985fcf4d16ebcb5eaaa2be374271ab69093f019b532f
+EBUILD netbeans-webcommon-9999_p20160928.ebuild 6242 SHA256 2bc069274305ef60fc36f51af1a825edcbbf77838c784e6994325aedd56cf913 SHA512 2f2072bc62eb305ffe52ed8d3aa4f288d8e9786f1d0339a429e2985a6e5bd8f5f8a63f4d7238014a501de81b2edae6841aa809559d5a13a7b1f379fd738f26d7 WHIRLPOOL 2cfce53963ee0aecd945974a63364b3591109c0b9a8eddfce0c829f75663303978248812ca600e089f36d2283773fd91f90d6c8f30856e07faeee9bb8861ab0d
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160928.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160928.ebuild
new file mode 100644
index 0000000..fb56322
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160928.ebuild
@@ -0,0 +1,132 @@
+# 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-28_00-02-33/zip/netbeans-trunk-nightly-201609280002-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 0aa9d2a..bc465ca 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201609240002-src.zip 218005040 SHA256 9967b7b3ac0f93
 DIST netbeans-trunk-nightly-201609250002-src.zip 218005446 SHA256 c28a4ee7eaa239ca0171799ce66ac1261fb1c94bc3657947637fbe57626781cb SHA512 2ac14c669ff9f1783402e5cbd14ffe3bd35f8b884dafe26265893b97098aa6251433b893dd9ab9790cb4fe133ce5c783106140a9bc005d8f9cb77c4fd4afd7c8 WHIRLPOOL 8ac171a5414bb283c7dd9010fd8fd186e0ae703a4b991713393021e24df41aefbb458a7e03c380b70b839ecf68d271db80079e87da42355f81e1ecc5aa122eb8
 DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1bf5de335c280b679d32646b7740176e0e3e91bdac284bc6fe66 SHA512 fe60ff01cdb7e1e8b044c4e9a51446198d8401180a66fa32f8d14953ec3d719e215e5161193253edc21c00bbca7f23af5903d4d59f5e4a9f5fb28d3be2aed235 WHIRLPOOL 4bbc58439fec5202aa774f3aa0057258aef8f9a259ed1aeab5110038462a727523bc27a845f05aa31c230cb730a988d5710735eb87f72bd53e434d21ccd4be21
 DIST netbeans-trunk-nightly-201609270002-src.zip 218005716 SHA256 c3fa3dc736f783a83a271884081217462cc31d4da6bfd1e7f069e4c5a3bc4a16 SHA512 ecb4885fb30f811901b1c443b4ca15952f1baf8926da411f6c937b8240af0adbd4fc42701b75f8e06a510d7dac9e393b5b799034885f07b3eccb0ef54f83af70 WHIRLPOOL 617347cc777545dfaa08b0731bc0e8aa2d363fa227c73914e79ad8a56e1d3ed8c224cb0560173a86c77937ce4174993cb31fc323d223fb91719ed32a75417496
+DIST netbeans-trunk-nightly-201609280002-src.zip 218005761 SHA256 367daea36555b453b8f12f89d0e75d20583869e3469f00db3c1c8c401e6ccfb1 SHA512 0eafbbedb1c1ea0ddfa1a52e235b7d681fcf9d1601a1ab07d42790bc5d02be3dcd8f0c3a7f71ad8e05f3450b3fdb7fcbd7810429ab5169c56fc777dca0e68e9c WHIRLPOOL 537016c960469b05459c054d4557ab710fd51f4cfe30bb5ff84ec1385bbc038a731eb44bd5d0dfb1426fe59bd4b4ede402242cb1d3dc138aaf0ed2dc80456c19
 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_p20160829.ebuild 2721 SHA256 3dac61291723c9248cc5e89cec12bd2a04a9cebd777c052c69f4b2b3d3b394d0 SHA512 50aacd4220f92343310c26452e19ec40bcc14ab31c24788cafe129bf9273f967becf763e703b7e96e45677fc30c9c2a3ac2967ba1f064c63e0f3469ae337711c WHIRLPOOL e956d0cf551b3e89ace53512f6ea4f6fb204502d01bb410f6eb684c13379e4ecb97d149467db82dd41d127ee53bc8cf67ce5fd42d7f04150dde754ecd012fb19
@@ -59,4 +60,5 @@ EBUILD netbeans-websvccommon-9999_p20160924.ebuild 2721 SHA256 8d66ca60b597df4bb
 EBUILD netbeans-websvccommon-9999_p20160925.ebuild 2721 SHA256 98abde0a9cbf32397e19c413283920bd288428b62109d4e430da454961609c44 SHA512 0f8832c1c688e05427a746244ddac024e2be486813fdd3c7fbc9dce62ce277902e0f2c07db029082a3320fe451f706853da3944c7738dcf6ca3f507f9d97280f WHIRLPOOL 09ea06d7c7d185af22731346c3ee38da47ca11ae7ba2d6302c640fef5d6a399f7962ab51c19ba992feee469117a7d521e22bae1bf9d3250ed90847a5016e9890
 EBUILD netbeans-websvccommon-9999_p20160926.ebuild 2721 SHA256 e2f18c43d3ce6f8cd19fc15d46b5f6f7af2e46ef7f4dc5c469f58cb2b39b70e2 SHA512 37a17d387b7f7d259b7b3bdce0832294e3c1ad0f567dfe78f9df1ba93da6ab5a685db09bdecb52a3bbb6ba7afa2e623c7b2da0da284c4783d92739409471159b WHIRLPOOL 53160ab30a87d668f8ee88f00f35dfacea5df95e3bd1968760900909fc27279d213626d5e0a8546bc37cd48b07a6da35d4c705adc821b36a9f997c312cd78430
 EBUILD netbeans-websvccommon-9999_p20160927.ebuild 2721 SHA256 1207f4450139cc29e60274acfd528b65d673f2e469ecf5b348685fac37931f65 SHA512 57d85e8a7c36412957a5b6c2d128650e4356b309938eeaf848877d2307f44fec436536e8910b20d446d12141c7ec0ca458de6d282d59fa6ee5f9519bb8d84d61 WHIRLPOOL ca2c035c4c5c93c019ee505e2677afa55a0d58a677444ba9d4708592f31cb4ff3cafd96b790e28b3b5c3ff5bf82bdcf6df9e8c87b44fd4ba84e0ed99beab5ab2
+EBUILD netbeans-websvccommon-9999_p20160928.ebuild 2721 SHA256 50d21f688b4e43a1e41fbc739ec143be6d5f3a7e74b8ad59e7b682c533d7a4d1 SHA512 3395b94bb748058c305cab027c19fd5c9e1b6ea46035caeb5a4be848ddcad2a367f71a606b4750add89ddb2167da63488ab28b9df82b1f612c85cff46e6ddb85 WHIRLPOOL 7fc6cd21a1cb6897b5a918257a2567ab47d68cae7b5b6da3a7395a3bce141eaacd0c76ce27111e0d2ebe52f7962f00211eaeb6894c076aa1ba65bf58051ec27d
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160928.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160928.ebuild
new file mode 100644
index 0000000..6757e15
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160928.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Common Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-09-28_00-02-33/zip/netbeans-trunk-nightly-201609280002-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 1d35e84..e4a9a87 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201609240002-src.zip 218005040 SHA256 9967b7b3ac0f93
 DIST netbeans-trunk-nightly-201609250002-src.zip 218005446 SHA256 c28a4ee7eaa239ca0171799ce66ac1261fb1c94bc3657947637fbe57626781cb SHA512 2ac14c669ff9f1783402e5cbd14ffe3bd35f8b884dafe26265893b97098aa6251433b893dd9ab9790cb4fe133ce5c783106140a9bc005d8f9cb77c4fd4afd7c8 WHIRLPOOL 8ac171a5414bb283c7dd9010fd8fd186e0ae703a4b991713393021e24df41aefbb458a7e03c380b70b839ecf68d271db80079e87da42355f81e1ecc5aa122eb8
 DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1bf5de335c280b679d32646b7740176e0e3e91bdac284bc6fe66 SHA512 fe60ff01cdb7e1e8b044c4e9a51446198d8401180a66fa32f8d14953ec3d719e215e5161193253edc21c00bbca7f23af5903d4d59f5e4a9f5fb28d3be2aed235 WHIRLPOOL 4bbc58439fec5202aa774f3aa0057258aef8f9a259ed1aeab5110038462a727523bc27a845f05aa31c230cb730a988d5710735eb87f72bd53e434d21ccd4be21
 DIST netbeans-trunk-nightly-201609270002-src.zip 218005716 SHA256 c3fa3dc736f783a83a271884081217462cc31d4da6bfd1e7f069e4c5a3bc4a16 SHA512 ecb4885fb30f811901b1c443b4ca15952f1baf8926da411f6c937b8240af0adbd4fc42701b75f8e06a510d7dac9e393b5b799034885f07b3eccb0ef54f83af70 WHIRLPOOL 617347cc777545dfaa08b0731bc0e8aa2d363fa227c73914e79ad8a56e1d3ed8c224cb0560173a86c77937ce4174993cb31fc323d223fb91719ed32a75417496
+DIST netbeans-trunk-nightly-201609280002-src.zip 218005761 SHA256 367daea36555b453b8f12f89d0e75d20583869e3469f00db3c1c8c401e6ccfb1 SHA512 0eafbbedb1c1ea0ddfa1a52e235b7d681fcf9d1601a1ab07d42790bc5d02be3dcd8f0c3a7f71ad8e05f3450b3fdb7fcbd7810429ab5169c56fc777dca0e68e9c WHIRLPOOL 537016c960469b05459c054d4557ab710fd51f4cfe30bb5ff84ec1385bbc038a731eb44bd5d0dfb1426fe59bd4b4ede402242cb1d3dc138aaf0ed2dc80456c19
 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_p20160829.ebuild 6939 SHA256 0ef0e941b9969a3c0d7fdee5eefff49d481acaac5eafa1818053ad276cd243e9 SHA512 42f540aecb27babea0d52dccee0c0ba38187aad33b2c73f4a9455a02ddf5b1be404fc076d33da6c202e9babca8dffb12253dc12623c6122d3fd96722ef34ed2a WHIRLPOOL a931a8f6b4e73ffa2d472adb1bbddfc66268570b632e57f333ff358a9646017f6df27e66c2bffdb2a5c4048d7966df5089218249d4181acd445625518def9722
@@ -62,4 +63,5 @@ EBUILD netbeans-9999_p20160924.ebuild 6939 SHA256 c4f4120ca5fe8e9ac2029940b6b863
 EBUILD netbeans-9999_p20160925.ebuild 6939 SHA256 ecb7a9ba45a2a3d4359c602d4b734d872458f57dc1115f1f0e30d7fb9b336b74 SHA512 e33065b4c2afb38675cd98709bc9eb918bec75a3a4efdd7f88295aa7cf638f6369b2966a23c0be8b6ae4196affc7536b11609a231bd1b37430b3c746be260a60 WHIRLPOOL 40ad6bd1749d7136c7abe03666a97ce24c440cfb19a41fdf16c606fea341eae14721ebb3374016fff53be18e1e0d42173b473c8c5460bd32a1c418d19d43ca30
 EBUILD netbeans-9999_p20160926.ebuild 6939 SHA256 b0cdc5fa51d3be1c35377db0aa40202f53ce7010378ef7de472bed0c2112b918 SHA512 e655ec2eeca25bf89bd2aed34a856ad5bc2c4e0410904e9671a925e8de83d0195cef7b90d5043d513d508bb6651644e84fe23497d3e3e69b049e6cdd688a5c94 WHIRLPOOL 629e2a05c4ec061c3f42fbb15faffa56b52302032daafc04349f036cf2cb36eac92cd5cafccc6a94a5b4ad12e97c703dda5b4b0d09b424721c5accdffbb35902
 EBUILD netbeans-9999_p20160927.ebuild 6939 SHA256 8d2ae46ad0f7e74bda10d7a14de18108cf40b9e295336e447dc0a9a54373276a SHA512 00b219b219a3688a2fb2ac3fcbc74180b4d31c0a6799c2c8f7f209d450afec2740d7329107766d0e2945a722b6736703c6cdd482cdf04bae7ce05eae7f9834ca WHIRLPOOL 9d1b4920a08f193946d7886321363000bf8bb425512923066d15f6a9271b2b0c16f5c80b10153f591270ad03811ca62fc0461c116adeb19e37797bc6c2b05393
+EBUILD netbeans-9999_p20160928.ebuild 6939 SHA256 e2ed1b99976afd5933756203c1a1f89c9e611c9e8ae3d10be6f3d20728671f94 SHA512 1a117773baf1fb3ccc1227d49115180ba01a350e7bea5c891c8a2257141c282883a4574450bd06afd9f117a9ed82a2b682749767ac0162718f699fec0f40a7bb WHIRLPOOL e937352d53dbd1eeddb03e71c30d3c1d12cbf9aacbfe496f44e262ef7bbce2522b9db0a203b3152820c83358a71c375ca994e97c86788acfc1ee6f90d4403b5f
 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834

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


^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-09-28  7:40 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-30  8:18 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-platform/, dev-java/netbeans-apisupport/, Miroslav Šulc
  -- strict thread matches above, loose matches on Subject: below --
2016-06-20  6:50 Miroslav Šulc
2016-07-16  9:02 Miroslav Šulc
2016-09-28  7: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