[gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-extide/, dev-java/netbeans-nb/, dev-util/netbeans/, ...

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

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-extide/, dev-java/netbeans-nb/, dev-util/netbeans/, ...
@ 2016-07-17 21:58 Miroslav Šulc
  0 siblings, 0 replies; only message in thread
From: Miroslav Šulc @ 2016-07-17 21:58 UTC (permalink / raw
  To: gentoo-commits

commit:     d8f179b48e6b65381e41f29389a620156ea947dd
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 17 21:58:33 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Jul 17 21:58:33 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=d8f179b4

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.3.0

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 5197752..7e04dfb 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f0
 DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
+DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 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_p20160616.ebuild 3384 SHA256 bc49b6a8adc59bad429c2eb36d051e35f84001396efc0f0f408e283c74ed3a40 SHA512 90f065ec7fb3b165c2fde3a74a75a403e484fce94e1a06b1fedb213955177c8ef405289f6f9a4fa9b082ad00ac8ff3918c4c5c7eb2cd6e0789cc72db844bbc78 WHIRLPOOL 5d754d206a00ea0688b06d70711d91a9e4a3f342f27f846e46810c8cb5c1af60a2956bc0c838b84c9ecdc1f36d0bc897f2a5f811897290a5ada6f8298ab38129
@@ -55,4 +56,5 @@ EBUILD netbeans-apisupport-9999_p20160712.ebuild 3384 SHA256 fcba3576425563b77cb
 EBUILD netbeans-apisupport-9999_p20160714.ebuild 3384 SHA256 837eac1f734cbfabf21e730aba428c0a2ce38f0de22867310663927d08fb2375 SHA512 6f0f6e9b7392d72b49a5a0eb663ce073ca38f9a7efb0b5eae760fd075e0ad55b962f7cb35963bc0ffe85903e87b331b075236a7c6c26bfddac4b54d54c340c0d WHIRLPOOL b2d7575ab01a541b60cc613df4d0f2edf85f15cdf17e7ab85f91ee3cd824abbe9c97ef9e10c0322e4de8d215486ccd536b1d523f2490792d19ceabf5ff652868
 EBUILD netbeans-apisupport-9999_p20160715.ebuild 3384 SHA256 3ae82894d8af5f8cfd05141d8487e2c26104eaaa7f3de1c58fa0a748364ca799 SHA512 5838e3373ffb2f2219ef917b2114b5411e645cdb6670024ca030ba917b6e98b7d13058e23ed56c68b519b238a55473cf1f8ac63e98a381760a8a7867ebee21db WHIRLPOOL 80b7127af19ea83c9acec46a94ceeceea56ad273c9e5fe570e539574543ec93e1159d964254f20cb18c98cf205aa6d573d754dd50ba114b233baea9cbc9a40e6
 EBUILD netbeans-apisupport-9999_p20160716.ebuild 3384 SHA256 318b50a25638716101a6d1bf70ff4ddb0fe3182cbd65b701eb02264a622c6ef0 SHA512 33dbdef4f2200bf509dbbd041543b3b96c76ccb2378a63e221d41b6e14fbf0e01b3b577b9e3e8635b424c20cb62ea8feef69e801afb2015655a4fa67f45b9009 WHIRLPOOL e7b8e69bd3d7c493ff7dba63652c925056d4987eb9e1fdb16cf35ac8a494f650cb78111b590a37d215edbe89c4f44af0802249b66995bd70bf45fa5163a3cb9a
+EBUILD netbeans-apisupport-9999_p20160717.ebuild 3384 SHA256 4174464d10048e8856aafad202683a13224a5bbbf752f2b7bb1344c5c11489a5 SHA512 77a0804b986f3197dcbdfc454cae5e325d94660a15fc99803085c7c28e0dea516dae60a4552ff2aaa5f4fd265f56ef3b9474e4c45dbc2b0521f883511687cfae WHIRLPOOL 1a1ed092cca82d649d030f798acfa23fcfec54518403fb6586d6b77c35f280aa2ad1ba3f11c51b4797c747cd8967b07444a6c993e752580fc1ff9d69c6947356
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160717.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160717.ebuild
new file mode 100644
index 0000000..324c967
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160717.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-07-17_00-02-33/zip/netbeans-trunk-nightly-201607170002-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 f34f5cc..5107467 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -41,6 +41,7 @@ DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f0
 DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
+DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 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_p20160616.ebuild 4790 SHA256 8e81c1d6df927f8e816c79073c2d50464893b359e1fa7353f81f9d29817544dd SHA512 07297874102c79c5c1e5d7e5d7f52ac3f9964912a937a5b0294656a13f0c93b5757ad684b688960b6b795439bd4cc3bf5ea69b56cc2b1b685a73035f083a646c WHIRLPOOL e03629cd10ec0ff49252650cc82046d95f90e54178a1cc74ffd116000f55deb4a84cc96491d68bf11781f9b1f0ed9c819c7cc7544ce607b591265ad916b30fb8
@@ -68,4 +69,5 @@ EBUILD netbeans-cnd-9999_p20160712.ebuild 4790 SHA256 9fe3e94c5795580417c4a392da
 EBUILD netbeans-cnd-9999_p20160714.ebuild 4790 SHA256 2eee5026bdede204985cbf858cf62005092e0777cbe6e2ce80102b2c773b7307 SHA512 5bde5f619a6127851f259636ab1d6a21abaa51f90913fc4d1f85a0a60f98a54fa8788992abcd27d9d157f38e6d3bf3bc0597dd6094c2c6af2e7e1bdf438beb8f WHIRLPOOL 3764855b3dba15f00173fb7dc1dc0947188dd881d0df4f346c4305e48bacc3a4587f2013c50636314b4f500f1f7a0692a1a9ebfd10f04eb5d1375bbcb3a1143c
 EBUILD netbeans-cnd-9999_p20160715.ebuild 4790 SHA256 681eac8ab30074f02b4fb6cf096a01187f75673aade1368ba3e4ba0fa421506a SHA512 98df3dca11e1aa7da5276666c92420a4af221d6fd42afc9b22e1a4e2081c3fc4a07f842247b2c7390530fcc46e7e197c503d641bd9dd309b135c2ed867981ebe WHIRLPOOL c4e3deb7b999451f3ae141b1b34504580063ecf7e5d068032e8bf4d2f6e08e0af87ad43fbdd8541777d3a035f14bea764019a866b6bc18be0d50ea078b715f8b
 EBUILD netbeans-cnd-9999_p20160716.ebuild 4790 SHA256 d0d07c3122deed6ce365cfcae7576e185e98a7f526ecd396730e7487b0559407 SHA512 cf2d829be74a34899313addccf3ff61658b201853facbe84d38dd648e2d5c10b21221e9c427e5e3fca34a16f0d54430537e04588705afab3749d018d131532f8 WHIRLPOOL 56833f243e4d6e210ced682b8fc8b7c9e53b802a57520aee6c91934794d2c42da4a115691963e485c18f0c499d5b8cc02014892660a6a854d8400c7c69e6ff22
+EBUILD netbeans-cnd-9999_p20160717.ebuild 4790 SHA256 0d81342f64c5b124fecfe586c95eb8a5cbc4c78d502cfe02b47115a4bd07173a SHA512 8b0461f10a7b547f07c2a4e7d9325f3612e2e4462128c20dc141fb42a4930d1c7c769646e1927cf40952eb1bfb763bbd6d9de8d1340247dd235c61301893ef39 WHIRLPOOL 717a3a8f269ece85b7a94769ff56fb585db747d5ee644aec5b13ccde360f172aaaad80cfa745c1bb51854e09324791af465f38b1fc3016daa758eefb71ce51af
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160717.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160717.ebuild
new file mode 100644
index 0000000..c38e440
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160717.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-07-17_00-02-33/zip/netbeans-trunk-nightly-201607170002-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/5F62670605D036468D158D3D02FDCC6FBAB5D20F-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}"/5F62670605D036468D158D3D02FDCC6FBAB5D20F-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 f5884f4..2490eac 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f0
 DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
+DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 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_p20160616.ebuild 2968 SHA256 97e12ba216fa4cc3724ae0ecd226dd8193562c10109bef67d11ab13f25bf772c SHA512 dff90f1f42c224a0118393227edc0cf29b6c46bc8dbe8a147c30f66a6b7bcf3913387f4b3bf563a52de2f1a2e26677e6ade96bf3286bd5cce08b20430ff54047 WHIRLPOOL 91c2a62d695a76d9fef57c9cc0fe4aeaf2c911aab4114a62f7f9bad1bd40d5871608c00fb0eef449bdaee32feee39ec847f69b9e0cf98cd1e49315a88299c318
@@ -58,4 +59,5 @@ EBUILD netbeans-dlight-9999_p20160712.ebuild 2968 SHA256 33a6b4e50e10d7978289a37
 EBUILD netbeans-dlight-9999_p20160714.ebuild 2968 SHA256 e4bd881e5a0edb900650b93198ef90eef955da49e5982b57cdfafdf146edb1e9 SHA512 c8eec6690a975909746b122915674aacecd15379d8152b7de740de14e4e916f0403756897fb97f4b827461e6fa5fa1af7c7f0d7735fb1fb5ddc0995ff5966f94 WHIRLPOOL f657db3d1267c93b870c0633617ec0bab5ccdd35a1ccaa786708ef17cc57056c1cb3b77801e04bb117f0bd37390dec9bf0913e546a1432251fdc64f4ebd9214e
 EBUILD netbeans-dlight-9999_p20160715.ebuild 2968 SHA256 146b73a492e29a60bf968b2fb13654fb1487dee1ac8a5ae7c713005cefcc5456 SHA512 666c18b364aeb632bf6e506a44f9af732ffc13f3d4479c3df07aa92b0249f00e788a018dd670fcc474eeaefb73dcbe29676636cc551a8ba9480d6ec1039042dc WHIRLPOOL d494213db3a03d0a0e45321308fd3b7478eeb0f32dd20441b20068b0e11a612b0cdb15394abf355c2657c7d4e386e384a88b550d15c114d002acc0f76fa29d8d
 EBUILD netbeans-dlight-9999_p20160716.ebuild 2968 SHA256 50e296b783a01fa2b5f45ebcbc6b97e5034b266db27e67b6e2ad9c2f839eaa5d SHA512 4c34a32ea63fa83b8c6455d8a286745cf5e93fb1b88c772efdb3819e6c50800ee180eff92fd145c4078199a0917f1f0c04bec9a4419b5f216ddfb77ffc16e431 WHIRLPOOL fbc935f8d3b539ceea0741d96fc7d2f545c064e1626dee1222601c6e51bcf77e3695be538fcdb7765b0782baf831bfbfc607aa869bc39df85f7c7e909809bbca
+EBUILD netbeans-dlight-9999_p20160717.ebuild 2968 SHA256 a9585c80567052a2dcd624548c5205f9c821967a92aa4faa8ef4b0b94cabfe22 SHA512 87bb7356eae2c64e5ca35381da57d2c37ad84df2a3cf05df59559cce0a4af58a99e65b1635c91f10661b9ced5df25d7d039d6daa5350bd302cf7a1fdd0c33190 WHIRLPOOL 8b53e3008878d567464d904b35221405cd878d71000e60c87510fde522056ad59fc10bf75e48113cba71f0da8858d973e97c6066f9c4e4aaa962212007b31558
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160717.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160717.ebuild
new file mode 100644
index 0000000..7e8a9b2
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160717.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-07-17_00-02-33/zip/netbeans-trunk-nightly-201607170002-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 babb5f8..fd43f84 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -60,6 +60,7 @@ DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f0
 DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
+DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 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_p20160616.ebuild 15825 SHA256 67dc65afc49bae33892ba44c72db823f25ec47f1334f36dadaf31b979d9b601d SHA512 33f20491ea4b39b6f82a6ff0c2df31d58b4b462aa0c3c9b151ea1bad1854ca3653a4f9369bf926d7368b33c88cbb42b696ecfe099d6ac7b165a4c61e56eab5e9 WHIRLPOOL e6c6ccf8b36c2ad1f4349cd37a08c0b656e9204617d8b8b94ae29e2ea37ab6bfb8fab9c8c6421783a51db36d6a25e33d9e3dd3ed78060224e6a5c14b9fe32a4f
@@ -87,4 +88,5 @@ EBUILD netbeans-enterprise-9999_p20160712.ebuild 15825 SHA256 7c62bb4e274dc45b32
 EBUILD netbeans-enterprise-9999_p20160714.ebuild 15825 SHA256 9a5c9d3b1183b11b1d5550fb4520d5023f42d6bf0f89aa5d085ce63ead9536ad SHA512 fca857f0e31c220d0b4730181e07c0ac3f16eddd80e93dbc000ffc8c2269e7e5729ebb9ed6f8270c4516e779ace88958c3585e06e56ed137b50e376badfb6cf2 WHIRLPOOL 0b59979e921bc5ba3243e3330e19fe989e23ab5c3b2234ff0d9a0b2e786da938c858fcb57498c89e539af3fcc373bea34a185e1da37affbb16c8adaea624b451
 EBUILD netbeans-enterprise-9999_p20160715.ebuild 15825 SHA256 b739e863158005b3e9b8c199d649a1a201feef8a5ac3c2d28730bc0f7fe41fbb SHA512 20b1af88ab9e44130e08b79c2c7a914432edbbf96aac914f12b3baa13592841ded88c439a7a5210db387b1c8912d3495d9fab12258cc681bb22af7b66781f303 WHIRLPOOL 5283ef5dbb15402da9bc05cda178ab1e51efa457904e95073213b64869dd9adb94bf44619dfa4b1a263bced83de3dc83f725951062c6ed5b9e1c1a10a4cbb564
 EBUILD netbeans-enterprise-9999_p20160716.ebuild 15825 SHA256 55d879123b6a613e7a0f5a8cf790bc8e617011d1eaf233022376f1df34267b2d SHA512 47d9fb2d63ab282fd5641fa928f799c04d072ff99dbeeca03d421cd7fb7b19acc27730277822f5ad46b4767f13ae578021ad2c34d375243736452507ddedc34c WHIRLPOOL ac42768cd7c7a1e6c15dbd740bc9cf1394baa082ee2da832d2bbb64e4c833574133b7bf4cdeb351b0d1940de26333b605a99c738c425bc35e250bcce5fdfdf4b
+EBUILD netbeans-enterprise-9999_p20160717.ebuild 15825 SHA256 6f265fe58c8252107ce4c86f337fd1903c5de552c4ca3a9c54de665a84ebafc6 SHA512 8aaaca1a4be98b54537088d6f7d8fd9dc985e1a85b6ce974af5557aa35a02576219d89cd923b92660b1dee84f956a261da0f4d3e85d11362952d83a0e6b10ce8 WHIRLPOOL 9c0d0742d2d54ba348dea2ef47b902d11831ed6ec387f3c6b2992c790bea3de4f303493b92297bc63299ca3ffebbe0096fe548d92e4ba2ccc97911c6cbd20680
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160717.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160717.ebuild
new file mode 100644
index 0000000..397e0e0
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160717.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-07-17_00-02-33/zip/netbeans-trunk-nightly-201607170002-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 f522d52..e7ba43e 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f0
 DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
+DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 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_p20160616.ebuild 2913 SHA256 fce9bb6e0222b4c2fc245c634bd247addb6268179796cf6811c5db1a12f5d31f SHA512 4111d7b14ef8c95dace4acb4cea3ae38b1bdde6d99ec2f86d44c96ba17fcf4edbf6414bc0937785571eebd9c3ed1fdf077845d8e6a7efafd9417afd3b2365563 WHIRLPOOL 85b439aac7d6ca7415407c8d5d43a39c7cdbcdd3796d712eb7a4d21d256ef584b045c47c49c80ce11ea068a1598df7874c81595054836d6e9b897c123d01fc24
@@ -55,4 +56,5 @@ EBUILD netbeans-ergonomics-9999_p20160712.ebuild 2913 SHA256 c861144edf651e86b2d
 EBUILD netbeans-ergonomics-9999_p20160714.ebuild 2913 SHA256 109819e4303720b3686e458af604ef65da28e0fcbd1c41d0e934084c4f0d1600 SHA512 290ab44bc7fec8a29ae7f0dbc5938a1d51524453055932d065129503b2d0cbb1f58129da64a57794b67c1eae34fe37e130ffb8ed4ff603e12274df03f7a69c14 WHIRLPOOL b5038c12667bcb52688276111f187360f144622b09e64767ae6f92540373a7a16af179210bdf45a4acbb595152aff09f4bcc047da56c4ca78a88074dba358062
 EBUILD netbeans-ergonomics-9999_p20160715.ebuild 2913 SHA256 9f4440176eb7116e8fafe44e0e0aa1bf332d2965d578d406fd8909240d1dbff9 SHA512 d035a940cc58b0b7cc7ba3bea371249e40fcce54c89409871d683da7aeadd76396f7f0ea36dd177917b42eb924a98e568f1cabcd1cac94c33acaa880c3d9730a WHIRLPOOL c6b2aa71666994dae05aa081bfcbc86904577fd7668fe27ff37f8ac5ebc8897ba653b26a72201342fdf434f8e841718424f8921fb5ec8f92bb14482cd1cc5317
 EBUILD netbeans-ergonomics-9999_p20160716.ebuild 2913 SHA256 f85c5186e583a6ed686d83f396a092a3898a1e51b706d8b71041b7509d56fc46 SHA512 9f1f6362e3357d0d2defcf75965cc1af7fc27bbfc67082dbd0908077987d5d720fc62e00df081f3a3a50c868c253e39b4f9b8416db7edb8deaed81c9a665e086 WHIRLPOOL bc244925aec449083fcece4a62d7da42474a21b4e3db4a6fc0e9e5f3916eb31bb804125eae87027305b6745523ef014b190edfe86930dc85da23de4e99c361a2
+EBUILD netbeans-ergonomics-9999_p20160717.ebuild 2913 SHA256 ae66c3fbb8da6a7dcaeeb397b54aae6a4b8abb8f5fde2ae34812b8551e2a28cd SHA512 4ba19510bcbe55baa0464d79b0ed3f52b6561c1d186eaab51f4ebf3291d3f5485684e14ad580a9e2fe931bf38c3cd9a5fd23d88d5b7cb03387a71cf146be2ca8 WHIRLPOOL 2c6c24750c6b8661c876b683809af4075739738c3104be7287ec6d1f738da0aba23d74b0d49641f42308d702a23ce6535d6e5183ee3f58e2bfe5804fb7808b4f
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160717.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160717.ebuild
new file mode 100644
index 0000000..2dc2867
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160717.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-07-17_00-02-33/zip/netbeans-trunk-nightly-201607170002-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 25b08c9..2a7810d 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f0
 DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
+DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 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_p20160616.ebuild 3377 SHA256 447b2b78d1f38e712a2c7d503718b2dd0e3cbe8b4d541519b4be7e4c483403db SHA512 f83bd4312fbeeec6d9c092372338f5d26006b4c4b751912a1ceeccb0f9c9775cc6aa4492d7cdd7fe4437a980a02a404ddc0c7c820e4a20b09bc73a65e3073d96 WHIRLPOOL 906bb9f17627a4c7a65fb3d3dd6b4a40db770f3af0dac7d4a999c9ef08b925e39a03d147eece3ba98b23f79e1a488e4a3f2a7aafc8794de22bbc9bf359e1825f
@@ -59,4 +60,5 @@ EBUILD netbeans-extide-9999_p20160712.ebuild 3377 SHA256 130f06d602288a3332031e6
 EBUILD netbeans-extide-9999_p20160714.ebuild 3377 SHA256 2e016dccd68d836434b2ee24a15cfc04904084b7fd82a28c965a88c4adb673a1 SHA512 1bcdd0ba2cf76cab1d886a8ed20cf40adcef2703623994c4b270927104f9d67412768a35712d3f87a7dda7eb56f41870479f5b48a1cba6189ad23c484a30bdc4 WHIRLPOOL 8dbc1d0b61126c2236dbe7ac1d1f7a1f521252cf17ecd35fe4909540f3734430f59d1b6c56b691ebcd9c1ab464a2766e89ca18f4e80f683e2dad1e794a2c236c
 EBUILD netbeans-extide-9999_p20160715.ebuild 3377 SHA256 002505862a979c1801612c829bf8f57fb63b2c95ad6ba8c67074bbb5d6288018 SHA512 473bc212d4602ad51a49078c46d83809cecad10a8a11290127d2c22a992e9956b30fccc228d1d1d716b824a97019aa7a4e77eef636cd22611f9e28d760fb3fc5 WHIRLPOOL c254628bad589e6f1b86f711cd5ccba1a959c49790dd3502c897a7da01b38228edfeadd3e58619e9d76039d7577ca417b51e9b9237cb587806a55c5b33d605ab
 EBUILD netbeans-extide-9999_p20160716.ebuild 3377 SHA256 6b03c3caa06d985643574bdbe2d3fa0c95cef0ca1f34d35b6385455c2e83590d SHA512 51022e73eb4724c4642b035c7db97e3a87d08ecd179e6c681e0e4a865639508c916252eef2976b91a766ae4396ab254e3ebc6cc7c8d452a40b6cf88131ce1277 WHIRLPOOL 530c30e039e6717e367e982616becd6024bdb325a9a9cb26206c0024f6b9a231b8e4cd01cea0d7d7f0b6abb52fdc0c34e534642fa51b87036ceccae0d8f77da1
+EBUILD netbeans-extide-9999_p20160717.ebuild 3377 SHA256 ab26b07b05a58b23549b5087c7894145d409a3d7e77776fb402d3edf1a7c2210 SHA512 610627b5f47b2da7fbf073c0073156d038db0c62697e2cb385cacce0563f9f872b91fa56bbc1ec7bf9a439e3fc0ffa7db3a524e335ad8732aa97554174e13071 WHIRLPOOL 05b1cc8602f17e3becdff52d2afcacd2b3156b9fe1294012b671b51d566467c2970a93c33bca0f793a52d04e12526ca4be56832e318321f47a3f8c5277622017
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160717.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160717.ebuild
new file mode 100644
index 0000000..784427b
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20160717.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-07-17_00-02-33/zip/netbeans-trunk-nightly-201607170002-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 373f9b6..7226e0c 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f0
 DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
+DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 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_p20160616.ebuild 3416 SHA256 42300c18c16b927900009b2318221ea59ce65006f0b4e99198fa587cfb3a24e6 SHA512 2701a9599d82a38687a322ab46269314d6048c763e85f0f51baa4401c6cdc46543e61555ab50899e9fab0685b34f0a5ea5028bb55bf228771bf586043882b5f6 WHIRLPOOL e0a9fc0909903b0bb78f98981f99c1cf49816ef9f0848f6bc0837378651805e43b3b5bd649def230421215663aa0491c704e5975828e190e52e0b79997232af7
@@ -57,4 +58,5 @@ EBUILD netbeans-groovy-9999_p20160712.ebuild 3416 SHA256 1b552e16fe46de929d14a5c
 EBUILD netbeans-groovy-9999_p20160714.ebuild 3416 SHA256 4198e02fe9c0dc7ad95306a57b7bf8a3eae0df6ef39549cde7a4a3ef56fc2947 SHA512 abb29366c9bc7483a5eaac509c9f2277997a2fda2096a68d51f3ed9d730e761275262f3c1ac5b3c8dddf434017ffef40da2447948adca47366d449c2013df4da WHIRLPOOL e11bb167bf2d5b7c56d0d7c791ba55b2b0bb3aa891f3c5f7ebfb54d1b326a44d7329a639ba68c857df31f671b9545207cfe5102bd8498dfa2ca5245000c1e404
 EBUILD netbeans-groovy-9999_p20160715.ebuild 3416 SHA256 b6c360cfd4a698b5c22babff3279bb5eab2a361ad0ba1cc68713f4f3b3f8e6e7 SHA512 a4b7f892221cc7cd95d4193b180b375f2abb513fbbd681b7781368f8320551aa565ce265e94059052192d94fd44d644fedc0a09be12e8d0751b4fb63f261ecd5 WHIRLPOOL e0e877ee2be3e5b8aabcc9b5ae325367b81c26ba41b322b79a879be826693add2898acbdd54d43d730c11c89ca3f766fa8bca47e603426f07e424f1c8d1fd770
 EBUILD netbeans-groovy-9999_p20160716.ebuild 3416 SHA256 6e5767c909aeba1ce22a27829a6319723bf8cd3eaf455dc0f00fea2388c729b4 SHA512 c89bb62141b8c72f66e7132a48111d4f43eeb1d928e86aa9a751f842e5682f6f74d13b4a65a2067dd5cc47ae5171c160383866304bf1db4bc33ac3ddddb6e145 WHIRLPOOL fc52c9492ab29e863731f70f43276e5788ca725506d208a33d9364dfac7560597ea71d1a608aecd9f66ea7be2a2b7b88ff2f562ab36c48318d47eca66884038e
+EBUILD netbeans-groovy-9999_p20160717.ebuild 3416 SHA256 7b05aa2637a21e64889dabeac2149951db5779a4efe21df2b06d21ba84c514d2 SHA512 dba6e3b94b813c476cfd2976a840207d8472c78a70d8c9f6cf677e8d3c9d9f30b687a04d84239bbe61b05ce76b4cb2cdf12d0fdf6c6ae0f7d3e83e37786b15de WHIRLPOOL c81b0b1ddf9bf155003d0151d1a8ec63b7423694238e0a848c3d0016e1ee5dd44a2dc9f82a3eb74d39ac59ce5b8631254464b98e4b9e4b3e8f180297534e1446
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160717.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160717.ebuild
new file mode 100644
index 0000000..2204887
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160717.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-07-17_00-02-33/zip/netbeans-trunk-nightly-201607170002-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 8712d27..e0f29df 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f0
 DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
+DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 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_p20160616.ebuild 4126 SHA256 ba685f70140f5011e7cfb66445933d498b4686d1cc897a52fb32d69cead6c63c SHA512 24f7d1debcbe39415a24d1adf8caca164eb1f8e83db091b67b169b8651ac72d16f5e3e32f7bad1b90e21bb80e533c0c7ce9da42255afec1813244a251746d428 WHIRLPOOL 45a2272c65a31ecf8762970c943c173272857b9529d2e18180fac419a58125bdb248a14bbd7cca38efa64cdcc4d50d927efa45f0f1a5f3223964bf0b51a77082
@@ -60,4 +61,5 @@ EBUILD netbeans-harness-9999_p20160712.ebuild 4126 SHA256 74a7dc8ae1b872aeed7469
 EBUILD netbeans-harness-9999_p20160714.ebuild 4126 SHA256 e7bb52061c190d9d3073df61b570507203158a241cd3f0d9b3ecfa4ba9c2c5e1 SHA512 aa121aafe325dea54073341de56853f1199579e55917c6966246708f4359555b74182ccaf1d7395499c8772e648f7f88f84edea50b75755e78749bca60748844 WHIRLPOOL 0f9a57978400e4c42cb8837a5f24d490ec9d8143d2e7be1be776b045a5d068cecb989070387165f63ad4ba70c7719b9972eac2cd8b988708f6febc51d178748a
 EBUILD netbeans-harness-9999_p20160715.ebuild 4126 SHA256 4975d85f01f7d3affb5c5c2dea2368d291936fe4d02f69b68fb2da1541ae39fb SHA512 c02fff0e78f689416e6541d32af0158c8c9bb475320e042404395af421134f63fa823691e8cfc971642e5ce4d9360f3e5c5ebb2a69fcad7aabc54be37a896f39 WHIRLPOOL 05d2f529643fcf7c7c8e7afae9483d5de0b2f22bdb0069d932016785f0fca4a6d0e1bf8f5d1ff999fefa4b526ba2dca522ce443210927c3f9bb2e522011dc345
 EBUILD netbeans-harness-9999_p20160716.ebuild 4126 SHA256 f28c3517705795aed249b12b176cbfd7d711ded55189b9ab0f1c9a4597e87102 SHA512 3f48e9d279c6dd86d2b793d86111a2dfa688eeff9db3ae9b112246e4c0a37c2fc4272de056f58143826626933ce2f94c5212f247e02a785f19cca7c58c51d5f8 WHIRLPOOL 8734c83e8737c202ac276f2160f87aa0513b701f885004283a0328ddac2445032078d38c096b4bd03a3d3deda1cd1904dd220a0ec0539827b4ee2e46fdbab777
+EBUILD netbeans-harness-9999_p20160717.ebuild 4126 SHA256 bf0875a3b8dc58b69add80c569c93d9a68864f258cf54ff2b0680b5871fb1e38 SHA512 1546e99ed7f9e5d4a1af1d921b6f63664ea35c7c61baffc598ba0c851429f5d61776b055acc89c018de262ad0f703ad5d12d2a052e65e8c2b3b64d55907bb681 WHIRLPOOL 0188144a6491042dcc31a57ad31e5547f4adab74ef032c1922405384b32b536b5fd0c54ca6b3171824e7c5f8b312c4cde63e120fc519a7aaca76925a63fd7639
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160717.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160717.ebuild
new file mode 100644
index 0000000..766b5f6
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20160717.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-07-17_00-02-33/zip/netbeans-trunk-nightly-201607170002-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 dc4da3d..26824a8 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -167,6 +167,7 @@ DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f0
 DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
+DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 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_p20160616.ebuild 29867 SHA256 8b9b24d96cfb1fdbcb17529ba0a216216a7ce3dde5bc7e76415fb10990696e1f SHA512 d96b51929d51e09d911d60a847313e1b06769985ce8490a7fc43cd83ceab0fee33b3e86836c9752585e5b2334d8b5db5501f3a50bee4b4a357ca6ab33f55b8ed WHIRLPOOL febf90375b1aa59cbaa5747b03973cda730f8826c36eb6528dc6491a0ef029bad1b40b5ad3e486edf1cbfd76ffbbfe7294a9ea7a41cdf378045e7b1687d5d70d
@@ -194,4 +195,5 @@ EBUILD netbeans-ide-9999_p20160712.ebuild 29867 SHA256 85b6bda9470fdcd1d2bf4b74d
 EBUILD netbeans-ide-9999_p20160714.ebuild 29867 SHA256 fd68f477e76398c46654bcc5a9e6a9199e66ea8752cf808cd20bedcc7b8703e3 SHA512 9bbe660125f0463c26f3bacc4bea97e2cb63015d419ebf789ee6142ce8142ab1caafdb0eec71918f53c045be70a58fadc978712210402f0938f6b10acff4c1ce WHIRLPOOL d2ba44aae7e1fe8e66dcbbb4bd204fc3d9c629435e3ffc2ae0ff46082817c6e77a97089b91ecc23b3516368b919cb8948769c661a82983848885eac041fc1c1a
 EBUILD netbeans-ide-9999_p20160715.ebuild 29867 SHA256 65fc09d4924b4f14cf9f0625745a2b859fc7effbbb21851403ee9c1b13fd82eb SHA512 b4c7d97d08b46730acb48354d11d076ac924d454bd8be40ed4871457bd45286b7815fb61531e8e51e00aa1554316cc4392c2178c675fd0bc5cef164154dd9f30 WHIRLPOOL 1ebf005aac3b07456bac82e952ff8a11dc80b4e29b865d4ba3be747ab86670bccef667a93be976fb675d9715468da106793bce56f5bf0fa45867f8d43fe4a79a
 EBUILD netbeans-ide-9999_p20160716.ebuild 29867 SHA256 17cf83fecba626caf6dd003923756181f56a67cacfcc97c47dea41f4986fcb1d SHA512 5c57610aecdca7c50002dd19e227cd162d2ece0810e629ddde2126e094662aef3ab94b88c4511fa0b9dc21a3b69371e4615e218c5aff4ba7fb8f13341fc2ee08 WHIRLPOOL a051705bc573ecc858b971caa96ddef86930d77a5f1c01c5c01dac1685f323e9182e5b0d146639623c7eadad51717fe031e45e2bcf53a1e37911b76104535f7b
+EBUILD netbeans-ide-9999_p20160717.ebuild 29867 SHA256 b8427180790446c73c44eeed52e0dd98ffceb675af44dd22585af7dc5b3a5aef SHA512 5ad67cf2c97070e7180cee5fbf80066de0afafd41b495ce89660dffddd22db6af1e28f8835f16fffe194ede13305689ebe2d53ebc588be8352316484ed99f0e4 WHIRLPOOL 4fa7d59bd7bbace808896dd21db6e7ebdc0284d6df7e9ded76cde17bc01c4b98fd07ad24628e4cc51dcfc46b889e1b04e1ce7a20532310ea83f26f5e46d9e1ca
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160717.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160717.ebuild
new file mode 100644
index 0000000..4899a6d
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20160717.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-07-17_00-02-33/zip/netbeans-trunk-nightly-201607170002-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 ef6b22f..46d2083 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -64,6 +64,7 @@ DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f0
 DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
+DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 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_p20160616.ebuild 15656 SHA256 08c0f6f91c18424f71499886f549d99a9f4f21e83864a1211adcc7001376140e SHA512 911161fedfb54ac9de79add222f1aa548907163cdb845302c8f720ec68009485c1b1c042c36e92dac1246b645d3c5c6bb4a7ba694c3dfb66b1374e257ace34e3 WHIRLPOOL 951e258428cbe2c789709c064c5bbd1bd8fed80551b0b37ce31749cdc13c10a618a16d89196123e18147f53a0cbb2714961fae0f48affe122089a000728df34e
@@ -91,4 +92,5 @@ EBUILD netbeans-java-9999_p20160712.ebuild 15656 SHA256 3820fac9f920771610b240f3
 EBUILD netbeans-java-9999_p20160714.ebuild 15656 SHA256 e0daff95e9a907f92c867223b7fd2704698cb344f474131a7d3ba0f1268911ab SHA512 bf8b36115e47da27fd59202a1993bd07f477ae6fcae02b3146cb488c054b9fc8ef1651f27ecb516a185b24cbd36d160fe50cbe1d812e43c1205172b15a393828 WHIRLPOOL a137c764f0975a27c48babe20f4b5c02da5cbbfdbe329d9d3f8d68c64a4226d13ac69c00cdf4665edd6797691ce41666858e469145ee899147fd90f58a55ebc3
 EBUILD netbeans-java-9999_p20160715.ebuild 15656 SHA256 c945bcf64cc7320255cb48effb27e45466e19704d63735dac2900c8496740d45 SHA512 b355b605f733200edeeb92d53394a48076afa0225c7d69fdc7386634d14428e4c3a2ced53dcbad65e61514ccf26c3b93e16af14e9ac95caea3e4196a1afde253 WHIRLPOOL dd0edf7c8f2b10d4e1f06e211d04b8495c99d6f0047638922060b6d9c18f141852c097b4b9ff98deebaa7b5f8a9ea359801e391f5594638b163042e8e50c6a03
 EBUILD netbeans-java-9999_p20160716.ebuild 15656 SHA256 a3c0873f6f871b8e84215e61943ca1943ea41fdd2e80567203850038f7def2d8 SHA512 61ed2b820e8a0bdae95687951c659439e532b995e4d76d094ce0fe6a1de8e1ff28aa17285e5e3be215a79abf2098f5cbf07856c51fc523acbb1e3f6982f9d767 WHIRLPOOL 481fa875998965c15cfc62cd1d7ce0107f2e94a6979d9cfb0bb067057075884a16b1acadb96b11894a228e9e7e4b14237d64a310672b5880d1cf8580d37876e2
+EBUILD netbeans-java-9999_p20160717.ebuild 15656 SHA256 ecf2234a5d3f6dad96eb51de1785af556dc2f7111104564dc175344afac0d4f0 SHA512 279741717d2c2f265315be722cdbf0ff773f0d576e444854ee7149ebd922145beb89181bc12782f8a46f9674b8ace5de7b33ba0dc5b16a47e181425a123e4d8e WHIRLPOOL 9f37b0156619c16b5e0d467a22dc3ada6a162fc4e5831f51ee3b998578829a31a8db5637169d85d79af29fd74edfd33c6fdf1182153acf86ca511a638d276a53
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160717.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160717.ebuild
new file mode 100644
index 0000000..a9727b1
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20160717.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-07-17_00-02-33/zip/netbeans-trunk-nightly-201607170002-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/D803BEB75E912EB3C2F2E042B808AC0263C066DC-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}"/D803BEB75E912EB3C2F2E042B808AC0263C066DC-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 9a624a3..48ec973 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f0
 DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
+DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 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_p20160616.ebuild 4971 SHA256 07f957fa622b72df3ad275babb74f734076fb2a83c6a5b5329ba29ca80743f1c SHA512 ebb4663e2e49a6966d4bc4cc83a9d34f689e857504e096f834c5b6d63379427d2860e2c14f668e528fc1f5a4d1818524a0e62f07c4231acb38bf0c1bdf3e9ec8 WHIRLPOOL 94ad39967a7f66f3bef4f6a14233f3729a1cfd356ee2a533e3f519bf3d1bbf87f574d19fdec4ae284ea2798a1a78b21092058637b93a56389a6475d232a8486c
@@ -58,4 +59,5 @@ EBUILD netbeans-javacard-9999_p20160712.ebuild 4971 SHA256 300af673ed75d66106555
 EBUILD netbeans-javacard-9999_p20160714.ebuild 4971 SHA256 1939e85d24e271167fabb8729a6eaca2f7b6370df12177e7ceb72a64349194e4 SHA512 5eda28e523f64b1a5678ffbcefb365af60af65d3e6e78eecab70d5fdd74b67cca4896950c38b054cafaf88ab372c06bb473e946ef24d7cadf50f6542d9bfba4b WHIRLPOOL 65f7ccef9299bc705d46fec9d39fc4958f118aa8794acad48f0834db1b935bf2e144aa21f0750ae89fa156bb08337540baa6bcce6054d683bfef9f9328a4e1bf
 EBUILD netbeans-javacard-9999_p20160715.ebuild 4971 SHA256 baa7a568f77a14b239bf154c1e2c664ccfeb16936ed9b0508e4801833fe0fd65 SHA512 71dbada1a7ce6700a5bef7e21838f5acefa7e8551c64768e5695cf6c2618fa5497700e0e5bfadb69d4a857790ef4fab5bfd580ba513bc11f662c9c7bc8997142 WHIRLPOOL dbf11ad0d3d482081b6c58e274efdf9f66489d31e3c0d2001faded776a03e7e406ab55e270f78aeef815c46e00fed0bf491788c304afd31d67907ace04190d79
 EBUILD netbeans-javacard-9999_p20160716.ebuild 4971 SHA256 d51d9eb7d5e69dd46fb8fe70340d6209ccdb488c6ce0bf552b7d1f8e461eb44f SHA512 8390ac99a224c821876a49ed7477035fc18ae83b21693e4ae3fc349b9880a3a45f4f24d4fb4e8411ae8cd927de8a5c7160317f92640669a1761e2c265f360bfd WHIRLPOOL 51823804c721644cbc1bb59deba065f97a986a654edbbf25651f42f9d2bb5dc0f3f5c5c2d56eab56d5f2b08f251c76c6b7abb853819f55072b454a56d48128fb
+EBUILD netbeans-javacard-9999_p20160717.ebuild 4971 SHA256 191d88d9b85ca0901a0122d608195620b4deb3f2505fce77b0e0e78944fbbc66 SHA512 4a1477363cb176cd2d9e9d2122a8c852ab1d8dad7ddad4d3a891a08c2c769cb2872d1b00721661e0a4fc92cb1907e579c8baea9fa59b111f2c0b9d4d72f3796a WHIRLPOOL 9f35a26ddfae9cf9a717c90108140039f470c17d94c88f6a1cb1a4d751535a0972c20843f264f408949be40b56d6a207b8b4535b2aaa55712135460cae40ba98
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160717.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160717.ebuild
new file mode 100644
index 0000000..5138854
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160717.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-07-17_00-02-33/zip/netbeans-trunk-nightly-201607170002-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 7645140..1b2c942 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f0
 DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
+DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 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_p20160616.ebuild 6293 SHA256 2c773464b6cd2f9afd9556359c8867d46da873a0d451c14b9b7ded53bba33c0f SHA512 9a960a89b1cc5e6057cdc1e4e4c61b563221aa08321c5465a10883315d4d5b57b07cc3b6baeda3725489ae8f2bc776492003f73218327d2559000c31a3d71593 WHIRLPOOL 25a47193598296e46ba636bd2025ff31fcb9a9f24b6c54c1237710d641485024b7c807b5c6b6d2a8c7010c138b5494f0dc0766ccd3fb0470ff8cef05321f6110
@@ -57,4 +58,5 @@ EBUILD netbeans-javadoc-9999_p20160712.ebuild 6293 SHA256 63b25e52b6af5b1101d7fd
 EBUILD netbeans-javadoc-9999_p20160714.ebuild 6293 SHA256 000c5327ecb0ef470e0a47fa538a548be89f44753cd7c5888cfc8f8a821dfc62 SHA512 ca47291b23e92812bb3b7b653bef76dc5948d1428acad025ce0ed3c38dc96355a3a5ba5c441f9fe116ee25d5e3890eed24159a62a999cb4a9dbfd56dd22623a0 WHIRLPOOL 1ca47476d6e70fdd14f119fca15329ffa0e55537dcf54aefaff343ff0b0b37ec919c79708001e0a465ce4b9e6bed1f54d6b8e4d6cc4a996fdebd26c7a29cb273
 EBUILD netbeans-javadoc-9999_p20160715.ebuild 6293 SHA256 679768220db001a6e5bdea0d232e0f247ae4ffcd1fd630f0e4780c952c83ac07 SHA512 17af308168a204c733327f561ee732b7ad99d93a1ad56a230553f139dd2cbca5c914318f485cd3ad18f63c12c83d179ca9cb711058f06db09fd69853f293f267 WHIRLPOOL e2d5acfcd32e114caed6f1b8ea3bfb026a6e8f7f44ebdd25feef64845adaf82b11b723d46d926b16bb7fe476150a49e93c3f3c33c73f7979cf2df71e474b1759
 EBUILD netbeans-javadoc-9999_p20160716.ebuild 6293 SHA256 8d294b83ff623343d453c4142b0c8d8b6b615fdfbc2cf4bde0b1ab9baeda5dfc SHA512 998b57833278f42aaa36f0f7394328b1a0b56677520cf407b885c452f143489c06a364cf7b6891e099511c9bcf7187d66aef009a2d1f940b6ce5e8643dd7ba38 WHIRLPOOL c7e1f86364ba973d0aac1102218a542333c064b397ac2d702be5217ce35eb9323e933994cf5e708978188dcab598099124de4514fc8a81c5c8935c797836bdb2
+EBUILD netbeans-javadoc-9999_p20160717.ebuild 6293 SHA256 3135b0769bc56bb6754e5911e8d94bee8eb5b827f6356433638dcb1f07ddadf9 SHA512 e7d5cc0b7c96a060b8f9728694331cca4699023ffd0db7bdf206e45f58b1f405ac340c0815ae5e51e1a7d86008893428526222c21721415e0ca7579eb9e2e06c WHIRLPOOL dd81408e028eec410e4b1f1e155d06be29ff7639cbe5821c9b97c482468fa9c0c4ae742fc4b87200434c82970bb2e7edc991abb6c87c4acf0d52500b34d49645
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160717.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160717.ebuild
new file mode 100644
index 0000000..cef5288
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160717.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-07-17_00-02-33/zip/netbeans-trunk-nightly-201607170002-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 4d2c27a..0918b79 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f0
 DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
+DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 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_p20160616.ebuild 4717 SHA256 e628c45fab98d8ca675391b8e46fce8c880eef550762477ee056bfef8a79f02f SHA512 6fb2fec0939dcbca63afca2983ea2112abfe87664cd79c82c66e6a9c8d3a0f25494674818b11c8462c6a0a1e3b8a4ba9320f34f885aa80d374cb40059110ea7f WHIRLPOOL 716244f2d572cd2426fa104e85b70ba6540ad49e4b26dbede8520fb3f0c233d2fe7239df61bbfaddc75f36ce1f5bf142542629ae96192a480924ae70b8379ef1
@@ -63,4 +64,5 @@ EBUILD netbeans-javafx-9999_p20160712.ebuild 4717 SHA256 b15f65389820606177c3938
 EBUILD netbeans-javafx-9999_p20160714.ebuild 4717 SHA256 79a5b09192620b7495ca7ba435701029d1d6d6b0fa9024a906a61e463256d8f2 SHA512 56a1d2937e4de529dcaa7b80037be3150f6d6d657b926ef56a9fd4e0a407c2648ef1abeb4ff6936f1cfd78787d72e6434b3f1cd58d548a8d89c7b6930459f8d8 WHIRLPOOL 04932d01999aa65f377168e039904d6c3c2d5f9e0048e0b0309aa7daeecb71195a4d4650546beede69e0339cb349ca8c02f3111c78512913ab49939d7d041788
 EBUILD netbeans-javafx-9999_p20160715.ebuild 4717 SHA256 39c6744a8e6b61dda6be4546fb4235d870c0ec330bdd171359274bc3f74fb86a SHA512 18a67072723595d506d56e4c652777485deaf1a320a32a74df0be27dfc0ef8e7ba21868968f7a075fb6051b2340f0c0e8756938cafea60c100f3ba858941dd26 WHIRLPOOL 135a12fb0acd5cd27553e109ef21c7392993befad892c0f3e3a5ef05f9738ef13d1e66dedb521796697015c98156aa7f869bb9a9998c2f9334c68b312d99ef37
 EBUILD netbeans-javafx-9999_p20160716.ebuild 4717 SHA256 54d965847895fae2142187cea50525c42e5acd2007d29e93b5277b37e71e3fb2 SHA512 bfc61c6fa114b561bfbff290b6e52823247a14aa6c63175579cd3f4003d0bddcb614d82d8311c2c130e2c418ab76e32a88d56922d0a053d61a8e55a07e3960be WHIRLPOOL 4aa618764f388d40985122898b93b71a279d7dce47023edcb2e24d324e9addad4973fe149e24d0827654706ff0b7b3d0f04f3a9284c7362d9d8a62cf873d241b
+EBUILD netbeans-javafx-9999_p20160717.ebuild 4717 SHA256 0f65fdce06426559412a854623ed39a08eade81bbe1676142ee5a9cbc46f4e10 SHA512 77765eaf48ca28cc181be0ab4fbc6f617e94f1be57e2c862d35a0ab996adeaf71775156e1744567e1831765fb3febaf91bc4461bf183f40d4cb4357889159f15 WHIRLPOOL 6db931aed455dac3954d7aebe46bcbe0cbd824fd87966ec41306160be43b0817643b27ed12d5faa8faece507da6a00092830bbf74cc0fb059be404ae6b611140
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160717.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160717.ebuild
new file mode 100644
index 0000000..6459a26
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160717.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-07-17_00-02-33/zip/netbeans-trunk-nightly-201607170002-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 329379a..af1fe83 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f0
 DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
+DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 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_p20160616.ebuild 4412 SHA256 7d70a21c94bfbe2ac070fef47455ef64eecf7c40149c5ea98bc8ab092c761dd6 SHA512 8fdfbc149f0623305cf695524c9df1be32f719e88cdfd2b8e962ae0509f38e1d42830f2c3b21c9975857beee640f0002fa783913c4718225cbb889fe17e63592 WHIRLPOOL 8803909f1ae5ce69df65943aefb944a58fd5cdccc4bc38b2da98eabfd5d66b0239a288b874903ca461cafb133f48caef7b362b846dd91bff5af1fd0eb66dde8a
@@ -55,4 +56,5 @@ EBUILD netbeans-mobility-9999_p20160712.ebuild 4412 SHA256 f27ec67bde63dd71ac3ee
 EBUILD netbeans-mobility-9999_p20160714.ebuild 4412 SHA256 b1c95899d7e6a463241c007bc638f295bdabfcdd871f67e8e878371b498a26e7 SHA512 061fe34302e287ad1ceeff8e2647d4fcd419ba4799e65dae7ef7fb6d8217c829624ebe8ee72e926b2cef77567849a77ba9b71ecb7ba324ed68eed3b19b51e17a WHIRLPOOL 0549aa617b3efd4845eeade84162a6a1f0cc5addbb192fff351087c8850da7d30540031b4f721dc41deec511c5422bee3956a2db28dc6706000f62228499fa38
 EBUILD netbeans-mobility-9999_p20160715.ebuild 4412 SHA256 4565630b7f89f2ea344275e800dfe331aaafa79fa87f169a8618398f14ae5f93 SHA512 64fda2531573cdb9d829c0d96d4b95c30e707893925dd9818942de979fea396178c386c2053a1492aada9aa231d1715ebf813ef6de6e678135984732368dd90c WHIRLPOOL b94d195b64832db30c528916850fd73bc2e9ea6393b7b960a4b1541ad347213ad967ffa4c842a793fe496e0888179bdbc4abc79c2dd6965dbb564dd81294e327
 EBUILD netbeans-mobility-9999_p20160716.ebuild 4412 SHA256 f2f3bf9adc3d923a7103dc5da9a640ce630cfef7ea6abc2a50db4453eeaa6d2a SHA512 18603992f1ea260e763d2f346dab6424b0704c055ae5db8adca9417ce758e03aa2a71b296b07a86697df720325207a3768e993c20e9df1e7b97d42aa11168ccd WHIRLPOOL 84829442c5ada70de596bc010359a9779ff514bcf1fae9a4591d3a94aa438b8d100d294ca26d415fb85b9f0384717c98164560fe0150e19967f78d6afe3e4032
+EBUILD netbeans-mobility-9999_p20160717.ebuild 4412 SHA256 9875dd3e26d88b3c7bc43c09dc28e2b9b86a29fb19501f57cdbb33e659e6045b SHA512 654bf97176ccc3e20c14dd3948227fce0f8b9c0ce4840ebe9ae8d64670848c6255ac467591cdb591bb91ac0c47f597ff11c88c93b73c9bc34a58260b2fcebe74 WHIRLPOOL 6c9d22fb45601071e5dca0636f26dcaae0464b689c32869c934e270a58f9a057cf247ba9bbe8ff0b6fdcc66df9298c8c79b395772fccb21f3b763d49023feb87
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160717.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160717.ebuild
new file mode 100644
index 0000000..ca13265
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160717.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-07-17_00-02-33/zip/netbeans-trunk-nightly-201607170002-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 441d2fd..d876e55 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f0
 DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
+DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 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_p20160616.ebuild 4111 SHA256 9c0a7c74d266bb8aa461bfed36528139ac313badb56474aef83def63b132e2fa SHA512 da8ccb62f620a11f03eb5328963fbc4ba0d27da3b804571153e972ed764c6c074db06d0716a36864de29dfad096417324ef2bc90f191d302a3dfad4b0f0c36e7 WHIRLPOOL dc8c22b7a0eaf9d1d39cfee2d3c309b9670728a0c70bb791ac7de88c9a62d67c47a5ae581e1f6cfcded486d906953b968523a6a5ba95963165159c6aca8f86f7
@@ -58,4 +59,5 @@ EBUILD netbeans-nb-9999_p20160712.ebuild 4111 SHA256 7451d65493aeea8cf2235c4bf36
 EBUILD netbeans-nb-9999_p20160714.ebuild 4111 SHA256 4baf4e282f2742165c53b78dc8987ef4e910f73c14b0cc43ba956bdb981f1622 SHA512 7238a5b2c4e5a1538f79e5247a3408a15ef5b431ea3f35bd9fd0fb449621bc559e17b52c31cece1b05244c2fb71263485bf3f681ffa2bebdee22b0b6692ed938 WHIRLPOOL db9c7f2a4f48dd0de80a6510dc41b68e678236e692ebd5ec14ca5bd50f3b68a0a9c4c87a4f9cb888b3dcc8fc7d49d8ae847935b3e0285a014cf363c71853b687
 EBUILD netbeans-nb-9999_p20160715.ebuild 4111 SHA256 3b32c1f634e83025c1f9f274648e87ecb8ab12c30c143e26821e350743e311f4 SHA512 9cc0f04c0e510f14efc8598081cd38ea05c5ee0b5fea3b64a55e626d9a8b039f691f5352fbedb69864b8849f5f6ea9991d5144ae8d33b65fda6759b607635955 WHIRLPOOL 1c415614d6cef3b8f34d66a66205cea74011d13f3946d8963011c727738e312962f471bab1e72d84ad90721b4c0c9cd42fcc583d34b442636582d79259b11dc7
 EBUILD netbeans-nb-9999_p20160716.ebuild 4111 SHA256 46bbb3e1fca18aad791b7cfc20c2c2a8671004d5866541d5a7229b6341b7c04e SHA512 de474d1d8aa47f86f2a6f2c7e67b4bbd7f0b8569b92fbea1b67b53f48d17615a4b6eaf211f6ebd8beecda311f994335316397a30b4f5c4675e2216de304d803c WHIRLPOOL 0fe3635244ed4e0f9bcb48f32d4ccda1f4a3282aa8f4f14a6429e770b8b7d1ac028cb1668cd6657c5dd834cd00a8c875dc797fbaed8f51793d3f6d87ad47efe1
+EBUILD netbeans-nb-9999_p20160717.ebuild 4111 SHA256 44a0d82084a38bbbe204144c277963858eb54bd3e3e6dc9fba7eb127053dde99 SHA512 ab2d69dcb56a54c8332d960adb89cd78c6432c698f8265438e3536e4d14257fc274e37ee371213872281edd8980484d9c5de3480fad2b318bda1de5b56ebc2cf WHIRLPOOL 1b6b8e942d071a90c22c5359521e1ee7a5f5accaeeb7ea514f75df66b3a9aa95c42ac6da65aa6a7f8e67b8eff91997a12c000ad9900c7c7190619e0ae6d83499
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160717.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160717.ebuild
new file mode 100644
index 0000000..9c3ceb5
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20160717.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-07-17_00-02-33/zip/netbeans-trunk-nightly-201607170002-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 e505f73..dd97f01 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f0
 DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
+DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 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_p20160616.ebuild 4418 SHA256 be0e2c81d9c13822532e29b2affdb4aeffc939c1ec71b4fcdf370cd4b02a5906 SHA512 70f69ca728886934fab8b04c42313811bbd816cd61ae44e37fee858ee12340ba58aa04a6fd279013fb98cd6ecf76d4a9b01fb57420cbbfc9bcbd4e3718576748 WHIRLPOOL eacc775c4342a397bcbbd735fd96c7077ac9a7681ac0bbcd26c982cc878cd042bc952a24fdf15d5077563571a9bf83563fe606839bca4460423b77166ceb4bf4
@@ -60,4 +61,5 @@ EBUILD netbeans-php-9999_p20160712.ebuild 4418 SHA256 9e3905f62ef3860be0aff89a7f
 EBUILD netbeans-php-9999_p20160714.ebuild 4418 SHA256 151fa7bd00a9fc0da71e1af780e3469234755cc55a9dc29fa6fd59f8eaf73399 SHA512 9e9a74d11c6275ee14a56be85f4caf6d7f5f3651bd46563bff27d6feffa3dbd378db7430694e6550a14b2cbac0069dd03d8e5bf88c1f734a1b1286ade9aa6366 WHIRLPOOL 3cb2690a7ae699252cc9c51794ffa3d287486945034150b55f1ced736eab63f74d19d9855cd7ac4d7bf49d51f785e2a6eb1578250a3802c6ec4fd167ffe7539f
 EBUILD netbeans-php-9999_p20160715.ebuild 4418 SHA256 030451623ea9bb0f748b15514f923473d6936b9a3db22af98b580f712a9ef845 SHA512 e31b987c71b71084cc309febab5c6f642d501b289277c356c57822cd3b49365a79a0db0d40e741bf2678e2f4ae253be2a2644b7d5c08ccc3fce0dfed71e32f53 WHIRLPOOL 1d8df726130832bc665c9b0a7f921265cb75f69a12425a0d8a1b86b8e7701c3732ab8517f15d414e4e9b5aea54010cf63d4eb42c27fc5e0be39f064578ddc6ca
 EBUILD netbeans-php-9999_p20160716.ebuild 4418 SHA256 25ddbf01cc46026f080b095088da20c8dc803f33eaf23d2ae182b41ca0539b46 SHA512 0420a75fded52cbc35837525fa1747f1f5d214b22b16fc21a33f317053b77921dc6d790b03d347ea8f33fc3dce45706be19fe7fa1979c777cef78cc9e0355cb0 WHIRLPOOL 0d24569f14251395403572157e1c53c685149fd39c46af5f256fbc18d3b542337e9f17ea7010ee60b76842f4e275938bfac60a44426312c685b1952c21e07a4f
+EBUILD netbeans-php-9999_p20160717.ebuild 4418 SHA256 8d2a0c51ebefe4b3f582e31021b799613dfde87cff55553ea1807b8332da03bc SHA512 4d37b7f8ac213b9a0a23b39a2551f22e82afe7b0ee76e19f0a5154e749b56ff282b0c2f80af68dbf9c5fa79dd4de1f3877a7f52b2628ad4a736d696185049b0b WHIRLPOOL 7207355781d8769e1ef6e333e34fe814974556aae771e0a8cc1a0eff8dbc600e4a580ab31b844a40b6cbccb7e01127d3c0713bbdf4da72c6512f8beccea6a5e5
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160717.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160717.ebuild
new file mode 100644
index 0000000..63628c8
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20160717.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-07-17_00-02-33/zip/netbeans-trunk-nightly-201607170002-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 1f80b2e..195f187 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -54,6 +54,7 @@ DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f0
 DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
+DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 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_p20160616.ebuild 9520 SHA256 f83b9f7c44432d294cf8560514c6280f9df7a22a64fca6a3f69157a1273716ae SHA512 930a7cb047b4b92df4aff7510c2893f9e99071f716533aef2c3b8d56335788b16f6d1d3840fff4f76972aeddbc92a28ccf0cf55432216cb0e38e88017194c353 WHIRLPOOL 9cf1d9a31d4509ded199cf19ba04f237421d2b5c8cd14d209db9bc1e02d9dc3e6548c167be1569c058d40aa64982742ee65bdc5bf8cdb3bcad14aef45bed9e3c
@@ -81,4 +82,5 @@ EBUILD netbeans-platform-9999_p20160712.ebuild 9520 SHA256 7cfcc2b2e2086957cdb69
 EBUILD netbeans-platform-9999_p20160714.ebuild 9520 SHA256 31e86905caca10d6b09b36127348f48524447c67a3c5d90bf2eb98142b63546d SHA512 f44e53ac7f345ad655dd945a63c66b956ef2511ac2abf4bde5607671dae264f282658c403f5e218888e86aa263161ad96a8f3e42c9817d6f7384960d69bc16c3 WHIRLPOOL 72481c75de16731e75b900e9d940754b86b1ae8c4019e89581478d539114d7094e05c0a8516ab069f722bcadf70bd72042a9c5757f6b859e29cab3497b825210
 EBUILD netbeans-platform-9999_p20160715.ebuild 9520 SHA256 9c6be49e7be03745de2b951be958697755fed986823aee3b7ddd932ba3c138b2 SHA512 5d992a259238d3585a57cb40e1958693f52aba72dbaa98da52452d3d1849f1fc5f52eb903d13748f379ccf4101c6d93d33eb0c1e193d5032d49d2a93280def62 WHIRLPOOL 32d029610e5ecb3d76197ba2304840845fe0c4fd81174dae7d9f06c5e33ffe00902ece070beec522be3185884db1336fbb5b8e278b3432ccf5e4e7c8ffce9a5a
 EBUILD netbeans-platform-9999_p20160716.ebuild 9520 SHA256 beead83e2a67d041641e0fa04430018a20a7577b466291431754d16752e52494 SHA512 19526b5e2c42651ab28aa91fa81b4d550d62d682bc1e54af6d69dd59463422dc9e396576cc7abe66e18e09ff1de1fbf654e1a387a335028e76352ef9d0487432 WHIRLPOOL be30be5fe3f38873b8c0d36820c32e111f008c07e62495569fb015546d5b209ad686015ab4c180e6dd8ef364f295f59f3c376bc0a8e51ae2e85e510ae10985fe
+EBUILD netbeans-platform-9999_p20160717.ebuild 9520 SHA256 27288bd56f3cebc554e4b8790e3bd5607e8bb32771365bdba788df7dcdc65330 SHA512 e7ab57eac6b422f986c9f32d7f7d68ebb3eecf642c6e30b4110269972791bcbd0ecb27c30b72a960b13da39e0ede6a5a7255e51c731464d6bbddfb61b7ec8b3d WHIRLPOOL a1d1c7cfb60d2e114b227bab18a35f01e0b555b5c879444136935c34de829e512045e9ea813f34084515615fc11df536940a630190e26c8a8b9cc73f6676efd9
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160717.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160717.ebuild
new file mode 100644
index 0000000..f6e4dc7
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20160717.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-07-17_00-02-33/zip/netbeans-trunk-nightly-201607170002-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 86fe0a1..57d030f 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f0
 DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
+DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 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_p20160616.ebuild 3472 SHA256 0a79f7add54314b7297739d89959b9ef694a02b25cc05fbd58d1ecabc897c478 SHA512 7da2bdc3361d044e5598b39620afb5e3f0ae819704a9f216a1e976898acdfdf780ab4b3665d0de2ccc63cd07cc8def0c893d55341d4f2c0e80bdf597d2ebc0a2 WHIRLPOOL 3fffc019f02cdb1f7bf7e95e5535e880d0734387225f51c8254ec10aa5c1a30faa8fee470d77b99519552347c585ff033aa9adeec583c9025396c82a50aa6b30
@@ -55,4 +56,5 @@ EBUILD netbeans-profiler-9999_p20160712.ebuild 3472 SHA256 a66b34f5f6cb6d1097d4d
 EBUILD netbeans-profiler-9999_p20160714.ebuild 3472 SHA256 1dfed7f18bdc70763ec83b1470ed7d5b0e0993b31ef59b60ed19481f57e6ef77 SHA512 e7cb4e0ffa5bdccc14b617dd1642bdaf133a276ea04612540de8c9a179091a873cbf2399367fc8508fc40e102a86df711088902fa231866e77b6002db175487f WHIRLPOOL de5812b4ed794c0b0b63cf212f247e3a3627fadd7727dc752330ab5b265ba1c9bd508bdf92c57046b657ccd5a9d6208d65651a25bff96a659dcf0b38e0962c4f
 EBUILD netbeans-profiler-9999_p20160715.ebuild 3472 SHA256 2822a260dcc2b29514bbfe8a1387c45257f23ed8aca503c619369b56ff491be6 SHA512 74064cb38322cb0f8ff5a2151b7341c2d9d926816455e949a3b4d82e6b52b1959d9605bb16731c9dde9b81c67f75001d5d715719bc8a6f24ac76851ad5a0cc1d WHIRLPOOL 2bd5a03eb1bb56bfc4c5cc0de9f38b7d10a43fae2113b924938ec02a13e15804ec944d24debc27a0d0dfd1cee9dbcc90a48167c1b2a396de04ed14c545aa85f0
 EBUILD netbeans-profiler-9999_p20160716.ebuild 3472 SHA256 86e23ce300ec6573cb11426495ab2c49c1a9cb773db852e2ac5d2b60f817b4d2 SHA512 66910597ca2e010d60041642cd79d34fee945e65c74987f52cfead4b276dd25945c6ecffcaff8a22c74afd8dfcf74cc926161ba2764b3ad636ff905fac8f820c WHIRLPOOL b49a557ca4794ebb203fa63de90479acbf013e3a99d54398842fb370826dd954559947d8073548eb52d4ce4982f8e50df8a6bf8165065fc22502920469535568
+EBUILD netbeans-profiler-9999_p20160717.ebuild 3472 SHA256 ca94edf54cb5dcc24aa4736c13c9d31eeb64b27014cc84e5369b45fe329113be SHA512 88f7013c3e3181a998be8bc5bf1a77af2f392d6efa4b5b65c47a167b241255eec57b159fbf355e6570c01c2aceb56bb1e6e92f3689a6031e4915194b4a7c3a91 WHIRLPOOL 35095660c2403e167bf207bb8d277c2a1ca31ca36b18ac442dac9565576962ae5b89c687661d409132d336737810fb08f420166fed4008be0bf62d35f991a626
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160717.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160717.ebuild
new file mode 100644
index 0000000..0aef38e
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160717.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-07-17_00-02-33/zip/netbeans-trunk-nightly-201607170002-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 8e3f0f3..8429657 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -53,6 +53,7 @@ DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f0
 DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
+DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 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_p20160616.ebuild 6242 SHA256 97916f4e9a9fdec59e7b691d3bfd060cdd27ad063603917748f4633600d3bf22 SHA512 eb0c50d2b5d5c9ef0b7c5eebf65f1b49f47fd3b5c7993c58edc6ddebb311a6786cbd106a22ee3a3d0f2f09d511e50fd8f57373fbee6f6131695d6a414d6f21b9 WHIRLPOOL 8dc26451a04a6e954adafd15eb1e0da5684964ce603ca59806df7e88141d439c52dc224ca83019ed4146781e9ad0089a9c1729ec9144abe308a2c88a349b54ce
@@ -80,4 +81,5 @@ EBUILD netbeans-webcommon-9999_p20160712.ebuild 6242 SHA256 3fb03a84632842716596
 EBUILD netbeans-webcommon-9999_p20160714.ebuild 6242 SHA256 3418a62049f63b85ad79e5e2357168d735929ff4653368d519293a6ab0230611 SHA512 29bb9f84ae57687286d461fee7716f50b0180f2db560d97a9e9d9b509a2b82f8d0cf8cfe0dc34db91db42880e1985ddd9bed76cf12d840925ce69e4b917c919a WHIRLPOOL 92e3b0bfd97b14b4de071e9a8b3f54d6b93701a48e6290851071fd81c2fd488c2354a9ac3bfa282fac088e0775794e21040429cd6a29fdf62343e5a6804bcd60
 EBUILD netbeans-webcommon-9999_p20160715.ebuild 6242 SHA256 9bb795db0d5d42b159aa1ea570612f519fa4a80b31fa9ad0d8c1827dcf2b8ce8 SHA512 91ceadcc633d325a2d90b4f79d683fd21de13d76a2114d380ec40022dfd506e3621eb379ff64e14491548ec31e51a8143088cea2d76f054461cb04cd2d76d5e4 WHIRLPOOL eb7f3f28d22c771e8a4847256582da07fd36a5744d05efd5456d940dfad79f504b6f4e3ba969b1b824989b693d82f52ee16847735c3bf1dccd839340df0c264d
 EBUILD netbeans-webcommon-9999_p20160716.ebuild 6242 SHA256 71af932f532f66cb2098bc0570ecb5aed4188e8b4d6e12e366b9a51812180820 SHA512 08c2b7c76137657aec699b5e28625d8bae24a1bbeb0066ec742b692fb3b3596816907b0ed95f0e63c37db0f7591c6b82a46aee8c5b55dafaadc73a1f173da28a WHIRLPOOL 1f2dd8cf917ebf599bc9616325182c88dc918f4506fbc0ae2c64393c85209afd7141727cf48b89f1dce229ae553bd98bc9b56d0b8e37ae506ebade08e5b219b1
+EBUILD netbeans-webcommon-9999_p20160717.ebuild 6242 SHA256 ee7200046af66189d8efd1eaa7b3aaa858dc481fc84d14821f33719b6c2a5c24 SHA512 06db68d025dd8a5fcf3a4779154893a3d174d282d157f7b5edd6802a28c405c2890814b39b7b18061093b40675ded4ddf6cad35610ed116b3719228cfe879aea WHIRLPOOL 251b4db4fcbd939a0f5a017333e33a5635cfc7baf46a0eccbfd8f3071a53aaac4497d04286f213375b8daa0a8daed375c21d86dda477c84f2065453cefefd530
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160717.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160717.ebuild
new file mode 100644
index 0000000..0de6a30
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160717.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-07-17_00-02-33/zip/netbeans-trunk-nightly-201607170002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/49154F217F990DBE818AFC30642D1AC1A2E6CE89-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}"/49154F217F990DBE818AFC30642D1AC1A2E6CE89-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 12ccb9e..99323b4 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f0
 DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
+DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 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_p20160616.ebuild 2721 SHA256 81077dd1a92ffef3a8c864094861350ddc3229ffd21168d8b74220047368ee6f SHA512 4a854355fac57d38b25fcd580a31fbda039cbb56265b39f2302773c13063be0df4d26140a9c3f8182488a8e8263ccba4cd495ccdb6fa9a9e2281cef5e0a0c1e2 WHIRLPOOL a04413646aeef0b1ec4f5f4434db18da805a1e1a970081797e94882cd58b8de1457911b134422e09f108098d4c2f66e7995024434fb1b5fbea5a3e430f378cbd
@@ -55,4 +56,5 @@ EBUILD netbeans-websvccommon-9999_p20160712.ebuild 2721 SHA256 254fa6d0c415ecaa4
 EBUILD netbeans-websvccommon-9999_p20160714.ebuild 2721 SHA256 a2779614839fbc7f3f990cb2d3b5b5c32d6598325c38a0bbab24ec2b6ec3af28 SHA512 0e30cc9ca5cb167597eb924712280d3d0fec53fe681d66aa1488097332cf41715a0a68a6ba15db9093e16091d261d68db9fad598da7d6f4244e69b06042dda01 WHIRLPOOL ffe86291db3ad1ffbcfbfd000853127f5ba82030fd865d5036d1955ab5e74e365be28c65cfe1b96bf92af58b7500833e95e62912e613911211b75e537fdb267f
 EBUILD netbeans-websvccommon-9999_p20160715.ebuild 2721 SHA256 4d7c7c0b55b2aac43fc078b408791958ea5b8157ae295b4d3da20a4f4939030e SHA512 8155022da527ec33a0ac10d1a4251e83f992a908970c12dc30fa8c0191fca4d64c60ff8be1a74c4b65dab7beb5d10b0788f2df6bb71e14340d66a9741bc87a6e WHIRLPOOL 1bb18bfe762d28ae5e629090e14dde541eaab61146c3651d14432ce238f4609e531f6a46a2ca81c770dfbe1b0d7c208b6231f7988426fb00dfcfbd80bbd86834
 EBUILD netbeans-websvccommon-9999_p20160716.ebuild 2721 SHA256 25201748f1c41c55cd808a9bfcfcf614f2e28d0520a84ff81cd7069c71467c9f SHA512 088df54a45bde5648e3af725382b6a293693c0e2dca5995c7eb8c961316d42efb9b413d23b467e273ba6ef5627d26cf2ad2b4569760bd26474fea359f1085f05 WHIRLPOOL 9b644817dddd6a9dc255b729e6c909f5361cc7ab969cda75cc404604b66a74200ea31b91ecb402cfce4c9960c551ea632b213744c050f6747835a3822e9295d3
+EBUILD netbeans-websvccommon-9999_p20160717.ebuild 2721 SHA256 1a6d30ed67c610f79628c86c79bb73657dd57949bbb12201a01442a2deff867f SHA512 8aa2594ac7ff48e41c21cc884e4b2eb751cf915e5f7aa08a1cfaa5859649efccd2418e85a3e1f428b94b72a3d218144094bf8226aec4d54fd91fd002d246ec81 WHIRLPOOL b5372ebbb32502083aacd1c5fbe7512c2722ca7ed12f39ec9cad62f95a4aa86ba6f0478d6a151377596716a7b15f03558fd36d72b89573af3e93b975a562decf
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160717.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160717.ebuild
new file mode 100644
index 0000000..b034520
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160717.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-07-17_00-02-33/zip/netbeans-trunk-nightly-201607170002-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 14cf75c..bfbe0dc 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f0
 DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 DIST netbeans-trunk-nightly-201607150002-src.zip 216593537 SHA256 e0d9639b1a5b6db8f0a7356607d4a257d13e43a800cad615a3dfaaff4f92873a SHA512 0a7232ce73964ba61322bed972678fa0199656aa3223e8fb518dbe4c36a06478d5b7c1b7069e6e29c436e61f7f6b74cf9a33b117ae9e7520579fdabd0a7e5a55 WHIRLPOOL df5bf6c3951d7d3d2ff8b858ff2afa8d33cb664a8ba6c650c548a4a083b32cdb4785d58a5050aa532821e92eab152b86a098faa296180b972875d7d5092c3997
 DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570d558a634ac4192aea808bf545cfc23736286c904fb18b6e45a SHA512 7c18676f64607fe175bdb11d689d30731e3edcf07af980727df0ef8d0973ed5b3a61e61af3c9b7e9091a4efea8682c3354af138896ed8e92d989efae5cc053ee WHIRLPOOL 37ae402b9125e4e587cd1f6a45c93ac934b8c4605863e8d710d9415a202d8be6eaca5e5e95da4034a5499b0f48f501be8faf859cfa2334ff68ade8627b78340a
+DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 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_p20160616.ebuild 6939 SHA256 d9ed9644003dfe397e89f927b0377b4b22a64925bb0d020b468bd8ccc9022a8c SHA512 ad6e3c3edb1895a91803a3f4d4c778db104e639d599cc454efbca25b9290dd47e0b1a7ddf8a5b727518482a7013030fdeaa0664d3da4f7ddfe144d75a3c3fb17 WHIRLPOOL 2bc6c33a2bfa39f3194590bfcc4e187bf0e1cc0c36b4a17e9a8cc82512f44c051690b411ef270d8ddc7bc63cf6688c0ecb83ecaf8da68ae7a760675c326fa6b5
@@ -58,4 +59,5 @@ EBUILD netbeans-9999_p20160712.ebuild 6939 SHA256 4161f911f67da50af615e89e97c49a
 EBUILD netbeans-9999_p20160714.ebuild 6939 SHA256 e5311bfc054c29ee55e8b47aca99541782178147ebe0d04ef84fcc7ae3939c7c SHA512 c04c20a9f6b319bc308e44665e1bdaff83344dba33efadc0c345c67e5867257a6d566ea933cf234c26cefe4a1b65f819799f537ceea617017940b4a284b4eac7 WHIRLPOOL 2426e16425125679933140033b89770cb1fbc2fa3fafc133385d024ccfa81fd6e4ebed299cd32933a5128cbcea27662780964fe6f2f60664017085530273b545
 EBUILD netbeans-9999_p20160715.ebuild 6939 SHA256 8190f340cbb3d9a257ccdf78226871fcddfe0b17b5e557a4da97a711cb96c342 SHA512 4f90c9e9420d84df5cd036319168ea777aa295966e79036d576f6f129be41c0d7d130ed4c1fba2c6d38e695b921d5a595c54271e38ecdd04ad4d856f8f65a524 WHIRLPOOL 4c8b5b4f44cfd55cfe114508c345ee7da90b9571f1a5d525609a843daa0485449c8e061e45099f005ce1bf7a7bb0636b5060893b602dbbbae21a3a647ff5c4dd
 EBUILD netbeans-9999_p20160716.ebuild 6939 SHA256 140c1597f86de88607f46d0182bf60651c56ef2b16792c6cff6e05c83e3ad303 SHA512 46e5931e07124ca50111668009d7ecea0b7b180ebea5b86105f0c5dbb42bd0baef793a6e937a64a2aef5cf2f22f619fbf1486d5a38447176ecc129f7d15311de WHIRLPOOL cfb199fb1b101ca3c2426988f7d18d7fdea9011269084906c37c8398de23aa91c8de6fe351d57d62e5a9fb2103595e8cf6148340826b2198972e114080f9720b
+EBUILD netbeans-9999_p20160717.ebuild 6939 SHA256 d5fd90c55429197f77bedf0badf303301cf5f03d9add4aab004b400a0c7cfb4d SHA512 d227f40bbc923f37d593ba7845027b4c3d1f1faf4dfc57b788d7ec9a0cf9535b49ed4dbecfcc05faf415828f7ad26165ee4fdb2b3b67829187e8532815666993 WHIRLPOOL 03ed806129b4f038798a2afd4242a3e0d1a6cd28f79b18ac0de8500f523a02598746b1b703829a3c1509451edd5cacd21d1ab4e4c2a20e5d50ef489e4e12a5eb
 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834

diff --git a/dev-util/netbeans/netbeans-9999_p20160717.ebuild b/dev-util/netbeans/netbeans-9999_p20160717.ebuild
new file mode 100644
index 0000000..0d6f16a
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20160717.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-07-17_00-02-33/zip/netbeans-trunk-nightly-201607170002-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] only message in thread

only message in thread, other threads:[~2016-07-17 21:58 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-17 21:58 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-extide/, dev-java/netbeans-nb/, dev-util/netbeans/, Miroslav Šulc

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